Changeset 579

Timestamp:

07/02/08 12:33:59 (5 months ago)

Author:

phill

Message:

o Yet another GCCism.

Files:

• trunk/libx42make/modeldata-write.cpp (modified) (2 diffs)

trunk/libx42make/modeldata-write.cpp

@@ -210 +210 @@
-}
-
+struct bone_trk
+{
+        std::queue< anim_key >  q;
+        u16                                             lastFrame;
+};
+
+struct bone_trks
+{
+        bone_trk        p;
+        bone_trk        s;
+        bone_trk        r;
+
+        bone_trk& operator[] ( uint i )
+        {
+                switch( i )
+                {
+                case X42_KT_POSITION:   return p;
+                case X42_KT_SCALE:              return s;
+                case X42_KT_ROTATION:   return r;                       
+                
+                default:
+                        throw std::exception();
+                }
+        }
+};
+
-void x42builder::pack_bones( const ModelData &data )
-{
@@ -217 +243 @@
-        bones.resize( data.bones.size() );
-        boneGroups.resize( data.bones.size() );
-
-        struct bone_trk
-        {
-                std::queue< anim_key >  q;
-                u16                                             lastFrame;
-        };
-
-        struct bone_trks
-        {
-                bone_trk        p;
-                bone_trk        s;
-                bone_trk        r;
-
-                bone_trk& operator[] ( uint i )
-                {
-                        switch( i )
-                        {
-                        case X42_KT_POSITION:   return p;
-                        case X42_KT_SCALE:              return s;
-                        case X42_KT_ROTATION:   return r;                       
-                        
-                        default:
-                                throw std::exception();
-                        }
-                }
-        };
-
-        std::vector< bone_trks > tracks( data.bones.size() );