mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use the city.obj mesh anymore

Browse Source
This commit is contained in:
Daniel Chappuis 2022-01-01 15:22:07 +01:00
parent 71ae2d00b8
commit d43ca6854c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testbed/scenes/collisiondetection/CollisionDetectionScene.cpp
View File

@ -106,7 +106,7 @@ CollisionDetectionScene::CollisionDetectionScene(const std::string& name, Engine
// ---------- Concave Mesh ---------- //
// Create a convex mesh and a corresponding collision body in the physics world
mConcaveMesh = new ConcaveMesh(false, mPhysicsCommon, mPhysicsWorld, mMeshFolderPath + "city.obj");
mConcaveMesh = new ConcaveMesh(false, mPhysicsCommon, mPhysicsWorld, mMeshFolderPath + "castle.obj", rp3d::Vector3(0.3, 0.3, 0.3));
mAllShapes.push_back(mConcaveMesh);
// Set the color

4
testbed/scenes/raycast/RaycastScene.cpp
View File

@ -105,7 +105,7 @@ RaycastScene::RaycastScene(const std::string& name, EngineSettings& settings, re
// ---------- Concave Mesh ---------- //
// Create a convex mesh and a corresponding collision body in the physics world
mConcaveMesh = new ConcaveMesh(false, mPhysicsCommon, mPhysicsWorld, mMeshFolderPath + "city.obj");
mConcaveMesh = new ConcaveMesh(false, mPhysicsCommon, mPhysicsWorld, mMeshFolderPath + "castle.obj");
// Set the color
mConcaveMesh->setColor(mObjectColorDemo);
@ -285,7 +285,7 @@ void RaycastScene::renderSinglePass(openglframework::Shader& shader, const openg
mColorShader.setMatrix4x4Uniform("worldToCameraMatrix", worldToCameraMatrix);
// Set the vertex color
openglframework::Vector4 color(1, 0.55f, 0, 1);
openglframework::Vector4 color(0, 0.0, 0, 1);
mColorShader.setIntUniform("isGlobalVertexColorEnabled", 1, false);
mColorShader.setVector4Uniform("globalVertexColor", color, false);