Changeset 1723Tweet

Timestamp:

Aug 12, 2012, 11:06:22 PM (11 years ago)

Author:

Jnat

Message:

omg

Location:

trunk/games/demo-jnat

Files:

• demo-jnat.cpp (modified) (2 diffs)
• player.h (modified) (3 diffs)

trunk/games/demo-jnat/demo-jnat.cpp

@@ -40 +40 @@
         // set color
     m_mesh.Compile("sc#221 scb#1c1");
-        m_mesh.AppendFlatChamfBox(vec3(1000, 10, 500), 1.f);
+        m_mesh.OpenBrace();
+        m_mesh.AppendFlatChamfBox(vec3(500, 50, 100), 1.f);
+        m_mesh.CloseBrace();
+        m_mesh.OpenBrace();
+        m_mesh.AppendFlatChamfBox(vec3(500, 50, 100), 1.f);
+        m_mesh.Translate(vec3(-300, -100,0));
+        m_mesh.AppendFlatChamfBox(vec3(100, 200, 100), 1.f);
+        m_mesh.Translate(vec3(900, 100,0));
+        m_mesh.CloseBrace();
 
         m_player = new Player();
+        m_player->m_position = vec3(0.f,30.f,30.f);
         Ticker::Ref(m_player);
-
-    /* Center everything -- is it needed? */
-    //m_mesh.Compile("tx4 tz4");
 
     m_camera = new Camera(vec3(0.f, 600.f, 0.f),
                             vec3(0.f, 0.f, 0.f),
                             vec3(0, 1, 0));
-    m_camera->SetPerspective(70.f, 960.f, 600.f, .1f, 1000.f);
+    m_camera->SetPerspective(20.f, 960.f, 600.f, .1f, 1000.f);
     m_camera->SetTarget(vec3(0.f, 0.f, 0.f));
-    m_camera->SetPosition(vec3(0.f, 80.f, -100.f));
+    m_camera->SetPosition(vec3(0.f, 60.f, 100.f));
     Ticker::Ref(m_camera);
 
@@ -74 +80 @@
         m_angle = 0;
 
-        m_camera->SetTarget(m_player->m_position);
-
+        m_camera->SetTarget(m_player->m_position + vec3(0.f,100.f,0.f));
+        m_camera->SetPosition(m_player->m_position + vec3(0.0f, 0.0f, 1000.0f));
     mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0));
     mat4 model = mat4::translate(vec3(0, 0, 0));

trunk/games/demo-jnat/player.h

@@ -14 +14 @@
         m_ready(false)
     {
-                m_bodymesh.Compile("sc#f21 scb#1c1");
-        m_bodymesh.AppendFlatChamfBox(vec3(10, 30, 10), 1.f);
-                m_position = vec3(0.f,10.0f,0.f);
+                m_bodymesh.Compile("[sc#3a0 afcb5 10 5 0.4 ty5]""[sc#a30 afcb8 7 10 0.4]");
     }
 
@@ -41 +39 @@
         {
             rightleft += 1.f * m_stick->GetAxis(0);
-            updown += -1.f * m_stick->GetAxis(1);
+            //updown += -1.f * m_stick->GetAxis(1);
         }
 
@@ -54 +52 @@
 
                 //Player control
+                //vec3 deltapos;
                 if (rightleft * rightleft + updown * updown > 0.2f){
-                        m_velocity = vec3(-rightleft,0,updown);//120.f * m_rotation.transform(vec3(0, 0, 1));
-                        vec3 deltapos = 50.f* seconds * m_velocity;
+                        m_velocity = vec3(rightleft,0,0);//120.f * m_rotation.transform(vec3(0, 0, 1));
+                        vec3 deltapos = 200.f* seconds * m_velocity;
 
                         m_position += deltapos;
                 }
+                
+                //m_position += deltapos;
 
     }