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

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source 
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
This commit is contained in:
Alexander Bock
2017-11-09 10:51:56 -05:00
parent dc85ee6cd7 ca7053d8f2
commit 88cf7926ae
37 changed files with 1002 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+10 -2
View File
@@ -235,7 +235,11 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
// data.time.j2000Seconds()
// );
glm::dmat3 tm = SpiceManager::ref().frameTransformationMatrix(_instrumentName, "ECLIPJ2000", data.time.j2000Seconds());
glm::dmat3 tm = SpiceManager::ref().frameTransformationMatrix(
_instrumentName,
"ECLIPJ2000",
data.time.j2000Seconds()
);
//_positions[SourcePosition] = { 0.f, 0.f, 0.f, 0.f };
@@ -267,7 +271,11 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
{ _lineColorBegin.r, _lineColorBegin.g, _lineColorBegin.b, _lineColorBegin.a }
},
{
{ target.x * powf(10, target.w), target.y * powf(10, target.w), target.z * powf(10, target.w) },
{
target.x * powf(10, target.w),
target.y * powf(10, target.w),
target.z * powf(10, target.w)
},
{ _lineColorEnd.r, _lineColorEnd.g, _lineColorEnd.b, _lineColorEnd.a }
}
};