Changeset 474 for cafu/trunk

Timestamp:

02/02/12 00:29:44 (4 months ago)

Author:

Carsten

Message:

Model code: Add support for importing smoothing groups to all model loaders.

The loaders of all model file formats have been augmented to import smoothing groups, whenever such information is available in the imported file.
The imported smoothing groups data is stored in our appropriately extended cmdl files, and the CafuModelT class has been extended accordingly.

Still missing is

• the actual use of the newly available information (at this time, we continue to compute tangent-space as before),
• thorough testing for each of the supported file formats.

References #100 and #101.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ElementsList.cpp (modified) (1 diff)
• CaWE/ModelEditor/TransformDialog.cpp (modified) (1 diff)
• Libs/Models/Classes.dia (modified) (previous)
• Libs/Models/Loader_ase.cpp (modified) (2 diffs)
• Libs/Models/Loader_ase.hpp (modified) (2 diffs)
• Libs/Models/Loader_cmdl.cpp (modified) (1 diff)
• Libs/Models/Loader_dummy.cpp (modified) (1 diff)
• Libs/Models/Loader_fbx.cpp (modified) (2 diffs)
• Libs/Models/Loader_lwo.cpp (modified) (1 diff)
• Libs/Models/Loader_md5.cpp (modified) (1 diff)
• Libs/Models/Loader_mdl.cpp (modified) (1 diff)
• Libs/Models/Model_cmdl.cpp (modified) (2 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/ElementsList.cpp

@@ -193 +193 @@
     const ArrayT<unsigned int>& Sel=m_ModelDoc->GetSelection(m_TYPE);
 
+    // When a command is done or undone, it can indirectly call our Notify_*() methods,
+    // which in turn call InitListItems(). Our calls to Select() unfortunately cause a
+    // wxEVT_COMMAND_LIST_ITEM_SELECTED event, which in turn calls our OnSelectionChanged()
+    // handler. Thus we set m_IsRecursiveSelfNotify in order to prevent the handler
+    // from inadvertently submitting another command.
     m_IsRecursiveSelfNotify=true;
     Freeze();

cafu/trunk/CaWE/ModelEditor/TransformDialog.cpp

@@ -103 +103 @@
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticText *item1 = new wxStaticText(this, -1, wxT("The transformation is applied to the entire model in the selected animation sequence or bind pose:"), wxDefaultPosition, wxSize(220,48), 0 );
+    wxStaticText *item1 = new wxStaticText(this, -1, wxT("The transformation is applied to the currently selected animation sequence(s):"), wxDefaultPosition, wxSize(220, 32), 0 );
     item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 

cafu/trunk/Libs/Models/Loader_ase.cpp

@@ -156 +156 @@
                     // remeber to not ignore the "*MATERIAL_REF" keyword any longer, and fix all faces with no "*MESH_MTLID" after loading!
                     if (SmoothGroupString=="*MESH_MTLID") break;
-                    Triangles[FaceNr].SmoothGroups.PushBack(strtoul(SmoothGroupString.c_str(), NULL, 0));
+
+                    const unsigned long SG=strtoul(SmoothGroupString.c_str(), NULL, 0);
+
+                    if (SG > 31)
+                        printf("Mesh is in smoothing group %lu, but should be in 0...31.\n", SG);
+
+                    Triangles[FaceNr].SmoothGroups.PushBack(SG);
+                    Triangles[FaceNr].SmoothGrps=uint32_t(1) << SG;
+
                     if (Triangles[FaceNr].SmoothGroups.Size()>32) throw TextParserT::ParseError();   // Safe-Guard...
                 }
@@ -580 +588 @@
             }
 
+            CafuTri.SmoothGroups=AseTri.SmoothGrps;
             CafuTri.gts_Normal=AseTri.Normal.AsVectorOfFloat();
         }

cafu/trunk/Libs/Models/Loader_ase.hpp

@@ -57 +57 @@
             /// Constructor.
             TriangleT()
+                : SmoothGrps(0)
             {
                 for (unsigned long i=0; i<3; i++)
@@ -69 +70 @@
             unsigned long         IndTexCoords[3];  ///< Indices into the TexCoords array.
             ArrayT<unsigned long> SmoothGroups;     ///< The SmoothGroups this triangle is in.
+            uint32_t              SmoothGrps;       ///< The smoothing groups that this triangle is in: If bit \c i is set, the triangle is in smoothing group \c i.
 
             // This data is computed after loading.

cafu/trunk/Libs/Models/Loader_cmdl.cpp

@@ -272 +272 @@
                                 lua_pop(m_LuaState, 1);
                             }
+
+                            lua_getfield(m_LuaState, -1, "sg");
+                            Triangle.SmoothGroups=uint32_t(lua_tonumber(m_LuaState, -1));
+                            lua_pop(m_LuaState, 1);
 
                             lua_getfield(m_LuaState, -1, "skipDraw");

cafu/trunk/Libs/Models/Loader_dummy.cpp

@@ -94 +94 @@
     {
         Mesh.Triangles.PushBack(CafuModelT::MeshT::TriangleT(0, ((i+1) % Facets)+1, i+1));
+        Mesh.Triangles[i].SmoothGroups=0x01;
     }
 

cafu/trunk/Libs/Models/Loader_fbx.cpp

@@ -573 +573 @@
         const KFbxLayerElement::EMappingMode        MappingMode=(Mesh->GetLayer(0) && Mesh->GetLayer(0)->GetUVs()) ? Mesh->GetLayer(0)->GetUVs()->GetMappingMode() : KFbxLayerElement::eNONE;
         KFbxLayerElementArrayTemplate<KFbxVector2>* UVArray    =NULL;
+        const KFbxLayerElementSmoothing*            SmoothingLE=NULL;
         std::map<uint64_t, unsigned int>            UniqueVertices;     // Maps tuples of (Mesh->GetPolygonVertex(), Mesh->GetTextureUVIndex()) to indices into CafuMesh.Vertices.
 
         Mesh->GetTextureUV(&UVArray, KFbxLayerElement::eDIFFUSE_TEXTURES);
 
+        if (Mesh->GetLayer(0))
+        {
+            SmoothingLE=Mesh->GetLayer(0)->GetSmoothing();
+
+            if (SmoothingLE)
+                Log << "    The mesh has a smoothing layer element with mapping mode "
+                    << SmoothingLE->GetMappingMode() << " and reference mode "
+                    << SmoothingLE->GetReferenceMode() << ".\n";
+            else
+                Log << "    The mesh has no smoothing layer element.\n";
+        }
+
         for (int PolyNr=0; PolyNr<Mesh->GetPolygonCount(); PolyNr++)
         {
+            uint32_t SmoothingGroups=0x01;    // Per default, all triangles are in a common smoothing group.
+
+            if (SmoothingLE)
+            {
+                if (SmoothingLE->GetMappingMode() == KFbxGeometryElement::eBY_POLYGON)
+                {
+                    switch (SmoothingLE->GetReferenceMode())
+                    {
+                        case KFbxGeometryElement::eDIRECT:
+                            SmoothingGroups = SmoothingLE->GetDirectArray().GetAt(PolyNr);
+                            break;
+
+                        case KFbxGeometryElement::eINDEX_TO_DIRECT:
+                            SmoothingGroups = SmoothingLE->GetDirectArray().GetAt(SmoothingLE->GetIndexArray().GetAt(PolyNr));
+                            break;
+
+                        default:
+                            // Ignore any unknown reference mode.
+                            break;
+                    }
+                }
+                else if (SmoothingLE->GetMappingMode() == KFbxGeometryElement::eBY_EDGE)
+                {
+                    // Unfortunately, we cannot deal with Maya-style smoothing info (hard vs. soft edges).
+                }
+            }
+
             for (int PolyTriNr=0; PolyTriNr < Mesh->GetPolygonSize(PolyNr)-2; PolyTriNr++)
             {
@@ -612 +652 @@
                 }
 
+                Tri.SmoothGroups=SmoothingGroups;
                 CafuMesh.Triangles.PushBack(Tri);
             }

cafu/trunk/Libs/Models/Loader_lwo.cpp

@@ -394 +394 @@
                     Triangle.VertexIdx[2]=PolygonMeshVertices[VertexNr+1];
 
+                    if (Poly.smoothgrp<0 || Poly.smoothgrp>31)
+                        Console->Warning(cf::va("Polygon %i is in smoothing group %i, but should be in 0...31.\n", PolyNr, Poly.smoothgrp));
+
+                    Triangle.SmoothGroups=uint32_t(1) << Poly.smoothgrp;
                     Triangle.gts_Normal=Vector3fT(Poly.norm);
 

cafu/trunk/Libs/Models/Loader_md5.cpp

@@ -179 +179 @@
                         Mesh.Triangles[TriIdx].VertexIdx[1]=TP.GetNextTokenAsInt();
                         Mesh.Triangles[TriIdx].VertexIdx[2]=TP.GetNextTokenAsInt();
+
+                        // All triangles are in a common smoothing group.
+                        Mesh.Triangles[TriIdx].SmoothGroups=0x01;
                     }
                     else if (Token=="vert")

cafu/trunk/Libs/Models/Loader_mdl.cpp

@@ -346 +346 @@
                     CafuModelT::MeshT::TriangleT CafuTri;
 
+                    // All triangles are in a common smoothing group.
+                    CafuTri.SmoothGroups=0x01;
+
                     for (unsigned int i=0; i<3; i++)
                     {

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -85 +85 @@
 
 CafuModelT::MeshT::TriangleT::TriangleT(unsigned int v0, unsigned int v1, unsigned int v2)
-    : Polarity(false),
+    : SmoothGroups(0),
+      Polarity(false),
       SkipDraw(false)
 {
@@ -719 +720 @@
             OutStream << "\t\t\t"
                       << "{ "
-                      << Triangle.VertexIdx[0] << ", " << Triangle.VertexIdx[1] << ", " << Triangle.VertexIdx[2];
-            if (Triangle.SkipDraw) OutStream << ", skipDraw=true;";
+                      << Triangle.VertexIdx[0] << ", " << Triangle.VertexIdx[1] << ", " << Triangle.VertexIdx[2]
+                      << ", sg=" << Triangle.SmoothGroups;
+            if (Triangle.SkipDraw) OutStream << ", skipDraw=true";
             OutStream << " "
                       << "},\n";

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -82 +82 @@
 
             unsigned int VertexIdx[3];  ///< The indices to the three vertices that define this triangle.
+            uint32_t     SmoothGroups;  ///< The smoothing groups that this triangle is in: If bit \c i is set, the triangle is in smoothing group \c i.
 
             int          NeighbIdx[3];  ///< The array indices of the three neighbouring triangles at the edges 01, 12 and 20. -1 indicates no neighbour, -2 indicates more than one neighbour.