X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=vtk%2Fsrc%2Fvtk%2FvtkPanel.java;fp=vtk%2Fsrc%2Fvtk%2FvtkPanel.java;h=aaa340ed4b5bed846762350ada3a43c48543b96a;hb=7e8142b80067a2af52ceb5bdf3a9307756c1c78c;hp=6747f92417dd5f1c2abd6c82d1cb3331fcd83180;hpb=d40911aa559213f660ac87c9bbd9f98fe81fba28;p=simantics%2F3d.git

diff --git a/vtk/src/vtk/vtkPanel.java b/vtk/src/vtk/vtkPanel.java
index 6747f924..aaa340ed 100644
--- a/vtk/src/vtk/vtkPanel.java
+++ b/vtk/src/vtk/vtkPanel.java
@@ -36,110 +36,8 @@ public class vtkPanel extends Canvas implements MouseListener, MouseMotionListen
   protected int InteractionMode = 1;
   protected boolean rendering = false;
   
-  static String[] libs = new String[] {
-		  "vtksys",
-		  "vtkCommonCore",
-	      "vtkWrappingJava",
-	      "vtkCommonCoreJava",
-	      "vtkCommonMath",
-	      "vtkCommonMathJava",
-	      "vtkCommonSystem",
-	      "vtkCommonSystemJava",
-	      "vtkCommonMisc",
-	      "vtkCommonMiscJava",
-	      "vtkCommonTransforms",
-	      "vtkCommonTransformsJava",
-	      "vtkCommonDataModel",
-	      "vtkCommonDataModelJava",
-	      "vtkCommonColor",
-	      "vtkCommonColorJava",
-	      "vtkCommonExecutionModel",
-	      "vtkCommonExecutionModelJava",
-	      "vtkCommonComputationalGeometry",
-	      "vtkCommonComputationalGeometryJava",
-	      "vtkexpat",
-	      "vtkdoubleconversion",
-	      "vtkjpeg",
-	      "vtkzlib",
-	      "vtklz4",
-	      "vtklzma",
-	      "vtktiff",
-	      "vtkpng",
-	      "vtkexpat",
-	      "vtkhdf5",
-	      "vtkhdf5_hl",
-	      "vtkmetaio",
-	      "vtkpugixml",
-	      "vtksqlite",
-	      "vtkogg",
-	      "vtktheora",
-	      "vtkverdict",
-	      "vtkglew",
-	      "vtkproj",
-	      "vtkfreetype",
-	      
-	      "vtkImagingCore",
-	      "vtkImagingCoreJava",
-	      "vtkImagingMath",
-	      "vtkImagingMathJava",
-	      "vtkImagingFourier",
-	      "vtkImagingFourierJava",
-	      "vtkImagingSources",
-	      "vtkImagingSourcesJava",
-	      "vtkImagingHybrid",
-	      "vtkImagingHybridJava",
-	      "vtkImagingColor",
-	      "vtkImagingColorJava",
-	      "vtkImagingGeneral",
-	      "vtkImagingGeneralJava",
-	      
-	      "vtkFiltersCore",
-	      "vtkFiltersCoreJava",
-	      "vtkFiltersGeometry",
-	      "vtkFiltersGeometryJava",
-	      "vtkFiltersGeneral",
-	      "vtkFiltersGeneralJava",
-	      "vtkFiltersSources",
-	      "vtkFiltersSourcesJava",
-	      "vtkFiltersGeneric",
-	      "vtkFiltersGenericJava",
-	      "vtkFiltersStatistics",
-	      "vtkFiltersStatisticsJava",
-	      "vtkFiltersExtraction",
-	      "vtkFiltersExtractionJava",
-	      "vtkFiltersModeling",
-	      "vtkFiltersModelingJava",
-	      
-	      "vtkRenderingCore",
-	      "vtkRenderingCoreJava",
-	      "vtkRenderingOpenGL2",
-	      "vtkRenderingOpenGL2Java",
-	      "vtkRenderingVolume",
-	      "vtkRenderingVolumeJava",
-	      "vtkRenderingVolumeOpenGL2",
-	      "vtkRenderingVolumeOpenGL2Java",
-	      
-	      "vtkRenderingFreeType",
-	      "vtkRenderingFreeTypeJava",
-	      "vtkRenderingAnnotation",
-	      "vtkRenderingAnnotationJava",
-	      
-	      "vtkFiltersHybrid",
-	      "vtkFiltersHybridJava",
-	      
-	      "vtkInteractionStyle",
-	      "vtkInteractionStyleJava",
-	      "vtkInteractionWidgets",
-	      "vtkInteractionWidgetsJava",
-	      "vtkInteractionImage",
-	      "vtkInteractionImageJava",
-	      
-	      };
-  
-  
   static {
-  	  for (String lib : libs)
-  		  System.loadLibrary(lib);
+	 vtkJavaDep.load();
   }
 
   // Allow access to display lock() and unlock().
@@ -186,6 +84,7 @@ public class vtkPanel extends Canvas implements MouseListener, MouseMotionListen
   protected native int UnLock();
 
   public vtkPanel() {
+	
     rw.AddRenderer(ren);
     addMouseListener(this);
     addMouseMotionListener(this);