Skip to content
Snippets Groups Projects
Commit 142aa8da authored by Andrew Wilson's avatar Andrew Wilson :elephant:
Browse files

STYLE: Uncrustify

parent 40899362
No related branches found
No related tags found
No related merge requests found
......@@ -101,7 +101,7 @@ makeArmadilloPbdObject(const std::string& name)
auto pbdObj = std::make_shared<PbdObject>(name);
// Read in the armadillo mesh
auto tetMesh = std::dynamic_pointer_cast<TetrahedralMesh>(MeshIO::read(iMSTK_DATA_ROOT "armadillo/armadillo_volume.vtk"));
auto tetMesh = std::dynamic_pointer_cast<TetrahedralMesh>(MeshIO::read(iMSTK_DATA_ROOT "armadillo/armadillo_volume.vtk"));
tetMesh->scale(0.07, Geometry::TransformType::ApplyToData);
tetMesh->rotate(Vec3d(1.0, 0.0, 0.0), 1.3, Geometry::TransformType::ApplyToData);
tetMesh->translate(Vec3d(0.0f, 10.0f, 0.0f), Geometry::TransformType::ApplyToData);
......
......@@ -44,7 +44,7 @@ std::shared_ptr<PbdObject> createAndAddPbdObject(std::shared_ptr<Scene> scene,
const std::string& tetMeshName);
// mesh file names
const std::string& tetMeshFileName = iMSTK_DATA_ROOT "textured_organs/heart_volume.vtk";
const std::string& tetMeshFileName = iMSTK_DATA_ROOT "textured_organs/heart_volume.vtk";
///
/// \brief This example demonstrates the soft body simulation
......@@ -86,7 +86,7 @@ std::shared_ptr<PbdObject>
createAndAddPbdObject(std::shared_ptr<Scene> scene,
const std::string& tetMeshName)
{
auto tetMesh = std::dynamic_pointer_cast<TetrahedralMesh>(MeshIO::read(tetMeshName));
auto tetMesh = std::dynamic_pointer_cast<TetrahedralMesh>(MeshIO::read(tetMeshName));
tetMesh->rotate(Vec3d(1.0, 0.0, 0.0), -1.3, Geometry::TransformType::ApplyToData);
auto surfMesh = std::make_shared<SurfaceMesh>();
tetMesh->extractSurfaceMesh(surfMesh, true);
......
......@@ -68,11 +68,11 @@ makeStringGeometry(const Vec3d& pos, const size_t numVerts, const double stringL
static std::shared_ptr<PbdObject>
makePbdString(
const std::string& name,
const Vec3d& pos,
const Vec3d& pos,
const size_t numVerts,
const double stringLength,
const double bendStiffness,
const Color& color)
const Color& color)
{
std::shared_ptr<PbdObject> stringObj = std::make_shared<PbdObject>(name);
......@@ -83,10 +83,10 @@ makePbdString(
auto pbdParams = std::make_shared<PBDModelConfig>();
pbdParams->enableConstraint(PbdConstraint::Type::Distance, 1e7);
pbdParams->enableConstraint(PbdConstraint::Type::Bend, bendStiffness);
pbdParams->m_fixedNodeIds = { 0 };
pbdParams->m_fixedNodeIds = { 0 };
pbdParams->m_uniformMassValue = 5.0;
pbdParams->m_gravity = Vec3d(0, -9.8, 0);
pbdParams->m_defaultDt = 0.0005;
pbdParams->m_gravity = Vec3d(0, -9.8, 0);
pbdParams->m_defaultDt = 0.0005;
pbdParams->m_iterations = 5;
// Setup the Model
......@@ -114,11 +114,11 @@ makePbdString(
static std::vector<std::shared_ptr<PbdObject>>
makePbdStrings(const size_t numStrings,
const size_t numVerts,
const double stringSpacing,
const double stringLength,
const Color& startColor,
const Color& endColor)
const size_t numVerts,
const double stringSpacing,
const double stringLength,
const Color& startColor,
const Color& endColor)
{
std::vector<std::shared_ptr<PbdObject>> pbdStringObjs(numStrings);
......@@ -127,7 +127,7 @@ makePbdStrings(const size_t numStrings,
for (unsigned int i = 0; i < numStrings; i++)
{
const Vec3d tipPos = Vec3d(static_cast<double>(i) * stringSpacing - size * 0.5, stringLength * 0.5, 0.0);
const double t = static_cast<double>(i) / (numStrings - 1);
const double t = static_cast<double>(i) / (numStrings - 1);
pbdStringObjs[i] = makePbdString(
"String " + std::to_string(i),
......@@ -141,14 +141,14 @@ makePbdStrings(const size_t numStrings,
return pbdStringObjs;
}
const double dt = 0.0005;
const double radius = 1.5;
const size_t numStrings = 8; // Number of strings
const size_t numVerts = 30; // Number of vertices on each string
const double dt = 0.0005;
const double radius = 1.5;
const size_t numStrings = 8; // Number of strings
const size_t numVerts = 30; // Number of vertices on each string
const double stringSpacing = 2.0; // How far each string is apart
const double stringLength = 10.0; // Total length of string
const Color startColor = Color(1.0, 0.0, 0.0); // Color of first string
const Color endColor = Color(0.0, 1.0, 0.0); // Color of last string
const double stringLength = 10.0; // Total length of string
const Color startColor = Color(1.0, 0.0, 0.0); // Color of first string
const Color endColor = Color(0.0, 1.0, 0.0); // Color of last string
///
/// \brief This examples uses the timing features of the task graph. This allows one
......@@ -177,7 +177,7 @@ main()
// Move the points every frame
double t = 0.0;
auto movePoints =
auto movePoints =
[&pbdStringObjs, &t](Module* module)
{
for (unsigned int i = 0; i < pbdStringObjs.size(); i++)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment