mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding satellites with ATM.

Browse Source
This commit is contained in:
Jonathas Costa
2017-07-11 17:46:15 -04:00
parent 39b90863d6
commit ff48f24c96
11 changed files with 1171 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderableplane.cpp
+3
View File
@@ -202,6 +202,9 @@ void RenderablePlane::render(const RenderData& data) {
_shader->setUniform("modelViewProjectionTransform",
data.camera.projectionMatrix() * glm::mat4(modelViewTransform));
_shader->setUniform("modelViewTransform",
glm::mat4(data.camera.combinedViewMatrix() * glm::dmat4(modelViewTransform)));
ghoul::opengl::TextureUnit unit;
unit.activate();
modules/base/rendering/renderabletrail.cpp
+2 -2
View File
@@ -226,7 +226,7 @@ void RenderableTrail::render(const RenderData & data) {
glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)));
_programObject->setUniform("projectionTransform", data.camera.projectionMatrix());
_programObject->setUniform("color", _lineColor);
_programObject->setUniform("useLineFade", _useLineFade);
if (_useLineFade) {
@@ -246,7 +246,7 @@ void RenderableTrail::render(const RenderData & data) {
if (usingFramebufferRenderer) {
glDepthMask(false);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
//glBlendFunc(GL_SRC_ALPHA, GL_ONE);
}
bool renderLines =