Changeset 380

Timestamp:

09/15/11 10:29:13 (8 months ago)

Author:

Carsten

Message:

Model Editor:
Add a spatial grid to the model editor as described in item 3 of #79.
The user can turn the grid on and off and set the spacing of the grid lines.

Closes #79.

Location:

cafu/trunk/CaWE/ModelEditor

Files:

• ScenePropGrid.cpp (modified) (4 diffs)
• ScenePropGrid.hpp (modified) (1 diff)
• SceneView3D.cpp (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.cpp

@@ -27 +27 @@
 #include "../GameConfig.hpp"
 #include "../MapBrush.hpp"
+#include "../Options.hpp"
 #include "MaterialSystem/MapComposition.hpp"
 #include "MaterialSystem/TextureMap.hpp"
@@ -43 +44 @@
       m_BackgroundColor(wxColour(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/BackgroundColor", "rgb(0, 128, 255)"))),
       m_ShowOrigin(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/ShowOrigin", 1l)!=0),
+      m_ShowGrid(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/ShowGrid", 0l)!=0),
+      m_GridSpacing(Options.Grid.InitialSpacing),
       m_GroundPlane_Show(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/GroundPlane_Show", 1l)!=0),
       m_Model_ShowMesh(wxConfigBase::Get()->Read("ModelEditor/SceneSetup/Model_ShowMesh", 1l)!=0),
@@ -84 +87 @@
     AppendIn(GeneralCat, new wxColourProperty("Background Color", wxPG_LABEL, m_BackgroundColor));
     AppendIn(GeneralCat, new wxBoolProperty("Show Origin", wxPG_LABEL, m_ShowOrigin));
+    AppendIn(GeneralCat, new wxBoolProperty("Show Grid", wxPG_LABEL, m_ShowGrid));
+    AppendIn(GeneralCat, new wxFloatProperty("Grid Spacing", wxPG_LABEL, m_GridSpacing));
 
 
@@ -182 +187 @@
          if (PropName=="Background Color")                m_BackgroundColor << Prop->GetValue();
     else if (PropName=="Show Origin")                     m_ShowOrigin=Prop->GetValue().GetBool();
+    else if (PropName=="Show Grid")                       m_ShowGrid=Prop->GetValue().GetBool();
+    else if (PropName=="Grid Spacing")                    m_GridSpacing=PropValueF;
     else if (PropName=="Camera.Pos.x")                    Camera.Pos.x=PropValueF;
     else if (PropName=="Camera.Pos.y")                    Camera.Pos.y=PropValueF;

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.hpp

@@ -51 +51 @@
         wxColour             m_BackgroundColor;
         bool                 m_ShowOrigin;
+        bool                 m_ShowGrid;
+        float                m_GridSpacing;
         bool                 m_GroundPlane_Show;
         bool                 m_Model_ShowMesh;

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -600 +600 @@
     }
 
+    // Render the grid.
+    if (ScenePropGrid->m_ShowGrid)
+    {
+        for (unsigned int PlaneNr=0; PlaneNr<3; PlaneNr++)
+        {
+            static MatSys::MeshT Mesh(MatSys::MeshT::Lines);
+
+            const unsigned int NumLines=17;
+            const float        Spacing =ScenePropGrid->m_GridSpacing;
+            const float        MaxCoord=Spacing * ((NumLines-1)/2);
+
+            if (Mesh.Vertices.Size()==0)
+            {
+                Mesh.Vertices.PushBackEmptyExact(NumLines*2);
+
+                const float r=Options.Grid.ColorHighlight1.Red()   / 255.0f;
+                const float g=Options.Grid.ColorHighlight1.Green() / 255.0f;
+                const float b=Options.Grid.ColorHighlight1.Blue()  / 255.0f;
+
+                for (unsigned int LineNr=0; LineNr<NumLines; LineNr++)
+                {
+                    Mesh.Vertices[LineNr*2  ].SetColor(r, g, b);
+                    Mesh.Vertices[LineNr*2+1].SetColor(r, g, b);
+                }
+            }
+
+            for (unsigned int DirNr=0; DirNr<2; DirNr++)
+            {
+                for (unsigned int LineNr=0; LineNr<NumLines; LineNr++)
+                {
+                    Vector3fT A;
+                    Vector3fT B;
+
+                    A[(PlaneNr+1+DirNr) % 3]=-MaxCoord;
+                    A[(PlaneNr+2-DirNr) % 3]=Spacing*LineNr - MaxCoord;
+
+                    B[(PlaneNr+1+DirNr) % 3]=MaxCoord;
+                    B[(PlaneNr+2-DirNr) % 3]=Spacing*LineNr - MaxCoord;
+
+                    Mesh.Vertices[LineNr*2  ].SetOrigin(A);
+                    Mesh.Vertices[LineNr*2+1].SetOrigin(B);
+                }
+
+                MatSys::Renderer->SetCurrentMaterial(m_Renderer.GetRMatWireframe());
+                MatSys::Renderer->RenderMesh(Mesh);
+            }
+        }
+    }
+
     // Render a small cross at the (world-space) position of each active light source.
     const ArrayT<ModelDocumentT::LightSourceT*>& LightSources=m_Parent->GetModelDoc()->GetLightSources();