mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-19 11:29:08 -06:00
fix for windows. removed thread for updating texture.
This commit is contained in:
@@ -67,6 +67,7 @@ bool ISWACygnet::initialize(){
|
||||
|
||||
bool ISWACygnet::deinitialize(){
|
||||
_parent = nullptr;
|
||||
return true;
|
||||
}
|
||||
|
||||
void ISWACygnet::render(){
|
||||
|
||||
@@ -22,8 +22,10 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __DATASURFACE_H__
|
||||
#define __DATASURFACE_H__
|
||||
#ifndef __ISWACYGNET_H__
|
||||
#define __ISWACYGNET_H__
|
||||
#define _USE_MATH_DEFINES
|
||||
#include <math.h>
|
||||
#include <openspace/properties/propertyowner.h>
|
||||
#include <memory>
|
||||
#include <modules/kameleon/include/kameleonwrapper.h>
|
||||
|
||||
@@ -46,15 +46,21 @@ bool ISWAManager::initialize(){
|
||||
addISWACygnet("${OPENSPACE_DATA}/BATSRUS.cdf");
|
||||
// addISWACygnet("${OPENSPACE_DATA}/ENLIL.cdf");
|
||||
addISWACygnet("${OPENSPACE_DATA}/test.png");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ISWAManager::deinitialize(){
|
||||
for(iSWACygnet : _iSWACygnets)
|
||||
for(auto iSWACygnet : _iSWACygnets)
|
||||
iSWACygnet->deinitialize();
|
||||
|
||||
return true;
|
||||
}
|
||||
bool ISWAManager::isReady() const {}
|
||||
|
||||
bool ISWAManager::isReady() const { return true; }
|
||||
|
||||
void ISWAManager::render(const RenderData& data){
|
||||
for(iSWACygnet : _iSWACygnets){
|
||||
for(auto iSWACygnet : _iSWACygnets){
|
||||
if(iSWACygnet->enabled()){
|
||||
iSWACygnet->render();
|
||||
}
|
||||
@@ -62,7 +68,7 @@ void ISWAManager::render(const RenderData& data){
|
||||
}
|
||||
|
||||
void ISWAManager::update(const UpdateData& data){
|
||||
for(iSWACygnet : _iSWACygnets)
|
||||
for(auto iSWACygnet : _iSWACygnets)
|
||||
iSWACygnet->update();
|
||||
}
|
||||
|
||||
|
||||
@@ -68,8 +68,6 @@ TexturePlane::~TexturePlane(){
|
||||
|
||||
bool TexturePlane::initialize(){
|
||||
ISWACygnet::initialize();
|
||||
std::thread t = std::thread(std::bind(&TexturePlane::updateTexture, this));
|
||||
t.detach();
|
||||
glGenVertexArrays(1, &_quad); // generate array
|
||||
glGenBuffers(1, &_vertexPositionBuffer); // generate buffer
|
||||
createPlane();
|
||||
|
||||
@@ -368,11 +368,6 @@ float* KameleonWrapper::getUniformSliceValues(
|
||||
|
||||
_model->loadVariable(var);
|
||||
|
||||
auto vars = _model->getLoadedVariables();
|
||||
for(v :vars){
|
||||
std::cout << v << std::endl;
|
||||
}
|
||||
|
||||
double varMin = _model->getVariableAttribute(var, "actual_min").getAttributeFloat();
|
||||
double varMax = _model->getVariableAttribute(var, "actual_max").getAttributeFloat();
|
||||
|
||||
|
||||
@@ -207,6 +207,8 @@ bool RenderEngine::initialize() {
|
||||
#endif // GHOUL_USE_SOIL
|
||||
|
||||
ghoul::io::TextureReader::ref().addReader(std::make_shared<ghoul::io::TextureReaderCMAP>());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool RenderEngine::initializeGL() {
|
||||
|
||||
Reference in New Issue
Block a user