mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 14:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/cleanup (#1608)

Browse Source 
* Revert screenlog back to showing Info and above messages
 * Various code cleanup
This commit is contained in:
Alexander Bock
2021-05-25 14:08:33 +02:00
committed by GitHub
parent 53d0b49f6b
commit c3ba532bdb
183 changed files with 4267 additions and 6072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/openspace/rendering/deferredcaster.h
View File

@@ -25,6 +25,7 @@
#ifndef __OPENSPACE_CORE___DEFERREDCASTER___H
#define __OPENSPACE_CORE___DEFERREDCASTER___H
#include <filesystem>
#include <string>
namespace ghoul::opengl {
@@ -46,31 +47,30 @@ public:
const DeferredcastData& /*deferredData*/,
ghoul::opengl::ProgramObject& /*program*/) {};
virtual void postRaycast(const RenderData & /*renderData*/,
virtual void postRaycast(const RenderData& /*renderData*/,
const DeferredcastData& /*deferredData*/,
ghoul::opengl::ProgramObject& /*program*/) {};
virtual std::string deferredcastPath() const = 0;
virtual std::filesystem::path deferredcastPath() const = 0;
virtual std::string deferredcastVSPath() const = 0;
virtual std::filesystem::path deferredcastVSPath() const = 0;
virtual std::string deferredcastFSPath() const = 0;
virtual std::filesystem::path deferredcastFSPath() const = 0;
virtual void initializeCachedVariables(ghoul::opengl::ProgramObject&) = 0;
virtual void update(const UpdateData&) = 0;
/**
* Return a path to a glsl file with helper functions required for the
* transformation and raycast steps.
* This file will be included once per shader program generated,
* regardless of how many volumes say they require the file.
* Ideal to avoid redefinitions of helper functions.
* Return a path to a GLSL file with helper functions required for the transformation
* and raycast steps. This file will be included once per shader program generated,
* regardless of how many volumes say they require the file. Ideal to avoid
* redefinitions of helper functions.
*
* The shader preprocessor will have access to the #{namespace} variable (unique per
* helper file) which should be a prefix to all symbols defined by the helper
*/
virtual std::string helperPath() const = 0;
virtual std::filesystem::path helperPath() const = 0;
};
} // namespace openspace

2
include/openspace/rendering/screenspacerenderable.h
View File

@@ -109,7 +109,7 @@ protected:
properties::TriggerProperty _delete;
glm::ivec2 _objectSize = glm::ivec2(0);
UniformCache(color, alpha, modelTransform, viewProj, texture) _uniformCache;
UniformCache(color, opacity, mvp, texture) _uniformCache;
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
};