From 847af32a5ffa8000a4613f55e215765fa62d3d5f Mon Sep 17 00:00:00 2001 From: Elon Date: Wed, 10 Apr 2019 13:34:54 -0600 Subject: [PATCH] pre rebase --- .../space/rendering/renderablesatellites.cpp | 4 ++-- modules/space/shaders/debrisViz_fs.glsl | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp index c4d3f831af..38fefb8605 100644 --- a/modules/space/rendering/renderablesatellites.cpp +++ b/modules/space/rendering/renderablesatellites.cpp @@ -602,8 +602,8 @@ void RenderableSatellites::initializeGL() { []() -> std::unique_ptr { return global::renderEngine.buildRenderProgram( ProgramName, - absPath("${MODULE_SPACE}/shaders/debrisViz_vs.glsl"), - absPath("${MODULE_SPACE}/shaders/debrisViz_fs.glsl") + absPath("${MODULE_SPACE}/shaders/renderablekeplerorbits_vs.glsl"), + absPath("${MODULE_SPACE}/shaders/renderablekeplerorbits_fs.glsl") ); } ); diff --git a/modules/space/shaders/debrisViz_fs.glsl b/modules/space/shaders/debrisViz_fs.glsl index 5915e3e6f5..5567149c58 100644 --- a/modules/space/shaders/debrisViz_fs.glsl +++ b/modules/space/shaders/debrisViz_fs.glsl @@ -22,15 +22,19 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -in vec3 vs_position; -in vec3 vs_color; -in vec2 vs_texcoord; +// uniform vec3 color; -out vec4 fs_color; +// in vec3 vs_position; +// in vec3 vs_color; +// in vec2 vs_texcoord; -void main { - fs_color = vec4(vs_color, 1.f); -} +// out vec4 fs_color; + +// Fragment getFragment() { +// Fragment frag; +// frag.color = vec4(color, 1.f); +// return frag; +// }