diff options
| author | Harvey Harrison <[email protected]> | 2012-11-18 17:29:05 -0800 |
|---|---|---|
| committer | Harvey Harrison <[email protected]> | 2012-11-18 17:29:05 -0800 |
| commit | a7b8a14d11c8c44b5faede0e7826058803cd5f9d (patch) | |
| tree | fdf57519aa4870d28332a7d8633eb1502bf0f733 /src/classes/share | |
| parent | 3be80211208f09dafeba1f1b70e06d47ceb736c1 (diff) | |
j3dcore: remove last uses of isD3D
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/classes/share')
| -rw-r--r-- | src/classes/share/javax/media/j3d/MasterControl.java | 8 | ||||
| -rw-r--r-- | src/classes/share/javax/media/j3d/RenderMolecule.java | 23 | ||||
| -rw-r--r-- | src/classes/share/javax/media/j3d/Renderer.java | 5 |
3 files changed, 4 insertions, 32 deletions
diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java index 9aac328..9e5e8c6 100644 --- a/src/classes/share/javax/media/j3d/MasterControl.java +++ b/src/classes/share/javax/media/j3d/MasterControl.java @@ -1124,14 +1124,6 @@ private static String getProperty(final String prop) { } /** - * Returns whether we are using D3D. - * TODO: most code that cares about this should move into the pipeline - */ - final boolean isD3D() { - return false; - } - - /** * This method increments and returns the next time value * timeLock must get before this procedure is invoked */ diff --git a/src/classes/share/javax/media/j3d/RenderMolecule.java b/src/classes/share/javax/media/j3d/RenderMolecule.java index 3e7cb64..7c9d3fc 100644 --- a/src/classes/share/javax/media/j3d/RenderMolecule.java +++ b/src/classes/share/javax/media/j3d/RenderMolecule.java @@ -1801,16 +1801,7 @@ class RenderMolecule extends IndexedObject implements ObjectUpdate, NodeComponen // we'll have to punt to vertex array as well. if ((pass != TextureBin.USE_DISPLAYLIST) || - (texCoordSetMapLen > cv.maxTexCoordSets) || - (VirtualUniverse.mc.isD3D() && - (((definingPolygonAttributes != null) && - ((isQuadGeometryArray && - (definingPolygonAttributes.polygonMode == - PolygonAttributes.POLYGON_LINE))|| - (isTriGeometryArray && - (definingPolygonAttributes.polygonMode == - PolygonAttributes.POLYGON_POINT)))) || - cv.texLinearMode))) { + (texCoordSetMapLen > cv.maxTexCoordSets)) { modeSupportDL = false; } @@ -2108,17 +2099,7 @@ class RenderMolecule extends IndexedObject implements ObjectUpdate, NodeComponen // instead. if ((pass != TextureBin.USE_DISPLAYLIST) || - (texCoordSetMapLen > cv.maxTexCoordSets) || - (VirtualUniverse.mc.isD3D() && - (((definingPolygonAttributes != null) && - ((isQuadGeometryArray && - (definingPolygonAttributes.polygonMode == - PolygonAttributes.POLYGON_LINE)) || - (isTriGeometryArray && - (definingPolygonAttributes.polygonMode == - PolygonAttributes.POLYGON_POINT)))) - || - cv.texLinearMode))) { + (texCoordSetMapLen > cv.maxTexCoordSets)) { modeSupportDL = false; } diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java index 5e6ee6e..8007c36 100644 --- a/src/classes/share/javax/media/j3d/Renderer.java +++ b/src/classes/share/javax/media/j3d/Renderer.java @@ -1063,9 +1063,8 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine if (canvas.view.getSceneAntialiasingEnable() && canvas.sceneAntialiasingAvailable) { - if (!VirtualUniverse.mc.isD3D() && - ((canvas.extensionsSupported & Canvas3D.MULTISAMPLE) == 0) || - !canvas.sceneAntialiasingMultiSamplesAvailable) { + if (((canvas.extensionsSupported & Canvas3D.MULTISAMPLE) == 0) || + !canvas.sceneAntialiasingMultiSamplesAvailable) { doAccum = true; num_accum_passes = NUM_ACCUMULATION_SAMPLES; |