Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
CAMP
campvis-public
Commits
aeb8f778
Commit
aeb8f778
authored
Dec 04, 2013
by
Christian Schulte zu Berge
Browse files
Fixed geometry integration in EEPGenerator
parent
8422aa85
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/vis/glsl/eepgenerator.frag
View file @
aeb8f778
...
...
@@ -57,7 +57,7 @@ void main() {
float
fragDepth
=
gl_FragCoord
.
z
;
if
(
_integrateGeometry
)
{
float
geometryDepth
=
getElement2DNormalized
(
_geometryDepthTexture
,
_geometryDepthTexParams
,
fragCoordNormalized
).
z
;
float
geometryDepth
=
getElement2DNormalized
(
_geometryDepthTexture
,
_geometryDepthTexParams
,
fragCoordNormalized
).
r
;
if
(
_isEntrypoint
)
{
// integrating geometry into Entrypoints
...
...
@@ -76,13 +76,13 @@ void main() {
}
else
{
// integrating geometry into Exitpoints
float
entryDepth
=
getElement2DNormalized
(
_entryDepthTexture
,
_entryDepthTexParams
,
fragCoordNormalized
).
z
;
float
entryDepth
=
getElement2DNormalized
(
_entryDepthTexture
,
_entryDepthTexParams
,
fragCoordNormalized
).
r
;
float
exitDepth
=
gl_FragCoord
.
z
;
if
(
geometryDepth
<=
entryDepth
)
{
// geometry before Entrypoint
out_Color
=
vec4
(
0
.
0
);
fragDepth
=
exit
Depth
;
fragDepth
=
geometry
Depth
;
}
else
if
(
geometryDepth
<=
exitDepth
)
{
// geometry between entrypoint and exitpoint
...
...
modules/vis/processors/eepgenerator.cpp
View file @
aeb8f778
...
...
@@ -138,9 +138,6 @@ namespace campvis {
LERROR
(
"No suitable virtual mirror geometry found."
);
}
}
FramebufferActivationGuard
fag
(
this
);
decorateRenderProlog
(
data
,
_shader
);
const
tgt
::
Camera
&
cam
=
p_camera
.
getValue
();
tgt
::
TextureUnit
geometryDepthUnit
,
entryDepthUnit
;
...
...
@@ -174,6 +171,8 @@ namespace campvis {
_shader
->
setIgnoreUniformLocationError
(
false
);
FramebufferActivationGuard
fag
(
this
);
decorateRenderProlog
(
data
,
_shader
);
glEnable
(
GL_CULL_FACE
);
glEnable
(
GL_DEPTH_TEST
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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