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

Intermediate commit

Browse Source
This commit is contained in:
Jonas Strandstedt
2014-10-10 11:29:16 +02:00
parent fdd0efccfc
commit 9a1b59a73e
14 changed files with 226 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/abuffer/abuffer.h
+4 -11
View File
@@ -64,10 +64,10 @@ protected:
void generateShaderSource();
bool updateShader();
std::string openspaceHeaders();
std::string openspaceSamplerCalls();
std::string openspaceSamplers();
std::string openspaceTransferFunction();
void openspaceHeaders();
void openspaceSamplerCalls();
void openspaceSamplers();
void openspaceTransferFunction();
unsigned int _width, _height, _totalPixels;
@@ -75,8 +75,6 @@ private:
GLuint _screenQuad;
bool _validShader;
std::string _fragmentShaderPath;
ghoul::filesystem::File* _fragmentShaderFile;
ghoul::opengl::ProgramObject* _resolveShader;
std::vector<std::pair<std::string,ghoul::opengl::Texture*> > _volumes;
@@ -84,13 +82,8 @@ private:
std::vector<ghoul::filesystem::File*> _samplerFiles;
std::vector<std::string> _samplers;
// Development functionality to update shader for changes in several files
std::vector<ghoul::filesystem::File*> _shaderFiles;
float _volumeStepFactor;
}; // ABuffer
} // openspace
include/openspace/abuffer/abufferdynamic.h
-3
View File
@@ -51,9 +51,6 @@ private:
GLuint _fragmentBuffer;
GLuint _fragmentTexture;
}; // ABufferDynamic
} // openspace