Fix PNG loading

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / shape / MeshActor.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/shape/MeshActor.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/shape/MeshActor.java
index 0cfc8246bcc155d43e25edf0dcb550800369669a..b290f861d27fbcf6d7d7610b1ad22a5c491f4aad 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/shape/MeshActor.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/shape/MeshActor.java
@@ -29,10 +29,7 @@ import vtk.vtkUnsignedCharArray;
 
 public class MeshActor extends vtkActor {
        
-       public void setMesh(Mesh mesh) {
-               
-               vtkPolyDataMapper mapper = new vtkPolyDataMapper();
-               
+       public static vtkPolyData createPolyData(Mesh mesh) {
                vtkPolyData polyData = new vtkPolyData();
                polyData.Allocate(mesh.getIndices().size()/3, mesh.getIndices().size()/3);
                
@@ -70,16 +67,23 @@ public class MeshActor extends vtkActor {
                colors.Delete();
                
         }
-        
+        return polyData;
+       }
+       
+       public void setMesh(Mesh mesh) {
+               
+               vtkPolyDataMapper mapper = new vtkPolyDataMapper();
+               vtkPolyData polyData = createPolyData(mesh);
+               
         boolean computeNormals = true;
         if (computeNormals) {
                vtkPolyDataNormals normals = new vtkPolyDataNormals();
-               normals.SetInput(polyData);
+               normals.SetInputData(polyData);
                mapper.SetInputConnection(normals.GetOutputPort());
                normals.GetOutputPort().Delete();
                normals.Delete();
         } else {
-               mapper.SetInput(polyData);
+               mapper.SetInputData(polyData);
         }
         
         if (mesh.getColors() != null) {