mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-01 09:08:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of gitignore file

Browse Source 
Started work on fixing Rosetta
This commit is contained in:
Alexander Bock
2017-07-19 22:05:12 -04:00
parent 4b3037144f
commit 36e97f1f62
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/rendering/renderabletrailtrajectory.cpp
View File

@@ -255,7 +255,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
// If only trail so far should be rendered, we need to find the corresponding time
// in the array and only render it until then
_primaryRenderInformation.first = 0;
double t = (data.time.j2000Seconds() - _start) / (_end - _start);
double t = std::max(0.0, (data.time.j2000Seconds() - _start) / (_end - _start));
_primaryRenderInformation.count = std::min(
static_cast<GLsizei>(ceil(_vertexArray.size() * t)),
static_cast<GLsizei>(_vertexArray.size() - 1)

4
modules/newhorizons/shaders/renderableModel_fs.glsl
View File

@@ -84,7 +84,7 @@ Fragment getFragment() {
}
frag.color.a = 1.0;
// frag.depth = vs_positionScreenSpace.w;
frag.depth = 0.0;
frag.depth = vs_positionScreenSpace.w;
// frag.depth = 0.0;
return frag;
}