diff --git a/modules/fieldlinessequence/rendering/renderablestreamnodes.cpp b/modules/fieldlinessequence/rendering/renderablestreamnodes.cpp index f036e862db..7fd453d5c9 100644 --- a/modules/fieldlinessequence/rendering/renderablestreamnodes.cpp +++ b/modules/fieldlinessequence/rendering/renderablestreamnodes.cpp @@ -301,7 +301,7 @@ namespace openspace { //if (!_loadingStatesDynamically) { // _sourceFiles.clear(); //} - _nStates = 274; + //_nStates = 20; setupProperties(); extractTriggerTimesFromFileNames(); @@ -400,7 +400,8 @@ namespace openspace { float ninetyDeToRad = 1.57079633f * 2; const float pi = 3.14159265359f; - float rTimesFluxValue = rValue * rValue * fluxValue; + //float rTimesFluxValue = rValue * rValue * fluxValue; + float rTimesFluxValue = rValue * fluxValue; rValue = rValue * AuToMeter; //if(thetaValue > 1.4 && thetaValue < 1.6){ diff --git a/modules/fieldlinessequence/rendering/renderablestreamnodes.h b/modules/fieldlinessequence/rendering/renderablestreamnodes.h index 8e47a626d2..62c63c664d 100644 --- a/modules/fieldlinessequence/rendering/renderablestreamnodes.h +++ b/modules/fieldlinessequence/rendering/renderablestreamnodes.h @@ -79,7 +79,7 @@ namespace openspace { // ------------------------------------- FLAGS -------------------------------------// // False => states are stored in RAM (using 'in-RAM-states'), True => states are // loaded from disk during runtime (using 'runtime-states') - bool _loadingStatesDynamically = true; + bool _loadingStatesDynamically = false; // False => the previous frame's state should still be shown bool _needsUpdate = false; @@ -103,7 +103,7 @@ namespace openspace { // Estimated end of sequence. double _sequenceEndTime; // Number of states in the sequence - size_t _nStates = 0; + size_t _nStates = 200; GLuint _vertexArrayObject = 0; // OpenGL Vertex Buffer Object containing the vertex positions diff --git a/modules/fieldlinessequence/shaders/streamnodes_vs.glsl b/modules/fieldlinessequence/shaders/streamnodes_vs.glsl index 8e69e5f8da..bcf5bef8aa 100644 --- a/modules/fieldlinessequence/shaders/streamnodes_vs.glsl +++ b/modules/fieldlinessequence/shaders/streamnodes_vs.glsl @@ -100,8 +100,8 @@ void main() { //vs_color = streamColor; - //if(rValue > filterRadius && rValue filterUpper){ - if(rValue > filterRadius){ + if(rValue > filterRadius && rValue < filterUpper){ + //if(rValue > filterRadius){ if(colorMode == 0){ vs_color = streamColor; } @@ -113,6 +113,9 @@ void main() { vs_color = vec4(0); } } + else{ + vs_color = vec4(0); + } //if(rValue > thresholdRadius){ // vs_color = vec4(0); //}