mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 04:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Haphazardly address #1455 by setting the stereo distance to some insane value but keeping the adaptive stereo separation

Browse Source
This commit is contained in:
Alexander Bock
2021-05-30 16:59:04 +02:00
parent bac54732f9
commit 8c870384fc
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/galaxy/rendering/galaxyraycaster.cpp
View File

@@ -58,7 +58,7 @@ void GalaxyRaycaster::initialize() {
void GalaxyRaycaster::renderEntryPoints(const RenderData& data,
ghoul::opengl::ProgramObject& program)
{
program.setUniform("modelViewTransform", glm::mat4(modelViewTransform(data)));
program.setUniform("modelViewTransform", modelViewTransform(data));
program.setUniform("projectionTransform", data.camera.projectionMatrix());
// Cull back face
@@ -73,7 +73,7 @@ void GalaxyRaycaster::renderExitPoints(const RenderData& data,
ghoul::opengl::ProgramObject& program)
{
// Uniforms
program.setUniform("modelViewTransform", glm::mat4(modelViewTransform(data)));
program.setUniform("modelViewTransform", modelViewTransform(data));
program.setUniform("projectionTransform", data.camera.projectionMatrix());
// Cull front face

11
modules/galaxy/shaders/raycasterbounds_vs.glsl
View File

@@ -24,19 +24,20 @@
#version __CONTEXT__
#include "PowerScaling/powerScalingMath.hglsl"
layout(location = 0) in vec4 vertPosition;
out vec3 modelPosition;
out vec4 viewPosition;
uniform mat4 projectionTransform;
uniform mat4 modelViewTransform;
uniform dmat4 modelViewTransform;
void main() {
modelPosition = vertPosition.xyz;
viewPosition = modelViewTransform*vertPosition;
dvec4 vp = modelViewTransform * vertPosition;
viewPosition = vec4(vp);
// project the position to view space
gl_Position = projectionTransform * viewPosition;
gl_Position.z = 0.0;
gl_Position = z_normalization(vec4(projectionTransform * viewPosition));
}

8
src/interaction/orbitalnavigator.cpp
View File

@@ -254,7 +254,12 @@ OrbitalNavigator::OrbitalNavigator()
, _joystickSensitivity(JoystickSensitivityInfo, 10.f, 1.0f, 50.f)
, _websocketSensitivity(WebsocketSensitivityInfo, 5.f, 1.0f, 50.f)
, _useAdaptiveStereoscopicDepth(UseAdaptiveStereoscopicDepthInfo, true)
, _stereoscopicDepthOfFocusSurface(StereoscopicDepthOfFocusSurfaceInfo, 8, 0.25, 100)
, _stereoscopicDepthOfFocusSurface(
StereoscopicDepthOfFocusSurfaceInfo,
200000,
0.25,
500000
)
, _staticViewScaleExponent(StaticViewScaleExponentInfo, 0.f, -30, 10)
, _retargetInterpolationTime(RetargetInterpolationTimeInfo, 2.0, 0.0, 10.0)
, _stereoInterpolationTime(StereoInterpolationTimeInfo, 8.0, 0.0, 10.0)
@@ -386,6 +391,7 @@ OrbitalNavigator::OrbitalNavigator()
addProperty(_useAdaptiveStereoscopicDepth);
addProperty(_staticViewScaleExponent);
_stereoscopicDepthOfFocusSurface.setExponent(10.f);
addProperty(_stereoscopicDepthOfFocusSurface);
addProperty(_retargetInterpolationTime);