Changeset 2298Tweet

Timestamp:

Jan 30, 2013, 1:00:13 PM (10 years ago)

Author:

sam

Message:

meshviewer: add two lights.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/MeshViewer.cpp (modified) (5 diffs)

trunk/.gitignore

@@ -71 +71 @@
 test/benchsuite
 test/btphystest
+test/meshviewer
 test/testsuite
 test/sandbox/sample

trunk/test/Makefile.am

@@ -11 +11 @@
 EXTRA_DIST = data/gradient.png
 
-noinst_PROGRAMS = benchsuite $(testsuite) btphystest MeshViewer
+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
+meshviewer_SOURCES = MeshViewer.cpp
+meshviewer_CPPFLAGS = @LOL_CFLAGS@
+meshviewer_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
+meshviewer_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

trunk/test/MeshViewer.cpp

@@ -31 +31 @@
         {
             m_meshes.Push(EasyMesh());
-            m_meshes.Last().Compile("[sc#0f0 ab 2 2 2 t .8 .8 .8 rx 20 ry 20 [sc#00f ab 2 2 2 tx 0 csgu]]");
+            m_meshes.Last().Compile("[sc#2f2 ab 2 2 2 t .8 .8 .8 rx 20 ry 20 [sc#22f ab 2 2 2 tx 0 csgu]]");
         }
 
@@ -44 +44 @@
         m_camera->ForceSceneUpdate();
         Ticker::Ref(m_camera);
+
+        m_lights << new Light();
+        m_lights.Last()->SetPosition(vec4(4.f, -1.f, -4.f, 0.f));
+        m_lights.Last()->SetColor(vec4(.0f, .2f, .5f, 1.f));
+        Ticker::Ref(m_lights.Last());
+
+        m_lights << new Light();
+        m_lights.Last()->SetPosition(vec4(8.f, 2.f, 6.f, 1.f));
+        m_lights.Last()->SetColor(vec4(.5f, .3f, .0f, 1.f));
+        Ticker::Ref(m_lights.Last());
+
         min_pos = vec3(FLT_MAX);
         max_pos = vec3(-FLT_MAX);
@@ -53 +64 @@
     {
         Ticker::Unref(m_camera);
+        for (int i = 0; i < m_lights.Count(); ++i)
+            Ticker::Unref(m_lights[i]);
     }
 
@@ -74 +87 @@
         vec4 c(0, 0, -2, 1.0f);
         vec4 d(-1, -1, 1, 1.0f);
-        
+
         //vec2 toto;
         //near plane : vec4(toto, 1.f, 1.f);
@@ -153 +166 @@
 
     Array<EasyMesh> m_meshes;
+    Array<Light *> m_lights;
     Camera *m_camera;