Changeset 308 for ps

Timestamp:

05/29/04 22:58:11 (21 years ago)

Author:

notpete

Message:

Minor changes to use CUnit::GetModel() and CUnit::GetObject() instead of m_Model and m_Object, as these are no longer public.

Location:

ps/trunk/source/simulation

Files:

• BaseEntityCollection.cpp (modified) (1 diff)
• Entity.cpp (modified) (4 diffs)
• EntityStateProcessing.cpp (modified) (1 diff)

ps/trunk/source/simulation/BaseEntityCollection.cpp

@@ -30 +30 @@
     // He's so annoyingly slow...
     CBaseEntity* dude = getTemplate( "Prometheus Dude" );
-    dude->m_actorObject->m_WalkAnim->m_FrameTime /= 10.0f;
     dude->m_speed *= 10.0f;
 

ps/trunk/source/simulation/Entity.cpp

@@ -16 +16 @@
 
     m_base = base;
-    m_actor = new CUnit;
-
-    m_actor->m_Object = m_base->m_actorObject;
-    m_actor->m_Model = ( m_actor->m_Object->m_Model ) ? m_actor->m_Object->m_Model->Clone() : NULL;
+    m_actor = new CUnit(m_base->m_actorObject,m_base->m_actorObject->m_Model->Clone());
 
     // Register the actor with the renderer.
@@ -59 +56 @@
     if( m_actor )
     {
-        if( m_actor->m_Model ) delete( m_actor->m_Model );
         g_UnitMan.RemoveUnit( m_actor );
         delete( m_actor );
@@ -80 +76 @@
     m._41 = 0.0f;       m._42 = 0.0f;   m._43 = 0.0f;       m._44 = 1.0f;
 
-    /* Equivalent to:
-    
-    m.SetYRotation( m_orientation );
-
-    m.Translate( m_position );
-
-    But the matrix multiplication seemed such a waste when we already have a forward vector
-
+    /* Equivalent to:   
+        m.SetYRotation( m_orientation );
+        m.Translate( m_position );
+        But the matrix multiplication seemed such a waste when we already have a forward vector
     */
 
-    m_actor->m_Model->SetTransform( m );
+    m_actor->GetModel()->SetTransform( m );
 }
 
@@ -162 +154 @@
         }
     }
-    if( m_actor->m_Model->GetAnimation() != m_actor->m_Object->m_IdleAnim )
-        m_actor->m_Model->SetAnimation( m_actor->m_Object->m_IdleAnim );
+    if( m_actor->GetModel()->GetAnimation() != m_actor->GetObject()->m_IdleAnim )
+        m_actor->GetModel()->SetAnimation( m_actor->GetObject()->m_IdleAnim );
 }
 

ps/trunk/source/simulation/EntityStateProcessing.cpp

@@ -116 +116 @@
     CVector2D path_to = current->m_data[0].location;
     m_orderQueue.pop_front();
-    if( m_actor->m_Model->GetAnimation() != m_actor->m_Object->m_WalkAnim )
+    if( m_actor->GetModel()->GetAnimation() != m_actor->GetObject()->m_WalkAnim )
     {
-        m_actor->m_Model->SetAnimation( m_actor->m_Object->m_WalkAnim );
-        m_actor->m_Model->Update( ( rand() * 1000.0f ) / 1000.0f );
+        m_actor->GetModel()->SetAnimation( m_actor->GetObject()->m_WalkAnim );
+        m_actor->GetModel()->Update( ( rand() * 1000.0f ) / 1000.0f );
     }
     g_Pathfinder.requestPath( me, path_to );