mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-06 19:39:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup for Spheres and PSC (#827)

Browse Source 
* Fade fixes
  * Clean up RenderableSphere. Add orientation properties.
  * Sane defaults for Digital Universe
  * Clean up New Horizons related code
  * Add basic scene
  * Add ability to initialize rotation as quaternion and mat3
  * Adapt legacy code to new Renderable interface
This commit is contained in:
Emil Axelsson
2019-04-24 13:34:49 +02:00
committed by Alexander Bock
parent e78121febc
commit 50ff2d96d2
77 changed files with 667 additions and 2848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/debugging/rendering/renderabledebugplane.cpp
+5 -1
View File
@@ -218,7 +218,11 @@ void RenderableDebugPlane::render(const RenderData& data, RendererTasks&) {
_shader->setUniform("ViewProjection", data.camera.viewProjectionMatrix());
_shader->setUniform("ModelTransform", transform);
setPscUniforms(*_shader, data.camera, data.position);
_shader->setUniform("campos", glm::vec4(data.camera.positionVec3(), 1.f));
_shader->setUniform("objpos", glm::vec4(data.modelTransform.translation, 0.f));
_shader->setUniform("camrot", glm::mat4(data.camera.viewRotationMatrix()));
_shader->setUniform("scaling", glm::vec2(1.f, 0.f));
ghoul::opengl::TextureUnit unit;
unit.activate();