Changeset 83 for trunk/src

Timestamp:

08/03/08 21:41:57 (4 months ago)

Author:

JoeCoder

Message:

More skeletal animation features.
Ignore last revision, it's broken.

Files:

• trunk/src/demo2/main.d (modified) (2 diffs)
• trunk/src/yage/resource/model.d (modified) (8 diffs)
• trunk/src/yage/resource/ms3dloader.d (modified) (7 diffs)
• trunk/src/yage/system/device.d (modified) (1 diff)
• trunk/src/yage/system/exceptions.d (added)
• trunk/src/yage/system/interfaces.d (added)
• trunk/src/yage/system/render.d (modified) (1 diff)

trunk/src/demo2/main.d

@@ -142 +142 @@
-    window1.style.color = Color("black");
-    
-    // Beast
-    
-    auto beast = new ModelNode(scene);
-    beast.setModel("beast/beast.ms3d");
-    beast.setPosition(Vec3f(0, 25, -1000));
-    beast.setRotation(Vec3f(0, 1.507, 0));
-    
-    
-    void animate(Node self)
-    {   ModelNode node = cast(ModelNode)self;
-        node.getModel().animate(node.getScene().getStartTime());
-    }
-    beast.onUpdate(&animate);
-
-    
-    // Music
-    auto music = new SoundNode(camera);
@@ -194 +179 @@
-    Timer delta = new Timer();
-    Log.write("Starting rendering loop.");
-
-
-
-
-
-
+
+
-    while(1)
-    {
-        writefln(total);
-        
-        float dtime = delta.get();
-        delta.reset();
-
+
-        Input.processInput();
-        camera.toTexture();

trunk/src/yage/resource/model.d

@@ -175 +175 @@
-        animation_time = time;
-        
-
+
+
+
+
-        foreach(j, joint; joints)
-        {
@@ -184 +187 @@
-            
-            // Find appropriate position keyframe
-nt i
+
-            while ((i<joint.positions.length) && (joint.positions[i].time < time))
-                i++;
-            
-            // Interpolate between 2 keyframes
--1
+
-            {   
-                deltatime = joint.positions[i].time - joint.positions[i-1].time;
@@ -202 +205 @@
-                m_frame.setPosition(joint.positions[0].value);
-            else // i==joints.positions.length
--1
+
-                        
-            // Find appropriate rotation keyframe
@@ -209 +212 @@
-                i++;
-            // Interpolate between 2 keyframes
--1
+
-            {   
-                deltatime = joint.rotations[i].time - joint.rotations[i-1].time;                
@@ -224 +227 @@
-                m_frame.setEuler(joint.rotations[0].value);
-            else // i==joints.rotations.length
--1
+
-            
-            m_rel.setEuler(joint.startRotation); 
@@ -236 +239 @@
-        }
-        
+        //writefln(time, " ", i);
+        
-        // Update vertex positions based on joints.
-        Vec3f[] vertices = getAttribute("gl_Vertex").vec3f;
-        Vec3f[] vertices_original = getAttribute("gl_VertexOriginal").vec3f;
+        
+        Vec3f[] normals;
+        Vec3f[] normals_original;
+        if (hasAttribute("gl_Normal"))
+        {   normals = getAttribute("gl_Normal").vec3f;
+            normals_original = getAttribute("gl_NormalOriginal").vec3f;     
+        }
-        for (int v=0; v<vertices.length; v++)
-        {   if (joint_indices[v] != -1)
@@ -246 +258 @@
-                vertices[v] = vertices_original[v].transform(cmatx);
-                
+                
+                if (normals.length)
+                    normals[v] = normals_original[v].rotate(cmatx);
-                // TODO: Normals
-                // TODO: only reassign cmatx if joint_indices[v] has changed.
@@ -252 +267 @@
-                
-        setAttribute("gl_Vertex", vertices);
-
+
+
-    }   
-    

trunk/src/yage/resource/ms3dloader.d

@@ -217 +217 @@
-        normals.length   = ms3d.vertices.length;
-        joint_indices.length= ms3d.vertices.length;
-
+
-        for (int v; v<ms3d.vertices.length; v++)
-        {   vertices[v].x = ms3d.vertices[v].vertex[0];
@@ -224 +224 @@
-            joint_indices[v] = ms3d.vertices[v].boneId;
-        }
+        
+        
-
-        // Meshes
-        meshes.length = ms3d.groups.length;
-        for (int m; m<meshes.length; m++)
-
+
+
+
-            Vec3i[] triangles = meshes[m].getTriangles();
-            triangles.length = ms3d.groups[m].numtriangles;
@@ -306 +310 @@
-                {
-                    // Duplicate vertex from original and copy new texutre and normal coordinates into it.
-
+joint_indices.length = 
-                    vertices[length-1] = vertices[ms3d.triangles[tindex].vertexIndices[0]];
-                    memcpy(&normals[length-1], &ms3d.triangles[tindex].vertexNormals[0], 12);
-                    texcoords[length-1].x = ms3d.triangles[tindex].s[0];
-                    texcoords[length-1].y = ms3d.triangles[tindex].t[0];
+                    joint_indices[length-1] = joint_indices[ms3d.triangles[tindex].vertexIndices[1]];
-                    // Assign this new vertex to the triangle
-                    triangles[t].x = vertices.length-1;
@@ -320 +325 @@
-                {
-                    // Duplicate vertex from original and copy new texutre and normal coordinates into it.
-
+joint_indices.length = 
-                    vertices[length-1] = vertices[ms3d.triangles[tindex].vertexIndices[1]];
-                    memcpy(&normals[length-1], &ms3d.triangles[tindex].vertexNormals[3], 12);
-                    texcoords[length-1].x = ms3d.triangles[tindex].s[1];
-                    texcoords[length-1].y = ms3d.triangles[tindex].t[1];
+                    joint_indices[length-1] = joint_indices[ms3d.triangles[tindex].vertexIndices[1]];
-                    // Assign this new vertex to the triangle
-                    triangles[t].y = vertices.length-1;
@@ -334 +340 @@
-                {
-                    // Duplicate vertex from original and copy new texutre and normal coordinates into it.
-
+joint_indices.length = 
-                    vertices[length-1] = vertices[ms3d.triangles[tindex].vertexIndices[2]];
-                    memcpy(&normals[length-1], &ms3d.triangles[tindex].vertexNormals[6], 12);
-                    texcoords[length-1].x = ms3d.triangles[tindex].s[2];
-                    texcoords[length-1].y = ms3d.triangles[tindex].t[2];
+                    joint_indices[length-1] = joint_indices[ms3d.triangles[tindex].vertexIndices[1]];
-                    // Assign this new vertex to the triangle
-                    triangles[t].z = vertices.length-1;
-                }
-            }
-
+
-            // Find meshes with material of -1 (no material) and assign them the default material
-            if (ms3d.groups[m].materialIndex==-1)
@@ -376 +383 @@
-            }
-        }
+        
+        
-        
-        // Link joint parent relationships.
@@ -414 +423 @@
-            // Inverse transform each vertex and inverse rotate each normal by the joint's Matrix.
-            for (int i; i<vertices.length; i++)
- 
+
-                {   Matrix matrix = joints[joint_indices[i]].transformAbs;
-
+
+
-            }   }
-            

trunk/src/yage/system/device.d

@@ -292 +292 @@
-                return cast(bool)shader;
-            case DEVICE_VBO: //return false; // true breaks custom vertex attributes
-                return false;
-                if (vbo==-1)
-                    vbo = checkExtension("GL_ARB_vertex_buffer_object");

trunk/src/yage/system/render.d

@@ -271 +271 @@
-        
-        // Draw joints
-true
+_debug
-        {   glDisable(GL_DEPTH_TEST);
-            glDisable(GL_LIGHTING);