Changeset 1739 for trunkTweet

Timestamp:

Aug 14, 2012, 2:22:30 PM (11 years ago)

Author:

Jnat

Message:

not working ...

Location:

trunk/games/demo-jnat

Files:

• bo.h (added)
• demo-jnat.cpp (modified) (2 diffs)
• demo-jnat.h (modified) (1 diff)
• demo-jnat.vcxproj (modified) (1 diff)
• player.h (modified) (5 diffs)

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

@@ -59 +59 @@
                             vec3(0.f, 0.f, 0.f),
                             vec3(0, 1, 0));
-    m_camera->SetPerspective(20.f, 960.f, 600.f, .1f, 1000.f);
+    //m_camera->SetPerspective(20.f, 960.f, 600.f, .1f, 1000.f);
+        m_camera->SetPerspective(30.f, 960.f, 600.f, .1f, 1000.f);
+
     m_camera->SetTarget(vec3(0.f, 0.f, 0.f));
     m_camera->SetPosition(vec3(0.f, 60.f, 100.f));
@@ -82 +84 @@
         m_angle = 0;
 
-        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));
+        m_camera->SetTarget(m_player->m_position + vec3(0.f,50.f,0.f));
+        //m_camera->SetPosition(m_player->m_position + vec3(0.0f, 0.0f, 1000.0f));
+        m_camera->SetPosition(m_player->m_position + vec3(0.0f, 200.0f, 300.0f));
     mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0));
     mat4 model = mat4::translate(vec3(0, 0, 0));

trunk/games/demo-jnat/demo-jnat.h

@@ -4 +4 @@
 #define __DEMOJNAT_H__
 
+#include "bo.h"
+#include "player.h"
 
-#include "player.h"
 
 class DemoJnat : public WorldEntity

trunk/games/demo-jnat/demo-jnat.vcxproj

@@ -44 +44 @@
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="bo.h" />
     <ClInclude Include="demo-jnat.h" />
     <ClInclude Include="player.h" />

trunk/games/demo-jnat/player.h

@@ -15 +15 @@
     {
                 m_bodymesh.Compile("[sc#3a0 afcb5 10 5 0.4 ty5]""[sc#a30 afcb8 7 10 0.4]");
+                //m_bo.m_position = m_position + vec3(100.0f,100.0f,100.0f);
     }
 
@@ -21 +22 @@
         if (m_stick)
             Input::UntrackStick(m_stick);
+                m_bo = new Bo();
+                Ticker::Ref(m_bo);
     }
 
@@ -32 +35 @@
         float updown = (float)(Input::GetButtonState(273 /*SDLK_UP*/) - Input::GetButtonState(274 /*SDLK_DOWN*/));
         float rightleft = (float)(Input::GetButtonState(275 /*SDLK_RIGHT*/) - Input::GetButtonState(276 /*SDLK_LEFT*/));
+                
+                //float StickAngle = (float)m_stick->GetAxis(2);
+
                 if (!m_stick)
             m_stick = Input::TrackStick(0);
@@ -59 +65 @@
                         m_position += deltapos;
                 }
-                
+                m_bo->m_position = (m_position + vec3(0.0f,0.0f,10.0f) );
                 //m_position += deltapos;
 
@@ -82 +88 @@
     EasyMesh m_bodymesh;
     Stick *m_stick;
+        Bo *m_bo;
         
     bool m_ready;