atria-soft/ephysics
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] basic update

Browse Source
This commit is contained in:
Edouard DUPIN 2018-02-17 23:04:08 +01:00
parent 14644e4f5f
commit 33f24d6b17
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/testCollisionWorld.cpp
View File

@ -38,13 +38,16 @@ class WorldCollisionCallback : public ephysics::CollisionCallback {
if (isContactBetweenBodies(boxBody, sphere1Body, _contactPointInfo)) { if (isContactBetweenBodies(boxBody, sphere1Body, _contactPointInfo)) {
TEST_WARNING("plop 1 boxCollideWithSphere1"); TEST_WARNING("plop 1 boxCollideWithSphere1");
boxCollideWithSphere1 = true; boxCollideWithSphere1 = true;
} else if (isContactBetweenBodies(boxBody, cylinderBody, _contactPointInfo)) { }
if (isContactBetweenBodies(boxBody, cylinderBody, _contactPointInfo)) {
TEST_WARNING("plop 2 boxCollideWithCylinder"); TEST_WARNING("plop 2 boxCollideWithCylinder");
boxCollideWithCylinder = true; boxCollideWithCylinder = true;
} else if (isContactBetweenBodies(sphere1Body, cylinderBody, _contactPointInfo)) { }
if (isContactBetweenBodies(sphere1Body, cylinderBody, _contactPointInfo)) {
TEST_WARNING("plop 3 sphere1CollideWithCylinder"); TEST_WARNING("plop 3 sphere1CollideWithCylinder");
sphere1CollideWithCylinder = true; sphere1CollideWithCylinder = true;
} else if (isContactBetweenBodies(sphere1Body, sphere2Body, _contactPointInfo)) { }
if (isContactBetweenBodies(sphere1Body, sphere2Body, _contactPointInfo)) {
TEST_WARNING("plop 4 sphere1CollideWithSphere2"); TEST_WARNING("plop 4 sphere1CollideWithSphere2");
sphere1CollideWithSphere2 = true; sphere1CollideWithSphere2 = true;
} }

4
test/testRaycast.cpp
View File

@ -243,7 +243,9 @@ class TestRaycast {
// Heightfield shape (plane height field at height=4) // Heightfield shape (plane height field at height=4)
for (int32_t i=0; i<100; i++) m_heightFieldData[i] = 4; for (int32_t i=0; i<100; i++) {
m_heightFieldData[i] = 4;
}
m_heightFieldShape = ETK_NEW(ephysics::HeightFieldShape, 10, 10, 0, 4, m_heightFieldData, ephysics::HeightFieldShape::HEIGHT_FLOAT_TYPE); m_heightFieldShape = ETK_NEW(ephysics::HeightFieldShape, 10, 10, 0, 4, m_heightFieldData, ephysics::HeightFieldShape::HEIGHT_FLOAT_TYPE);
m_heightFieldProxyShape = m_heightFieldBody->addCollisionShape(m_heightFieldShape, m_shapeTransform); m_heightFieldProxyShape = m_heightFieldBody->addCollisionShape(m_heightFieldShape, m_shapeTransform);