Changeset 427 for cafu/trunk

Timestamp:

11/19/11 21:12:38 (6 months ago)

Author:

Carsten

Message:

Model code:
Replaced all remaining occurrences of obsolete class ModelProxyT with new model class CafuModelT.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/AnimInspector.cpp (modified) (1 diff)
• CaWE/ModelEditor/ChildFrame.hpp (modified) (1 diff)
• Games/DeathMatch/Code/ARGrenade.cpp (modified) (6 diffs)
• Games/DeathMatch/Code/ARGrenade.hpp (modified) (3 diffs)
• Games/DeathMatch/Code/Butterfly.cpp (modified) (4 diffs)
• Games/DeathMatch/Code/Butterfly.hpp (modified) (4 diffs)
• Games/DeathMatch/Code/Eagle.cpp (modified) (5 diffs)
• Games/DeathMatch/Code/Eagle.hpp (modified) (3 diffs)
• Games/DeathMatch/Code/FaceHugger.cpp (modified) (5 diffs)
• Games/DeathMatch/Code/FaceHugger.hpp (modified) (4 diffs)
• Games/DeathMatch/Code/GameImpl.cpp (modified) (2 diffs)
• Games/DeathMatch/Code/HandGrenade.cpp (modified) (6 diffs)
• Games/DeathMatch/Code/HandGrenade.hpp (modified) (3 diffs)
• Games/DeathMatch/Code/Item.cpp (modified) (5 diffs)
• Games/DeathMatch/Code/Item.hpp (modified) (3 diffs)
• Games/DeathMatch/Code/ItemAmmo357.cpp (modified) (1 diff)
• Games/DeathMatch/Code/ItemAmmoArrow.cpp (modified) (1 diff)
• Games/DeathMatch/Code/Rocket.cpp (modified) (6 diffs)
• Games/DeathMatch/Code/Rocket.hpp (modified) (3 diffs)
• Games/DeathMatch/Code/StaticDetailModel.cpp (modified) (13 diffs)
• Games/DeathMatch/Code/StaticDetailModel.hpp (modified) (2 diffs)
• Games/DeathMatch/Code/Weapon.cpp (modified) (5 diffs)
• Games/DeathMatch/Code/Weapon.hpp (modified) (3 diffs)
• Games/DeathMatch/Code/Weapon357.cpp (modified) (1 diff)
• Games/DeathMatch/Code/Weapon9mmAR.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponBattleScythe.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponCrossbow.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponEgon.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponFaceHugger.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponGauss.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponGrenade.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponHornetGun.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponPistol.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponRPG.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponShotgun.cpp (modified) (1 diff)
• Games/DeathMatch/Code/WeaponTripmine.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.hpp (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/AnimInspector.cpp

@@ -111 +111 @@
 
         Append(new wxIntProperty("Next sequence", wxPG_LABEL, Anim.Next));
+
+        // if (Anim.IsLastFrameDup())
+        // {
+        //     wxPGProperty* Note=Append(new wxStringProperty("Note", wxPG_LABEL, "0 == last"));
+        //     DisableProperty(Note);
+        // }
     }
     else

cafu/trunk/CaWE/ModelEditor/ChildFrame.hpp

@@ -89 +89 @@
 
         /// Sets the type of the most recently used (clicked) model element.
-        void SetLastUsedType(ModelElementTypeT Type) { wxASSERT(Type<5); m_LastUsedType=Type; }
+        void SetLastUsedType(ModelElementTypeT Type) { wxASSERT(Type<6); m_LastUsedType=Type; }
 
         ModelDocumentT* GetModelDoc() const { return m_ModelDoc; }

cafu/trunk/Games/DeathMatch/Code/ARGrenade.cpp

@@ -19 +19 @@
 =================================================================================
 */
-
-/*************************/
-/*** AR Grenade (Code) ***/
-/*************************/
 
 #include "ARGrenade.hpp"
@@ -33 +29 @@
 #include "SoundSystem/SoundShaderManager.hpp"
 #include "../../GameWorld.hpp"
-#include "Models/Model_proxy.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "ParticleEngine/ParticleEngineMS.hpp"
 
@@ -73 +69 @@
                                0,       // ActiveWeaponSequNr
                                0.0)),   // ActiveWeaponFrameNr
-      FireSound(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Weapon/Shotgun_dBarrel")))
+      m_Model(Params.GameWorld->GetModel("Games/DeathMatch/Models/Weapons/Grenade_w.mdl")),
+      m_FireSound(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Weapon/Shotgun_dBarrel")))
 {
 }
@@ -81 +78 @@
 {
     // Release sound.
-    SoundSystem->DeleteSound(FireSound);
+    SoundSystem->DeleteSound(m_FireSound);
 }
 
@@ -185 +182 @@
     // We only receive a single event here ("Detonation!"), thus there is no need to look at 'EventID'.
     // Update sound position.
-    FireSound->SetPosition(State.Origin);
+    m_FireSound->SetPosition(State.Origin);
 
     // Play the fire sound.
-    FireSound->Play();
+    m_FireSound->Play();
 
     // Register explosion particles.
@@ -273 +270 @@
     // glTranslatef(0.0, 0.0, 4.0);
 
-    static ModelProxyT ARGrenadeModel("Games/DeathMatch/Models/Weapons/Grenade_w.mdl");
-
-    ARGrenadeModel.Draw(State.ModelSequNr, State.ModelFrameNr, LodDist);
-}
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Draw(-1 /*default skin*/, LodDist);
+}

cafu/trunk/Games/DeathMatch/Code/ARGrenade.hpp

@@ -20 +20 @@
 */
 
-/***************************/
-/*** AR Grenade (Header) ***/
-/***************************/
-
 #ifndef _ARGRENADE_HPP_
 #define _ARGRENADE_HPP_
@@ -30 +26 @@
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 class SoundI;
@@ -55 +52 @@
     private:
 
-    SoundI* FireSound;
+    const CafuModelT* m_Model;
+    SoundI*           m_FireSound;
 };
 

cafu/trunk/Games/DeathMatch/Code/Butterfly.cpp

@@ -20 +20 @@
 */
 
-/************************/
-/*** Butterfly (Code) ***/
-/************************/
-
 #include "Butterfly.hpp"
 #include "TypeSys.hpp"
 #include "EntityCreateParams.hpp"
 #include "Libs/LookupTables.hpp"
-#include "Models/Model_proxy.hpp"
+#include "../../GameWorld.hpp"
+#include "Models/Model_cmdl.hpp"
 
 
@@ -67 +64 @@
                                0,       // ActiveWeaponSequNr
                                0.0)),   // ActiveWeaponFrameNr
+      m_Model(Params.GameWorld->GetModel("Games/DeathMatch/Models/LifeForms/Butterfly.mdl")),
       ArcCenter(Params.Origin),
       ArcPos(0)
@@ -92 +90 @@
 void EntButterflyT::Draw(bool /*FirstPersonView*/, float LodDist) const
 {
-    static ModelProxyT ButterflyModel("Games/DeathMatch/Models/LifeForms/Butterfly.mdl");
-
-    ButterflyModel.Draw(State.ModelSequNr, State.ModelFrameNr, LodDist);
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Draw(-1 /*default skin*/, LodDist);
 }
 
@@ -100 +97 @@
 void EntButterflyT::PostDraw(float FrameTime, bool /*FirstPersonView*/)
 {
-    // Note that ModelProxyTs are *very* cheap and share common resources.
-    // Thus, having here another instance of a Butterfly model is not beautiful coding, but perfectly fine otherwise.
-    // Other entities do it different, I was just intending to demonstrate the effect here.
-    static ModelProxyT ButterflyModel("Games/DeathMatch/Models/LifeForms/Butterfly.mdl");
-
     // Implicit simple "mini-prediction".
-    State.ModelFrameNr=ButterflyModel.AdvanceFrameNr(State.ModelSequNr, State.ModelFrameNr, FrameTime, true);
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Advance(FrameTime, true);
+    State.ModelFrameNr=Pose->GetFrameNr();
 }

cafu/trunk/Games/DeathMatch/Code/Butterfly.hpp

@@ -20 +20 @@
 */
 
-/**************************/
-/*** Butterfly (Header) ***/
-/**************************/
-
 #ifndef _BUTTERFLY_HPP_
 #define _BUTTERFLY_HPP_
@@ -30 +26 @@
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 
@@ -35 +32 @@
 class EntButterflyT : public BaseEntityT
 {
-    private:
-
-    VectorT        ArcCenter;
-    unsigned short ArcPos;
-
-
     public:
 
@@ -53 +44 @@
     static void* CreateInstance(const cf::TypeSys::CreateParamsT& Params);
     static const cf::TypeSys::TypeInfoT TypeInfo;
+
+
+    private:
+
+    const CafuModelT* m_Model;
+    VectorT           ArcCenter;
+    unsigned short    ArcPos;
 };
 

cafu/trunk/Games/DeathMatch/Code/Eagle.cpp

@@ -20 +20 @@
 */
 
-/********************/
-/*** Eagle (Code) ***/
-/********************/
-
 #include "Eagle.hpp"
 #include "EntityCreateParams.hpp"
@@ -33 +29 @@
 #include "MaterialSystem/Material.hpp"
 #include "MaterialSystem/Renderer.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "SoundSystem/SoundSys.hpp"
 #include "SoundSystem/Sound.hpp"
@@ -75 +72 @@
                                0,       // ActiveWeaponSequNr
                                0.0)),   // ActiveWeaponFrameNr
-      EagleModel("Games/DeathMatch/Models/LifeForms/Eagle.mdl"),
+      m_Model(Params.GameWorld->GetModel("Games/DeathMatch/Models/LifeForms/Eagle.mdl")),
       FlightState(CruiseFlight),
       OldOrigin(),
@@ -229 +226 @@
     MatSys::Renderer->SetCurrentEyePosition(EyePos.x, EyePos.y, EyePos.z);
 
-    EagleModel.Draw(State.ModelSequNr, State.ModelFrameNr, LodDist);
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Draw(-1 /*default skin*/, LodDist);
 }
 
@@ -235 +233 @@
 void EntEagleT::PostDraw(float FrameTime, bool /*FirstPersonView*/)
 {
-    State.ModelFrameNr=EagleModel.AdvanceFrameNr(State.ModelSequNr, State.ModelFrameNr, FrameTime, true);
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Advance(FrameTime, true);
+    State.ModelFrameNr=Pose->GetFrameNr();
 
     // Update sound position and velocity.

cafu/trunk/Games/DeathMatch/Code/Eagle.hpp

@@ -20 +20 @@
 */
 
-/**********************/
-/*** Eagle (Header) ***/
-/**********************/
-
 #ifndef _EAGLE_HPP_
 #define _EAGLE_HPP_
 
 #include "../../BaseEntity.hpp"
-#include "Models/Model_proxy.hpp"
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 class SoundI;
@@ -37 +33 @@
 class EntEagleT : public BaseEntityT
 {
-    private:
-
-    enum FlightStateT { CruiseFlight, ControlledCruise, HalfLoopAndRoll, ClimpBackToCruiseAlt };
-
-    const ModelProxyT EagleModel;
-    FlightStateT      FlightState;
-    VectorT           OldOrigin;
-    VectorT           LoopCenter;
-    float             FigureDistance;
-    float             FigureLeft;
-
-    float             TimeUntilNextCry;
-
-    SoundI*           EagleCry;
-
-
     public:
 
@@ -66 +46 @@
     static void* CreateInstance(const cf::TypeSys::CreateParamsT& Params);
     static const cf::TypeSys::TypeInfoT TypeInfo;
+
+
+    private:
+
+    enum FlightStateT { CruiseFlight, ControlledCruise, HalfLoopAndRoll, ClimpBackToCruiseAlt };
+
+    const CafuModelT* m_Model;
+    FlightStateT      FlightState;
+    VectorT           OldOrigin;
+    VectorT           LoopCenter;
+    float             FigureDistance;
+    float             FigureLeft;
+
+    float             TimeUntilNextCry;
+    SoundI*           EagleCry;
 };
 

cafu/trunk/Games/DeathMatch/Code/FaceHugger.cpp

@@ -20 +20 @@
 */
 
-/**************************/
-/*** Face Hugger (Code) ***/
-/**************************/
-
 #include "FaceHugger.hpp"
 #include "EntityCreateParams.hpp"
@@ -30 +26 @@
 #include "Libs/Physics.hpp"                         // ÜBERFLÜSSIG?
 #include "TypeSys.hpp"
-#include "Models/Model_proxy.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "ParticleEngine/ParticleEngineMS.hpp"
 
@@ -69 +65 @@
                                0,       // ActiveWeaponSlot
                                0,       // ActiveWeaponSequNr
-                               0.0))    // ActiveWeaponFrameNr
+                               0.0)),   // ActiveWeaponFrameNr
+      m_Model(Params.GameWorld->GetModel("Games/DeathMatch/Models/LifeForms/FaceHugger.mdl"))
 {
 }
@@ -109 +106 @@
 void EntFaceHuggerT::Draw(bool /*FirstPersonView*/, float LodDist) const
 {
-    static ModelProxyT FaceHuggerModel("Games/DeathMatch/Models/LifeForms/FaceHugger.mdl");
-
-    FaceHuggerModel.Draw(State.ModelSequNr, State.ModelFrameNr, LodDist);
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Draw(-1 /*default skin*/, LodDist);
 }
 
@@ -117 +113 @@
 void EntFaceHuggerT::PostDraw(float FrameTime, bool /*FirstPersonView*/)
 {
-    // Note that ModelProxyTs are *very* cheap and share common resources.
-    // Thus, having here another instance of a Butterfly model is not beautiful coding, but perfectly fine otherwise.
-    // Other entities do it different, I was just intending to demonstrate the effect here.
-    static ModelProxyT FaceHuggerModel("Games/DeathMatch/Models/LifeForms/FaceHugger.mdl");
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Advance(FrameTime, true);
 
-    const float OldFrameNr  =State.ModelFrameNr;
-
-    State.ModelFrameNr=FaceHuggerModel.AdvanceFrameNr(State.ModelSequNr, State.ModelFrameNr, FrameTime, true);
-
-    const float NewFrameNr  =State.ModelFrameNr;
-    const bool  SequenceWrap=NewFrameNr<OldFrameNr;
+    const bool SequenceWrap=Pose->GetFrameNr() < State.ModelFrameNr;
+    State.ModelFrameNr=Pose->GetFrameNr();
 
     if (SequenceWrap)

cafu/trunk/Games/DeathMatch/Code/FaceHugger.hpp

@@ -20 +20 @@
 */
 
-/****************************/
-/*** Face Hugger (Header) ***/
-/****************************/
-
 #ifndef _FACEHUGGER_HPP_
 #define _FACEHUGGER_HPP_
@@ -30 +26 @@
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 
@@ -35 +32 @@
 class EntFaceHuggerT : public BaseEntityT
 {
- // private:
-
- // unsigned long TargetEntityID;   // ID of the entity that this face hugger attacks.
-
-
     public:
 
@@ -52 +44 @@
     static void* CreateInstance(const cf::TypeSys::CreateParamsT& Params);
     static const cf::TypeSys::TypeInfoT TypeInfo;
+
+
+    private:
+
+    const CafuModelT* m_Model;
+ // unsigned long     m_TargetEntityID;   // ID of the entity that this face hugger attacks.
 };
 

cafu/trunk/Games/DeathMatch/Code/GameImpl.cpp

@@ -127 +127 @@
         // On the other hand, registering materials can only be done *after* GetGame() was called.
         // So a good place for registering materials that we need within this DLL is for example at the end of GetGame(), or right here.
-        // Registering the materials that our models will use is quite easy, because we just need to instantiate a ModelProxyT of each.
+        // Registering the materials that our models will use is quite easy, because we just need to find them in the ModelMan each.
         // (Nothing breaks if the following list is simply deleted, these models just aren't pre-cached then.)
         //
@@ -138 +138 @@
         {
             // And the rest. Observe that static detail models are NOT mentioned (how could they?).
-            static ModelProxyT M01("Games/DeathMatch/Models/Items/Ammo_DartGun.mdl");
-            static ModelProxyT M02("Games/DeathMatch/Models/Items/Ammo_DesertEagle.mdl");
-
-            static ModelProxyT M03("Games/DeathMatch/Models/LifeForms/Butterfly.mdl");
-            static ModelProxyT M04("Games/DeathMatch/Models/LifeForms/Eagle.mdl");
-            static ModelProxyT M05("Games/DeathMatch/Models/LifeForms/FaceHugger.mdl");
-
-            static ModelProxyT M06("Games/DeathMatch/Models/Weapons/9mmAR_w.mdl");
-            static ModelProxyT M07("Games/DeathMatch/Models/Weapons/BattleScythe_w.mdl");
-            static ModelProxyT M08("Games/DeathMatch/Models/Weapons/Bazooka_w.mdl");
-            static ModelProxyT M09("Games/DeathMatch/Models/Weapons/Beretta_w.mdl");
-            static ModelProxyT M10("Games/DeathMatch/Models/Weapons/DartGun_w.mdl");
-            static ModelProxyT M11("Games/DeathMatch/Models/Weapons/DesertEagle_w.mdl");
-            static ModelProxyT M12("Games/DeathMatch/Models/Weapons/Egon_w.mdl");
-            static ModelProxyT M13("Games/DeathMatch/Models/Weapons/FaceHugger_w.mdl");
-            static ModelProxyT M14("Games/DeathMatch/Models/Weapons/Gauss_w.mdl");
-            static ModelProxyT M15("Games/DeathMatch/Models/Weapons/Grenade_w.mdl");
-            static ModelProxyT M16("Games/DeathMatch/Models/Weapons/HornetGun_w.mdl");
-            static ModelProxyT M17("Games/DeathMatch/Models/Weapons/Shotgun_w.mdl");
-            static ModelProxyT M18("Games/DeathMatch/Models/Weapons/Tripmine_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Items/Ammo_DartGun.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Items/Ammo_DesertEagle.mdl");
+
+            ModelMan.GetModel("Games/DeathMatch/Models/LifeForms/Butterfly.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/LifeForms/Eagle.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/LifeForms/FaceHugger.mdl");
+
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/9mmAR_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/BattleScythe_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/Bazooka_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/Beretta_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/DartGun_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/DesertEagle_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/Egon_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/FaceHugger_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/Gauss_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/Grenade_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/HornetGun_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/Shotgun_w.mdl");
+            ModelMan.GetModel("Games/DeathMatch/Models/Weapons/Tripmine_w.mdl");
         }
 

cafu/trunk/Games/DeathMatch/Code/HandGrenade.cpp

@@ -19 +19 @@
 =================================================================================
 */
-
-/***************************/
-/*** Hand Grenade (Code) ***/
-/***************************/
 
 #include "HandGrenade.hpp"
@@ -33 +29 @@
 #include "SoundSystem/SoundShaderManager.hpp"
 #include "../../GameWorld.hpp"
-#include "Models/Model_proxy.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "ParticleEngine/ParticleEngineMS.hpp"
 
@@ -73 +69 @@
                                0,       // ActiveWeaponSequNr
                                0.0)),   // ActiveWeaponFrameNr
-      FireSound(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Weapon/Shotgun_dBarrel")))
-{
-    FireSound->SetPosition(Params.Origin);
+      m_Model(Params.GameWorld->GetModel("Games/DeathMatch/Models/Weapons/Grenade_w.mdl")),
+      m_FireSound(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Weapon/Shotgun_dBarrel")))
+{
+    m_FireSound->SetPosition(Params.Origin);
 }
 
@@ -82 +79 @@
 {
     // Release sound.
-    SoundSystem->DeleteSound(FireSound);
+    SoundSystem->DeleteSound(m_FireSound);
 }
 
@@ -177 +174 @@
     // We only receive a single event here ("Detonation!"), thus there is no need to look at 'EventID'.
     // Update sound position.
-    FireSound->SetPosition(State.Origin);
+    m_FireSound->SetPosition(State.Origin);
 
     // Play the fire sound.
-    FireSound->Play();
+    m_FireSound->Play();
 
     // Register explosion particles.
@@ -256 +253 @@
     if (State.ActiveWeaponFrameNr>=3.0) return;
 
-    static ModelProxyT HandGrenadeModel("Games/DeathMatch/Models/Weapons/Grenade_w.mdl");
-
-    HandGrenadeModel.Draw(State.ModelSequNr, State.ModelFrameNr, LodDist);
-}
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Draw(-1 /*default skin*/, LodDist);
+}

cafu/trunk/Games/DeathMatch/Code/HandGrenade.hpp

@@ -20 +20 @@
 */
 
-/*****************************/
-/*** Hand Grenade (Header) ***/
-/*****************************/
-
 #ifndef _HANDGRENADE_HPP_
 #define _HANDGRENADE_HPP_
@@ -30 +26 @@
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 class SoundI;
@@ -55 +52 @@
     private:
 
-    SoundI* FireSound;
+    const CafuModelT* m_Model;
+    SoundI*           m_FireSound;
 };
 

cafu/trunk/Games/DeathMatch/Code/Item.cpp

@@ -20 +20 @@
 */
 
-/*******************/
-/*** Item (Code) ***/
-/*******************/
-
 #include "Item.hpp"
 #include "EntityCreateParams.hpp"
@@ -32 +28 @@
 #include "../../GameWorld.hpp"
 #include "ConsoleCommands/Console.hpp"
-#include "Models/Model_proxy.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "TypeSys.hpp"
 
@@ -78 +74 @@
                                0,                           // ActiveWeaponSequNr
                                0.0)),                       // ActiveWeaponFrameNr
-      ItemModel(ModelName),
-      TimeLeftNotActive(2.0),
+      m_ItemModel(Params.GameWorld->GetModel(ModelName)),
+      m_TimeLeftNotActive(2.0),
       PickUp(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Item/PickUp"))),
       Respawn(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Item/Respawn")))
@@ -106 +102 @@
     {
         case StateOfExistance_NotActive:
-            TimeLeftNotActive-=FrameTime;
-            if (TimeLeftNotActive<=0.0)
+            m_TimeLeftNotActive-=FrameTime;
+            if (m_TimeLeftNotActive<=0.0)
             {
                 State.StateOfExistance=StateOfExistance_Active;
@@ -136 +132 @@
     if (State.StateOfExistance==StateOfExistance_NotActive) return;
 
-    ItemModel.Draw(0, 0.0, LodDist);
+    AnimPoseT* Pose=m_ItemModel->GetSharedPose(0, 0.0f);
+    Pose->Draw(-1 /*default skin*/, LodDist);
 
     // RotAngle  +=  234.0*FrameTime; if (RotAngle>360.0) RotAngle-=360.0;

cafu/trunk/Games/DeathMatch/Code/Item.hpp

@@ -20 +20 @@
 */
 
-/*********************/
-/*** Item (Header) ***/
-/*********************/
-
 #ifndef _ITEM_HPP_
 #define _ITEM_HPP_
 
 #include "../../BaseEntity.hpp"
-#include "Models/Model_proxy.hpp"
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 class SoundI;
@@ -37 +33 @@
 class EntItemT : public BaseEntityT
 {
-    protected:
-
-    enum EventIDs { EventID_PickedUp, EventID_Respawn };
-
-    static const char StateOfExistance_Active;
-    static const char StateOfExistance_NotActive;
-
-    const ModelProxyT ItemModel;            // Could easily get rid of this member, but each item had to provide an own Draw() method then.
-    float             TimeLeftNotActive;
-
-    SoundI* PickUp;
-    SoundI* Respawn;
-
-
     public:
 
@@ -66 +48 @@
     static void* CreateInstance(const cf::TypeSys::CreateParamsT& Params);
     static const cf::TypeSys::TypeInfoT TypeInfo;
+
+
+    protected:
+
+    enum EventIDs { EventID_PickedUp, EventID_Respawn };
+
+    static const char StateOfExistance_Active;
+    static const char StateOfExistance_NotActive;
+
+    const CafuModelT* m_ItemModel;
+    float             m_TimeLeftNotActive;
+
+    SoundI* PickUp;
+    SoundI* Respawn;
 };
 

cafu/trunk/Games/DeathMatch/Code/ItemAmmo357.cpp

@@ -73 +73 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/ItemAmmoArrow.cpp

@@ -73 +73 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/Rocket.cpp

@@ -19 +19 @@
 =================================================================================
 */
-
-/*********************/
-/*** Rocket (Code) ***/
-/*********************/
 
 #include "Rocket.hpp"
@@ -32 +28 @@
 #include "SoundSystem/SoundShaderManager.hpp"
 #include "../../GameWorld.hpp"
-#include "Models/Model_proxy.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "ParticleEngine/ParticleEngineMS.hpp"
 #include "TypeSys.hpp"
@@ -73 +69 @@
                                0,       // ActiveWeaponSequNr
                                0.0)),   // ActiveWeaponFrameNr
-      FireSound(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Weapon/Shotgun_dBarrel")))
-{
-    FireSound->SetPosition(Params.Origin);
+      m_Model(Params.GameWorld->GetModel("Games/DeathMatch/Models/Weapons/Grenade_w.mdl")),
+      m_FireSound(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Weapon/Shotgun_dBarrel")))
+{
+    m_FireSound->SetPosition(Params.Origin);
 }
 
@@ -82 +79 @@
 {
     // Release sound.
-    SoundSystem->DeleteSound(FireSound);
+    SoundSystem->DeleteSound(m_FireSound);
 }
 
@@ -174 +171 @@
     // We only receive a single event here ("Detonation!"), thus there is no need to look at 'EventID'.
     // Update souud position.
-    FireSound->SetPosition(State.Origin);
+    m_FireSound->SetPosition(State.Origin);
 
     // Play the fire sound.
-    FireSound->Play();
+    m_FireSound->Play();
 
     // Register explosion particles.
@@ -257 +254 @@
     if (State.ActiveWeaponFrameNr>0.0) return;
 
-    static ModelProxyT RocketModel("Games/DeathMatch/Models/Weapons/Grenade_w.mdl");
-
-    RocketModel.Draw(State.ModelSequNr, State.ModelFrameNr, LodDist);
-}
+    AnimPoseT* Pose=m_Model->GetSharedPose(State.ModelSequNr, State.ModelFrameNr);
+    Pose->Draw(-1 /*default skin*/, LodDist);
+}

cafu/trunk/Games/DeathMatch/Code/Rocket.hpp

@@ -20 +20 @@
 */
 
-/***********************/
-/*** Rocket (Header) ***/
-/***********************/
-
 #ifndef _ROCKET_HPP_
 #define _ROCKET_HPP_
@@ -30 +26 @@
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 class SoundI;
@@ -55 +52 @@
     private:
 
-    SoundI* FireSound;
+    const CafuModelT* m_Model;
+    SoundI*           m_FireSound;
 };
 

cafu/trunk/Games/DeathMatch/Code/StaticDetailModel.cpp

@@ -20 +20 @@
 */
 
-/**********************************/
-/*** Static Detail Model (Code) ***/
-/**********************************/
-
 #include <stdio.h>
 #include <string.h>
@@ -30 +26 @@
 #include "StaticDetailModel.hpp"
 #include "EntityCreateParams.hpp"
+#include "../../GameWorld.hpp"
 #include "TypeSys.hpp"
 #include "ConsoleCommands/Console.hpp"
@@ -38 +35 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "Math3D/Matrix.hpp"
+#include "Models/Model_cmdl.hpp"
 
 
@@ -135 +133 @@
                                0,       // ActiveWeaponSequNr
                                0.0)),   // ActiveWeaponFrameNr
-      Model(""),
+      m_Model(NULL),
       m_PlayAnim(State.Flags),
       m_SequNr(State.ModelSequNr),
@@ -161 +159 @@
         else if (Key=="model")
         {
-            Model=ModelProxyT(std::string("Games/DeathMatch/")+Value);
+            m_Model=GameWorld->GetModel(std::string("Games/DeathMatch/")+Value);
         }
         else if (Key=="sequence") m_SequNr=atoi(Value.c_str());    // Note that the "sequence" key is NOT guaranteed to come after the "model" key!
@@ -189 +187 @@
     }
 
+    if (!m_Model)
+        m_Model=GameWorld->GetModel("");
+
 
     // Set the proper Dimensions bounding box for this model.
@@ -194 +195 @@
     // and it must be properly scaled and rotated for world space.
     VectorT V[8];
-    Model.GetBB(m_SequNr, 0.0f).AsBoxOfDouble().GetCornerVertices(V);
+    m_Model->GetSharedPose(m_SequNr, 0.0f)->GetBB().AsBoxOfDouble().GetCornerVertices(V);
 
     for (unsigned int VertexNr=0; VertexNr<8; VertexNr++)
@@ -287 +288 @@
 
 
-    Model.Draw(m_SequNr, m_FrameNr, LodDist);
+    AnimPoseT* Pose=m_Model->GetSharedPose(m_SequNr, m_FrameNr);
+    Pose->Draw(-1 /*default skin*/, LodDist);
 
 
@@ -297 +299 @@
         Vector3fT GuiAxisY;
 
-        if (Model.GetGuiPlane(m_SequNr, m_FrameNr, LodDist, GuiOrigin, GuiAxisX, GuiAxisY))
+        if (m_Model->GetGuiPlane(m_SequNr, m_FrameNr, LodDist, GuiOrigin, GuiAxisX, GuiAxisY))
         {
 #if 1
@@ -344 +346 @@
     {
         // Advance the client-local animation.
-        m_FrameNr=Model.AdvanceFrameNr(m_SequNr, m_FrameNr, FrameTime, true);
+        AnimPoseT* Pose=m_Model->GetSharedPose(m_SequNr, m_FrameNr);
+        Pose->Advance(FrameTime, true);
+        m_FrameNr=Pose->GetFrameNr();
     }
 
@@ -386 +390 @@
 bool EntStaticDetailModelT::GetGuiPlane(Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const
 {
-    if (!Model.GetGuiPlane(m_SequNr, m_FrameNr, 0.0, GuiOrigin, GuiAxisX, GuiAxisY)) return false;
+    if (!m_Model->GetGuiPlane(m_SequNr, m_FrameNr, 0.0, GuiOrigin, GuiAxisX, GuiAxisY)) return false;
 
     // Okay, got the plane. Now transform it from model space into world space.
@@ -452 +456 @@
     Ent->State.Events^=(1 << EventID_RestartSequ);
 
-    if (Ent->m_SequNr>=int(Ent->Model.GetNrOfSequences())) Ent->m_SequNr=0;
+    if (Ent->m_SequNr >= int(Ent->m_Model->GetAnims().Size())) Ent->m_SequNr=0;
     return 0;
 }
@@ -471 +475 @@
     EntStaticDetailModelT* Ent=(EntStaticDetailModelT*)cf::GameSys::ScriptStateT::GetCheckedObjectParam(LuaState, 1, TypeInfo);
 
-    lua_pushinteger(LuaState, Ent->Model.GetNrOfSequences());
+    lua_pushinteger(LuaState, Ent->m_Model->GetAnims().Size());
     return 1;
 }

cafu/trunk/Games/DeathMatch/Code/StaticDetailModel.hpp

@@ -20 +20 @@
 */
 
-/************************************/
-/*** Static Detail Model (Header) ***/
-/************************************/
-
 #ifndef _STATIC_DETAIL_MODEL_HPP_
 #define _STATIC_DETAIL_MODEL_HPP_
 
 #include "../../BaseEntity.hpp"
-#include "Models/Model_proxy.hpp"
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 namespace cf { namespace GuiSys { class GuiI; } }
@@ -75 +71 @@
     enum EventIDs { EventID_RestartSequ };
 
-    ModelProxyT       Model;
+    const CafuModelT* m_Model;
     char&             m_PlayAnim;   ///< If 1, play the animation, i.e. advance the frames over time. If 0, keep still. This is a reference to State.Flags to have it sync'ed over the network.
     char&             m_SequNr;     ///< The number of the animation sequence to play. This is a reference to State.ModelSequNr to have it sync'ed over the network.

cafu/trunk/Games/DeathMatch/Code/Weapon.cpp

@@ -20 +20 @@
 */
 
-/*********************/
-/*** Weapon (Code) ***/
-/*********************/
-
 #include "Weapon.hpp"
 #include "EntityCreateParams.hpp"
@@ -32 +28 @@
 #include "../../GameWorld.hpp"
 #include "ConsoleCommands/Console.hpp"
-#include "Models/Model_proxy.hpp"
+#include "Models/Model_cmdl.hpp"
 #include "TypeSys.hpp"
 
@@ -78 +74 @@
                                0,                           // ActiveWeaponSequNr
                                0.0)),                       // ActiveWeaponFrameNr
-      WeaponModel(ModelName),
-      TimeLeftNotActive(2.0),
+      m_WeaponModel(Params.GameWorld->GetModel(ModelName)),
+      m_TimeLeftNotActive(2.0),
       PickUp(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Item/PickUp"))),
       Respawn(SoundSystem->CreateSound3D(SoundShaderManager->GetSoundShader("Item/Respawn")))
@@ -106 +102 @@
     {
         case StateOfExistance_NotActive:
-            TimeLeftNotActive-=FrameTime;
-            if (TimeLeftNotActive<=0.0)
+            m_TimeLeftNotActive-=FrameTime;
+            if (m_TimeLeftNotActive<=0.0)
             {
                 State.StateOfExistance=StateOfExistance_Active;
@@ -136 +132 @@
     if (State.StateOfExistance==StateOfExistance_NotActive) return;
 
-    WeaponModel.Draw(0, 0.0, LodDist);
+    AnimPoseT* Pose=m_WeaponModel->GetSharedPose(0, 0.0f);
+    Pose->Draw(-1 /*default skin*/, LodDist);
 
     // RotAngle  +=  234.0*FrameTime; if (RotAngle>360.0) RotAngle-=360.0;

cafu/trunk/Games/DeathMatch/Code/Weapon.hpp

@@ -20 +20 @@
 */
 
-/***********************/
-/*** Weapon (Header) ***/
-/***********************/
-
 #ifndef _WEAPON_HPP_
 #define _WEAPON_HPP_
 
 #include "../../BaseEntity.hpp"
-#include "Models/Model_proxy.hpp"
 
 
+class CafuModelT;
 class EntityCreateParamsT;
 class SoundI;
@@ -37 +33 @@
 class EntWeaponT : public BaseEntityT
 {
-    protected:
-
-    enum EventIDs { EventID_PickedUp, EventID_Respawn };
-
-    static const char StateOfExistance_Active;
-    static const char StateOfExistance_NotActive;
-
-    const ModelProxyT WeaponModel;          // Could easily get rid of this member, but each item had to provide an own Draw() method then.
-    float             TimeLeftNotActive;
-
-    SoundI* PickUp;
-    SoundI* Respawn;
-
-
     public:
 
@@ -66 +48 @@
     static void* CreateInstance(const cf::TypeSys::CreateParamsT& Params);
     static const cf::TypeSys::TypeInfoT TypeInfo;
+
+
+    protected:
+
+    enum EventIDs { EventID_PickedUp, EventID_Respawn };
+
+    static const char StateOfExistance_Active;
+    static const char StateOfExistance_NotActive;
+
+    const CafuModelT* m_WeaponModel;
+    float             m_TimeLeftNotActive;
+
+    SoundI* PickUp;
+    SoundI* Respawn;
 };
 

cafu/trunk/Games/DeathMatch/Code/Weapon357.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/Weapon9mmAR.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponBattleScythe.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponCrossbow.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponEgon.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponFaceHugger.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponGauss.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponGrenade.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponHornetGun.cpp

@@ -75 +75 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponPistol.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponRPG.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponShotgun.cpp

@@ -70 +70 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Games/DeathMatch/Code/WeaponTripmine.cpp

@@ -87 +87 @@
     State.StateOfExistance=StateOfExistance_NotActive;
     State.Events^=(1 << EventID_PickedUp);
-    TimeLeftNotActive=5.0;
+    m_TimeLeftNotActive=5.0;
 }

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -205 +205 @@
         }
     }
+}
+
+
+bool CafuModelT::AnimT::IsLastFrameDup() const
+{
+    if (Frames.Size() < 2) return false;
+
+    return Frames[0].AnimData == Frames[Frames.Size()-1].AnimData;
 }
 

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -210 +210 @@
         void RecomputeBB(unsigned int FrameNr, const ArrayT<JointT>& Joints, const ArrayT<MeshT>& Meshes);
 
+        /// Returns whether the first frame in the sequence is equal to the last.
+        /// The editor may use this to ask the user if he wishes to delete the last frame.
+        bool IsLastFrameDup() const;
 
         std::string        Name;            ///< Name of this animation sequence.