diff --git a/config/flareConfig.txt b/config/flareConfig.txt deleted file mode 100644 index b456a06554..0000000000 --- a/config/flareConfig.txt +++ /dev/null @@ -1,82 +0,0 @@ -# Filenames -# Don't change during runtime -# (Transfer function values can be changed during runtime though) -tsp_filename ${OPENSPACE_DATA}/enlil_64_32_8.tsp -transferfunction_filename ${CONFIG}/transferfunctions/fire.txt - -# Window dimensions -# Don't change during runtime -# NOT USED -win_width 512 -win_height 512 - -# Save screenshots every frame (saved in flare/ folder) 0/1 -take_screenshot 0 - - -# 0 to not clear cache every frame, 1 to clear it -# Used for benchmarking purposes -clear_cache 0 - -# Local kernel work size -# Can't be changed during runtime -local_worksize_x 16 -local_worksize_y 16 - -# Scaling division to make textures smaller -# Saves OpenCL threads -# (A factor of 2 results in half the number of threads per dimension etc) -texture_division_factor 1 - -# Error tolerances -# Use -1 for no tolerance -spatial_error_tolerance -1 -temporal_error_tolerance -1 - -# Calculate error or not (0 no, 1 yes) -calculate_error 0 - -# Step size for TSP probing -# Decrease this if holes appear in the rendering -tsp_traversal_stepsize 0.02 - -# Ray caster constants -raycaster_stepsize 0.005 -raycaster_intensity 1.0 - -# Animation speed -animator_refresh_interval 0.5 - -# Various paths -raycaster_kernel_filename ${KERNELS}/RaycasterTSP.cl -tsp_traversal_kernel_filename ${KERNELS}/TSPTraversal.cl -cube_shader_vert_filename ${SHADERS}/cubeVert.glsl -cube_shader_frag_filename ${SHADERS}/cubeFrag.glsl -quad_shader_vert_filename ${SHADERS}/quadVertFlare.glsl -quad_shader_frag_filename ${SHADERS}/quadFrag.glsl - -# Model -start_pitch -20.0 -start_roll 30.0 -start_yaw 0.0 - -# Automatic pitch/roll/yaw -pitch_speed 0.0 -roll_speed 0.0 -yaw_speed 0.0 - -# View - -# Works well for standalone.xml -translate_x -0.5 -translate_y -0.5 -translate_z -1.0 - -# Navigation -# If mouse motion seems backwards, flip the sign of the roll and/or pitch factors -mouse_pitch_factor -0.05 -mouse_roll_factor 0.05 -zoom_factor 0.35 - - - diff --git a/shaders/cubeFrag.glsl b/shaders/cubeFrag.glsl deleted file mode 100644 index 876035e2c9..0000000000 --- a/shaders/cubeFrag.glsl +++ /dev/null @@ -1,32 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014 * - * * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this * - * software and associated documentation files (the "Software"), to deal in the Software * - * without restriction, including without limitation the rights to use, copy, modify, * - * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * - * permit persons to whom the Software is furnished to do so, subject to the following * - * conditions: * - * * - * The above copyright notice and this permission notice shall be included in all copies * - * or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * - * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - ****************************************************************************************/ - -#version __CONTEXT__ - -in vec4 color; -out vec4 outputColor; - -void main() { - outputColor = color; -} \ No newline at end of file diff --git a/shaders/cubeVert.glsl b/shaders/cubeVert.glsl deleted file mode 100644 index b240159d65..0000000000 --- a/shaders/cubeVert.glsl +++ /dev/null @@ -1,37 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014 * - * * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this * - * software and associated documentation files (the "Software"), to deal in the Software * - * without restriction, including without limitation the rights to use, copy, modify, * - * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * - * permit persons to whom the Software is furnished to do so, subject to the following * - * conditions: * - * * - * The above copyright notice and this permission notice shall be included in all copies * - * or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * - * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - ****************************************************************************************/ - -#version __CONTEXT__ - -uniform mat4 projectionMatrix; -uniform mat4 viewMatrix; -uniform mat4 modelMatrix; - -in vec4 position; -out vec4 color; - -void main() { - gl_Position = projectionMatrix * viewMatrix * modelMatrix * position; - color = position; -} \ No newline at end of file diff --git a/shaders/exitpoints.frag b/shaders/exitpoints.frag deleted file mode 100644 index 938df00ca5..0000000000 --- a/shaders/exitpoints.frag +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014 * - * * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this * - * software and associated documentation files (the "Software"), to deal in the Software * - * without restriction, including without limitation the rights to use, copy, modify, * - * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * - * permit persons to whom the Software is furnished to do so, subject to the following * - * conditions: * - * * - * The above copyright notice and this permission notice shall be included in all copies * - * or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * - * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - ****************************************************************************************/ - -#version __CONTEXT__ - -uniform int volumeType; - -in vec3 vPosition; -in vec4 worldPosition; -in float s; - -#include "ABuffer/abufferStruct.hglsl" -#include "ABuffer/abufferAddToBuffer.hglsl" -#include "PowerScaling/powerScaling_fs.hglsl" - -void main() { - vec4 fragColor = vec4(vPosition+0.5, 1.0); - vec4 position = worldPosition; - float depth = pscDepth(position); - - gl_FragDepth = depth; - - ABufferStruct_t frag; - _col_(frag, fragColor); - _z_(frag, depth); - _type_(frag, volumeType); - _pos_(frag, position); - addToBuffer(frag); -} \ No newline at end of file diff --git a/shaders/exitpoints.vert b/shaders/exitpoints.vert deleted file mode 100644 index 1abe4bf478..0000000000 --- a/shaders/exitpoints.vert +++ /dev/null @@ -1,57 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014 * - * * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this * - * software and associated documentation files (the "Software"), to deal in the Software * - * without restriction, including without limitation the rights to use, copy, modify, * - * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * - * permit persons to whom the Software is furnished to do so, subject to the following * - * conditions: * - * * - * The above copyright notice and this permission notice shall be included in all copies * - * or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * - * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - ****************************************************************************************/ - -#version __CONTEXT__ - -layout(location = 0) in vec4 vertPosition; - -uniform mat4 modelViewProjection; -uniform mat4 modelTransform; - -out vec3 vPosition; -out vec4 worldPosition; -out float s; - -#include "PowerScaling/powerScaling_vs.hglsl" - -void main() { - - //vs_st = in_st; - //vs_stp = in_position.xyz; - - vPosition = vertPosition.xyz; - worldPosition = vertPosition; - - // this is wrong for the normal. The normal transform is the transposed inverse of the model transform - //vs_normal = normalize(modelTransform * vec4(in_normal,0)); - - vec4 position = pscTransform(worldPosition, modelTransform); - - // project the position to view space - gl_Position = z_normalization(modelViewProjection * position); - - // vPosition = vertPosition.xyz; - // worldPosition = (modelTransform *vec4(vPosition, 1.0)).xyz; - // gl_Position = modelViewProjection *vec4(worldPosition, 1.0); -} \ No newline at end of file