Changeset 407 for cafu/trunk

Timestamp:

10/12/11 10:42:16 (7 months ago)

Author:

Carsten

Message:

Model Editor:
Added an info pane about the level-of-detail models used with the current model.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ChildFrame.cpp (modified) (6 diffs)
• CaWE/ModelEditor/ChildFrame.hpp (modified) (3 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -100 +100 @@
       m_ScenePropGrid(NULL),
       m_SubmodelsPanel(NULL),
+      m_DlodModelsList(NULL),
       m_TransformDialog(NULL)
 {
@@ -156 +157 @@
     ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_SCENE_SETUP,          "Scene Setup",           "Show or hide the scene setup inspector");
     ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_SUBMODELS_LIST,       "Submodels List",        "Show or hide the submodels list");
+    ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_DLOD_MODELS_LIST,     "LoD Models",            "Show or hide the list of models for reduced levels of detail");
     ViewMenu->AppendCheckItem(ID_MENU_VIEW_AUIPANE_TRANSFORM_DIALOG,     "Transform Dialog",      "Show or hide the model transform dialog");
     ViewMenu->AppendSeparator();
@@ -272 +274 @@
                          Name("SubmodelsPanel").Caption("Submodels").
                          Right().Position(5));
+
+    m_DlodModelsList=new wxStaticText(this, wxID_ANY, GetLodModelsString(), wxDefaultPosition, wxSize(260, 180), wxST_ELLIPSIZE_START);
+    m_AUIManager.AddPane(m_DlodModelsList, wxAuiPaneInfo().
+                         Name("DlodModelsList").Caption("Level-of-Detail Models").
+                         Right().Position(6));
 
     m_TransformDialog=new TransformDialogT(this, wxSize(248, 240));
@@ -771 +778 @@
 
 
+wxString ModelEditor::ChildFrameT::GetLodModelsString() const
+{
+    wxString s;
+
+    for (const CafuModelT* Model=m_ModelDoc->GetModel(); Model; Model=Model->GetDlodModel())
+    {
+        wxFileName fn(Model->GetFileName());
+
+        fn.MakeRelativeTo(m_ModelDoc->GetGameConfig()->ModDir);
+        s+=fn.GetFullPath(wxPATH_UNIX);
+
+        if (Model->GetDlodModel())
+            s+=wxString::Format(" (%.2f)\n", Model->GetDlodDist());
+        else
+            s+=" (inf)";
+    }
+
+    return s;
+}
+
+
 void ModelEditor::ChildFrameT::OnMenuView(wxCommandEvent& CE)
 {
@@ -790 +818 @@
         case ID_MENU_VIEW_AUIPANE_SCENE_SETUP:          PaneToggleShow(m_AUIManager.GetPane(m_ScenePropGrid      )); break;
         case ID_MENU_VIEW_AUIPANE_SUBMODELS_LIST:       PaneToggleShow(m_AUIManager.GetPane(m_SubmodelsPanel     )); break;
+        case ID_MENU_VIEW_AUIPANE_DLOD_MODELS_LIST:     PaneToggleShow(m_AUIManager.GetPane(m_DlodModelsList     )); break;
         case ID_MENU_VIEW_AUIPANE_TRANSFORM_DIALOG:     PaneToggleShow(m_AUIManager.GetPane(m_TransformDialog    )); break;
 
@@ -826 +855 @@
         case ID_MENU_VIEW_AUIPANE_SCENE_SETUP:          UE.Check(m_AUIManager.GetPane(m_ScenePropGrid      ).IsShown()); break;
         case ID_MENU_VIEW_AUIPANE_SUBMODELS_LIST:       UE.Check(m_AUIManager.GetPane(m_SubmodelsPanel     ).IsShown()); break;
+        case ID_MENU_VIEW_AUIPANE_DLOD_MODELS_LIST:     UE.Check(m_AUIManager.GetPane(m_DlodModelsList     ).IsShown()); break;
         case ID_MENU_VIEW_AUIPANE_TRANSFORM_DIALOG:     UE.Check(m_AUIManager.GetPane(m_TransformDialog    ).IsShown()); break;
     }

cafu/trunk/CaWE/ModelEditor/ChildFrame.hpp

@@ -103 +103 @@
         void PaneToggleShow(wxAuiPaneInfo& PaneInfo);
 
+        /// Returns a string with all the LoD models loaded with the main model.
+        wxString GetLodModelsString() const;
+
         wxString           m_FileName;
         ModelDocumentT*    m_ModelDoc;
@@ -130 +133 @@
         ScenePropGridT*    m_ScenePropGrid;
         SubmodelsPanelT*   m_SubmodelsPanel;
+        wxStaticText*      m_DlodModelsList;
         TransformDialogT*  m_TransformDialog;
 
@@ -154 +158 @@
             ID_MENU_VIEW_AUIPANE_SCENE_SETUP,
             ID_MENU_VIEW_AUIPANE_SUBMODELS_LIST,
+            ID_MENU_VIEW_AUIPANE_DLOD_MODELS_LIST,
             ID_MENU_VIEW_AUIPANE_TRANSFORM_DIALOG,
             ID_MENU_VIEW_LOAD_DEFAULT_PERSPECTIVE,

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -321 +321 @@
     BoundingBox3fT       m_BindPoseBB;              ///< [REMOVE???] The bounding-box for the base pose of the model.
 
-    CafuModelT*          m_DlodModel;               ///< Use the m_DlodModel instead of this when the camera is more that m_DlodDist away.
+    CafuModelT*          m_DlodModel;               ///< Use the m_DlodModel instead of this when the camera is more than m_DlodDist away.
     float                m_DlodDist;                ///< The distance beyond which the m_DlodModel is used instead of this.