Changeset 1784Tweet

Timestamp:

Aug 21, 2012, 2:09:14 PM (11 years ago)

Author:

elliotek

Message:

EsayMesh : RadialJitter func & demo added

Location:

trunk

Files:

• src/easymesh/easymesh.cpp (modified) (1 diff)
• src/easymesh/easymesh.h (modified) (1 diff)
• tutorial/05_easymesh.cpp (modified) (3 diffs)

trunk/src/easymesh/easymesh.cpp

@@ -238 +238 @@
 }
 
+void EasyMesh::RadialJitter(float r)
+{
+    Array<int> Welded;
+        Welded.Push(-1);
+    for (int i = m_cursors.Last().m1 + 1; i < m_vert.Count(); i++)
+        {
+                int j;
+                for (j = m_cursors.Last().m1; j < i; j++)
+                {
+                        if(sqlength(m_vert[i].m1 - m_vert[j].m1) < 0.1f)
+                                break;
+                }
+
+                if(j == i)
+                        Welded.Push(-1);
+                else
+                        Welded.Push(j);
+        }
+
+        int i, j;
+    for (i = m_cursors.Last().m1, j = 0; i < m_vert.Count(); i++, j++)
+        {
+                if(Welded[j] == -1)
+                        m_vert[i].m1 *= 1.0f + RandF(r);
+                else
+                        m_vert[i].m1 = m_vert[Welded[j]].m1;
+        }
+
+        ComputeNormals(m_cursors.Last().m2, m_indices.Count() - m_cursors.Last().m2);
+}
+
 void EasyMesh::TaperX(float y, float z, float xoff)
 {

trunk/src/easymesh/easymesh.h

@@ -52 +52 @@
     void SetCurVertNormal(vec3 const &normal);
     void SetCurVertColor(vec4 const &color);
+
+    void RadialJitter(float r);
 
     void Translate(vec3 const &v);

trunk/tutorial/05_easymesh.cpp

@@ -30 +30 @@
                 m_mesh.Compile("ad12,2.2,0 ty.1 ac12,.2,2.4,2.2,0,1 ty.8 ac12,1.7,2.4,2.4,0,1 ty2.5");
                 m_mesh.Translate(vec3(i * 8.f, (h - 1) * 3.2f, j * 8.f));
-                m_mesh.CloseBrace();
+
+                                m_mesh.CloseBrace();
             }
         m_mesh.OpenBrace();
@@ -37 +38 @@
         m_mesh.CloseBrace();
         m_mesh.Translate(vec3(dx * 8.f, dh * 3.2f, dy * 8.f));
+
         m_mesh.CloseBrace();
     }
@@ -43 +45 @@
     {
         m_angle = 0;
-        //m_mesh.Compile("sc#e94 scb#964 [asph11 7 7 7 tx10]");
+        m_mesh.Compile("sc#800 [asph10 20 20 20]");
+                m_mesh.RadialJitter(0.2f);              
         //m_mesh.Compile("sc#94e scb#649 [asph3 7 7 7 tx-6 tz-9]");
         //m_mesh.Compile("sc#49e scb#469 [asph31 7 7 7 tx-6 tz9]");