Commit e4a54492 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla

REFAC: Misc. edits

parent 6289cd6a
......@@ -12,7 +12,7 @@ endif()
#-----------------------------------------------------------------------------
# Output Directories
#-----------------------------------------------------------------------------
if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${PROJECT_NAME}_LIB_DIR})
endif()
if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
......
......@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utilities
${CMAKE_MODULE_PATH}
)
set(${PROJECT_NAME}_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
set(${PROJECT_NAME}_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
#-----------------------------------------------------------------------------
# Set a default build type if none was specified
......
......@@ -16,6 +16,6 @@ macro(listOfSubDir result curdir)
foreach(subdir ${subDirs})
add_subdirectory(${subdir})
endforeach()
endforeach()
......@@ -27,7 +27,7 @@ add_executable(${PROJECT_NAME} DeformableBody.cpp)
# Link libraries to executable
#-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager)
#-----------------------------------------------------------------------------
# Add shaders
#-----------------------------------------------------------------------------
......
......@@ -166,7 +166,7 @@ FEMDeformableBodyModel::loadBoundaryConditions()
auto maxAllowed = m_vegaPhysicsMesh->getNumVertices();
while (!file.eof())
{
file >> index;
file >> index;
if (index < maxAllowed)
{
m_fixedNodeIds.emplace_back(index);
......
......@@ -80,7 +80,8 @@ VTKRenderer::VTKRenderer(std::shared_ptr<Scene> scene, const bool enableVR)
auto axes = vtkSmartPointer<vtkAxesActor>::New();
axes->SetShaftType(vtkAxesActor::CYLINDER_SHAFT);
axes->SetAxisLabels(false);
m_debugVtkActors.push_back( axes );
axes->SetTotalLength(40, 40, 40);
m_debugVtkActors.push_back(axes);
// Camera and camera actor
if (!enableVR)
......
......@@ -44,7 +44,7 @@ ConjugateGradient::applyLinearProjectionFilter(Vectord& x, const std::vector<Lin
{
const auto threeI = 3 * localProjector.getNodeId();
Vec3d p = localProjector.getProjector()*Vec3d(x(threeI), x(threeI + 1), x(threeI + 2));
if (setVal)
{
p += (Mat3d::Identity() - localProjector.getProjector())*localProjector.getValue();
......@@ -87,7 +87,7 @@ ConjugateGradient::modifiedCGSolve(Vectord& x)
{
applyLinearProjectionFilter(x, *m_DynamicLinearProjConstraints, true);
}
if (m_FixedLinearProjConstraints)
{
applyLinearProjectionFilter(x, *m_FixedLinearProjConstraints, true);
......
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