Commit 59b378d4 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

Merge branch 'updateDocumantation' into 'master'

Update documantation

See merge request !368
parents 8e7167b8 7f33a0e4
This diff is collapsed.
......@@ -111,7 +111,7 @@ main()
auto updateFunc =
[&](Module*) {
if (count > 5)
if (count > 15)
{
count = 0;
debugPoints->clear();
......
......@@ -92,9 +92,9 @@ addCubeRigidObject(std::string& name, std::shared_ptr<Scene> scene, Vec3d pos, c
auto mesh = imstk::MeshIO::read(iMSTK_DATA_ROOT "/asianDragon/asianDragon.obj");
auto SurfaceMesh = std::dynamic_pointer_cast<imstk::SurfaceMesh>(mesh);
SurfaceMesh->scale(5., Geometry::TransformType::ApplyToData);
auto renderModel = std::make_shared<VisualModel>(SurfaceMesh);
auto renderModel = std::make_shared<VisualModel>(cubeGeom);
auto mat = std::make_shared<RenderMaterial>();
mat->setDisplayMode(RenderMaterial::SURFACE);
mat->setDisplayMode(RenderMaterial::WIREFRAME_SURFACE);
mat->setLineWidth(2.);
mat->setColor(Color::Orange);
renderModel->setRenderMaterial(mat);
......@@ -107,11 +107,14 @@ addCubeRigidObject(std::string& name, std::shared_ptr<Scene> scene, Vec3d pos, c
// cube dynamic model
auto rigidModel = std::make_shared<RigidBodyModel>();
auto rigidProp = std::make_shared<RigidBodyPropertyDesc>();
rigidProp->m_dynamicFriction = 0.01;
rigidProp->m_restitution = 0.01;
rigidProp->m_staticFriction = 0.005;
rigidModel->configure(cubeGeom, rigidProp, RigidBodyType::Dynamic);
cubeObj->setDynamicalModel(rigidModel);
cubeObj->setPhysicsToVisualMap(rigidMap);
//cubeObj->setPhysicsToVisualMap(rigidMap);
// add cube to scene
scene->addSceneObject(cubeObj);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment