mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 09:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added:

Browse Source 
New obj mod file with separate obj-loads
Imagesequencer - active instrument slightly improved
Printout of active instrument
Ortho-square dissapears when not needed
This commit is contained in:
Michal Marcinkowski
2015-02-24 00:03:00 -05:00
parent aae0516acd
commit 85e13f7738
9 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/renderablefov.cpp
+2 -6
View File
@@ -413,7 +413,7 @@ void RenderableFov::render(const RenderData& data){
if (instrument == "MVIC"){
if (_instrumentID == "NH_RALPH_MVIC_PAN1" ||
_instrumentID == "NH_RALPH_MVIC_PAN2" ||
_instrumentID == "NH_RALPH_MVIC_RED" ||
_instrumentID == "NH_RALPH_MVIC_RED" ||
_instrumentID == "NH_RALPH_MVIC_BLUE" ||
_instrumentID == "NH_RALPH_MVIC_FT"){
drawFOV = true;
@@ -453,10 +453,6 @@ void RenderableFov::render(const RenderData& data){
}
computeColors();
double t2 = openspace::ImageSequencer::ref().getNextCaptureTime();
double diff = (t2 - _time);
double t = 0.0;
if (diff <= 30.0) t = 1.f - diff / 30.0;
double targetEpoch;
// for each FOV vector
@@ -527,7 +523,7 @@ void RenderableFov::render(const RenderData& data){
//second vbo
if (_withinFOV){
glLineWidth(2.f);
glLineWidth(1.f);
glBindVertexArray(_vaoID[1]);
glDrawArrays(GL_LINE_LOOP, 0, _vtotal[1]);
glBindVertexArray(0);