Skip to content

Commit 05e0127

Browse files
janbenderjanbender
committed
- small changes
1 parent 5e7d569 commit 05e0127

16 files changed

+165
-99
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
lib/
2+
bin/
3+
!bin/*.bat

‎Demos/CMakeLists.txt

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,29 @@ include(Visualization/CMakeLists.txt)
22
add_definitions(-DPBD_DATA_PATH="../data")
33

44
# search all demos
5-
file (
6-
GLOB _demo_dirs
7-
RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
8-
"${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt"
5+
set(PBD_DEMOS
6+
BarDemo
7+
ClothDemo
8+
CouplingDemos
9+
DistanceFieldDemos
10+
FluidDemo
11+
GenericConstraintsDemos
12+
PositionBasedElasticRodsDemo
13+
RigidBodyDemos
14+
SceneLoaderDemo
915
)
1016

11-
foreach (_demo_dir ${_demo_dirs})
12-
get_filename_component (_demo_name ${_demo_dir} PATH)
13-
option(Build_${_demo_name} "Build ${_demo_name}" ON)
14-
if (Build_${_demo_name})
15-
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/${_demo_name})
16-
endif (Build_${_demo_name})
17-
endforeach ()
17+
add_subdirectory(Simulation)
18+
add_subdirectory(Utils)
19+
20+
if (NOT PBD_NO_DEMOS)
21+
foreach (_demo_name ${PBD_DEMOS})
22+
option(Build_${_demo_name} "Build ${_demo_name}" ON)
23+
if (Build_${_demo_name})
24+
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/${_demo_name})
25+
endif (Build_${_demo_name})
26+
endforeach ()
27+
endif()
1828

1929
install(DIRECTORY ./Common
2030
DESTINATION include/Demos

‎Demos/CouplingDemos/RigidBodyClothCouplingDemo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ void createRigidBodyModel()
404404
SimulationModel::RigidBodyVector &rb = model.getRigidBodies();
405405
SimulationModel::ConstraintVector &constraints = model.getConstraints();
406406

407-
string fileName = dataPath + "/models/cube.obj";
407+
string fileName = Utilities::normalizePath(dataPath + "/models/cube.obj");
408408
IndexedFaceMesh mesh;
409409
VertexData vd;
410410
OBJLoader::loadObj(fileName, vd, mesh, Vector3r(width, height, depth));

‎Demos/DistanceFieldDemos/ClothCollisionDemo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,12 @@ void buildModel ()
252252
createMesh();
253253

254254
// create static rigid body
255-
string fileName = dataPath + "/models/cube.obj";
255+
string fileName = Utilities::normalizePath(dataPath + "/models/cube.obj");
256256
IndexedFaceMesh mesh;
257257
VertexData vd;
258258
OBJLoader::loadObj(fileName, vd, mesh);
259259

260-
string fileNameTorus = dataPath + "/models/torus.obj";
260+
string fileNameTorus = Utilities::normalizePath(dataPath + "/models/torus.obj");
261261
IndexedFaceMesh meshTorus;
262262
VertexData vdTorus;
263263
OBJLoader::loadObj(fileNameTorus, vdTorus, meshTorus);

‎Demos/DistanceFieldDemos/DeformableCollisionDemo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@ void buildModel ()
210210
createMesh();
211211

212212
// create static rigid body
213-
string fileName = dataPath + "/models/cube.obj";
213+
string fileName = Utilities::normalizePath(dataPath + "/models/cube.obj");
214214
IndexedFaceMesh mesh;
215215
VertexData vd;
216216
OBJLoader::loadObj(fileName, vd, mesh);
217217

218-
string fileNameTorus = dataPath + "/models/torus.obj";
218+
string fileNameTorus = Utilities::normalizePath(dataPath + "/models/torus.obj");
219219
IndexedFaceMesh meshTorus;
220220
VertexData vdTorus;
221221
OBJLoader::loadObj(fileNameTorus, vdTorus, meshTorus);

‎Demos/DistanceFieldDemos/RigidBodyCollisionDemo.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -172,24 +172,24 @@ void mouseMove(int x, int y)
172172

173173
void selection(const Eigen::Vector2i &start, const Eigen::Vector2i &end)
174174
{
175-
std::vector<unsigned int> hits;
176-
selectedBodies.clear();
175+
std::vector<unsigned int> hits;
176+
selectedBodies.clear();
177177

178178
SimulationModel::RigidBodyVector &rb = model.getRigidBodies();
179179
std::vector<Vector3r, Eigen::aligned_allocator<Vector3r> > x;
180180
x.resize(rb.size());
181-
for (unsigned int i = 0; i < rb.size(); i++)
182-
{
181+
for (unsigned int i = 0; i < rb.size(); i++)
182+
{
183183
x[i] = rb[i]->getPosition();
184-
}
184+
}
185185

186-
Selection::selectRect(start, end, &x[0], &x[rb.size() - 1], selectedBodies);
187-
if (selectedBodies.size() > 0)
188-
MiniGL::setMouseMoveFunc(GLUT_MIDDLE_BUTTON, mouseMove);
189-
else
190-
MiniGL::setMouseMoveFunc(-1, NULL);
186+
Selection::selectRect(start, end, &x[0], &x[rb.size() - 1], selectedBodies);
187+
if (selectedBodies.size() > 0)
188+
MiniGL::setMouseMoveFunc(GLUT_MIDDLE_BUTTON, mouseMove);
189+
else
190+
MiniGL::setMouseMoveFunc(-1, NULL);
191191

192-
MiniGL::unproject(end[0], end[1], oldMousePos);
192+
MiniGL::unproject(end[0], end[1], oldMousePos);
193193
}
194194

195195
void timeStep ()
@@ -356,27 +356,27 @@ void createBodyModel()
356356
SimulationModel::RigidBodyVector &rb = model.getRigidBodies();
357357
SimulationModel::ConstraintVector &constraints = model.getConstraints();
358358

359-
string fileNameBox = dataPath + "/models/cube.obj";
359+
string fileNameBox = Utilities::normalizePath(dataPath + "/models/cube.obj");
360360
IndexedFaceMesh meshBox;
361361
VertexData vdBox;
362362
OBJLoader::loadObj(fileNameBox, vdBox, meshBox);
363363

364-
string fileNameCylinder = dataPath + "/models/cylinder.obj";
364+
string fileNameCylinder = Utilities::normalizePath(dataPath + "/models/cylinder.obj");
365365
IndexedFaceMesh meshCylinder;
366366
VertexData vdCylinder;
367367
OBJLoader::loadObj(fileNameCylinder, vdCylinder, meshCylinder);
368368

369-
string fileNameTorus = dataPath + "/models/torus.obj";
369+
string fileNameTorus = Utilities::normalizePath(dataPath + "/models/torus.obj");
370370
IndexedFaceMesh meshTorus;
371371
VertexData vdTorus;
372372
OBJLoader::loadObj(fileNameTorus, vdTorus, meshTorus);
373373

374-
string fileNameCube = dataPath + "/models/cube_5.obj";
374+
string fileNameCube = Utilities::normalizePath(dataPath + "/models/cube_5.obj");
375375
IndexedFaceMesh meshCube;
376376
VertexData vdCube;
377377
OBJLoader::loadObj(fileNameCube, vdCube, meshCube);
378378

379-
string fileNameSphere = dataPath + "/models/sphere.obj";
379+
string fileNameSphere = Utilities::normalizePath(dataPath + "/models/sphere.obj");
380380
IndexedFaceMesh meshSphere;
381381
VertexData vdSphere;
382382
OBJLoader::loadObj(fileNameSphere, vdSphere, meshSphere);

‎Demos/RigidBodyDemos/ChainDemo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,12 @@ void createBodyModel()
257257
SimulationModel::RigidBodyVector &rb = model.getRigidBodies();
258258
SimulationModel::ConstraintVector &constraints = model.getConstraints();
259259

260-
string fileName = dataPath + "/models/cube.obj";
260+
string fileName = Utilities::normalizePath(dataPath + "/models/cube.obj");
261261
IndexedFaceMesh mesh;
262262
VertexData vd;
263263
OBJLoader::loadObj(fileName, vd, mesh, Vector3r(width, height, depth));
264264

265-
string fileName2 = dataPath + "/models/bunny_10k.obj";
265+
string fileName2 = Utilities::normalizePath(dataPath + "/models/bunny_10k.obj");
266266
IndexedFaceMesh mesh2;
267267
VertexData vd2;
268268
OBJLoader::loadObj(fileName2, vd2, mesh2, Vector3r(2.0, 2.0, 2.0));

‎Demos/RigidBodyDemos/JointDemo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ void createBodyModel()
394394
{
395395
SimulationModel::RigidBodyVector &rb = model.getRigidBodies();
396396

397-
string fileName = dataPath + "/models/cube.obj";
397+
string fileName = Utilities::normalizePath(dataPath + "/models/cube.obj");
398398
IndexedFaceMesh mesh;
399399
VertexData vd;
400400
OBJLoader::loadObj(fileName, vd, mesh, Vector3r(width, height, depth));

‎Demos/SceneLoaderDemo/SceneLoaderDemo.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ int main( int argc, char **argv )
112112
if (argc > 1)
113113
sceneFileName = string(argv[1]);
114114
else
115-
sceneFileName = dataPath + sceneFileName;
115+
sceneFileName = Utilities::normalizePath(dataPath + sceneFileName);
116116

117117
buildModel();
118118

@@ -878,7 +878,7 @@ void readScene()
878878
{
879879
IndexedFaceMesh mesh;
880880
VertexData vd;
881-
OBJLoader::loadObj(rbd.m_modelFile, vd, mesh);
881+
OBJLoader::loadObj(Utilities::normalizePath(rbd.m_modelFile), vd, mesh);
882882
objFiles[rbd.m_modelFile] = { vd, mesh };
883883
}
884884
}
@@ -893,7 +893,7 @@ void readScene()
893893
{
894894
IndexedFaceMesh mesh;
895895
VertexData vd;
896-
OBJLoader::loadObj(tmd.m_modelFileVis, vd, mesh);
896+
OBJLoader::loadObj(Utilities::normalizePath(tmd.m_modelFileVis), vd, mesh);
897897
objFiles[tmd.m_modelFileVis] = { vd, mesh };
898898
}
899899
}
@@ -972,7 +972,7 @@ void readScene()
972972
{
973973
IndexedFaceMesh mesh;
974974
VertexData vd;
975-
OBJLoader::loadObj(tmd.m_modelFile, vd, mesh);
975+
OBJLoader::loadObj(Utilities::normalizePath(tmd.m_modelFile), vd, mesh);
976976
triFiles[tmd.m_modelFile] = { vd, mesh };
977977
}
978978
}
@@ -1031,7 +1031,7 @@ void readScene()
10311031
{
10321032
vector<Vector3r> vertices;
10331033
vector<unsigned int> tets;
1034-
TetGenLoader::loadTetgenModel(tmd.m_modelFileNodes, tmd.m_modelFileElements, vertices, tets);
1034+
TetGenLoader::loadTetgenModel(Utilities::normalizePath(tmd.m_modelFileNodes), Utilities::normalizePath(tmd.m_modelFileElements), vertices, tets);
10351035
tetFiles[fileNames] = { vertices, tets };
10361036
}
10371037
}

0 commit comments

Comments
 (0)