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
8745164e
Commit
8745164e
authored
Aug 16, 2010
by
Alexander Wiebel
Browse files
[---] patched with d19dee52ee15 to fix fiberdisplay crash
parent
852ad9b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
src/kernel/modules/fiberDisplay/WMFiberDisplay.cpp
src/kernel/modules/fiberDisplay/WMFiberDisplay.cpp
+9
-3
No files found.
src/kernel/modules/fiberDisplay/WMFiberDisplay.cpp
View file @
8745164e
...
...
@@ -93,6 +93,11 @@ void WMFiberDisplay::moduleMain()
m_moduleState
.
wait
();
// waits for firing of m_moduleState ( dataChanged, shutdown, etc. )
if
(
m_shutdownFlag
()
)
{
break
;
}
initCullBox
();
/////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -138,6 +143,8 @@ void WMFiberDisplay::moduleMain()
}
}
}
WKernel
::
getRunningKernel
()
->
getGraphicsEngine
()
->
getScene
()
->
remove
(
m_osgNode
);
}
void
WMFiberDisplay
::
update
()
...
...
@@ -455,15 +462,14 @@ void WMFiberDisplay::initUniforms( osg::StateSet* rootState )
m_uniformCullBoxUBZ
=
osg
::
ref_ptr
<
osg
::
Uniform
>
(
new
osg
::
Uniform
(
"cullBoxUBZ"
,
static_cast
<
float
>
(
zMax
)
)
);
rootState
->
addUniform
(
m_uniformUseCullBox
);
rootState
->
addUniform
(
m_uniformInsideCullBox
);
rootState
->
addUniform
(
m_uniformCullBoxLBX
);
rootState
->
addUniform
(
m_uniformCullBoxLBY
);
rootState
->
addUniform
(
m_uniformCullBoxLBZ
);
rootState
->
addUniform
(
m_uniformCullBoxUBX
);
rootState
->
addUniform
(
m_uniformCullBoxUBY
);
rootState
->
addUniform
(
m_uniformCullBoxUBZ
);
rootState
->
addUniform
(
m_uniformUseCullBox
);
rootState
->
addUniform
(
m_uniformInsideCullBox
);
}
void
WMFiberDisplay
::
notifyTextureChange
()
...
...
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