Changeset 1724 for trunk/test/BtPhysTest.cpp
- Timestamp:
- Aug 12, 2012, 11:07:23 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/BtPhysTest.cpp
r1722 r1724 52 52 #define USE_WALL 1 53 53 #define USE_PLATFORM 1 54 #define USE_ROPE 055 #define USE_BODIES 054 #define USE_ROPE 1 55 #define USE_BODIES 1 56 56 #define USE_ROTATION 0 57 57 #define USE_CHARACTER 1 … … 71 71 72 72 m_simulation = new Simulation(); 73 m_simulation->SetWorldLimit(vec3(-1000.0f, -1000.0f, -1000.0f), vec3(1000.0f, 1000.0f, 1000.0f)); 73 74 m_simulation->Init(); 74 75 vec3 NewGravity = vec3(.0f, -10.0f, .0f); … … 110 111 { 111 112 quat NewRotation = quat::fromeuler_xyz(5.f, 0.f, 0.f); 112 vec3 NewPosition = pos_offset + vec3(5.0f, -2 0.0f, -15.0f);113 vec3 NewPosition = pos_offset + vec3(5.0f, -25.0f, -15.0f); 113 114 114 115 PhysicsObject* NewPhyobj = new PhysicsObject(m_simulation, NewPosition, NewRotation, 1); … … 128 129 { 129 130 quat NewRotation = quat::fromeuler_xyz(0.f, 0.f, 0.f); 130 vec3 NewPosition = pos_offset + vec3(.0f, 40.0f, .0f);131 vec3 NewPosition = pos_offset + vec3(.0f, 20.0f, .0f); 131 132 132 133 PhysicsObject* NewPhyobj = new PhysicsObject(m_simulation, NewPosition, NewRotation, 2); … … 410 411 { 411 412 PhysicsObject* PhysObj = m_character_list[i]; 413 EasyCharacterController* Character = (EasyCharacterController*)PhysObj->GetCharacter(); 414 415 int HMovement = Input::GetButtonState(275 /*SDLK_RIGHT*/) - Input::GetButtonState(276 /*SDLK_LEFT*/); 416 int VMovement = Input::GetButtonState(273 /*SDLK_UP*/) - Input::GetButtonState(274 /*SDLK_DOWN*/); 417 418 Character->SetMovementForFrame(vec3((float)VMovement * seconds * 4.f, .0f, (float)HMovement * seconds * 4.f)); 419 } 420 } 421 422 if (USE_CHARACTER) 423 { 424 PhysObjBarycenter = vec3(.0f); 425 factor = .0f; 426 427 for (int i = 0; i < m_character_list.Count(); i++) 428 { 429 PhysicsObject* PhysObj = m_character_list[i]; 412 430 mat4 GroundMat = PhysObj->GetTransform(); 413 431 … … 418 436 PhysObjBarycenter /= factor; 419 437 420 m_camera->SetTarget(PhysObjBarycenter); 421 m_camera->SetPosition(PhysObjBarycenter + vec3(-80.0f, 80.0f, .0f)); 438 m_camera->SetTarget(m_camera->GetTarget() + (seconds / (seconds + 0.18f)) * (PhysObjBarycenter - m_camera->GetTarget())); 439 vec3 CamPosCenter = m_camera->GetTarget() + vec3(.0f, 20.0f, .0f); 440 m_camera->SetPosition(CamPosCenter + normalize(m_camera->GetPosition() - CamPosCenter) * 5.0f); 422 441 } 423 442 else
Note: See TracChangeset
for help on using the changeset viewer.