j3dcore: remove some trivial uses of isD3D which is always false

Signed-off-by: Harvey Harrison <[email protected]>

6 files changed, 2 insertions, 47 deletions

diff --git a/src/classes/share/javax/media/j3d/BehaviorStructure.java b/src/classes/share/javax/media/j3d/BehaviorStructure.java
index e7f4c00..0884618 100644
--- a/src/classes/share/javax/media/j3d/BehaviorStructure.java
+++ b/src/classes/share/javax/media/j3d/BehaviorStructure.java
@@ -506,7 +506,7 @@ class BehaviorStructure extends J3dStructure {
 		incTimestamp = true;
 		universe.disableFocusEvents();
 	    }
-	    if (!VirtualUniverse.mc.isD3D() && !keyEnable && universe.enableKey) {
+	    if (!keyEnable && universe.enableKey) {
 		// key event use for toggle to fullscreen/window mode
 		incTimestamp = true;
 		universe.disableKeyEvents();
diff --git a/src/classes/share/javax/media/j3d/EventCatcher.java b/src/classes/share/javax/media/j3d/EventCatcher.java
index 745d534..71b83b8 100644
--- a/src/classes/share/javax/media/j3d/EventCatcher.java
+++ b/src/classes/share/javax/media/j3d/EventCatcher.java
@@ -65,10 +65,6 @@ class EventCatcher extends Object implements ComponentListener, FocusListener,
 
     EventCatcher(Canvas3D c) {
 	canvas = c;
-
-	if (VirtualUniverse.mc.isD3D()) {
-	    enableKeyEvents();
-	}
     }
 
     void enableFocusEvents() {
diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java
index 157b950..9aac328 100644
--- a/src/classes/share/javax/media/j3d/MasterControl.java
+++ b/src/classes/share/javax/media/j3d/MasterControl.java
@@ -489,10 +489,7 @@ class MasterControl {
 	}
 
 	// Check to see whether shared contexts are allowed
-	if (!isD3D()) {
-	    isSharedCtx =
-		getBooleanProperty("j3d.sharedctx", isSharedCtx, "shared contexts");
-	}
+	isSharedCtx = getBooleanProperty("j3d.sharedctx", isSharedCtx, "shared contexts");
 
 	doCompaction = getBooleanProperty("j3d.docompaction", doCompaction,
 					  "compaction");
diff --git a/src/classes/share/javax/media/j3d/RenderMolecule.java b/src/classes/share/javax/media/j3d/RenderMolecule.java
index 8546563..98aae33 100644
--- a/src/classes/share/javax/media/j3d/RenderMolecule.java
+++ b/src/classes/share/javax/media/j3d/RenderMolecule.java
@@ -844,14 +844,6 @@ class RenderMolecule extends IndexedObject implements ObjectUpdate, NodeComponen
 		return (false);
 	    }
 
-	    if (VirtualUniverse.mc.isD3D() &&
-		(((geo.getClassType() == GeometryRetained.QUAD_TYPE)
-		  && !isQuadGeometryArray) ||
-		 ((geo.getClassType() == GeometryRetained.TRIANGLE_TYPE)
-		  && !isTriGeometryArray))) {
-		return false;
-	    }
-
 	} else if (geo instanceof CompressedGeometryRetained) {
 	    if (this.vertexFormat !=
 		((CompressedGeometryRetained)geo).getVertexFormat()) {
diff --git a/src/classes/share/javax/media/j3d/TextureBin.java b/src/classes/share/javax/media/j3d/TextureBin.java
index ac1e870..36fa8ef 100644
--- a/src/classes/share/javax/media/j3d/TextureBin.java
+++ b/src/classes/share/javax/media/j3d/TextureBin.java
@@ -1243,21 +1243,6 @@ class TextureBin extends Object implements ObjectUpdate {
 	// include this TextureBin to the to-be-updated state set in canvas
 	cv.setStateToUpdate(Canvas3D.TEXTUREBIN_BIT, this);
 
-        // For D3D - set the texLinearMode flag in the canvas if texcoord
-        // generation is enabled in object_linear mode for any texture unit.
-	if ((texUnitState != null) && VirtualUniverse.mc.isD3D()) {
-	    TextureUnitStateRetained tus;
-	    for (int i = 0; i < texUnitState.length; i++) {
-		tus = texUnitState[i];
-		if ((tus != null) && tus.isTextureEnabled()) {
-		    if ((tus.texGen != null) &&
-			(tus.texGen.genMode == TexCoordGeneration.OBJECT_LINEAR)) {
-			cv.texLinearMode = true;
-		    }
-		}
-	    }
-        }
-
         renderList(cv, USE_DISPLAYLIST, rlist);
     }
 
diff --git a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java
index 388a4c6..a1cf24f 100644
--- a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java
+++ b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java
@@ -206,15 +206,6 @@ class TextureUnitStateRetained extends NodeComponentRetained {
         if (this.texAttrs == null) {
 	    if (reload || dirty || cv.texUnitState[index].texAttrs != null) {
                 cv.resetTextureAttributes(cv.ctx);
-		if (VirtualUniverse.mc.isD3D() &&
-		    (texGen != null) &&
-		    ((texGen.genMode == TexCoordGeneration.EYE_LINEAR) ||
-		    ((texGen.genMode == TexCoordGeneration.SPHERE_MAP)))) {
-		    // We need to reload tex since eye linear
-		    // and sphere map in D3D will change the
-		    // texture transform matrix also.
-		    dirty = true;
-		}
 		cv.setBlendFunc(cv.ctx, TransparencyAttributes.BLEND_ONE,
 				TransparencyAttributes.BLEND_ZERO);
 	    	cv.texUnitState[index].texAttrs = null;
@@ -239,12 +230,6 @@ class TextureUnitStateRetained extends NodeComponentRetained {
 
 	    if (reload || dirty || cv.texUnitState[index].texAttrs != mTexAttrs) {
                 this.texAttrs.updateNative(cv, simulate, texture.format);
-		if (VirtualUniverse.mc.isD3D() &&
-		    (texGen != null) &&
-		    ((texGen.genMode == TexCoordGeneration.EYE_LINEAR) ||
-		    ((texGen.genMode == TexCoordGeneration.SPHERE_MAP)))) {
-		    dirty = true;
-		}
 	    	cv.texUnitState[index].texAttrs = mTexAttrs;
 	    }
         }