[Supertuxkart-commit] SF.net SVN: supertuxkart:[10323] main/trunk/src/tracks

[<au...@us...>]

Revision: 10323
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10323&view=rev
Author:   auria
Date:     2011-12-04 01:29:27 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Complete animating LOD objects

Modified Paths:
--------------
    main/trunk/src/tracks/track.cpp
    main/trunk/src/tracks/track_object_manager.hpp

Modified: main/trunk/src/tracks/track.cpp
===================================================================
--- main/trunk/src/tracks/track.cpp	2011-12-04 01:25:09 UTC (rev 10322)
+++ main/trunk/src/tracks/track.cpp	2011-12-04 01:29:27 UTC (rev 10323)
@@ -1244,8 +1244,11 @@
     {
         std::vector<TrackObject*>& queue = track_objects[ lod_nodes[n]->getGroupName() ];
         assert( queue.size() > 0 );
-        queue[ queue.size() - 1 ]->setNode( lod_nodes[n] );
+        TrackObject* obj = queue[ queue.size() - 1 ];
+        obj->setNode( lod_nodes[n] );
         queue.erase( queue.end() - 1 );
+        
+        m_track_object_manager->manualInsertObject( obj );
     }
     
     track_objects.clear();

Modified: main/trunk/src/tracks/track_object_manager.hpp
===================================================================
--- main/trunk/src/tracks/track_object_manager.hpp	2011-12-04 01:25:09 UTC (rev 10322)
+++ main/trunk/src/tracks/track_object_manager.hpp	2011-12-04 01:29:27 UTC (rev 10323)
@@ -72,6 +72,11 @@
     
     void removeObject(PhysicalObject* who);
     
+    void manualInsertObject(TrackObject* obj)
+    {
+        m_all_objects.push_back(obj);
+    }
+    
     /** Get the queue of LOD objects that are waiting to be assigned a scene node */
     std::map<std::string, std::vector<TrackObject*> >& getLodObjects() { return m_lod_objects; }
 };   // class TrackObjectManager

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.