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

Merge pull request #1068 from OpenSpace/issue/1065

Browse Source 
Issue/1065
This commit is contained in:
Alexander Bock
2020-02-10 14:54:03 +01:00
committed by GitHub
parent 49c793d976 e23efd61ad
commit 3c88ee5de3
3 changed files with 168 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderabletrail.cpp
+17
View File
@@ -249,6 +249,18 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
}
void RenderableTrail::initializeGL() {
#ifdef __APPLE__
_programObject = BaseModule::ProgramObjectManager.request(
ProgramName,
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
return global::renderEngine.buildRenderProgram(
ProgramName,
absPath("${MODULE_BASE}/shaders/renderabletrail_apple_vs.glsl"),
absPath("${MODULE_BASE}/shaders/renderabletrail_apple_fs.glsl")
);
}
);
#else
_programObject = BaseModule::ProgramObjectManager.request(
ProgramName,
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
@@ -259,6 +271,7 @@ void RenderableTrail::initializeGL() {
);
}
);
#endif
ghoul::opengl::updateUniformLocations(*_programObject, _uniformCache, UniformNames);
}
@@ -320,7 +333,11 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
(_appearance.renderingModes == RenderingModeLinesPoints);
if (renderLines) {
#ifdef __APPLE__
glLineWidth(1.f);
#else
glLineWidth(ceil((2.f * 1.f + _appearance.lineWidth) * std::sqrt(2.f)));
#endif
}
if (renderPoints) {
glEnable(GL_PROGRAM_POINT_SIZE);