提交 1ec93a7c 编写于 作者: M Mathieu Bastian

Cleaning viewport setting code in Octree

上级 70bbcf68
......@@ -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;
}
......
......@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册