Changeset 184

Timestamp:

05/31/10 13:28:34 (2 years ago)

Author:

JoeCoder

Message:

Improved support for the older collada 1.3 format (has a few things incorrect instead of crashing).
Fixed a bug that caused Geometry.optimize to leave more vertices than needed.

Files:

• trunk/src/tests/integration/main.d (modified) (3 diffs)
• trunk/src/yage/resource/collada.d (modified) (15 diffs)
• trunk/src/yage/resource/geometry.d (modified) (3 diffs)

trunk/src/tests/integration/main.d

@@ -154 +154 @@
-        
-        // Create a textured plane
-16, 16
+4, 4
-        Texture texture = Texture(ResourceManager.texture("space/rocky2.jpg"));
-        Texture normal = Texture(ResourceManager.texture("space/rocky2-normal.jpg"));
@@ -213 +213 @@
-        //beast.setAngularVelocity(Vec3f(0, .5, 0));
-        
-        // For testing sprites
-        plane = scene.addChild(new ModelNode(geometry));
-        plane.setPosition(Vec3f(0, -10, 0));
-        plane.setRotation(Vec3f(-PI/2, 0, 0));
-        plane.setScale(Vec3f(10));
-
-        
-        // Lights
-        auto rotater = addChild(new ModelNode());
@@ -225 +218 @@
-        auto light1 = rotater.addChild(new LightNode());
-        light1.setPosition(Vec3f(10, 0, 0));
- // TODO: This seems to make it gradually move?
+
-        light1.diffuse = "white";
-3
+8
-        //light1.spotExponent = 3;
-        //light1.spotAngle = 80 * 3.1415/180;

trunk/src/yage/resource/collada.d

@@ -104 +104 @@
-            if (mesh.hasChild("polylist"))
-                polyList = mesh.getChild("polylist");
+            else if (mesh.hasChild("triangles"))
+                polyList = mesh.getChild("triangles");
-            else
-triangles");
+polygons"); // collada 1.3?
-            
-            // Inputs are the cordinates that the triangles index into.
@@ -121 +123 @@
-            {                   
-                inputs[i].name = inputNode.getAttribute("semantic");
+                char[] offset = inputNode.hasAttribute("offset") ? inputNode.getAttribute("offset") : inputNode.getAttribute("idx");                
-                try {
-inputNode.getAttribute("offset")
+offset
-                } catch (ConversionException e)
-                {   throw new XmlException(e.toString());
-                }
-
+   
-                if (inputs[i].name=="VERTEX") // VERTEX type requires another level of indirection to get to proper node.
-                {   char[] verticesId = inputNode.getAttribute("source");               
@@ -135 +138 @@
-                // Get values
-                char[] sourceId = inputNode.getAttribute("source"); 
-
-
-
+
+
+
+
+
-            int[] vcounts;
-            if (polyList.hasChild("vcount"))
@@ -172 +177 @@
-                    float[] data = new float[indices.length*c/indicesPerVertex];
-                    for (int i=0; i<indices.length; i+=indicesPerVertex)
-ODO: This creates duplicate vertices on shared triangle edges
+his creates duplicate vertices on shared triangle edges, Geometry.optimize takes care of it later
-                        int j = i/indicesPerVertex*c;
-                        data[j..j+c] = input.data[index..index+c];
@@ -186 +191 @@
-                    else
-                        assert(0);
-   
+
-                    // Flip the y texture coordinate for OpenGL.
-                    foreach (inout texCoord; cast(Vec2f[])result.getAttribute(Geometry.TEXCOORDS0))
-                        texCoord.y = -texCoord.y;
+                    
-                }
+                
-                
-                // Build triangles
@@ -229 +236 @@
-                result.meshes = [mesh];
-                
-                if (!calledByGetMerged)
-                {   result.optimize();
-                
-                    //If phong shading is used, generate binormals.
-                    if (material.getPass().autoShader == MaterialPass.AutoShader.PHONG)
-                        result.setAttribute(Geometry.TEXCOORDS1, result.createTangentVectors());
-                }
-            
-                
-                return result;
-            }               
@@ -244 +242 @@
-        
-        // Merge meshes into a single geometry
-[0]
+.length ? meshes[0] : null
-        if (meshes.length > 1)
-
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        delete meshes;  // garbage from old mesh sub-data
-         
+
-        return result;
-    }
@@ -280 +289 @@
-        MaterialPass pass = result.techniques[0].passes[0];
-        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        
-        Node shadingType = technique.getChild(); // in profile_COMMON, it can be newparam, image, blinn, constant, lambert, phong, or extra.
@@ -312 +327 @@
-            }   }
-            
+            if (!param.getChildren().length)
+                continue;
+            
-            Node child = param.getChild();              
-            GPUTexture texture;
@@ -323 +341 @@
-                    pass.setDiffuseTexture(Texture(texture)); // may be null
-                    break;
-
+ // Bump map extension used by Okino, http://www.okino.com/conv/exp_collada_extensions.htm
-                    getColorOrTexture(child, pass.diffuse, texture);
-                    pass.setNormalSpecularTexture(Texture(texture)); // may be null
@@ -350 +368 @@
-                default:
-                    break;
-                // TODO: Get normal from extra tag, see: http://www.okino.com/conv/exp_collada_extensions.htm
-            }
-            
@@ -381 +398 @@
-    {
-        Geometry[] geometries;
-
+ // A transformation matrix for each geometry found.
-        
-        // Get the up direction (unfinished)
@@ -391 +408 @@
-        
-        // Loop through the scenes and load all the geometry nodes they reference.
-
-
-
+
+
+
+
+
+
+
+
-        {
-
-
+
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
+
+
+
+
+
+
+
-        
-        // Transform geometry instances by their transformation matrix
@@ -446 +483 @@
-        delete geometries;
-        
-
-Timer a = new Timer(true);
-
+//foreach (mesh; result.meshes)
+ Log.trace(mesh.getTriangles().length);      
+//Log.trace(result.getAttribute(Geometry.VERTICES).length);
-        result.optimize();
-        
@@ -510 +547 @@
-    // See: https://collada.org/mediawiki/index.php/Using_accessors
-    private float[] getDataFromSourceId(char[] id, out ushort components)
-
-
+
+
+
+
+
+
+
+
+
+
-        components = params.length;
-
-char[] sourceFloatArray = Xml.getNodeById(doc, sourceFloatArrayId).value
-
+s
+Node sourceFloatArray = Xml.getNodeById(doc, sourceFloatArrayId)
+.value
-    }
-    

trunk/src/yage/resource/geometry.d

@@ -8 +8 @@
-
-import tango.math.Math;
+import yage.core.format;
-import yage.core.math.vector;
-import yage.resource.manager;
@@ -255 +256 @@
-    void optimize()
-    {
+        debug {
+            int length =  getVertexBuffer(Geometry.VERTICES).length;
+            foreach (name, attribute; attributes)
+            {   assert(attribute.length == length, format("%s is only of length %s, but vertices are of length %s", name, attribute.length, length));
+            }
+            
+        }
+        
-        // Merge duplicate vertices
-        VertexBuffer vb = attributes[Geometry.VERTICES];
@@ -312 +321 @@
-        
-        // Move data
-
+name, 
-        {
-            int c2 = attribute.components;
-            float[] oldData = cast(float[])attribute.data;
-
-
+
-            foreach (to, from; remapReverse) // Too bad doing this in-place fails for some models           
+            {   //Log.trace("%s %s %s %s", data.length, to*c2+c2, oldData.length, from*c2+c2);
-                data[to*c2..to*c2+c2] = oldData[from*c2..from*c2+c2];   
+            }
-            
-            attribute.data = data;