Changeset 2457Tweet

Timestamp:

Feb 20, 2013, 11:42:37 AM (10 years ago)

Author:

touky

Message:

easymesh : Tweak previous crashfix.

Location:

trunk/src/easymesh

Files:

• easymesh.cpp (modified) (1 diff)
• easymesh.h (modified) (1 diff)

trunk/src/easymesh/easymesh.cpp

@@ -372 +372 @@
 {
     EasyMeshCompiler mc(*this);
-    bool res = mc.ParseString(command);
+    return mc.ParseString(command);
+}
+
+//-----------------------------------------------------------------------------
+void EasyMesh::OpenBrace()
+{
+    m_cursors.Push(m_vert.Count(), m_indices.Count());
+}
+
+//-----------------------------------------------------------------------------
+void EasyMesh::CloseBrace()
+{
+    m_cursors.Pop();
+}
+//-----------------------------------------------------------------------------
+void EasyMesh::MeshConvert(GpuShaderData* new_gpu_sdata)
+{
     delete(m_build_data);
     m_build_data = NULL;
-    return res;
-}
-
-//-----------------------------------------------------------------------------
-void EasyMesh::OpenBrace()
-{
-    m_cursors.Push(m_vert.Count(), m_indices.Count());
-}
-
-//-----------------------------------------------------------------------------
-void EasyMesh::CloseBrace()
-{
-    m_cursors.Pop();
-}
-//-----------------------------------------------------------------------------
-void EasyMesh::MeshConvert(GpuShaderData* new_gpu_sdata)
-{
+
     if (new_gpu_sdata)
     {

trunk/src/easymesh/easymesh.h

@@ -21 +21 @@
 namespace lol
 {
+
+//Utility enum for renderers
+struct MeshRender
+{
+    enum Value
+    {
+        NeedInit,
+        CanRender,
+        IgnoreRender
+    }
+    m_value;
+
+    inline MeshRender(Value v) : m_value(v) {}
+    inline MeshRender() : m_value(NeedInit) {}
+    inline operator Value() { return m_value; }
+};
 
 //Vertex datas for easymesh vertex list.