Changeset 402 for cafu/trunk

Timestamp:

10/09/11 12:17:14 (8 months ago)

Author:

Carsten

Message:

Model Editor: Added support for rendering

• the normal vectors of the mesh triangles, with the color of the normal indicating the polarity of the triangle,
• the tangent-space axes at each vertex.

References #90.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ScenePropGrid.cpp (modified) (3 diffs)
• CaWE/ModelEditor/ScenePropGrid.hpp (modified) (1 diff)
• CaWE/ModelEditor/SceneView3D.cpp (modified) (2 diffs)
• Libs/Models/AnimPose.cpp (modified) (6 diffs)
• Libs/Models/AnimPose.hpp (modified) (3 diffs)

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.cpp

@@ -51 +51 @@
       m_Model_ShowMesh(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowMesh", 1l)!=0),
       m_Model_ShowSkeleton(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowSkeleton", 0l)!=0),
+      m_Model_ShowTriangleNormals(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowTriangleNormals", 0l)!=0),
+      m_Model_ShowTangentSpace(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowTangentSpace", 0l)!=0),
       m_AmbientLightColor(wxColour(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/AmbientLightColor", "rgb(96, 96, 96)"))),
       m_AmbientTexture(NULL),
@@ -129 +131 @@
     AppendIn(ModelProps, new wxBoolProperty("Show Mesh", wxPG_LABEL, m_Model_ShowMesh));
     AppendIn(ModelProps, new wxBoolProperty("Show Skeleton", wxPG_LABEL, m_Model_ShowSkeleton));
+    AppendIn(ModelProps, new wxBoolProperty("Show triangle normals", wxPG_LABEL, m_Model_ShowTriangleNormals));
+    AppendIn(ModelProps, new wxBoolProperty("Show tangent-space", wxPG_LABEL, m_Model_ShowTangentSpace));
 
 
@@ -216 +220 @@
         }
     }
-    else if (PropName=="Model.Show Mesh")     m_Model_ShowMesh    =Prop->GetValue().GetBool();
-    else if (PropName=="Model.Show Skeleton") m_Model_ShowSkeleton=Prop->GetValue().GetBool();
+    else if (PropName=="Model.Show Mesh")             m_Model_ShowMesh           =Prop->GetValue().GetBool();
+    else if (PropName=="Model.Show Skeleton")         m_Model_ShowSkeleton       =Prop->GetValue().GetBool();
+    else if (PropName=="Model.Show triangle normals") m_Model_ShowTriangleNormals=Prop->GetValue().GetBool();
+    else if (PropName=="Model.Show tangent-space")    m_Model_ShowTangentSpace   =Prop->GetValue().GetBool();
     else if (PropName=="Frame No.") { AnimState.Pose.SetFrameNr(PropValueF); m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }
     else if (PropName=="Speed")     { AnimState.Speed=PropValueF; m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.hpp

@@ -58 +58 @@
         bool                 m_Model_ShowMesh;
         bool                 m_Model_ShowSkeleton;
+        bool                 m_Model_ShowTriangleNormals;
+        bool                 m_Model_ShowTangentSpace;
         wxColour             m_AmbientLightColor;
         MatSys::TextureMapI* m_AmbientTexture;    ///< A uniform 2x2 texture colored in the ambient light color, used as lightmap for the ground plane.

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -411 +411 @@
 
 
+    // Render the triangle normals and/or the tangent-space axes of the model in this pose.
+    if ((ScenePropGrid->m_Model_ShowTriangleNormals || ScenePropGrid->m_Model_ShowTangentSpace) && MatSys::Renderer->GetCurrentRenderAction()==MatSys::RendererI::AMBIENT)
+    {
+        static MatSys::MeshT TangentSpace(MatSys::MeshT::Lines);
+
+        TangentSpace.Vertices.Overwrite();
+
+        for (unsigned long MeshNr=0; MeshNr<Model->GetMeshes().Size(); MeshNr++)
+        {
+            const CafuModelT::MeshT&    Mesh    =Model->GetMeshes()[MeshNr];
+            const AnimPoseT::MeshInfoT& MeshInfo=Anim.Pose.GetMeshInfos()[MeshNr];
+
+            for (unsigned long TriNr=0; TriNr<Mesh.Triangles.Size(); TriNr++)
+            {
+                const CafuModelT::MeshT::TriangleT& Tri=Mesh.Triangles[TriNr];
+                Vector3fT Center;
+
+                for (unsigned int i=0; i<3; i++)
+                {
+                    const AnimPoseT::MeshInfoT::VertexT& VertexInfo=MeshInfo.Vertices[Tri.VertexIdx[i]];
+
+                    Center+=VertexInfo.Pos;
+
+                    if (ScenePropGrid->m_Model_ShowTangentSpace)
+                    {
+                        // Render the tangent-space axes at each vertex.
+                        for (unsigned int AxisNr=0; AxisNr<3; AxisNr++)
+                        {
+                            Vector3fT Axis; Axis[AxisNr]=1.0f;
+
+                            TangentSpace.Vertices.PushBackEmpty(2);
+                            MatSys::MeshT::VertexT& V1=TangentSpace.Vertices[TangentSpace.Vertices.Size()-2];
+                            MatSys::MeshT::VertexT& V2=TangentSpace.Vertices[TangentSpace.Vertices.Size()-1];
+
+                            V1.SetOrigin(VertexInfo.Pos);
+                            V1.SetColor(Axis.x, Axis.y, Axis.z);
+
+                            const Vector3fT Vec=(AxisNr==0) ? VertexInfo.Normal :
+                                                (AxisNr==1) ? VertexInfo.Tangent :
+                                                              VertexInfo.BiNormal;
+
+                            V2.SetOrigin(VertexInfo.Pos + Vec);
+                            V2.SetColor(Axis.x, Axis.y, Axis.z);
+                        }
+                    }
+                }
+
+                // Render the triangle's normal vector.
+                if (ScenePropGrid->m_Model_ShowTriangleNormals)
+                {
+                    Center/=3.0f;
+
+                    TangentSpace.Vertices.PushBackEmpty(2);
+                    MatSys::MeshT::VertexT& V1=TangentSpace.Vertices[TangentSpace.Vertices.Size()-2];
+                    MatSys::MeshT::VertexT& V2=TangentSpace.Vertices[TangentSpace.Vertices.Size()-1];
+
+                    V1.SetOrigin(Center);
+                    V1.SetColor(0.5f, Tri.Polarity ? 0 : 0.5f, 0);
+
+                    V2.SetOrigin(Center + MeshInfo.Triangles[TriNr].Normal);
+                    V2.SetColor(0.5f, Tri.Polarity ? 0 : 0.5f, 0);
+                }
+            }
+        }
+
+        MatSys::Renderer->SetCurrentMaterial(m_Renderer.GetRMatWireframe());
+        MatSys::Renderer->RenderMesh(TangentSpace);
+    }
+
+
     // Render the GUI fixtures.
     if (MatSys::Renderer->GetCurrentRenderAction()==MatSys::RendererI::AMBIENT)
@@ -425 +495 @@
                 if (!Model->IsVertexNrOK(GF, PointNr)) continue;
 
-                Points[PointNr]=Anim.Pose.GetVertexPos(GF.Points[PointNr].MeshNr, GF.Points[PointNr].VertexNr);
+                Points[PointNr]=Anim.Pose.GetMeshInfos()[GF.Points[PointNr].MeshNr].Vertices[GF.Points[PointNr].VertexNr].Pos;
                 PointsOK|=(1 << PointNr);
             }

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -37 +37 @@
       m_BoundingBox()
 {
+    NormalizeInput();
 }
 
@@ -135 +136 @@
                 MatSys::Renderer->SetCurrentMaterial(m_Model.GetRenderMaterial(MeshNr, SkinNr));
                 MatSys::Renderer->RenderMesh(m_Draw_Meshes[MeshNr]);
-
-#if 0
-                // Render the tangent space axes for each vertex.
-                static MaterialT SolidColorMaterial;
-                SolidColorMaterial.UseMeshColors=true;
-
-                static MatSys::MeshT TangentSpaceAxes(MatSys::MeshT::Lines);
-                TangentSpaceAxes.Vertices.Overwrite();
-
-                for (unsigned long VertexNr=0; VertexNr<m_Draw_Meshes[MeshNr].Vertices.Size(); VertexNr++)
-                {
-                    const float         scale=1.0f;
-                    const Vector3fT     Orig =Vector3fT(m_Draw_Meshes[MeshNr].Vertices[VertexNr].Origin);
-                    const Vector3fT     S_   =Vector3fT(m_Draw_Meshes[MeshNr].Vertices[VertexNr].Tangent);
-                    const Vector3fT     T_   =Vector3fT(m_Draw_Meshes[MeshNr].Vertices[VertexNr].BiNormal);
-                    const Vector3fT     N_   =Vector3fT(m_Draw_Meshes[MeshNr].Vertices[VertexNr].Normal);
-                    const float         col_ =m_Meshes[MeshNr].Triangles[VertexNr / 3].Polarity ? 0.5f : 0.0f;
-                    const unsigned long Ofs  =TangentSpaceAxes.Vertices.Size();
-
-                    TangentSpaceAxes.Vertices.PushBackEmpty(6);
-
-                    TangentSpaceAxes.Vertices[Ofs+0].SetOrigin(Orig);
-                    TangentSpaceAxes.Vertices[Ofs+0].SetColor(1, col_, col_);
-                    TangentSpaceAxes.Vertices[Ofs+1].SetOrigin(Orig+S_*scale);
-                    TangentSpaceAxes.Vertices[Ofs+1].SetColor(1, col_, col_);
-
-                    TangentSpaceAxes.Vertices[Ofs+2].SetOrigin(Orig);
-                    TangentSpaceAxes.Vertices[Ofs+2].SetColor(col_, 1, col_);
-                    TangentSpaceAxes.Vertices[Ofs+3].SetOrigin(Orig+T_*scale);
-                    TangentSpaceAxes.Vertices[Ofs+3].SetColor(col_, 1, col_);
-
-                    TangentSpaceAxes.Vertices[Ofs+4].SetOrigin(Orig);
-                    TangentSpaceAxes.Vertices[Ofs+4].SetColor(col_, col_, 1);
-                    TangentSpaceAxes.Vertices[Ofs+5].SetOrigin(Orig+N_*scale);
-                    TangentSpaceAxes.Vertices[Ofs+5].SetColor(col_, col_, 1);
-                }
-
-                MatSys::RenderMaterialT* SolidColorRenderMat=MatSys::Renderer->RegisterMaterial(&SolidColorMaterial);
-
-                MatSys::Renderer->SetCurrentMaterial(SolidColorRenderMat);
-                MatSys::Renderer->RenderMesh(TangentSpaceAxes);
-
-                MatSys::Renderer->FreeMaterial(SolidColorRenderMat);
-
-                // FIXME! Rendering the stencil shadows uses the same material as the ambient pass does!
-                // (The call to FreeMaterial() above implies that no material is being set, and thus without this line,
-                //  no stencil shadows get rendered!)
-                MatSys::Renderer->SetCurrentMaterial(m_Meshes[MeshNr].RenderMaterial);
-#endif
             }
             break;
@@ -416 +368 @@
 
 
-const Vector3fT& AnimPoseT::GetVertexPos(unsigned int MeshNr, unsigned int VertexNr) const
+const ArrayT<MatrixT>& AnimPoseT::GetJointMatrices() const
 {
     Recache();
 
-    return m_MeshInfos[MeshNr].Vertices[VertexNr].Pos;
-}
-
-
-const ArrayT<MatrixT>& AnimPoseT::GetJointMatrices() const
+    return m_JointMatrices;
+}
+
+
+const ArrayT<AnimPoseT::MeshInfoT>& AnimPoseT::GetMeshInfos() const
 {
     Recache();
 
-    return m_JointMatrices;
+    return m_MeshInfos;
 }
 
@@ -710 +662 @@
             const float     f   =uv01.x*uv02.y-uv01.y*uv02.x>0.0 ? 1.0f : -1.0f;
 
-            const Vector3fT TriInfo_Draw_Tangent =myNormalize(Edge02.GetScaled(-uv01.y*f) + Edge01.GetScaled(uv02.y*f));
-            const Vector3fT TriInfo_Draw_BiNormal=myNormalize(Edge02.GetScaled( uv01.x*f) - Edge01.GetScaled(uv02.x*f));
+            const Vector3fT TriInfo_Tangent =myNormalize(Edge02.GetScaled(-uv01.y*f) + Edge01.GetScaled(uv02.y*f));
+            const Vector3fT TriInfo_BiNormal=myNormalize(Edge02.GetScaled( uv01.x*f) - Edge01.GetScaled(uv02.x*f));
 
 
@@ -737 +689 @@
 
                 VertexInfo.Normal  +=TriInfo.Normal*TriWeight[i];
-                VertexInfo.Tangent +=TriInfo_Draw_Tangent*TriWeight[i];
-                VertexInfo.BiNormal+=TriInfo_Draw_BiNormal*TriWeight[i];
+                VertexInfo.Tangent +=TriInfo_Tangent*TriWeight[i];
+                VertexInfo.BiNormal+=TriInfo_BiNormal*TriWeight[i];
 
                 for (unsigned long DupNr=0; DupNr<Vertex.GeoDups.Size(); DupNr++)
@@ -746 +698 @@
 
                     DupVertexInfo.Normal  +=TriInfo.Normal*TriWeight[i];
-                    DupVertexInfo.Tangent +=TriInfo_Draw_Tangent*(Tri.Polarity==DupVertex.Polarity ? TriWeight[i] : -TriWeight[i]);
-                    DupVertexInfo.BiNormal+=TriInfo_Draw_BiNormal*TriWeight[i];
+                    DupVertexInfo.Tangent +=TriInfo_Tangent*(Tri.Polarity==DupVertex.Polarity ? TriWeight[i] : -TriWeight[i]);
+                    DupVertexInfo.BiNormal+=TriInfo_BiNormal*TriWeight[i];
                 }
             }

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -53 +53 @@
 {
     public:
+
+    /// The instances of this struct parallel and augment the \c CafuModelT::MeshT instances in the related \c CafuModelT.
+    struct MeshInfoT
+    {
+        struct TriangleT
+        {
+            Vector3fT Normal;       ///< The normal vector of this triangle, required for the shadow-silhouette determination.
+        };
+
+        struct VertexT
+        {
+            Vector3fT Pos;          ///< The spatial position of this vertex.
+            Vector3fT Normal;       ///< The tangent-space normal   vector of this vertex.
+            Vector3fT Tangent;      ///< The tangent-space tangent  vector of this vertex.
+            Vector3fT BiNormal;     ///< The tangent-space binormal vector of this vertex.
+        };
+
+        ArrayT<TriangleT> Triangles;
+        ArrayT<VertexT>   Vertices;
+    };
+
 
     /// This struct describes information about a parent or "super" model whose skeleton pose
@@ -117 +138 @@
     unsigned int FindClosestVertex(unsigned int MeshNr, unsigned int TriNr, const Vector3fT& P) const;
 
-    /// Returns the spatial position of the given vertex in the specified mesh.
-    const Vector3fT& GetVertexPos(unsigned int MeshNr, unsigned int VertexNr) const;
-
-    /// This method returns the set of transformation matrices (one per joint) at the given sequence and frame number.
+    /// Returns the set of transformation matrices (one per joint) at the given sequence and frame number.
     const ArrayT<MatrixT>& GetJointMatrices() const;
 
-    /// This method returns the MatSys meshes for this pose.
+    /// Returns the mesh infos with additional data for each mesh in this pose.
+    const ArrayT<MeshInfoT>& GetMeshInfos() const;
+
+    /// Returns the MatSys meshes for this pose.
     const ArrayT<MatSys::MeshT>& GetDrawMeshes() const;
 
-    /// This method returns the bounding-box for this pose.
+    /// Returns the bounding-box for this pose.
     const BoundingBox3fT& GetBB() const;
 
 
     private:
-
-    /// The instances of this struct parallel and augment the \c CafuModelT::MeshT instances in the related \c CafuModelT.
-    struct MeshInfoT
-    {
-        struct TriangleT
-        {
-            Vector3fT Normal;       ///< The normal vector of this triangle, required for the shadow-silhouette determination.
-        };
-
-        struct VertexT
-        {
-            Vector3fT Pos;          ///< The spatial position of this vertex.
-            Vector3fT Normal;       ///< The tangent-space normal   vector of this vertex.
-            Vector3fT Tangent;      ///< The tangent-space tangent  vector of this vertex.
-            Vector3fT BiNormal;     ///< The tangent-space binormal vector of this vertex.
-        };
-
-        ArrayT<TriangleT> Triangles;
-        ArrayT<VertexT>   Vertices;
-    };
-
 
     void NormalizeInput();
@@ -158 +158 @@
     void Recache() const;
 
-    const CafuModelT&             m_Model;              ///< The related model that this is a pose for.
-    int                           m_SequNr;             ///< The animation sequence number at which we have computed the cache data.
-    float                         m_FrameNr;            ///< The animation frame    number at which we have computed the cache data.
+    const CafuModelT&             m_Model;          ///< The related model that this is a pose for.
+    int                           m_SequNr;         ///< The animation sequence number at which we have computed the cache data.
+    float                         m_FrameNr;        ///< The animation frame    number at which we have computed the cache data.
     const SuperT*                 m_Super;
- // ArrayT<...>                   m_Def;                ///< Array of { channel, sequence, framenr, (forceloop), blendweight } tuples.
- // bool                          m_DoCache;            ///< Cache the computed data? (Set to true by the user if he want to re-use this instance.)
+ // ArrayT<...>                   m_Def;            ///< Array of { channel, sequence, framenr, (forceloop), blendweight } tuples.
+ // bool                          m_DoCache;        ///< Cache the computed data? (Set to true by the user if he want to re-use this instance.)
 
-    mutable bool                  m_NeedsRecache;       ///< wird auf 'true' gesetzt wann immer SetSequ(), SetFrameNr() oder AdvanceAll() o.ä. aufgerufen wird, übernimmt m_Draw_CachedDataAt*Nr Funktionalität.
-    mutable ArrayT<MatrixT>       m_JointMatrices;      ///< The transformation matrices that represent the pose of the skeleton at the given animation sequence and frame number.
-    mutable ArrayT<MeshInfoT>     m_MeshInfos;          ///< Additional data for each mesh in m_Model.
-    mutable ArrayT<MatSys::MeshT> m_Draw_Meshes;        ///< The draw meshes resulting from the m_JointMatrices.
-    mutable BoundingBox3fT        m_BoundingBox;        ///< The bounding-box for the model in this pose.
+    mutable bool                  m_NeedsRecache;   ///< wird auf 'true' gesetzt wann immer SetSequ(), SetFrameNr() oder AdvanceAll() o.ä. aufgerufen wird, übernimmt m_Draw_CachedDataAt*Nr Funktionalität.
+    mutable ArrayT<MatrixT>       m_JointMatrices;  ///< The transformation matrices that represent the pose of the skeleton at the given animation sequence and frame number.
+    mutable ArrayT<MeshInfoT>     m_MeshInfos;      ///< Additional data for each mesh in m_Model.
+    mutable ArrayT<MatSys::MeshT> m_Draw_Meshes;    ///< The draw meshes resulting from the m_JointMatrices.
+    mutable BoundingBox3fT        m_BoundingBox;    ///< The bounding-box for the model in this pose.
 };