diff options
| -rw-r--r-- | src/main/java/org/jogamp/java3d/MasterControl.java | 20 | ||||
| -rw-r--r-- | src/main/java/org/jogamp/java3d/NodeRetained.java | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/main/java/org/jogamp/java3d/MasterControl.java b/src/main/java/org/jogamp/java3d/MasterControl.java index b60710c..ffcce55 100644 --- a/src/main/java/org/jogamp/java3d/MasterControl.java +++ b/src/main/java/org/jogamp/java3d/MasterControl.java @@ -399,9 +399,17 @@ class MasterControl { // the setting in the driver. boolean implicitAntialiasing = false; - // If set to false default capabilities will not eb set, potentially allowing + // If set to false default capabilities will not be set, potentially allowing // much more compilation of scene graphs boolean defaultReadCapability = true; + + // If set to false nodes will not be pickable by default, potentially allowing + // much more compilation of scene graphs + boolean defaultNodePickable = true; + + // If set to false nodes will not be collidable by default, potentially allowing + // much more compilation of scene graphs + boolean defaultNodeCollidable = true; // False to disable compiled vertex array extensions if support boolean isCompiledVertexArray = true; @@ -538,6 +546,16 @@ class MasterControl { getBooleanProperty("j3d.defaultReadCapability", defaultReadCapability, "default read capability"); + + defaultNodePickable = + getBooleanProperty("j3d.defaultNodePickable", + defaultNodePickable, + "default node pickable"); + + defaultNodeCollidable = + getBooleanProperty("j3d.defaultNodeCollidable", + defaultNodeCollidable, + "default node collidable"); isCompiledVertexArray = getBooleanProperty("j3d.compiledVertexArray", diff --git a/src/main/java/org/jogamp/java3d/NodeRetained.java b/src/main/java/org/jogamp/java3d/NodeRetained.java index 97fda10..f683ac8 100644 --- a/src/main/java/org/jogamp/java3d/NodeRetained.java +++ b/src/main/java/org/jogamp/java3d/NodeRetained.java @@ -119,12 +119,12 @@ abstract class NodeRetained extends SceneGraphObjectRetained implements NnuId { * This indicates if the node is pickable. If this node is not * pickable then neither are any children */ - boolean pickable = true; + boolean pickable = VirtualUniverse.mc.defaultNodePickable; /** * The collidable setting; see getCollidable and setCollidable. */ - boolean collidable = true; + boolean collidable = VirtualUniverse.mc.defaultNodeCollidable; // A list of localToVworld transforms. If inSharedGroup is false, // then only localToVworld[0][] is valid. |