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
iMSTK
iMSTK
Commits
6ebedcdf
Commit
6ebedcdf
authored
May 16, 2016
by
Alexis Girault
Browse files
ENH: Implement Viewer::getCurrentRenderer
parent
b5a57f0f
Changes
2
Show whitespace changes
Inline
Side-by-side
Base/SimulationManager/imstkViewer.cpp
View file @
6ebedcdf
...
@@ -45,7 +45,7 @@ Viewer::setCurrentScene(std::shared_ptr<Scene>scene)
...
@@ -45,7 +45,7 @@ Viewer::setCurrentScene(std::shared_ptr<Scene>scene)
// If the current scene has a renderer, remove it
// If the current scene has a renderer, remove it
if
(
m_currentScene
)
if
(
m_currentScene
)
{
{
auto
vtkRenderer
=
m_rendererMap
.
at
(
m_currentScene
)
->
getVtkRenderer
();
auto
vtkRenderer
=
this
->
getCurrentRenderer
(
)
->
getVtkRenderer
();
if
(
m_vtkRenderWindow
->
HasRenderer
(
vtkRenderer
))
if
(
m_vtkRenderWindow
->
HasRenderer
(
vtkRenderer
))
{
{
m_vtkRenderWindow
->
RemoveRenderer
(
vtkRenderer
);
m_vtkRenderWindow
->
RemoveRenderer
(
vtkRenderer
);
...
@@ -62,12 +62,18 @@ Viewer::setCurrentScene(std::shared_ptr<Scene>scene)
...
@@ -62,12 +62,18 @@ Viewer::setCurrentScene(std::shared_ptr<Scene>scene)
}
}
// Set renderer to renderWindow
// Set renderer to renderWindow
m_vtkRenderWindow
->
AddRenderer
(
m_rendererMap
.
at
(
m_currentScene
)
->
getVtkRenderer
());
m_vtkRenderWindow
->
AddRenderer
(
this
->
getCurrentRenderer
(
)
->
getVtkRenderer
());
// Set name to renderWindow
// Set name to renderWindow
m_vtkRenderWindow
->
SetWindowName
(
m_currentScene
->
getName
().
data
());
m_vtkRenderWindow
->
SetWindowName
(
m_currentScene
->
getName
().
data
());
}
}
std
::
shared_ptr
<
Renderer
>
Viewer
::
getCurrentRenderer
()
const
{
return
m_rendererMap
.
at
(
m_currentScene
);
}
void
void
Viewer
::
setRenderingMode
(
Renderer
::
Mode
mode
)
Viewer
::
setRenderingMode
(
Renderer
::
Mode
mode
)
{
{
...
@@ -79,7 +85,7 @@ Viewer::setRenderingMode(Renderer::Mode mode)
...
@@ -79,7 +85,7 @@ Viewer::setRenderingMode(Renderer::Mode mode)
}
}
// Setup renderer
// Setup renderer
m_rendererMap
.
at
(
m_currentScene
)
->
setup
(
mode
);
this
->
getCurrentRenderer
(
)
->
setup
(
mode
);
if
(
!
m_running
)
if
(
!
m_running
)
{
{
return
;
return
;
...
...
Base/SimulationManager/imstkViewer.h
View file @
6ebedcdf
...
@@ -54,6 +54,8 @@ public:
...
@@ -54,6 +54,8 @@ public:
std
::
shared_ptr
<
Scene
>
getCurrentScene
()
const
;
std
::
shared_ptr
<
Scene
>
getCurrentScene
()
const
;
void
setCurrentScene
(
std
::
shared_ptr
<
Scene
>
scene
);
void
setCurrentScene
(
std
::
shared_ptr
<
Scene
>
scene
);
std
::
shared_ptr
<
Renderer
>
getCurrentRenderer
()
const
;
void
setRenderingMode
(
Renderer
::
Mode
mode
);
void
setRenderingMode
(
Renderer
::
Mode
mode
);
void
startRenderingLoop
();
void
startRenderingLoop
();
void
endRenderingLoop
();
void
endRenderingLoop
();
...
@@ -64,9 +66,6 @@ public:
...
@@ -64,9 +66,6 @@ public:
protected:
protected:
void
debugModeKeyPressCallback
(
vtkObject
*
,
long
unsigned
int
,
void
*
);
void
simulationModeKeyPressCallback
(
vtkObject
*
,
long
unsigned
int
,
void
*
);
vtkSmartPointer
<
vtkRenderWindow
>
m_vtkRenderWindow
=
vtkSmartPointer
<
vtkRenderWindow
>::
New
();
vtkSmartPointer
<
vtkRenderWindow
>
m_vtkRenderWindow
=
vtkSmartPointer
<
vtkRenderWindow
>::
New
();
vtkSmartPointer
<
InteractorStyle
>
m_interactorStyle
=
vtkSmartPointer
<
InteractorStyle
>::
New
();
vtkSmartPointer
<
InteractorStyle
>
m_interactorStyle
=
vtkSmartPointer
<
InteractorStyle
>::
New
();
std
::
shared_ptr
<
Scene
>
m_currentScene
;
std
::
shared_ptr
<
Scene
>
m_currentScene
;
...
...
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