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

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source 
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
This commit is contained in:
Alexander Bock
2017-11-08 19:10:59 -06:00
parent e63b7ea396 44806687bf
commit acdfefe46d
380 changed files with 1913 additions and 2014 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+9 -9
View File
@@ -146,7 +146,7 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
_colorTexturePath = absPath(dictionary.value<std::string>(
ColorTextureInfo.identifier
));
addPropertySubOwner(_geometry.get());
addPropertySubOwner(_projectionComponent);
@@ -156,7 +156,7 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
_projectionComponent.initialize(
dictionary.value<ghoul::Dictionary>(keyProjection)
);
float boundingSphereRadius = 1.0e9;
dictionary.getValue(keyBoundingSphereRadius, boundingSphereRadius);
setBoundingSphere(boundingSphereRadius);
@@ -252,7 +252,7 @@ void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
glm::vec3 directionToSun = glm::normalize(_sunPosition.vec3() - glm::vec3(bodyPosition));
glm::vec3 directionToSunViewSpace = glm::mat3(data.camera.combinedViewMatrix()) * directionToSun;
_programObject->setUniform("_performShading", _performShading);
_programObject->setUniform("directionToSunViewSpace", directionToSunViewSpace);
_programObject->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
@@ -261,7 +261,7 @@ void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
_geometry->setUniforms(*_programObject);
ghoul::opengl::TextureUnit unit[2];
unit[0].activate();
_baseTexture->bind();
@@ -272,7 +272,7 @@ void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
_programObject->setUniform("projectionTexture", unit[1]);
_geometry->render();
_programObject->deactivate();
}
@@ -286,7 +286,7 @@ void RenderableModelProjection::update(const UpdateData& data) {
}
_projectionComponent.update();
if (_depthFboProgramObject->isDirty()) {
_depthFboProgramObject->rebuildFromFile();
}
@@ -303,9 +303,9 @@ void RenderableModelProjection::update(const UpdateData& data) {
);
}
}
_stateMatrix = data.modelTransform.rotation;
glm::dvec3 p =
OsEng.renderEngine().scene()->sceneGraphNode("Sun")->worldPosition() -
data.modelTransform.translation;
@@ -395,7 +395,7 @@ void RenderableModelProjection::attitudeParameters(double time) {
);
psc position = PowerScaledCoordinate::CreatePowerScaledCoordinate(p.x, p.y, p.z);
position[3] += 4;
glm::vec3 cpos = position.vec3();