mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-13 23:20:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed filterbug, _nstates now in .h file and flux scale by only radius

Browse Source
This commit is contained in:
Christian Adamsson
2020-06-17 22:46:58 +02:00
parent 07c44c57a6
commit 169fa06d99
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/fieldlinessequence/rendering/renderablestreamnodes.cpp
View File

@@ -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){

4
modules/fieldlinessequence/rendering/renderablestreamnodes.h
View File

@@ -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

7
modules/fieldlinessequence/shaders/streamnodes_vs.glsl
View File

@@ -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);
//}