diff options
| author | phil <[email protected]> | 2016-10-22 17:58:36 +1300 |
|---|---|---|
| committer | phil <[email protected]> | 2016-10-22 17:58:36 +1300 |
| commit | d0fa672008836024a1d814ece86e8a36319a4c67 (patch) | |
| tree | 6614bf5142dd715e698a9aee513dffa03a4e5c4a /src/main/java | |
| parent | 544ce676ffabdc4590ff77b21d56c9467e8ae411 (diff) | |
Bug 1329 - SceneGraphObject read capability bits set to true by default
and this is not configurable.
These will now default to true but can be turned off by adding the
system property j3d.defaultReadCapability=false
e.g.
System.setProperty("j3d.defaultReadCapability", "false");
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/org/jogamp/java3d/MasterControl.java | 9 | ||||
| -rw-r--r-- | src/main/java/org/jogamp/java3d/SceneGraphObject.java | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/org/jogamp/java3d/MasterControl.java b/src/main/java/org/jogamp/java3d/MasterControl.java index e806caa..ef50d81 100644 --- a/src/main/java/org/jogamp/java3d/MasterControl.java +++ b/src/main/java/org/jogamp/java3d/MasterControl.java @@ -398,6 +398,10 @@ class MasterControl { // True to disable all underlying multisampling API so it uses // the setting in the driver. boolean implicitAntialiasing = false; + + // If set to false default capabilities will not eb set, potentially allowing + // much more compilation of scene graphs + boolean defaultReadCapability = true; // False to disable compiled vertex array extensions if support boolean isCompiledVertexArray = true; @@ -529,6 +533,11 @@ class MasterControl { getBooleanProperty("j3d.implicitAntialiasing", implicitAntialiasing, "implicit antialiasing"); + + defaultReadCapability = + getBooleanProperty("j3d.defaultReadCapability", + defaultReadCapability, + "default read capability"); isCompiledVertexArray = getBooleanProperty("j3d.compiledVertexArray", diff --git a/src/main/java/org/jogamp/java3d/SceneGraphObject.java b/src/main/java/org/jogamp/java3d/SceneGraphObject.java index 8755fb3..230d6a1 100644 --- a/src/main/java/org/jogamp/java3d/SceneGraphObject.java +++ b/src/main/java/org/jogamp/java3d/SceneGraphObject.java @@ -133,7 +133,7 @@ public abstract class SceneGraphObject extends Object { * Method to set default read capability bits to true */ void setDefaultReadCapabilities(int[] bits) { - if (true /*VirtualUniverse.mc.defaultReadCapability*/) { + if (VirtualUniverse.mc.defaultReadCapability) { for (int i=0; i < bits.length; i++) { setCapability(bits[i]); } |