mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-06 19:39:56 -05:00
Cleanup of gitignore file
Started work on fixing Rosetta
This commit is contained in:
+7
-9
@@ -1,18 +1,17 @@
|
||||
*~
|
||||
*.swp
|
||||
.DS_Store
|
||||
.vscode
|
||||
/bin/
|
||||
/build/
|
||||
/cache/
|
||||
Thumbs.db
|
||||
tmp/
|
||||
|
||||
/documentation
|
||||
/doc
|
||||
/logs
|
||||
/documentation
|
||||
/ext/SGCT
|
||||
/logs
|
||||
tmp/
|
||||
Thumbs.db
|
||||
|
||||
*~
|
||||
*.swp
|
||||
*.gglsl
|
||||
*.GhoulGenerated.glsl
|
||||
*.OpenSpaceGenerated.glsl
|
||||
@@ -31,7 +30,6 @@ install_manifest.txt
|
||||
.project
|
||||
|
||||
shaders/ABuffer/constants.hglsl
|
||||
log.html
|
||||
ScriptLog.txt
|
||||
|
||||
data/scene/atmosphereearth/textures
|
||||
@@ -119,4 +117,4 @@ data/spice/nh_kernels
|
||||
data/spice/OsirisRexKernels
|
||||
data/spice/plu055.bsp
|
||||
data/spice/Rosetta
|
||||
data/spice/sat375.bsp
|
||||
data/spice/sat375.bsp
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user