aboutsummaryrefslogtreecommitdiffstats
path: root/src/graphui/classes/com/jogamp/graph/ui/GraphShape.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-04-05 10:06:26 +0200
committerSven Gothel <[email protected]>2023-04-05 10:06:26 +0200
commit1eb9d91bbf5d24a02c4d9e98501ff51eb7ecdcd0 (patch)
treedc1c7615f4b99d7b09c9b3c569f6e3d459dbb4e5 /src/graphui/classes/com/jogamp/graph/ui/GraphShape.java
parent15e60161787224e85172685f74dc0ac195969b51 (diff)
GraphUI: Adopting Vec*f API; Adding Group; Scene + Group are Container, traversing the PMVMatrix throughout childs (-> see TreeTool).
Utilizing the Vec*f (and Matrix4f) API w/ AABBox et al renders our code more clean & safe, see commit 15e60161787224e85172685f74dc0ac195969b51. A Group allows to contain multiple Shapes, hence the PMVMatrix must be traversed accordingly using TreeTool for all operations (draw, picking, win->obj coordinates, ..). Hence Scene + Group are now implementing Container and reuse code via TreeTool and a Shape.Visitor*. This will allow further simplification of user code.
Diffstat (limited to 'src/graphui/classes/com/jogamp/graph/ui/GraphShape.java')
-rw-r--r--src/graphui/classes/com/jogamp/graph/ui/GraphShape.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/graphui/classes/com/jogamp/graph/ui/GraphShape.java b/src/graphui/classes/com/jogamp/graph/ui/GraphShape.java
index 6efd7f5f4..8b142210a 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/GraphShape.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/GraphShape.java
@@ -38,7 +38,6 @@ import com.jogamp.graph.geom.Vertex;
import com.jogamp.graph.geom.Vertex.Factory;
import com.jogamp.opengl.GL2ES2;
import com.jogamp.opengl.GLProfile;
-import com.jogamp.opengl.math.geom.AABBox;
import com.jogamp.opengl.util.texture.TextureSequence;
/**
@@ -137,7 +136,7 @@ public abstract class GraphShape extends Shape {
if( null != gl ) {
clearDirtyRegions(gl);
}
- if( isShapeDirty() || null == region ) {
+ if( isShapeDirty() ) {
if( null == region ) {
region = createGLRegion(glp);
} else if( null == gl ) {
@@ -164,7 +163,7 @@ public abstract class GraphShape extends Shape {
final float x2 = box.getMaxX();
final float y1 = box.getMinY();
final float y2 = box.getMaxY();
- final float z = box.getCenter()[2]; // 0; // box.getMinZ() + 0.025f;
+ final float z = box.getCenter().z(); // 0; // box.getMinZ() + 0.025f;
{
// Outer OutlineShape as Winding.CCW.
shape.moveTo(x1, y1, z);