Changeset 403

Timestamp:

10/09/11 14:26:27 (8 months ago)

Author:

Carsten

Message:

Model support:
For model files that bring fixed/given tangent-space vectors (.ase and .lwo), the "given" tangent-space vectors were no longer accounted for since r400. Fixed.

(Note that this fix is understood to be temporary: "fixed, given tangent-space" is supposed to soon be replaced by means to compute it on-the-fly, just as with animated models. This will most likely be implemented in the course of introducing support for smoothgroups.)

Files:

• cafu/trunk/Libs/Models/AnimPose.cpp (modified) (1 diff)

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -611 +611 @@
     {
         assert(Anims.Size()==0);  // It doesn't make sense to have statically given tangent-space axes with *animated* geometry...
+
+        // Copy the given tangent space details into the pose.
+        for (unsigned long MeshNr=0; MeshNr<Meshes.Size(); MeshNr++)
+        {
+            const MeshT& Mesh    =Meshes[MeshNr];
+            MeshInfoT&   MeshInfo=m_MeshInfos[MeshNr];
+
+            for (unsigned long TriNr=0; TriNr<Mesh.Triangles.Size(); TriNr++)
+            {
+                MeshInfo.Triangles[TriNr].Normal = Mesh.Triangles[TriNr].gts_Normal;
+            }
+
+            for (unsigned long VertexNr=0; VertexNr<Mesh.Vertices.Size(); VertexNr++)
+            {
+                MeshInfo.Vertices[VertexNr].Pos      = Mesh.Vertices[VertexNr].gts_Pos;
+                MeshInfo.Vertices[VertexNr].Normal   = Mesh.Vertices[VertexNr].gts_Normal;
+                MeshInfo.Vertices[VertexNr].Tangent  = Mesh.Vertices[VertexNr].gts_Tangent;
+                MeshInfo.Vertices[VertexNr].BiNormal = Mesh.Vertices[VertexNr].gts_BiNormal;
+            }
+        }
+
         goto DoneComputingTS;
     }