Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
iMSTK
iMSTK
Commits
eecca310
Commit
eecca310
authored
Jul 25, 2019
by
Sreekanth Arikatla
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
COMP:Diasable compiler warning 4201 for color class
parent
43eae007
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
7 deletions
+6
-7
Examples/PBDCloth/pbdClothExample.cpp
Examples/PBDCloth/pbdClothExample.cpp
+0
-4
Source/Core/imstkColor.h
Source/Core/imstkColor.h
+3
-0
Source/DynamicalModels/ObjectModels/imstkPbdModel.cpp
Source/DynamicalModels/ObjectModels/imstkPbdModel.cpp
+1
-1
Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp
Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp
+1
-1
Source/DynamicalModels/ObjectModels/imstkSPHModel.h
Source/DynamicalModels/ObjectModels/imstkSPHModel.h
+1
-1
No files found.
Examples/PBDCloth/pbdClothExample.cpp
View file @
eecca310
...
...
@@ -128,10 +128,6 @@ main()
scene
->
addLight
(
colorLight
);
scene
->
addSceneObject
(
deformableObj
);
// print UPS
/*auto ups = std::make_shared<UPSCounter>();
apiutils::printUPS(sdk->getSceneManager(scene), ups);*/
scene
->
getCamera
()
->
setFocalPoint
(
0
,
-
5
,
5
);
scene
->
getCamera
()
->
setPosition
(
-
15.
,
-
5.0
,
15.0
);
...
...
Source/Core/imstkColor.h
View file @
eecca310
...
...
@@ -23,6 +23,8 @@
#include <iostream>
/// \todo remove nameless union/struct in the future
#pragma warning(disable : 4201)
namespace
imstk
{
///
...
...
@@ -102,4 +104,5 @@ struct Color
static
Color
Orange
;
static
Color
Yellow
;
};
#pragma warning(default : 4201)
}
Source/DynamicalModels/ObjectModels/imstkPbdModel.cpp
View file @
eecca310
...
...
@@ -394,7 +394,7 @@ PbdModel::initializeConstantDensityConstraint(const double stiffness)
&&
m_mesh
->
getType
()
!=
Geometry
::
Type
::
PointSet
)
{
//\todo Really only need a point cloud, so may need to change this.
LOG
(
WARNING
)
<<
"Constant constraint should come with a mesh!"
;
LOG
(
WARNING
)
<<
"Constant constraint should come with a mesh!"
;
return
false
;
}
...
...
Source/DynamicalModels/ObjectModels/imstkSPHModel.cpp
View file @
eecca310
...
...
@@ -34,7 +34,7 @@ SPHModelConfig::SPHModelConfig(const Real particleRadius)
}
else
{
LOG
(
WARNING
,
"Particle radius too small! Setting to 1.e-6"
)
;
LOG
(
WARNING
)
<<
"Particle radius too small! Setting to 1.e-6"
;
m_particleRadius
=
1.e-6
;
}
initialize
();
...
...
Source/DynamicalModels/ObjectModels/imstkSPHModel.h
View file @
eecca310
...
...
@@ -127,7 +127,7 @@ public:
///
/// \brief Reset the current state to the initial state
///
virtual
void
resetToInitialState
()
override
virtual
void
resetToInitialState
()
override
{
this
->
m_currentState
->
setState
(
this
->
m_initialState
);
}
///
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment