mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-28 15:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/thesis work merge (#566)

Browse Source 
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
This commit is contained in:
Emil Axelsson
2018-03-20 09:30:59 +01:00
committed by GitHub
parent 35fe90cbfa
commit d64a0df5f6
340 changed files with 26401 additions and 1625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rendering/transferfunction.cpp
View File

@@ -92,7 +92,7 @@ ghoul::opengl::Texture& TransferFunction::getTexture() {
}
void TransferFunction::update() {
if (_needsUpdate) {
/* if (_needsUpdate) {
if (hasExtension(_filepath, "txt")) {
setTextureFromTxt();
} else {
@@ -103,14 +103,14 @@ void TransferFunction::update() {
if (_tfChangedCallback) {
_tfChangedCallback(*this);
}
}
}*/
}
void TransferFunction::setCallback(TfChangedCallback callback) {
_tfChangedCallback = std::move(callback);
}
void TransferFunction::setTextureFromTxt() {
void TransferFunction::setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture> ptr) {
std::ifstream in;
in.open(_filepath.c_str());
@@ -204,6 +204,7 @@ void TransferFunction::setTextureFromTxt() {
}
// no need to deallocate transferFunction. Ownership is transferred to the Texture.
_texture = std::make_unique<ghoul::opengl::Texture>(
transferFunction,
glm::size3_t(width, 1, 1),