bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Load all data sets ahead of time.

Browse Source 
This allows for easier flipping through all images.
This commit is contained in:
Bert Peters
2018-04-19 14:17:56 +02:00
parent 08c805377e
commit 03cac53d05
2 changed files with 73 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/fmri/RenderingState.hpp
View File

@@ -73,13 +73,10 @@ namespace fmri
} options;
std::array<float, 3> pos;
std::array<float, 2> angle;
std::map<std::string, LayerInfo> layerInfo;
std::vector<std::vector<LayerData>> layerData;
std::vector<std::vector<LayerData>>::iterator currentData;
std::vector<std::unique_ptr<LayerVisualisation>> layerVisualisations;
std::vector<std::unique_ptr<Animation>> interactionAnimations;
std::future<bool> visualisationFuture;
std::future<std::pair<decltype(layerInfo), decltype(layerData)>> simulationFuture;
std::vector<std::vector<std::pair<std::unique_ptr<LayerVisualisation>, std::unique_ptr<Animation>>>> visualisations;
std::future<decltype(visualisations)> loadingFuture;
decltype(visualisations)::iterator currentData;
RenderingState() noexcept;
@@ -87,7 +84,7 @@ namespace fmri
void configureRenderingContext() const;
void move(unsigned char key, bool sprint);
void updateVisualisers();
void idleFunc();
std::string debugInfo() const;
@@ -96,8 +93,6 @@ namespace fmri
void drawLayer(float time, unsigned long i) const;
void queueUpdate();
void renderVisualisation(float time) const;
void loadGLItems();