Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
OpenSpace
Commits
ec89a5a4
Commit
ec89a5a4
authored
7 years ago
by
Emil Axelsson
Browse files
Options
Download
Email Patches
Plain Diff
Fix bugs in volumetric rendering
parent
b2f680e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/volume/shaders/boundsfs.glsl
+2
-2
modules/volume/shaders/boundsfs.glsl
src/rendering/framebufferrenderer.cpp
+1
-1
src/rendering/framebufferrenderer.cpp
with
3 additions
and
3 deletions
+3
-3
modules/volume/shaders/boundsfs.glsl
+
2
-
2
View file @
ec89a5a4
...
...
@@ -22,15 +22,15 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include
"PowerScaling/powerScaling_fs.hglsl"
#include
"fragment.glsl"
#include
"floatoperations.glsl"
in
vec4
positionLocalSpace
;
in
vec4
positionCameraSpace
;
Fragment
getFragment
()
{
vec4
position
=
positionCameraSpace
;
float
depth
=
pscDep
th
(
position
);
float
depth
=
safeLeng
th
(
position
);
Fragment
frag
;
frag
.
color
=
vec4
(
positionLocalSpace
.
xyz
+
0
.
5
,
1
.
0
);
...
...
This diff is collapsed.
Click to expand it.
src/rendering/framebufferrenderer.cpp
+
1
-
1
View file @
ec89a5a4
...
...
@@ -1072,7 +1072,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
raycastProgram
->
setUniform
(
"mainDepthTexture"
,
mainDepthTextureUnit
);
raycastProgram
->
setUniform
(
"nAaSamples"
,
_nAaSamples
);
raycastProgram
->
setUniform
(
"windowSize"
,
_resolution
);
raycastProgram
->
setUniform
(
"windowSize"
,
static_cast
<
glm
::
vec2
>
(
_resolution
)
)
;
glDisable
(
GL_DEPTH_TEST
);
glDepthMask
(
false
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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