Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
e457fb27
Commit
e457fb27
authored
Mar 07, 2010
by
Alexander Wiebel
Browse files
[FIX] if fiber dataset is reactivated, show it.
parent
9a164d9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
src/modules/fiberDisplay/WMFiberDisplay.cpp
src/modules/fiberDisplay/WMFiberDisplay.cpp
+13
-9
No files found.
src/modules/fiberDisplay/WMFiberDisplay.cpp
View file @
e457fb27
...
...
@@ -140,11 +140,8 @@ void WMFiberDisplay::update()
void
WMFiberDisplay
::
create
()
{
// remove nodes if they are any
WKernel
::
getRunningKernel
()
->
getGraphicsEngine
()
->
getScene
()
->
removeChild
(
m_osgNode
.
get
()
);
// create new node
m_
osgNode
=
osg
::
ref_ptr
<
osg
::
Group
>
(
new
osg
::
Group
);
osg
::
ref_ptr
<
osg
::
Group
>
osgNode
New
=
osg
::
ref_ptr
<
osg
::
Group
>
(
new
osg
::
Group
);
m_tubeDrawable
=
osg
::
ref_ptr
<
WTubeDrawable
>
(
new
WTubeDrawable
);
m_tubeDrawable
->
setDataset
(
m_dataset
);
...
...
@@ -152,13 +149,20 @@ void WMFiberDisplay::create()
osg
::
ref_ptr
<
osg
::
Geode
>
geode
=
osg
::
ref_ptr
<
osg
::
Geode
>
(
new
osg
::
Geode
);
geode
->
addDrawable
(
m_tubeDrawable
);
m_osgNode
->
addChild
(
geode
);
osgNodeNew
->
addChild
(
geode
);
osgNodeNew
->
getOrCreateStateSet
()
->
setMode
(
GL_LIGHTING
,
osg
::
StateAttribute
::
OFF
);
WKernel
::
getRunningKernel
()
->
getGraphicsEngine
()
->
getScene
()
->
addChild
(
osgNodeNew
.
get
()
);
osgNodeNew
->
setUserData
(
this
);
osgNodeNew
->
addUpdateCallback
(
new
fdNodeCallback
);
// remove previous nodes if there are any
WKernel
::
getRunningKernel
()
->
getGraphicsEngine
()
->
getScene
()
->
removeChild
(
m_osgNode
.
get
()
);
m_osgNode
->
getOrCreateStateSet
()
->
setMode
(
GL_LIGHTING
,
osg
::
StateAttribute
::
OFF
);
WKernel
::
getRunningKernel
()
->
getGraphicsEngine
()
->
getScene
()
->
addChild
(
m_osgNode
.
get
()
);
m_osgNode
=
osgNodeNew
;
m_osgNode
->
setUserData
(
this
);
m_osgNode
->
addUpdateCallback
(
new
fdNodeCallback
);
activate
();
}
void
WMFiberDisplay
::
connectors
()
...
...
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