Changeset 438 for cafu/trunk

Timestamp:

12/01/11 10:47:06 (6 months ago)

Author:

Carsten

Message:

Display and operate GUIs that are attached via GuiFixtureT's to their model in the game just as well as those that are attached via the older GuiLocT's.

Location:

cafu/trunk

Files:

• Games/DeathMatch/Code/HumanPlayer.cpp (modified) (1 diff)
• Games/DeathMatch/Code/StaticDetailModel.cpp (modified) (2 diffs)
• Games/DeathMatch/Code/StaticDetailModel.hpp (modified) (1 diff)
• Libs/Models/AnimPose.cpp (modified) (1 diff)
• Libs/Models/AnimPose.hpp (modified) (1 diff)

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

@@ -260 +260 @@
     Vector3fT GuiAxisY;
 
-    if (!GuiEnt->GetGuiPlane(GuiOrigin, GuiAxisX, GuiAxisY)) return false;
+    if (!GuiEnt->GetGuiPlane(0, GuiOrigin, GuiAxisX, GuiAxisY) && !GuiEnt->GetGuiPlane(GuiOrigin, GuiAxisX, GuiAxisY)) return false;
 
 

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

@@ -299 +299 @@
         Vector3fT GuiAxisY;
 
-        if (m_Model->GetGuiPlane(GuiOrigin, GuiAxisX, GuiAxisY))
+        if (Pose->GetGuiPlane(0, GuiOrigin, GuiAxisX, GuiAxisY) || m_Model->GetGuiPlane(GuiOrigin, GuiAxisX, GuiAxisY))
         {
 #if 1
@@ -415 +415 @@
 
 
+bool EntStaticDetailModelT::GetGuiPlane(unsigned int GFNr, Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const
+{
+    if (!m_Model->GetSharedPose(m_SequNr, m_FrameNr)->GetGuiPlane(GFNr, GuiOrigin, GuiAxisX, GuiAxisY)) return false;
+
+    // Okay, got the plane. Now transform it from model space into world space.
+    GuiOrigin=scale(GuiOrigin, 25.4f);
+    GuiOrigin=GuiOrigin.GetRotX(     -float(State.Pitch  )/8192.0f*45.0f);
+    GuiOrigin=GuiOrigin.GetRotY(      float(State.Bank   )/8192.0f*45.0f);
+    GuiOrigin=GuiOrigin.GetRotZ(90.0f-float(State.Heading)/8192.0f*45.0f);
+
+    GuiAxisX=scale(GuiAxisX, 25.4f);
+    GuiAxisX=GuiAxisX.GetRotX(     -float(State.Pitch  )/8192.0f*45.0f);
+    GuiAxisX=GuiAxisX.GetRotY(      float(State.Bank   )/8192.0f*45.0f);
+    GuiAxisX=GuiAxisX.GetRotZ(90.0f-float(State.Heading)/8192.0f*45.0f);
+
+    GuiAxisY=scale(GuiAxisY, 25.4f);
+    GuiAxisY=GuiAxisY.GetRotX(     -float(State.Pitch  )/8192.0f*45.0f);
+    GuiAxisY=GuiAxisY.GetRotY(      float(State.Bank   )/8192.0f*45.0f);
+    GuiAxisY=GuiAxisY.GetRotZ(90.0f-float(State.Heading)/8192.0f*45.0f);
+
+    // The GuiOrigin must also be translated.
+    GuiOrigin+=State.Origin.AsVectorOfFloat();
+
+    return true;
+}
+
+
 int EntStaticDetailModelT::IsPlayingAnim(lua_State* LuaState)
 {

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

@@ -60 +60 @@
     ///     GuiAxisX and GuiAxisY parameters were filled-out properly.
     bool GetGuiPlane(Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const;
+    bool GetGuiPlane(unsigned int GFNr, Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const;
 
 

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -717 +717 @@
 
 
+bool AnimPoseT::GetGuiPlane(unsigned int GFNr, Vector3fT& Origin, Vector3fT& AxisX, Vector3fT& AxisY) const
+{
+    // if (m_Model.GetDlodModel() && LodDist >= m_Model.GetDlodDist())
+    // {
+    //     return m_DlodPose->GetGuiPlane(GFNr, Origin, AxisX, AxisY);
+    // }
+
+    Recache();
+
+    if (GFNr >= m_Model.GetGuiFixtures().Size()) return false;
+
+    const CafuModelT::GuiFixtureT& GF=m_Model.GetGuiFixtures()[GFNr];
+    Vector3fT                      Points[3];
+
+    for (unsigned int PointNr=0; PointNr<3; PointNr++)
+    {
+        if (!m_Model.IsMeshNrOK  (GF, PointNr)) return false;
+        if (!m_Model.IsVertexNrOK(GF, PointNr)) return false;
+
+        Points[PointNr]=m_MeshInfos[GF.Points[PointNr].MeshNr].Vertices[GF.Points[PointNr].VertexNr].Pos;
+    }
+
+    AxisX =(Points[1]-Points[0])*GF.Scale[0];
+    AxisY =(Points[2]-Points[0])*GF.Scale[1];
+    Origin=Points[0] + AxisX*GF.Trans[0] + AxisY*GF.Trans[1];
+
+    // // It's pretty easy to derive this matrix geometrically, see my TechArchive note from 2006-08-22.
+    // MatrixT M(AxisX.x/640.0f, AxisY.x/480.0f, 0.0f, Origin.x,
+    //           AxisX.y/640.0f, AxisY.y/480.0f, 0.0f, Origin.y,
+    //           AxisX.z/640.0f, AxisY.z/480.0f, 0.0f, Origin.z,
+    //                     0.0f,           0.0f, 0.0f,     1.0f);
+
+    return true;
+}
+
+
 bool AnimPoseT::TraceRay(int SkinNr, const Vector3fT& RayOrigin, const Vector3fT& RayDir, TraceResultT& Result) const
 {

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -126 +126 @@
     void Draw(int SkinNr, float LodDist) const;
 
+    /// Returns the origin, x-axis and y-axis vectors for the given Gui fixture.
+    /// The return value indicates whether the vectors could successfully be returned in the reference parameters
+    /// (the method can fail if e.g. the model has no such Gui fixture or the Gui fixture is improperly specified).
+    bool GetGuiPlane(unsigned int GFNr, Vector3fT& Origin, Vector3fT& AxisX, Vector3fT& AxisY) const;
+
     /// Traces a ray against this model in this pose, and returns whether it was hit.
     /// The ray for the trace is defined by RayOrigin + RayDir*Fraction, where Fraction is a scalar >= 0.