Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sreekanth Arikatla
iMSTK
Commits
38fe30ca
Commit
38fe30ca
authored
Jul 15, 2017
by
Sreekanth Arikatla
Browse files
Merge branch 'fixBugsInSandbox' into 'master'
BUG: Fix lighting related bugs in fluid examples See merge request
!194
parents
a8ec2dc7
210081c0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Examples/Sandbox/main.cpp
View file @
38fe30ca
...
...
@@ -2153,9 +2153,9 @@ void testPbdFluidBenchmarking()
});
// Light (white)
auto
whiteLight
=
std
::
make_shared
<
imstk
::
Light
>
(
"whiteLight"
);
whiteLight
->
set
Position
(
Vec3d
(
5
,
8
,
5
));
whiteLight
->
set
Color
(
Color
::
White
);
auto
whiteLight
=
std
::
make_shared
<
imstk
::
Directional
Light
>
(
"whiteLight"
);
whiteLight
->
set
FocalPoint
(
imstk
::
Vec3d
(
5
,
-
8
,
-
5
));
whiteLight
->
set
Intensity
(
7
);
scene
->
addLight
(
whiteLight
);
scene
->
getCamera
()
->
setPosition
(
0
,
10.0
,
10.0
);
...
...
@@ -2194,7 +2194,6 @@ void testPbdFluid()
auto
material1
=
std
::
make_shared
<
RenderMaterial
>
();
material1
->
setDisplayMode
(
RenderMaterial
::
DisplayMode
::
POINTS
);
material1
->
setDiffuseColor
(
Color
::
Blue
);
material1
->
setSpecularColor
(
Color
::
Blue
);
material1
->
setPointSize
(
6.0
);
surfMeshVisual
->
setRenderMaterial
(
material1
);
...
...
@@ -2399,9 +2398,9 @@ void testPbdFluid()
colGraph
->
addInteractionPair
(
pair
);
// Light (white)
auto
whiteLight
=
std
::
make_shared
<
imstk
::
Light
>
(
"whiteLight"
);
whiteLight
->
set
Position
(
Vec3d
(
5
,
8
,
5
));
whiteLight
->
set
Color
(
Color
::
White
);
auto
whiteLight
=
std
::
make_shared
<
imstk
::
Directional
Light
>
(
"whiteLight"
);
whiteLight
->
set
FocalPoint
(
imstk
::
Vec3d
(
5
,
-
8
,
-
5
));
whiteLight
->
set
Intensity
(
7
);
scene
->
addLight
(
whiteLight
);
sdk
->
setCurrentScene
(
scene
);
...
...
Write
Preview
Supports
Markdown
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