Changeset 2294Tweet

Timestamp:

Jan 29, 2013, 1:32:27 PM (10 years ago)

Author:

touky

Message:

Added MeshViewer new project, its goal being to have a program capable of previewing a mesh from an outer source (.txt, js, etc ...) in order to speed up mesh creation.
Added RadialJitter("rj") to EasyMesh parser.

Location:

trunk

Files:

• build/vs2010/Lol.sln (modified) (3 diffs)
• src/camera.cpp (modified) (2 diffs)
• src/camera.h (modified) (1 diff)
• src/easymesh/easymesh-parser.y (modified) (2 diffs)
• src/easymesh/easymesh-scanner.l (modified) (1 diff)
• src/easymesh/easymesh.h (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/MeshViewer.cpp (added)
• test/MeshViewer.vcxproj (added)

trunk/build/vs2010/Lol.sln

@@ -114 +114 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeshViewer", "..\..\test\MeshViewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
 EndProject
 Global
@@ -618 +620 @@
                 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|x64.Build.0 = Release|x64
                 {FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|Xbox 360.ActiveCfg = Release|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Any CPU.ActiveCfg = Debug|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Mixed Platforms.Build.0 = Debug|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|PS3.ActiveCfg = Debug|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.ActiveCfg = Debug|Win32
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.Build.0 = Debug|Win32
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.ActiveCfg = Debug|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.Build.0 = Debug|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Xbox 360.ActiveCfg = Debug|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Any CPU.ActiveCfg = Release|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Mixed Platforms.ActiveCfg = Release|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Mixed Platforms.Build.0 = Release|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|PS3.ActiveCfg = Release|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.ActiveCfg = Release|Win32
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.Build.0 = Release|Win32
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.ActiveCfg = Release|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.Build.0 = Release|x64
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Xbox 360.ActiveCfg = Release|x64
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
@@ -639 +659 @@
                 {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
                 {EE203B88-44CF-4859-9D42-7A1F43FECB52} = {E0491194-35E3-4513-9D31-608EA3165ECF}
+                {7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
                 {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}

trunk/src/camera.cpp

@@ -88 +88 @@
 }
 
+void Camera::ForceSceneUpdate()
+{
+    Scene::GetDefault()->SetViewMatrix(m_view_matrix);
+    Scene::GetDefault()->SetProjMatrix(m_proj_matrix);
+}
+
 void Camera::TickGame(float seconds)
 {
@@ -125 +131 @@
     WorldEntity::TickDraw(seconds);
 
-    Scene::GetDefault()->SetViewMatrix(m_view_matrix);
-    Scene::GetDefault()->SetProjMatrix(m_proj_matrix);
+    ForceSceneUpdate();
 }
 

trunk/src/camera.h

@@ -41 +41 @@
     mat4 const &GetViewMatrix();
     mat4 const &GetProjMatrix();
+    void ForceSceneUpdate();
 
 protected:

trunk/src/easymesh/easymesh-parser.y

@@ -48 +48 @@
 %token T_TRANSLATEY T_ROTATEY T_TAPERY T_SCALEY T_MIRRORY
 %token T_TRANSLATEZ T_ROTATEZ T_TAPERZ T_SCALEZ T_MIRRORZ
-%token T_TRANSLATE T_SCALE T_TOGGLESCALEWINDING
+%token T_TRANSLATE T_SCALE T_TOGGLESCALEWINDING T_RADIALJITTER
 %token T_CSGUNION T_CSGSUBSTRACT T_CSGAND T_CSGXOR
 %token T_CHAMFER
@@ -136 +136 @@
   | T_MIRRORY              { mc.m_mesh.MirrorY(); }
   | T_MIRRORZ              { mc.m_mesh.MirrorZ(); }
+  | T_RADIALJITTER args1   { mc.m_mesh.RadialJitter($2.f0); }
   | T_TOGGLESCALEWINDING   { mc.m_mesh.ToggleScaleWinding(); }
   | T_CSGUNION             { mc.m_mesh.CsgUnion(); }

trunk/src/easymesh/easymesh-scanner.l

@@ -67 +67 @@
 sz    { return token::T_SCALEZ; }
 s     { return token::T_SCALE; }
-tsw      { return token::T_TOGGLESCALEWINDING; }
+tsw   { return token::T_TOGGLESCALEWINDING; }
 mx    { return token::T_MIRRORX; }
 my    { return token::T_MIRRORY; }
 mz    { return token::T_MIRRORZ; }
+rj    { return token::T_RADIALJITTER; }
 
 csgu  { return token::T_CSGUNION; }

trunk/src/easymesh/easymesh.h

@@ -106 +106 @@
                    float r2, float r12, float r22, float sidemul, int offset);
 
+    //Convenience functions
+public:
+    int GetVertexCount() { return m_vert.Count(); }
+    vec3 const &GetVertexLocation(int i) { return m_vert[i].m1; }
+
 private:
     vec4 m_color, m_color2;

trunk/test/Makefile.am

@@ -11 +11 @@
 EXTRA_DIST = data/gradient.png
 
-noinst_PROGRAMS = benchsuite $(testsuite) btphystest
+noinst_PROGRAMS = benchsuite $(testsuite) btphystest MeshViewer
 
 TESTS = $(testsuite)
@@ -50 +50 @@
 btphystest_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
+MeshViewer_SOURCES = MeshViewer.cpp
+MeshViewer_CPPFLAGS = @LOL_CFLAGS@
+MeshViewer_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
+MeshViewer_DEPENDENCIES = $(top_builddir)/src/liblol.a
+