Changeset 1605


Ignore:
Timestamp:
Jul 8, 2012, 11:19:16 PM (7 years ago)
Author:
sam
Message:

test: minor tweaks to the physics demo.

Location:
trunk/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/BtPhysTest.cpp

    r1600 r1605  
    244244
    245245        m_camera->SetTarget(vec3(.0f));
    246         m_camera->SetPosition(vec3(-30.0f, 10.0f, .0f));
     246        m_camera->SetPosition(vec3(-30.0f, 20.0f, .0f));
    247247
    248248#if 0
  • trunk/test/PhysicObject.h

    r1601 r1605  
    4747                int SphereLimit = MeshRand.Count();
    4848
    49                 MeshRand << "[sc#add asph16 2 2 2]";
    50                 MeshRand << "[sc#dad asph16 2 2 2]";
    51                 MeshRand << "[sc#dda asph16 2 2 2]";
    52                 MeshRand << "[sc#daa asph16 2 2 2]";
    53                 MeshRand << "[sc#ada asph16 2 2 2]";
    54                 MeshRand << "[sc#aad asph16 2 2 2]";
     49                MeshRand << "[sc#add asph6 2 2 2]";
     50                MeshRand << "[sc#dad asph6 2 2 2]";
     51                MeshRand << "[sc#dda asph6 2 2 2]";
     52                MeshRand << "[sc#daa asph6 2 2 2]";
     53                MeshRand << "[sc#ada asph6 2 2 2]";
     54                MeshRand << "[sc#aad asph6 2 2 2]";
    5555
    5656                int ConeLimit = MeshRand.Count();
     
    7474                int CapsLimit = MeshRand.Count();
    7575
    76                 MeshRand << "[sc#add scb#add asph16 2 2 2 ty-1 my ac16 2 1 1 0 0]";
    77                 MeshRand << "[sc#dad scb#dad asph16 2 2 2 ty-1 my ac16 2 1 1 0 0]";
    78                 MeshRand << "[sc#dda scb#dda asph16 2 2 2 ty-1 my ac16 2 1 1 0 0]";
    79                 MeshRand << "[sc#daa scb#daa asph16 2 2 2 ty-1 my ac16 2 1 1 0 0]";
    80                 MeshRand << "[sc#ada scb#ada asph16 2 2 2 ty-1 my ac16 2 1 1 0 0]";
    81                 MeshRand << "[sc#aad scb#aad asph16 2 2 2 ty-1 my ac16 2 1 1 0 0]";
     76                MeshRand << "[sc#add scb#add asph6 1 1 1 ty-1 my ac16 2 1 1 0 0]";
     77                MeshRand << "[sc#dad scb#dad asph6 1 1 1 ty-1 my ac16 2 1 1 0 0]";
     78                MeshRand << "[sc#dda scb#dda asph6 1 1 1 ty-1 my ac16 2 1 1 0 0]";
     79                MeshRand << "[sc#daa scb#daa asph6 1 1 1 ty-1 my ac16 2 1 1 0 0]";
     80                MeshRand << "[sc#ada scb#ada asph6 1 1 1 ty-1 my ac16 2 1 1 0 0]";
     81                MeshRand << "[sc#aad scb#aad asph6 1 1 1 ty-1 my ac16 2 1 1 0 0]";
    8282
    8383                int RandValue = (int)(lol::RandF() * (MeshRand.Count() - 1));
     
    8888                        m_physics.SetShapeToBox(BoxSize);
    8989                else if (RandValue < ConeLimit)
    90                         m_physics.SetShapeToSphere(BoxSize.x);
     90                        m_physics.SetShapeToSphere(BoxSize.x * 2.f);
    9191                else if (RandValue < CylLimit)
    9292                        m_physics.SetShapeToCone(BoxSize.x, BoxSize.y);
Note: See TracChangeset for help on using the changeset viewer.