Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenWalnut Core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
44
Issues
44
List
Boards
Labels
Service Desk
Milestones
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
981f4313
Commit
981f4313
authored
Oct 07, 2010
by
schurade
Browse files
Options
Browse Files
Download
Plain Diff
[MERGE] with d20ec0ed3783c3845a19ca1689a58f351b28c0eb
parents
352d8648
ba1eb5a7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
2 deletions
+60
-2
src/graphicsEngine/WGEOffscreenFinalPass.cpp
src/graphicsEngine/WGEOffscreenFinalPass.cpp
+22
-0
src/graphicsEngine/WGEOffscreenRenderPass.cpp
src/graphicsEngine/WGEOffscreenRenderPass.cpp
+4
-0
src/graphicsEngine/WGETextureHud.cpp
src/graphicsEngine/WGETextureHud.cpp
+7
-1
src/graphicsEngine/WGETextureHud.h
src/graphicsEngine/WGETextureHud.h
+12
-0
src/graphicsEngine/shaders/WGEUtils.glsl
src/graphicsEngine/shaders/WGEUtils.glsl
+15
-1
No files found.
src/graphicsEngine/WGEOffscreenFinalPass.cpp
View file @
981f4313
...
@@ -34,6 +34,17 @@ WGEOffscreenFinalPass::WGEOffscreenFinalPass( size_t textureWidth, size_t textur
...
@@ -34,6 +34,17 @@ WGEOffscreenFinalPass::WGEOffscreenFinalPass( size_t textureWidth, size_t textur
// initialize members
// initialize members
setRenderTargetImplementation
(
osg
::
Camera
::
FRAME_BUFFER
);
setRenderTargetImplementation
(
osg
::
Camera
::
FRAME_BUFFER
);
setRenderOrder
(
osg
::
Camera
::
NESTED_RENDER
,
0
);
setRenderOrder
(
osg
::
Camera
::
NESTED_RENDER
,
0
);
// render before the hud
if
(
m_hud
)
{
getOrCreateStateSet
()
->
setRenderBinDetails
(
m_hud
->
getRenderBin
()
-
1
,
"RenderBin"
);
}
else
{
getOrCreateStateSet
()
->
setRenderBinDetails
(
10000
,
"RenderBin"
);
}
osg
::
StateSet
*
state
=
this
->
getOrCreateStateSet
();
osg
::
StateSet
*
state
=
this
->
getOrCreateStateSet
();
state
->
setMode
(
GL_DEPTH_TEST
,
osg
::
StateAttribute
::
ON
);
state
->
setMode
(
GL_DEPTH_TEST
,
osg
::
StateAttribute
::
ON
);
}
}
...
@@ -45,6 +56,17 @@ WGEOffscreenFinalPass::WGEOffscreenFinalPass( size_t textureWidth, size_t textur
...
@@ -45,6 +56,17 @@ WGEOffscreenFinalPass::WGEOffscreenFinalPass( size_t textureWidth, size_t textur
// initialize members
// initialize members
setRenderTargetImplementation
(
osg
::
Camera
::
FRAME_BUFFER
);
setRenderTargetImplementation
(
osg
::
Camera
::
FRAME_BUFFER
);
setRenderOrder
(
osg
::
Camera
::
NESTED_RENDER
,
0
);
setRenderOrder
(
osg
::
Camera
::
NESTED_RENDER
,
0
);
// render before the hud
if
(
m_hud
)
{
getOrCreateStateSet
()
->
setRenderBinDetails
(
m_hud
->
getRenderBin
()
-
1
,
"RenderBin"
);
}
else
{
getOrCreateStateSet
()
->
setRenderBinDetails
(
10000
,
"RenderBin"
);
}
osg
::
StateSet
*
state
=
this
->
getOrCreateStateSet
();
osg
::
StateSet
*
state
=
this
->
getOrCreateStateSet
();
state
->
setMode
(
GL_DEPTH_TEST
,
osg
::
StateAttribute
::
ON
);
state
->
setMode
(
GL_DEPTH_TEST
,
osg
::
StateAttribute
::
ON
);
}
}
...
...
src/graphicsEngine/WGEOffscreenRenderPass.cpp
View file @
981f4313
...
@@ -91,7 +91,11 @@ osg::ref_ptr< osg::Texture2D > WGEOffscreenRenderPass::attach( BufferComponent b
...
@@ -91,7 +91,11 @@ osg::ref_ptr< osg::Texture2D > WGEOffscreenRenderPass::attach( BufferComponent b
}
}
else
else
{
{
#if defined(__APPLE__)
tex
=
createTexture
(
GL_RGBA
);
// on MacOS X, only RGBA textures work as attachment for FBO's
#else
tex
=
createTexture
(
internalFormat
);
tex
=
createTexture
(
internalFormat
);
#endif
}
}
attach
(
buffer
,
tex
);
attach
(
buffer
,
tex
);
return
tex
;
return
tex
;
...
...
src/graphicsEngine/WGETextureHud.cpp
View file @
981f4313
...
@@ -44,10 +44,11 @@ WGETextureHud::WGETextureHud():
...
@@ -44,10 +44,11 @@ WGETextureHud::WGETextureHud():
osg
::
Projection
(),
osg
::
Projection
(),
m_group
(
new
WGEGroupNode
()
),
m_group
(
new
WGEGroupNode
()
),
m_maxElementWidth
(
256
),
m_maxElementWidth
(
256
),
m_renderBin
(
10000
),
m_viewport
(
new
osg
::
Viewport
()
),
m_viewport
(
new
osg
::
Viewport
()
),
m_coupleTexViewport
(
false
)
m_coupleTexViewport
(
false
)
{
{
getOrCreateStateSet
()
->
setRenderBinDetails
(
1000
,
"RenderBin"
);
getOrCreateStateSet
()
->
setRenderBinDetails
(
m_renderBin
,
"RenderBin"
);
m_group
->
addUpdateCallback
(
new
SafeUpdateCallback
(
this
)
);
m_group
->
addUpdateCallback
(
new
SafeUpdateCallback
(
this
)
);
addChild
(
m_group
);
addChild
(
m_group
);
}
}
...
@@ -310,3 +311,8 @@ osg::ref_ptr< osg::Texture2D > WGETextureHud::WGETextureHudEntry::getTexture() c
...
@@ -310,3 +311,8 @@ osg::ref_ptr< osg::Texture2D > WGETextureHud::WGETextureHudEntry::getTexture() c
return
m_texture
;
return
m_texture
;
}
}
size_t
WGETextureHud
::
getRenderBin
()
const
{
return
m_renderBin
;
}
src/graphicsEngine/WGETextureHud.h
View file @
981f4313
...
@@ -183,6 +183,13 @@ public:
...
@@ -183,6 +183,13 @@ public:
*/
*/
void
coupleViewportWithTextureViewport
(
bool
couple
=
true
);
void
coupleViewportWithTextureViewport
(
bool
couple
=
true
);
/**
* Returns the render bin used by the HUD.
*
* \return the bin number
*/
size_t
getRenderBin
()
const
;
protected:
protected:
/**
/**
...
@@ -196,6 +203,11 @@ protected:
...
@@ -196,6 +203,11 @@ protected:
*/
*/
unsigned
int
m_maxElementWidth
;
unsigned
int
m_maxElementWidth
;
/**
* The render bin to use
*/
size_t
m_renderBin
;
/**
/**
* The current viewport of
* The current viewport of
*/
*/
...
...
src/graphicsEngine/shaders/WGEUtils.glsl
View file @
981f4313
...
@@ -45,8 +45,22 @@ float scaleZeroOne( in float threshold, in float min, in float max )
...
@@ -45,8 +45,22 @@ float scaleZeroOne( in float threshold, in float min, in float max )
*
*
* \return true if zero.
* \return true if zero.
*/
*/
bool
isZero
(
in
float
value
,
in
float
epsilon
=
0
.
001
)
bool
isZero
(
in
float
value
,
in
float
epsilon
)
{
{
return
(
abs
(
value
)
<=
epsilon
);
return
(
abs
(
value
)
<=
epsilon
);
}
}
/**
* Evaluates a given value whether it is zero, or more exactly, if it can be seen as zero.
* \note This version is needed for portability as the GLSL compiler on MacOS X does not allow argument default values in functions.
*
* \param value the value to check
* \param epsilon the epsilon to use. Default is 0.001. Much lower is not recommended since floating point precision in GLSL is not that high.
*
* \return true if zero.
*/
bool
isZero
(
in
float
value
)
{
return
(
abs
(
value
)
<=
0
.
001
);
}
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