Changeset 683

Timestamp:

06/27/07 16:55:33 (17 months ago)

Author:

leo

Message:

Added default mesh objects.

Location:

trunk/common

Files:

• lc_application.cpp (modified) (3 diffs)
• lc_flexpiece.cpp (modified) (3 diffs)
• lc_mesh.cpp (modified) (4 diffs)
• lc_mesh.h (modified) (2 diffs)
• lc_pivot.cpp (modified) (1 diff)

trunk/common/lc_application.cpp

@@ -1 +1 @@
 #include "lc_global.h"
+#include "lc_application.h"
+
 #include <stdio.h>
-#include "lc_application.h"
+#include "lc_mesh.h"
 #include "library.h"
 #include "system.h"
@@ -257 +259 @@
     SystemInit();
 
+    lcCreateDefaultMeshes();
+
     // Create a new project.
     Project* project = new Project();
@@ -410 +414 @@
     m_Library = NULL;
 
+    lcDestroyDefaultMeshes();
+
     GL_Shutdown();
 }

trunk/common/lc_flexpiece.cpp

@@ -275 +275 @@
 // FIXME: split this into another file
 
-// FIXME: move the sphere somewhere else.
-static lcMesh* SphereMesh;
+#define LC_FLEXPIECE_POINT_SIZE 0.2f
 
 lcFlexiblePiecePoint::lcFlexiblePiecePoint(lcFlexiblePiece* Parent)
@@ -282 +281 @@
 {
     m_Parent = Parent;
-
-    if (!SphereMesh)
-        SphereMesh = lcCreateSphereMesh(0.2f, 8);
 }
 
@@ -301 +297 @@
     // FIXME: lcFlexiblePiece
 
+    Matrix44 ScaleMatrix(Vector4(LC_FLEXPIECE_POINT_SIZE, 0.0f, 0.0f, 0.0f), Vector4(0.0f, LC_FLEXPIECE_POINT_SIZE, 0.0f, 0.0f), Vector4(0.0f, 0.0f, LC_FLEXPIECE_POINT_SIZE, 0.0f), Vector4(0.0f, 0.0f, 0.0f, 1.0f));
+
+    Matrix44 ModelWorld = IdentityMatrix44();
+    ModelWorld.SetTranslation(m_WorldPosition);
+
     lcRenderSection RenderSection;
 
     RenderSection.Owner = (lcPieceObject*)this;
-    RenderSection.ModelWorld = IdentityMatrix44();
-    RenderSection.ModelWorld.SetTranslation(m_WorldPosition);
-    RenderSection.Mesh = SphereMesh;
-    RenderSection.Section = &SphereMesh->m_Sections[0];
+    RenderSection.ModelWorld = Mul(ScaleMatrix, ModelWorld);;
+    RenderSection.Mesh = lcSphereMesh;
+    RenderSection.Section = &lcSphereMesh->m_Sections[0];
     RenderSection.Color = 0;
 

trunk/common/lc_mesh.cpp

@@ -1 +1 @@
 #include "lc_global.h"
+#include "lc_mesh.h"
+
 #include <malloc.h>
 #include <stdlib.h>
 #include "opengl.h"
 #include "globals.h"
-#include "lc_mesh.h"
 #include "system.h"
 #include "debug.h"
+
+lcMesh* lcSphereMesh;
+lcMesh* lcBoxMesh;
+lcMesh* lcWireframeBoxMesh;
+
+void lcCreateDefaultMeshes()
+{
+    lcSphereMesh = lcCreateSphereMesh(1.0f, 16);
+    lcBoxMesh = lcCreateBoxMesh(Vector3(-1.0f, -1.0f, -1.0f), Vector3(1.0f, 1.0f, 1.0f));
+    lcWireframeBoxMesh = lcCreateWireframeBoxMesh(Vector3(-1.0f, -1.0f, -1.0f), Vector3(1.0f, 1.0f, 1.0f));
+}
+
+void lcDestroyDefaultMeshes()
+{
+    delete lcSphereMesh;
+    lcSphereMesh = NULL;
+    delete lcBoxMesh;
+    lcBoxMesh = NULL;
+    delete lcWireframeBoxMesh;
+    lcWireframeBoxMesh = NULL;
+}
 
 lcMesh* lcCreateSphereMesh(float Radius, int Slices)
@@ -88 +110 @@
 }
 
-lcMesh* lcCreateWireframeBoxMesh(const Vector3& Min, const Vector3& Max)
-{
-    int NumIndices = 12;
+lcMesh* lcCreateBoxMesh(const Vector3& Min, const Vector3& Max)
+{
+    int NumIndices = 24;
     int NumVertices = 8;
 
@@ -96 +118 @@
 
     lcMeshEditor<u16> MeshEdit(BoxMesh);
-    MeshEdit.StartSection(GL_LINES, LC_COL_DEFAULT);
+    MeshEdit.StartSection(GL_QUADS, LC_COL_DEFAULT);
 
     MeshEdit.AddVertex(Vector3(Min[0], Min[1], Min[2]));
@@ -109 +131 @@
     MeshEdit.AddIndex(0);
     MeshEdit.AddIndex(1);
+    MeshEdit.AddIndex(2);
+    MeshEdit.AddIndex(3);
+    MeshEdit.AddIndex(7);
+    MeshEdit.AddIndex(6);
+    MeshEdit.AddIndex(5);
+    MeshEdit.AddIndex(4);
+
+    MeshEdit.AddIndex(0);
+    MeshEdit.AddIndex(1);
+    MeshEdit.AddIndex(5);
+    MeshEdit.AddIndex(4);
+    MeshEdit.AddIndex(2);
+    MeshEdit.AddIndex(3);
+    MeshEdit.AddIndex(7);
+    MeshEdit.AddIndex(6);
+
+    MeshEdit.AddIndex(0);
+    MeshEdit.AddIndex(3);
+    MeshEdit.AddIndex(7);
+    MeshEdit.AddIndex(4);
+    MeshEdit.AddIndex(1);
+    MeshEdit.AddIndex(2);
+    MeshEdit.AddIndex(6);
+    MeshEdit.AddIndex(5);
+
+    MeshEdit.EndSection();
+
+    return BoxMesh;
+}
+
+lcMesh* lcCreateWireframeBoxMesh(const Vector3& Min, const Vector3& Max)
+{
+    int NumIndices = 24;
+    int NumVertices = 8;
+
+    lcMesh* BoxMesh = new lcMesh(1, NumIndices, NumVertices, NULL);
+
+    lcMeshEditor<u16> MeshEdit(BoxMesh);
+    MeshEdit.StartSection(GL_LINES, LC_COL_DEFAULT);
+
+    MeshEdit.AddVertex(Vector3(Min[0], Min[1], Min[2]));
+    MeshEdit.AddVertex(Vector3(Min[0], Max[1], Min[2]));
+    MeshEdit.AddVertex(Vector3(Max[0], Max[1], Min[2]));
+    MeshEdit.AddVertex(Vector3(Max[0], Min[1], Min[2]));
+    MeshEdit.AddVertex(Vector3(Min[0], Min[1], Max[2]));
+    MeshEdit.AddVertex(Vector3(Min[0], Max[1], Max[2]));
+    MeshEdit.AddVertex(Vector3(Max[0], Max[1], Max[2]));
+    MeshEdit.AddVertex(Vector3(Max[0], Min[1], Max[2]));
+
+    MeshEdit.AddIndex(0);
+    MeshEdit.AddIndex(1);
     MeshEdit.AddIndex(1);
     MeshEdit.AddIndex(2);

trunk/common/lc_mesh.h

@@ -3 +3 @@
 
 #include "opengl.h"
+#include "algebra.h"
 
 class lcVertexBuffer
@@ -273 +274 @@
 
 lcMesh* lcCreateSphereMesh(float Radius, int Slices);
+lcMesh* lcCreateBoxMesh(const Vector3& Min, const Vector3& Max);
 lcMesh* lcCreateWireframeBoxMesh(const Vector3& Min, const Vector3& Max);
 
+void lcCreateDefaultMeshes();
+void lcDestroyDefaultMeshes();
+
+extern lcMesh* lcSphereMesh;
+extern lcMesh* lcBoxMesh;
+extern lcMesh* lcWireframeBoxMesh;
+
 #endif

trunk/common/lc_pivot.cpp

@@ -56 +56 @@
 void lcPivot::AddToScene(lcScene* Scene, int Color)
 {
+    Matrix44 ScaleMatrix(Vector4(LC_PIVOT_SIZE, 0.0f, 0.0f, 0.0f), Vector4(0.0f, LC_PIVOT_SIZE, 0.0f, 0.0f), Vector4(0.0f, 0.0f, LC_PIVOT_SIZE, 0.0f), Vector4(0.0f, 0.0f, 0.0f, 1.0f));
+
     // fixme: lcPivot
-    static lcMesh* BoxMesh = lcCreateWireframeBoxMesh(Vector3(-LC_PIVOT_SIZE, -LC_PIVOT_SIZE, -LC_PIVOT_SIZE), Vector3(LC_PIVOT_SIZE, LC_PIVOT_SIZE, LC_PIVOT_SIZE));
-
     lcRenderSection RenderSection;
 
     RenderSection.Owner = this;
-    RenderSection.ModelWorld = m_ModelWorld;
-    RenderSection.Mesh = BoxMesh;
-    RenderSection.Section = &BoxMesh->m_Sections[0];
+    RenderSection.ModelWorld = Mul(ScaleMatrix, m_ModelWorld);
+    RenderSection.Mesh = lcWireframeBoxMesh;
+    RenderSection.Section = &lcWireframeBoxMesh->m_Sections[0];
     RenderSection.Color = 1;