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
28d95bf3
Commit
28d95bf3
authored
Dec 03, 2009
by
Mathias Goldau
Browse files
[CHANGE
#153
] Now loading other dataset then fibers is ok with fiber displaying module
parent
c2296a86
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
src/kernel/WKernel.cpp
src/kernel/WKernel.cpp
+1
-1
src/modules/fiberDisplay/WMFiberDisplay.cpp
src/modules/fiberDisplay/WMFiberDisplay.cpp
+7
-5
No files found.
src/kernel/WKernel.cpp
View file @
28d95bf3
...
...
@@ -134,7 +134,7 @@ void WKernel::threadMain()
// default modules
m_moduleContainer
->
add
(
m_moduleFactory
->
create
(
m_moduleFactory
->
getPrototypeByName
(
"Navigation Slice Module"
)
)
,
true
);
m_moduleContainer
->
add
(
m_moduleFactory
->
create
(
m_moduleFactory
->
getPrototypeByName
(
"Coordinate System Module"
)
)
,
true
);
//
m_moduleContainer->add( m_moduleFactory->create( m_moduleFactory->getPrototypeByName( "Fiber Display Module" ) ) , true );
m_moduleContainer
->
add
(
m_moduleFactory
->
create
(
m_moduleFactory
->
getPrototypeByName
(
"Fiber Display Module"
)
)
,
true
);
// actually there is nothing more to do here
waitForStop
();
...
...
src/modules/fiberDisplay/WMFiberDisplay.cpp
View file @
28d95bf3
...
...
@@ -139,12 +139,14 @@ void WMFiberDisplay::moduleMain()
}
boost
::
shared_ptr
<
const
WDataSetFibers
>
fiberDS
;
assert
(
fiberDS
=
boost
::
shared_dynamic_cast
<
const
WDataSetFibers
>
(
dataHandler
->
getSubject
(
0
)
->
getDataSet
(
0
)
)
);
if
(
fiberDS
=
boost
::
shared_dynamic_cast
<
const
WDataSetFibers
>
(
dataHandler
->
getSubject
(
0
)
->
getDataSet
(
0
)
)
)
{
osg
::
ref_ptr
<
osg
::
Group
>
group
=
osg
::
ref_ptr
<
osg
::
Group
>
(
new
osg
::
Group
);
group
->
addChild
(
genFiberGeode
(
fiberDS
,
false
).
get
()
);
group
->
getOrCreateStateSet
()
->
setMode
(
GL_LIGHTING
,
osg
::
StateAttribute
::
OFF
);
WKernel
::
getRunningKernel
()
->
getGraphicsEngine
()
->
getScene
()
->
addChild
(
group
.
get
()
);
}
// Since the modules run in a separate thread: such loops are possible
while
(
!
m_FinishRequested
)
...
...
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