Changeset 155:3a06387c0ef8

Timestamp:

08/16/2008 02:23:51 AM (4 months ago)

Author:

marc@f1.local

branch:

default

Message:

minor additions to DynamicXXX utility classes

Files:

• development/java/field/graphics/dynamic/DynamicMesh.java (modified) (15 diffs)
• development/java/field/graphics/dynamic/DynamicPointlist.java (modified) (5 diffs)
• distribution/application/field.app/Contents/Resources/Java/circle.tif (added)
• distribution/application/field.app/Contents/Resources/Java/content/shaders/Texture2DForPointSprites.glslang (added)
• extras/jfbxlib/java/field/graphics/jfbxlib/HierarchyOfCoordinateFrames.java (modified) (2 diffs)
• extras/jfbxlib/java/field/graphics/jfbxlib/SkinningTools.java (modified) (1 diff)
• extras/jfbxlib/java/field/graphics/jfbxlib/SlowSkinner.java (modified) (1 diff)

development/java/field/graphics/dynamic/DynamicMesh.java

@@ -9 +9 @@
-import field.bytecode.protect.iInside;
-import field.graphics.core.Base;
+import field.graphics.core.BasicGLSLangProgram;
-import field.graphics.core.BasicGeometry;
-import field.graphics.core.BasicSceneList;
@@ -19 +20 @@
-import field.math.linalg.Vector3;
-
-
-/**
- * @author marc Created on Oct 21, 2003
@@ -37 +37 @@
-        }
-
+        public static DynamicMesh coloredMesh(BasicSceneList basicSceneList) {
+                BasicGLSLangProgram program = new BasicGLSLangProgram("content/shaders/TestGLSLangVertex.glslang", "content/shaders/VertexColorFragment.glslang");
+                BasicGeometry.TriangleMesh lines = new BasicGeometry.TriangleMesh(new BasicUtilities.Position());
+                lines.rebuildTriangle(0);
+                lines.rebuildVertex(0);
+                lines.addChild(program);
+                if (basicSceneList!=null)
+                        basicSceneList.addChild(lines);
+                DynamicMesh ret = new DynamicMesh(lines);
+                return ret;
+        }
+
-        static public DynamicPointlist unshadedPoints(BasicSceneList into) {
-                BasicGeometry.TriangleMesh lines = new PointList(new BasicUtilities.Position());
-                lines.rebuildTriangle(0);
-                lines.rebuildVertex(0);
-
+
+
-
-                DynamicPointlist ret = new DynamicPointlist(lines);
@@ -113 +126 @@
-                        }
-                }
-<
+ < 
-                        assert false : "to many closes";
-        }
-
-        public void copyFrom(SubMesh subMesh) {
-
-
+
+
+
+
-
-                for (int i = 0; i < subMesh.delegate.cachedAuxBuffer.length; i++) {
@@ -134 +149 @@
-                subMesh.delegate.cachedTriangleBuffer.rewind();
-
-
-
+
-
-                // subMesh.delegate.cachedVertexBuffer.clear();
@@ -147 +161 @@
-         */
-        public Vector3 getPositionOfVertex(int v1, Vector3 v) {
-
+
+
-                return v.set(cachedVertexBuffer.get(3 * v1), cachedVertexBuffer.get(3 * v1 + 1), cachedVertexBuffer.get(3 * v1 + 2));
-        }
@@ -177 +192 @@
-                cachedVertexBuffer.position(0);
-
-
-                checkTriangleStorage(triangleCursor, triangle.remaining() / elementSize);
-                cachedTriangleBuffer.position(triangleCursor * elementSize);
@@ -187 +201 @@
-                                short c = (short) (triangle.get() - offset);
-
-
-                                // assert c>0;
-                                cachedTriangleBuffer.put(c);
@@ -197 +210 @@
-                triangleCursor += triangle.limit() / elementSize;
-
-
-                for (int i = 0; i < auxs.length; i++) {
- if (auxBuffers[i].remaining() > 0) {
-
-
-checkAuxStorage(auxs[i], auxBuffers[i].capacity() / (vertex.capacity() / 3));
-} else
-checkAuxStorage(auxs[i], cachedAuxBufferWidth[auxs[i]]);
-cachedAuxBuffer[auxs[i]].position(cachedAuxBufferWidth[auxs[i]] * originalVertexCursor
-
-
-
-
-
+
+
+
+       if (cachedAuxBuffer[auxs[i]] == null) {
+                       checkAuxStorage(auxs[i], auxBuffers[i].capacity() / (vertex.capacity() / 3));
+       } else
+                       checkAuxStorage(auxs[i], cachedAuxBufferWidth[auxs[i]]
+
+
+               
+               
+               
-                        // else
-                }
@@ -277 +289 @@
-                int vertexCursor3 = 3 * vertexCursor;
-
-
-                cachedVertexBuffer.put(vertexCursor3, v1.get(0));
-                cachedVertexBuffer.put(vertexCursor3 + 1, v1.get(1));
@@ -304 +315 @@
-                if (this.getUnderlyingGeometry().getParents().size() != 0) {
-
- 
- 
+
+
-                        while (n.hasNext()) {
-                                iMutable<iSceneListElement> nn = n.next();
@@ -313 +324 @@
-                        ((TriangleMesh) this.getUnderlyingGeometry()).deallocate(ResourceMonitor.resourceMonitor.getQueue());
-                }
-
+
+
-        }
-
@@ -351 +363 @@
-                cachedVertexBuffer.put(vertexCursor3 + 1, v1.get(1));
-                cachedVertexBuffer.put(vertexCursor3 + 2, v1.get(2));
-
+
+
-        }
-
@@ -375 +388 @@
-        protected void checkTriangleStorage(int at, int plus) {
-
-
+
+
-                cachedTriangleBuffer.clear();
-                if (cachedTriangleBuffer.capacity() < ((at + plus) * elementSize)) {
@@ -385 +399 @@
-        protected void checkVertexStorage(int at, int plus) {
-
-
+
+
-                cachedVertexBuffer.clear();
-                if (cachedVertexBuffer.capacity() < ((at * 3 + plus))) {

development/java/field/graphics/dynamic/DynamicPointlist.java

@@ -3 +3 @@
-import field.graphics.core.Base;
-import field.graphics.core.BasicGLSLangProgram;
-import field.graphics.core.BasicGeometry;
-import field.graphics.core.BasicSceneList;
-import field.graphics.core.BasicUtilities;
@@ -11 +10 @@
-/**
- * Created on Nov 2, 2003
- 
+
- * @author marc
- */
@@ -24 +23 @@
-
-        /** @return */
+        @Override
-        public PointList getUnderlyingGeometry() {
-                return (PointList) basis;
-        }
-
-
+
+
-        public int nextFace(Vector3 v1, Vector3 v2, Vector3 v3) {
-                nextVertex(v1);
@@ -36 +37 @@
-        }
-
+        @Override
-        public int nextFace(int v1, int v2, int v3) {
-                return -1;
-        }
-
+        @Override
-        public int nextVertex(Vector3 v1) {
-                return super.nextVertex(v1);
-        }
-
+
-
-        public static DynamicPointlist coloredPoints(BasicSceneList sceneList, float width) {
@@ -57 +60 @@
-                return ret;
-        }
+
+        public static DynamicPointlist texturedColoredPoints(BasicSceneList sceneList, float width) {
+
+                BasicGLSLangProgram program = new BasicGLSLangProgram("content/shaders/TestGLSLangVertex_withPointsize.glslang", "content/shaders/Texture2DForPointSprites.glslang");
+                program.new SetIntegerUniform("texture", 0);
+                program.setDoPointSize();
+                PointList lines = new PointList(new BasicUtilities.Position()).setSize(width);
+                lines.rebuildTriangle(0);
+                lines.rebuildVertex(0);
+                lines.addChild(program);
+                if (sceneList != null)
+                        sceneList.addChild(lines);
+                DynamicPointlist ret = new DynamicPointlist(lines);
+                return ret;
+        }
-}

extras/jfbxlib/java/field/graphics/jfbxlib/HierarchyOfCoordinateFrames.java

@@ -55 +55 @@
-                public void getWorld(CoordinateFrame out) {
-                        // first, lets just check to see if anything has changed
-
-
-
+//
+//
+//
-
-                        // next, lets see if just us has changed
@@ -88 +88 @@
-
-                        cachedWorld.multiply(tmp, frame);
+
-
-                        modCountParent = parent != null ? parent.modCountHere : 0;

extras/jfbxlib/java/field/graphics/jfbxlib/SkinningTools.java

@@ -269 +269 @@
-                                                        n.setLocal(out);
-
+
-                                                }
-                                        } else {

extras/jfbxlib/java/field/graphics/jfbxlib/SlowSkinner.java

@@ -71 +71 @@
-                        currentLinkInfo[i].inverseGeometry.set(skinningInfo.bindPoseDescriptions[i].geometryRotation, skinningInfo.bindPoseDescriptions[i].geometryTranslation, skinningInfo.bindPoseDescriptions[i].geometryScale);
-
-
+//
-                        currentLinkInfo[i].inverseGeometry.invert();
-                }