diff --git a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/GraphLimits.java b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/GraphLimits.java index f22276c04770112115107da05251ed132ad79f76..247c3a032feb7f907c380f871eef93c51dd86347 100644 --- a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/GraphLimits.java +++ b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/GraphLimits.java @@ -49,10 +49,6 @@ import org.gephi.lib.gleem.linalg.Vec3f; */ public class GraphLimits { - private int minXviewport; - private int maxXviewport; - private int minYviewport; - private int maxYviewport; private float minXoctree; private float maxXoctree; private float minYoctree; @@ -71,14 +67,6 @@ public class GraphLimits { this.maxXoctree = maxXoctree; } - public synchronized int getMaxXviewport() { - return maxXviewport; - } - - public synchronized void setMaxXviewport(int maxXviewport) { - this.maxXviewport = maxXviewport; - } - public synchronized float getMaxYoctree() { return maxYoctree; } @@ -87,14 +75,6 @@ public class GraphLimits { this.maxYoctree = maxYoctree; } - public synchronized int getMaxYviewport() { - return maxYviewport; - } - - public synchronized void setMaxYviewport(int maxYviewport) { - this.maxYviewport = maxYviewport; - } - public synchronized float getMaxZoctree() { return maxZoctree; } @@ -111,14 +91,6 @@ public class GraphLimits { this.minXoctree = minXoctree; } - public synchronized int getMinXviewport() { - return minXviewport; - } - - public synchronized void setMinXviewport(int minXviewport) { - this.minXviewport = minXviewport; - } - public synchronized float getMinYoctree() { return minYoctree; } @@ -127,14 +99,6 @@ public class GraphLimits { this.minYoctree = minYoctree; } - public synchronized int getMinYviewport() { - return minYviewport; - } - - public synchronized void setMinYviewport(int minYviewport) { - this.minYviewport = minYviewport; - } - public synchronized float getMinZoctree() { return minZoctree; } diff --git a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/octree/Octree.java b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/octree/Octree.java index b589bf53434c6e762d414419c27d222ccd781bce..3dbe570517f0c901c75598eeb0764163228c1ebf 100644 --- a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/octree/Octree.java +++ b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/octree/Octree.java @@ -259,71 +259,12 @@ public class Octree { } } - int viewportMinX = Integer.MAX_VALUE; - int viewportMaxX = Integer.MIN_VALUE; - int viewportMinY = Integer.MAX_VALUE; - int viewportMaxY = Integer.MIN_VALUE; - float[] point; - - point = drawable.myGluProject(minX, minY, minZ); //bottom far left - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - - point = drawable.myGluProject(minX, minY, maxZ); //bottom near left - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - - point = drawable.myGluProject(minX, maxY, maxZ); //up near left - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - - point = drawable.myGluProject(maxX, minY, maxZ); //bottom near right - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - - point = drawable.myGluProject(maxX, minY, minZ); //bottom far right - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - - point = drawable.myGluProject(maxX, maxY, minZ); //up far right - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - - point = drawable.myGluProject(maxX, maxY, maxZ); //up near right - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - - point = drawable.myGluProject(minX, maxY, minZ); //up far left - viewportMinX = Math.min(viewportMinX, (int) point[0]); - viewportMinY = Math.min(viewportMinY, (int) point[1]); - viewportMaxX = Math.max(viewportMaxX, (int) point[0]); - viewportMaxY = Math.max(viewportMaxY, (int) point[1]); - limits.setMinXoctree(minX); limits.setMaxXoctree(maxX); limits.setMinYoctree(minY); limits.setMaxYoctree(maxY); limits.setMinZoctree(minZ); limits.setMaxZoctree(maxZ); - - limits.setMinXviewport(viewportMinX); - limits.setMaxXviewport(viewportMaxX); - limits.setMinYviewport(viewportMinY); - limits.setMaxYviewport(viewportMaxY); } public void updateVisibleOctant(GL2 gl) {