mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-24 22:09:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

master merge + seed point files from directory fix

Browse Source
This commit is contained in:
ElonOlsson
2021-05-18 12:00:53 -04:00
parent 9d1ece1163 205d4c9db1
commit fcc690fa09
164 changed files with 3123 additions and 3951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/base/rendering/renderableplane.cpp
View File

@@ -102,7 +102,7 @@ namespace {
// [[codegen::verbatim(BlendModeInfo.description)]]
std::optional<BlendMode> blendMode;
// [[codegen::verbatim(BlendModeInfo.description)]]
// [[codegen::verbatim(MultiplyColorInfo.description)]]
std::optional<glm::vec3> multiplyColor [[codegen::color()]];
};
#include "renderableplane_codegen.cpp"
@@ -290,6 +290,7 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
glBindVertexArray(_quad);
glDrawArrays(GL_TRIANGLES, 0, 6);
glBindVertexArray(0);
if (additiveBlending) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -342,6 +343,7 @@ void RenderablePlane::createPlane() {
sizeof(GLfloat) * 6,
reinterpret_cast<void*>(sizeof(GLfloat) * 4)
);
glBindVertexArray(0);
}
} // namespace openspace