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

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source 
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
This commit is contained in:
Alexander Bock
2017-11-09 10:51:56 -05:00
parent dc85ee6cd7 ca7053d8f2
commit 88cf7926ae
37 changed files with 1002 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/debugging/rendering/renderabledebugplane.cpp
View File

@@ -274,7 +274,14 @@ void RenderableDebugPlane::createPlane() {
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, nullptr);
glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 6, reinterpret_cast<void*>(sizeof(GLfloat) * 4));
glVertexAttribPointer(
1,
2,
GL_FLOAT,
GL_FALSE,
sizeof(GLfloat) * 6,
reinterpret_cast<void*>(sizeof(GLfloat) * 4)
);
}
} // namespace openspace