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

More robust readData function

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-22 10:29:36 -04:00
parent 7c350ae2a9
commit ec49ae51a4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/dataplane.cpp
+4 -4
View File
@@ -132,9 +132,8 @@ bool DataPlane::deinitialize(){
bool DataPlane::loadTexture() {
float* values = readData();
if(!values){
if(!values)
return false;
}
if (!_texture) {
std::unique_ptr<ghoul::opengl::Texture> texture = std::make_unique<ghoul::opengl::Texture>(
@@ -221,10 +220,10 @@ void DataPlane::readHeader(){
}
float* DataPlane::readData(){
if(!_dataOptions.options().size()) // load options for value selection
if(!_memorybuffer.empty()){
if(!_dataOptions.options().size()) // load options for value selection
readHeader();
if(!_memorybuffer.empty()){
std::stringstream memorystream(_memorybuffer);
std::string line;
@@ -317,6 +316,7 @@ float* DataPlane::readData(){
} else {
LWARNING("Noting in memory buffer, are you connected to the information super highway?");
return nullptr;
}
}