Changeset 185

Timestamp:

06/01/10 00:03:08 (2 years ago)

Author:

JoeCoder

Message:

Improved collada parsing again. Geometry data referenced by skeleton controllers is also loaded. Fixed parsing number lists with multiple spaces between numbers.

Files:

• trunk/src/yage/resource/collada.d (modified) (10 diffs)
• trunk/src/yage/resource/model.d (modified) (6 diffs)

trunk/src/yage/resource/collada.d

@@ -14 +14 @@
-import tango.text.xml.DocTester;
-import tango.util.Convert;
+
-import yage.core.array;
-import yage.core.color;
@@ -25 +26 @@
-import yage.resource.material;
-import yage.resource.manager;
+import yage.resource.model;
-import yage.resource.texture;
-import yage.system.log;
@@ -84 +86 @@
-        {   throw new XMLException("Could not parse xml document.");
-        }
+    }
+    
+    Matrix getBaseTransform()
+    {   char[] upAxis = Node(doc.elements).getChild("asset").getChild("up_axis").value();
+        if (upAxis == "X_UP") // Y is already up
+            return Vec3f(0, -3.1415/2, 0).toMatrix();
+        if (upAxis == "Z_UP")
+            return Vec3f(-3.1415/2, 0, 0).toMatrix();
+        return Matrix.IDENTITY;
-    }
-    
@@ -297 +308 @@
-            technique = profileCommon.getChild("technique");
-        } else // Collada 1.3
-
-
+
-        
-        Node shadingType = technique.getChild(); // in profile_COMMON, it can be newparam, image, blinn, constant, lambert, phong, or extra.
@@ -308 +318 @@
-        // else use blinn (gourard) shading from the fixed function pipeline
-        
+        
+        // Helper function for loading material data.
+        void getColorOrTexture(Node n, inout Color color, inout GPUTexture texture)
+        {   char[] name = n.name();
+            switch (name)
+            {   case "param":
+                    n = Xml.getNodeById(doc, n.getAttribute("ref"), "sid").getChild("float3");  
+                    // deliberate fall-through
+                case "color":
+                    Color temp = Color(Xml.parseNumberList!(float)(n.value));
+                    color = Color(cast(int)temp.r, cast(int)temp.g, cast(int)temp.b, ((color.a*cast(int)temp.a)/255));
+                    break;
+                case "texture":
+                    texture = getTextureById(n.getAttribute("texture")); // TODO getImageByTexture
+                    break;
+                default:
+                    Log.error("Collada material parameter %s not supported", name);
+        }   }
+        
-        // Loop through and get each material property
-        scope Node[] params = shadingType.getChildren();
-        foreach (Node param; params)
-        {               
-            void getColorOrTexture(Node n, inout Color color, inout GPUTexture texture)
-            {   char[] name = n.name();
-                switch (name)
-                {   case "param":
-                        n = Xml.getNodeById(doc, n.getAttribute("ref"), "sid").getChild("float3");  
-                        // deliberate fall-through
-                    case "color":
-                        Color temp = Color(Xml.parseNumberList!(float)(n.value));
-                        color = Color(cast(int)temp.r, cast(int)temp.g, cast(int)temp.b, ((color.a*cast(int)temp.a)/255));
-                        break;
-                    case "texture":
-                        texture = getTextureById(n.getAttribute("texture")); // TODO getImageByTexture
-                        break;
-            }   }
-            
-            if (!param.getChildren().length)
-                continue;
@@ -369 +383 @@
-                    break;
-            }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (result.getPass().autoShader == MaterialPass.AutoShader.PHONG)
-        {
@@ -401 +426 @@
-        
-        // Get the up direction (unfinished)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        {
-
+
+
-            {
-Node instance_geometry
-
-instance_geometry = node.getChild("instance_geometry
+char[] geometryId
+ // Collada 1.4+
+geometryId = node.getChild("instance_geometry").getAttribute("url
-                else if (node.hasChild("instance")) // Collada 1.3
-
-
-
+
+
+
+
+
+
+
+
-                {                       
-                    char[] geometryId = instance_geometry.getAttribute("url"); // TODO: Multiple instance geometry?
-                    Geometry geometry = getGeometryById(geometryId, true);
-if (geometry)
-{
-   // Get transformation matrix for this instance of the geometry.
-   Matrix matrix;
-foreach (transform; node.getChildren())
-{  if (transform.name=="transl
-       matrix.move(Vec3f(Xml.parseNumberList!(float)(transform.value))
-else if (transform.name=="rotate")
-{  float[] values = Xml.parseNumberList!(float)(transform.value);
-       assert(values.length==4);
-       matrix = matrix.rotate(Vec3f(values[3]*tango.math.Math.PI/180, values[0], values[1], values[2])); // load from axis-angle   
-} 
-   else if (transform.name=="scale")                       
-   matrix.setScalePreservingRotation(Vec3f(Xml.parseNumberList!(float)(transform.value)));
-   else if (transform.name=="matrix") // collada 1.3
-       {   matrix = Matrix(Xml.parseNumberList!(float)(transform.value));
-           
-       }
-   }
+
+// Get transformation matrix for this instance of the geometry.
+foreach (transform; node.getChildren())
+{  if (transform.name=="translate")
+   matrix = matrix.move(Vec3f(Xml.parseNumberList!(float)(transform.value)));
+else if (transform.name=="rot
+{  float[] values = Xml.parseNumberList!(float)(transform.value
+assert(values.length==4);
+matrix = matrix.rotate(Vec3f(values[3]*tango.math.Math.PI/180, values[0], values[1], values[2])); // load from axis-angle                          
+} 
+else if (transform.name=="scale")
+matrix.setScalePreservingRotation(Vec3f(Xml.parseNumberList!(float)(transform.value)));
+else if (transform.name=="matrix") // collada 1.3
+matrix = Matrix(Xml.parseNumberList!(float)(transform.value)); 
+
+}
+
+if (geometry)  // TODO: Sometimes intance_geometry has xml children specifying a material (or other things as well?)
+{  geometries~= geometry;
-                        geometryTransforms ~= matrix * upTransform;
-                        
-                        // TODO: Sometimes intance_geometry has xml children specifying a material (or other things as well?)
-                        
-                        geometries~= geometry;
-                    }
-                }
-                
-                foreach (child; node.getChildren("node")) // loop through nodes in a scene
-
+, matrix
-            }
-            
-
+, Matrix.IDENTITY
-        }
-        
@@ -499 +513 @@
-        return result;
-    }
+    
+    Node[] getScenes()
+    {
+        Node[] scenes;
+        Node root = Node(doc.elements);
+        if (root.hasChild("library_visual_scenes"))
+            scenes = root.getChild("library_visual_scenes").getChildren("visual_scene");
+        else // collada 1.3
+            scenes = root.getChildren("scene");
+        return scenes;
+    }
-
+    Joint[] getSkeletonById(char[] id)
+    {
+        // Get the up direction (unfinished)
+        Matrix upTransform = getBaseTransform();
+        
+        // Loop through the scenes and load all the geometry nodes they reference.
+        
+        
+        foreach (scene; getScenes()) // loop through scenes
+        {
+            
+            
+        }
+        return null;
+    }
+    
-    /**
-     * Get a yage GPUTexture from the Collada file by its id.
@@ -548 +589 @@
-    private float[] getDataFromSourceId(char[] id, out ushort components)
-    {   
-        
-        
-        Node source = Xml.getNodeById(doc, id);     
-        Node sourceAccessor;
@@ -661 +700 @@
-            try {
-                foreach(i, piece; pieces)           
-
+
+
-            } catch (ConversionException e)
-            {   throw new XmlException(e.toString());

trunk/src/yage/resource/model.d

@@ -14 +14 @@
-import yage.core.math.vector;
-import yage.core.object2;
+import yage.core.tree;
-import yage.resource.collada;
-import yage.resource.geometry;
@@ -20 +21 @@
-import yage.system.log;
-
+/*
-///
-struct KeyFrame
@@ -39 +41 @@
-    KeyFrame[] rotations;
-};
-
+
+
+
+
+
+
+
-
-/**
@@ -51 +59 @@
-    private char[] source;
-
+    // Old:
-    protected float fps=24;
-    protected bool animated = false;
-    protected double animation_time=-1;
-
-
-
+
+
+
+
-
-    /// Instantiate an empty model.
@@ -75 +85 @@
-    }
-
-*
+
-     * Advance this Model's animation to time.
-     * This still has bugs somehow.
-     * Params:
-     *     time =
-     */
-    void animateTo(double time)
-    {
@@ -179 +188 @@
-            setAttribute(Geometry.NORMALS, normals);
-    }   
-
-
-
-
-
-
-
+
-    
-    /**