Changeset 434 for cafu/trunk

Timestamp:

11/27/11 14:23:03 (6 months ago)

Author:

Carsten

Message:

Model Editor:
Added a tool for fixing models that did not bring proper UV-coordinates, or none at all.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/Commands/UpdateUVCoords.cpp (added)
• CaWE/ModelEditor/Commands/UpdateUVCoords.hpp (added)
• CaWE/ModelEditor/ElementsList.cpp (modified) (4 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (2 diffs)

cafu/trunk/CaWE/ModelEditor/ElementsList.cpp

@@ -27 +27 @@
 #include "Commands/Rename.hpp"
 #include "Commands/Select.hpp"
+#include "Commands/UpdateUVCoords.hpp"
 #include "../ArtProvider.hpp"
 
 #include "MaterialSystem/Material.hpp"
 #include "Models/Model_cmdl.hpp"
+
+#include "wx/numdlg.h"
 
 
@@ -293 +296 @@
         ID_MENU_INSPECT_EDIT=wxID_HIGHEST+1+100,
         ID_MENU_RENAME,
-        ID_MENU_ADD_NEW
+        ID_MENU_ADD_NEW,
+        ID_MENU_PROJECT_UV_COORDS
     };
 
@@ -302 +306 @@
     if (m_TYPE==GFIX || m_TYPE==SKIN || m_TYPE==CHAN) Menu.Append(ID_MENU_ADD_NEW, "Add/create new");
 
-    /* if (m_TYPE==MESH)
-    {
-        Append(..., "Remove unused Vertices");
-        Append(..., "Remove unused Weights");
-    } */
+    if (m_TYPE==MESH)
+    {
+        Menu.AppendSeparator();
+        // Menu.Append(..., "Remove unused Vertices");
+        // Menu.Append(..., "Remove unused Weights");
+        Menu.Append(ID_MENU_PROJECT_UV_COORDS, "Project new UV-coords...", "Project UV-coordinates onto the mesh");
+    }
 
     switch (GetPopupMenuSelectionFromUser(Menu))
@@ -333 +339 @@
                 default: break;
             }
+            break;
+        }
+
+        case ID_MENU_PROJECT_UV_COORDS:
+        {
+            if (m_TYPE!=MESH) break;
+            if (m_ModelDoc->GetSelection(m_TYPE).Size()==0) break;
+
+            const unsigned int MeshNr=m_ModelDoc->GetSelection(m_TYPE)[0];
+
+            const long Scale=wxGetNumberFromUser(
+                "This is a tool for fixing models that did not bring proper UV-coordinates, or none at all.\n"
+                "The right solution is to assign UV-coordinates in your favourite 3D mesh modelling software\n"
+                "and then to re-import the model, whereas this tool is meant as a very quick and very simple\n"
+                "means for a hot-fix (that sometimes may suffice nevertheless).",
+                "Enter UV-vector scale:",
+                wxString::Format("Project UV-coordinates onto mesh %u", MeshNr),
+                12,
+                1,
+                1024);
+
+            m_MainFrame->SubmitCommand(new CommandUpdateUVCoordsT(m_ModelDoc,
+                MeshNr,
+                m_ModelDoc->GetAnimState().Pose,
+                Vector3fT(Scale, 0, 0),
+                Vector3fT(0, 0, Scale)));
             break;
         }

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -51 +51 @@
 namespace ModelEditor { class CommandUpdateGuiFixtureT; }
 namespace ModelEditor { class CommandUpdateTriangleT; }
+namespace ModelEditor { class CommandUpdateUVCoordsT; }
 
 
@@ -306 +307 @@
     friend class ModelEditor::CommandUpdateGuiFixtureT;
     friend class ModelEditor::CommandUpdateTriangleT;
+    friend class ModelEditor::CommandUpdateUVCoordsT;
 
     CafuModelT(const CafuModelT&);                  ///< Use of the Copy    Constructor is not allowed.