mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-05 20:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

pre rebase

Browse Source
This commit is contained in:
Elon
2019-04-10 13:34:54 -06:00
committed by ElonOlsson
parent c1205959a5
commit 847af32a5f
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/space/rendering/renderablesatellites.cpp
View File

@@ -602,8 +602,8 @@ void RenderableSatellites::initializeGL() {
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
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")
);
}
);

18
modules/space/shaders/debrisViz_fs.glsl
View File

@@ -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;
// }