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

Add rendering of optimistic vs conservative HZ boundaries

Browse Source
This commit is contained in:
Emma Broman
2021-01-22 14:33:01 +01:00
parent 10d615cdc8
commit d693dd0bbe
7 changed files with 271 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/base/rendering/renderabledisc.cpp
View File

@@ -122,7 +122,6 @@ RenderableDisc::RenderableDisc(const ghoul::Dictionary& dictionary)
_width = static_cast<float>(dictionary.value<double>(WidthInfo.identifier));
}
addProperty(_width);
addProperty(_opacity);
setRenderBin(Renderable::RenderBin::PostDeferredTransparent);
@@ -140,13 +139,7 @@ void RenderableDisc::initialize() {
}
void RenderableDisc::initializeGL() {
_shader = global::renderEngine->buildRenderProgram(
"DiscProgram",
absPath("${MODULE_BASE}/shaders/disc_vs.glsl"),
absPath("${MODULE_BASE}/shaders/disc_fs.glsl")
);
ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
initializeShader();
_texture->loadFromFile(_texturePath);
_texture->uploadToGpu();
@@ -204,7 +197,7 @@ void RenderableDisc::render(const RenderData& data, RendererTasks&) {
void RenderableDisc::update(const UpdateData&) {
if (_shader->isDirty()) {
_shader->rebuildFromFile();
ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
updateUniformLocations();
}
if (_planeIsDirty) {
@@ -215,6 +208,19 @@ void RenderableDisc::update(const UpdateData&) {
_texture->update();
}
void RenderableDisc::initializeShader() {
_shader = global::renderEngine->buildRenderProgram(
"DiscProgram",
absPath("${MODULE_BASE}/shaders/disc_vs.glsl"),
absPath("${MODULE_BASE}/shaders/disc_fs.glsl")
);
updateUniformLocations();
}
void RenderableDisc::updateUniformLocations() {
ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
}
float RenderableDisc::planeSize() {
return _size;
}