mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06: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

18
modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
View File

@@ -219,7 +219,7 @@ void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
glDrawArrays(GL_LINES, 0, 2);
glBindVertexArray(0);
_program->deactivate();
}
@@ -228,12 +228,12 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
_program->rebuildFromFile();
}
glm::dmat3 transformMatrix = SpiceManager::ref().positionTransformMatrix(
_source,
//"ECLIPJ2000",
"GALACTIC",
data.time.j2000Seconds()
);
// glm::dmat3 transformMatrix = SpiceManager::ref().positionTransformMatrix(
// _source,
// //"ECLIPJ2000",
// "GALACTIC",
// data.time.j2000Seconds()
// );
glm::dmat3 tm = SpiceManager::ref().frameTransformationMatrix(_instrumentName, "ECLIPJ2000", data.time.j2000Seconds());
@@ -249,9 +249,9 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
//catch (const SpiceManager::SpiceException& e) {
//LERROR(e.what());
//}
glm::vec4 target(boresight[0], boresight[1], boresight[2], 12);
//target = glm::dmat4(tm) * target;
target = glm::dmat4(tm) * target;
//_positions[TargetPosition] = target;
//_positions[TargetPosition] = {