Changeset 1724Tweet

Timestamp:

Aug 12, 2012, 11:07:23 PM (11 years ago)

Author:

touky

Message:

So Character Controller works with a lazy camera logic.

Location:

trunk

Files:

• src/camera.cpp (modified) (1 diff)
• src/camera.h (modified) (1 diff)
• test/BtPhysTest.cpp (modified) (6 diffs)
• test/PhysicObject.h (modified) (3 diffs)
• test/Physics/EasyPhysics.cpp (modified) (1 diff)
• test/Physics/EasyPhysics.h (modified) (1 diff)
• test/Physics/LolPhysics.h (modified) (5 diffs)

trunk/src/camera.cpp

@@ -73 +73 @@
     return m_target;
 }
+vec3 Camera::GetPosition()
+{
+    return m_position;
+}
 
 mat4 const &Camera::GetViewMatrix()

trunk/src/camera.h

@@ -37 +37 @@
     void SetTarget(vec3 const &pos);
     vec3 GetTarget();
+    vec3 GetPosition();
 
     mat4 const &GetViewMatrix();

trunk/test/BtPhysTest.cpp

@@ -52 +52 @@
 #define USE_WALL                1
 #define USE_PLATFORM    1
-#define USE_ROPE                0
-#define USE_BODIES              0
+#define USE_ROPE                1
+#define USE_BODIES              1
 #define USE_ROTATION    0
 #define USE_CHARACTER   1
@@ -71 +71 @@
 
         m_simulation = new Simulation();
+        m_simulation->SetWorldLimit(vec3(-1000.0f, -1000.0f, -1000.0f), vec3(1000.0f, 1000.0f, 1000.0f));
         m_simulation->Init();
         vec3 NewGravity = vec3(.0f, -10.0f, .0f);
@@ -110 +111 @@
         {
                 quat NewRotation = quat::fromeuler_xyz(5.f, 0.f, 0.f);
-                vec3 NewPosition = pos_offset + vec3(5.0f, -20.0f, -15.0f);
+                vec3 NewPosition = pos_offset + vec3(5.0f, -25.0f, -15.0f);
 
                 PhysicsObject* NewPhyobj = new PhysicsObject(m_simulation, NewPosition, NewRotation, 1);
@@ -128 +129 @@
         {
                 quat NewRotation = quat::fromeuler_xyz(0.f, 0.f, 0.f);
-                vec3 NewPosition = pos_offset + vec3(.0f, 40.0f, .0f);
+                vec3 NewPosition = pos_offset + vec3(.0f, 20.0f, .0f);
 
                 PhysicsObject* NewPhyobj = new PhysicsObject(m_simulation, NewPosition, NewRotation, 2);
@@ -410 +411 @@
                 {
                         PhysicsObject* PhysObj = m_character_list[i];
+                        EasyCharacterController* Character = (EasyCharacterController*)PhysObj->GetCharacter();
+
+                        int HMovement = Input::GetButtonState(275 /*SDLK_RIGHT*/) - Input::GetButtonState(276 /*SDLK_LEFT*/);
+                        int VMovement = Input::GetButtonState(273 /*SDLK_UP*/) - Input::GetButtonState(274 /*SDLK_DOWN*/);
+
+                        Character->SetMovementForFrame(vec3((float)VMovement * seconds * 4.f, .0f, (float)HMovement * seconds * 4.f));
+                }
+        }
+
+        if (USE_CHARACTER)
+        {
+                PhysObjBarycenter = vec3(.0f);
+                factor = .0f;
+
+                for (int i = 0; i < m_character_list.Count(); i++)
+                {
+                        PhysicsObject* PhysObj = m_character_list[i];
                         mat4 GroundMat = PhysObj->GetTransform();
 
@@ -418 +436 @@
                 PhysObjBarycenter /= factor;
 
-                m_camera->SetTarget(PhysObjBarycenter);
-                m_camera->SetPosition(PhysObjBarycenter + vec3(-80.0f, 80.0f, .0f));
+                m_camera->SetTarget(m_camera->GetTarget() + (seconds / (seconds + 0.18f)) * (PhysObjBarycenter - m_camera->GetTarget()));
+                vec3 CamPosCenter = m_camera->GetTarget() + vec3(.0f, 20.0f, .0f);
+                m_camera->SetPosition(CamPosCenter + normalize(m_camera->GetPosition() - CamPosCenter) * 5.0f);
         }
         else

trunk/test/PhysicObject.h

@@ -41 +41 @@
                 {
                         m_mesh.Compile("[sc#ddd afcb20 1 20 -.1]");
-                        //m_mesh.Compile("[sc#f00 afcb10 10 10 -.1]");
-
                         vec3 BoxSize = vec3(20.f, 1.f, 20.f);
                         m_physics.SetCollisionChannel(0, 0xFF);
@@ -54 +52 @@
                 {
                         m_is_character = true;
-                        m_mesh.Compile("[sc#f00 afcb10 10 10 -.1]");
-                        //m_mesh.Compile("[sc#fff scb#fff ac1 2 2 2 0 0]");
-                        vec3 BoxSize = vec3(2.f, 2.f, 2.f);
+                        //m_mesh.Compile("[sc#f00 afcb10 10 10 -.1]");
+                        m_mesh.Compile(
+                                "[sc#000 scb#000"
+                                //"[sc#aaa scb#aaa"
+                                "[ad8 2 0 rx180 ty-1]"
+                                "[asph8 .5 .5 .5 ty1]"
+                                "[ac32 2 .5 .5 0 0]"
+                                "[asph6 .1 .1 .1 ty.9 tx.5 tz.15]"
+                                "[asph6 .1 .1 .1 ty.9 tx.5 tz-.15]"
+                                "[asph8 .05 .5 .05 ty.6 tz.5]"
+                                "[asph8 .05 .5 .05 ty.6 tz-.5]"
+                                "]"
+                                "[sc#fd0 scb#fd0"
+                                "[ac8 .4 .1 0 0 0 ty.25 rz-90 ty.7 tx.5]"
+                                "]"
+                                "["
+                                "[sc#fff scb#fff"
+                                "[ad8 2 0 rx180 ty-1]"
+                                "[asph8 .5 .5 .5 ty1]"
+                                "[ac32 1.9 .5 .5 0 0]"
+                                "]"
+                                " ty-.1 tx.05]"
+                                );
+                        vec3 BoxSize = vec3(.5f, 2.f, .5f);
                         m_character.SetCollisionChannel(0, 0xFF);
                         m_character.SetShapeToCapsule(BoxSize.x, BoxSize.y);
@@ -89 +108 @@
                 int ConeLimit = MeshRand.Count();
 
-                MeshRand << "[sc#add scb#add ad1 2 0 rx180 ty-1 ac1 2 2 0 0 0]";
-                MeshRand << "[sc#dad scb#dad ad1 2 0 rx180 ty-1 ac1 2 2 0 0 0]";
-                MeshRand << "[sc#dda scb#dda ad1 2 0 rx180 ty-1 ac1 2 2 0 0 0]";
-                MeshRand << "[sc#daa scb#daa ad1 2 0 rx180 ty-1 ac1 2 2 0 0 0]";
-                MeshRand << "[sc#ada scb#ada ad1 2 0 rx180 ty-1 ac1 2 2 0 0 0]";
-                MeshRand << "[sc#aad scb#aad ad1 2 0 rx180 ty-1 ac1 2 2 0 0 0]";
+                MeshRand << "[sc#add scb#add ad1 2 0 rx180 ty-1 ac4 2 2 0 0 0]";
+                MeshRand << "[sc#dad scb#dad ad1 2 0 rx180 ty-1 ac4 2 2 0 0 0]";
+                MeshRand << "[sc#dda scb#dda ad1 2 0 rx180 ty-1 ac4 2 2 0 0 0]";
+                MeshRand << "[sc#daa scb#daa ad1 2 0 rx180 ty-1 ac4 2 2 0 0 0]";
+                MeshRand << "[sc#ada scb#ada ad1 2 0 rx180 ty-1 ac4 2 2 0 0 0]";
+                MeshRand << "[sc#aad scb#aad ad1 2 0 rx180 ty-1 ac4 2 2 0 0 0]";
 
                 int CylLimit = MeshRand.Count();
 
-                MeshRand << "[sc#add scb#add ad1 2 0 rx180 ty-1 my ac1 2 2 2 0 0]";
-                MeshRand << "[sc#dad scb#dad ad1 2 0 rx180 ty-1 my ac1 2 2 2 0 0]";
-                MeshRand << "[sc#dda scb#dda ad1 2 0 rx180 ty-1 my ac1 2 2 2 0 0]";
-                MeshRand << "[sc#daa scb#daa ad1 2 0 rx180 ty-1 my ac1 2 2 2 0 0]";
-                MeshRand << "[sc#ada scb#ada ad1 2 0 rx180 ty-1 my ac1 2 2 2 0 0]";
-                MeshRand << "[sc#aad scb#aad ad1 2 0 rx180 ty-1 my ac1 2 2 2 0 0]";
+                MeshRand << "[sc#add scb#add ad1 2 0 rx180 ty-1 my ac4 2 2 2 0 0]";
+                MeshRand << "[sc#dad scb#dad ad1 2 0 rx180 ty-1 my ac4 2 2 2 0 0]";
+                MeshRand << "[sc#dda scb#dda ad1 2 0 rx180 ty-1 my ac4 2 2 2 0 0]";
+                MeshRand << "[sc#daa scb#daa ad1 2 0 rx180 ty-1 my ac4 2 2 2 0 0]";
+                MeshRand << "[sc#ada scb#ada ad1 2 0 rx180 ty-1 my ac4 2 2 2 0 0]";
+                MeshRand << "[sc#aad scb#aad ad1 2 0 rx180 ty-1 my ac4 2 2 2 0 0]";
 
                 int CapsLimit = MeshRand.Count();

trunk/test/Physics/EasyPhysics.cpp

@@ -308 +308 @@
 }
 
+//Set movement for this frame
+void EasyCharacterController::SetMovementForFrame(vec3 &MoveQuantity)
+{
+        m_character->setWalkDirection(LOL2BT_VEC3(MoveQuantity));
+}
+
+
 //-------------------------------------------------------------------------
 //EASY_CONSTRAINT

trunk/test/Physics/EasyPhysics.h

@@ -143 +143 @@
         virtual void AddToSimulation(class Simulation* current_simulation);
         virtual void RemoveFromSimulation(class Simulation* current_simulation);
+        virtual void SetMovementForFrame(vec3 &MoveQuantity);
 
 protected:

trunk/test/Physics/LolPhysics.h

@@ -46 +46 @@
         {
                 // Build the broadphase
-                m_broadphase = new btDbvtBroadphase();
+                if (1)
+                {
+                        m_Sweep_broadphase = new btAxisSweep3(LOL2BT_VEC3(m_world_min), LOL2BT_VEC3(m_world_max));
+                        m_Sweep_broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback());
+                        m_broadphase = m_Sweep_broadphase;
+                }
+                else
+                        m_broadphase = new btDbvtBroadphase();
  
                 // Set up the collision configuration and dispatcher
@@ -99 +106 @@
         }
 
+        void CustomSetWorldLimit(vec3 &NewWorldMin, vec3 &NewWorldMax)
+        {
+        }
+
         void CustomSetTimestep(float NewTimestep) { }
 
         //broadphase
         btBroadphaseInterface*                                  m_broadphase;
+        btAxisSweep3*                                                   m_Sweep_broadphase;
         // Set up the collision configuration and dispatc
         btDefaultCollisionConfiguration*                m_collision_configuration;
@@ -120 +132 @@
         void CustomSetContinuousDetection(bool ShouldUseCCD) { }
         void CustomSetGravity(vec3 &NewGravity) { }
+        void CustomSetWorldLimit(vec3 &NewWorldMin, vec3 &NewWorldMax) { }
         void CustomSetTimestep(float NewTimestep) { }
 
@@ -141 +154 @@
                 m_gravity = NewGravity;
                 CustomSetGravity(NewGravity);
+        }
+
+        //Sets the simulation gravity.
+        void SetWorldLimit(vec3 &NewWorldMin, vec3 &NewWorldMax)
+        {
+                m_world_min = NewWorldMin;
+                m_world_max = NewWorldMax;
+                CustomSetWorldLimit(NewWorldMin, NewWorldMax);
         }
 
@@ -173 +194 @@
         bool                                                                    m_using_CCD;
         vec3                                                                    m_gravity;
+        vec3                                                                    m_world_min;
+        vec3                                                                    m_world_max;
 };