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

Updated Ghoul version

Browse Source 
Started cleaning up OpenSpace
This commit is contained in:
Alexander Bock
2015-12-13 22:01:42 -08:00
parent 8260f5701d
commit e26f1d41a4
34 changed files with 304 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/volume/rendering/renderablevolumegl.cpp
+4 -4
View File
@@ -177,13 +177,13 @@ bool RenderableVolumeGL::initialize() {
if(_filename != "") {
_volume = loadVolume(_filename, _hintsDictionary);
_volume->uploadTexture();
OsEng.renderEngine()->aBuffer()->addVolume(_volumeName, _volume);
OsEng.renderEngine().aBuffer()->addVolume(_volumeName, _volume);
}
if(_transferFunctionPath != "") {
_transferFunction = loadTransferFunction(_transferFunctionPath);
_transferFunction->uploadTexture();
OsEng.renderEngine()->aBuffer()->addTransferFunction(_transferFunctionName, _transferFunction);
OsEng.renderEngine().aBuffer()->addTransferFunction(_transferFunctionName, _transferFunction);
auto textureCallback = [this](const ghoul::filesystem::File& file) {
_updateTransferfunction = true;
@@ -192,9 +192,9 @@ bool RenderableVolumeGL::initialize() {
}
// add the sampler and get the ID
_id = OsEng.renderEngine()->aBuffer()->addSamplerfile(_samplerFilename);
_id = OsEng.renderEngine().aBuffer()->addSamplerfile(_samplerFilename);
OsEng.configurationManager()->getValue("RaycastProgram", _boxProgram);
OsEng.configurationManager().getValue("RaycastProgram", _boxProgram);
// ============================
// GEOMETRY (box)