mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 05:58:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

windows fix, add base module as dependency to iswa

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-04 12:43:59 -04:00
parent 3a80405c30
commit bf9a819617
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/dataplane.cpp
+3 -3
View File
@@ -208,7 +208,7 @@ void DataPlane::setUniforms(){
int activeTransferfunctions = _transferFunctions.size();
ghoul::opengl::TextureUnit txUnits[activeTextures];
ghoul::opengl::TextureUnit txUnits[10];
int j = 0;
for(int option : selectedOptions){
if(_textures[option]){
@@ -223,7 +223,7 @@ void DataPlane::setUniforms(){
}
}
ghoul::opengl::TextureUnit tfUnits[activeTransferfunctions];
ghoul::opengl::TextureUnit tfUnits[10];
j = 0;
if((activeTransferfunctions == 1) && (_textures.size() != _transferFunctions.size())){
@@ -538,7 +538,7 @@ void DataPlane::setTransferFunctions(std::string tfPath){
if(tfFile.is_open()){
while(getline(tfFile, line)){
std::shared_ptr<TransferFunction> tf = std::make_shared<TransferFunction>(line);
std::shared_ptr<TransferFunction> tf = std::make_shared<TransferFunction>(absPath(line));
if(tf)
tfs.push_back(tf);
}