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

New asset structure and fixes for sphere slices

Browse Source
This commit is contained in:
Christian Adamsson
2020-08-11 16:00:04 +02:00
parent d4908040d2
commit e51032ce0f
8 changed files with 114 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/streamnodes/rendering/renderabletimevaryingplaneimagelocal.cpp
+5 -5
View File
@@ -233,7 +233,7 @@ namespace openspace {
//LDEBUG("Vi borde uppdatera1");
// _mustLoadNewStateFromDisk = true;
LDEBUG("vi borde uppdatera");
//LDEBUG("vi borde uppdatera");
_needsUpdate = true;
} // else {we're still in same state as previous frame (no changes needed)}
@@ -319,10 +319,10 @@ namespace openspace {
std::unique_ptr<ghoul::opengl::Texture> texture =
ghoul::io::TextureReader::ref().loadTexture(absPath(path));
LDEBUGC(
"RenderableTimeVaryingPlaneImageLocal",
fmt::format("Loaded texture from '{}'", absPath(path))
);
// LDEBUGC(
// "RenderableTimeVaryingPlaneImageLocal",
// fmt::format("Loaded texture from '{}'", absPath(path))
//);
texture->uploadTexture();
texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
texture->purgeFromRAM();
modules/streamnodes/rendering/renderabletimevaryingsphere.cpp
+5 -5
View File
@@ -524,7 +524,7 @@ void RenderableTimeVaryingSphere::update(const UpdateData& data) {
//LDEBUG("Vi borde uppdatera1");
// _mustLoadNewStateFromDisk = true;
LDEBUG("vi borde uppdatera");
//LDEBUG("vi borde uppdatera");
_needsUpdate = true;
} // else {we're still in same state as previous frame (no changes needed)}
@@ -623,10 +623,10 @@ void RenderableTimeVaryingSphere::loadTexture() {
std::unique_ptr<ghoul::opengl::Texture> texture =
ghoul::io::TextureReader::ref().loadTexture(absPath(path));
LDEBUGC(
"RenderableTimeVaryingSphere",
fmt::format("Loaded texture from '{}'", absPath(path))
);
//LDEBUGC(
// "RenderableTimeVaryingSphere",
// fmt::format("Loaded texture from '{}'", absPath(path))
// );
texture->uploadTexture();
texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
texture->purgeFromRAM();