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

Code cleanup branch (#618)

Browse Source 
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
This commit is contained in:
Alexander Bock
2018-06-10 04:47:34 +00:00
committed by GitHub
parent 5de728442d
commit 4952f8f977
796 changed files with 22428 additions and 24063 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cefwebgui/src/guirenderhandler.cpp
+33 -17
View File
@@ -22,37 +22,44 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <glm/gtc/matrix_transform.hpp>
#include <modules/cefwebgui/include/guirenderhandler.h>
#include <openspace/engine/openspaceengine.h>
#include <ghoul/filesystem/filesystem.h>
#include "modules/cefwebgui/include/guirenderhandler.h"
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/textureunit.h>
namespace {
std::string _loggerCat = "WebGUI:RenderHandler";
}
constexpr const char* _loggerCat = "WebGUI:RenderHandler";
} // namespace
namespace openspace {
GUIRenderHandler::GUIRenderHandler() {
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::InitializeGL,
[this](){
LDEBUG("Initializing WebGUI RenderHandler OpenGL");
initializeGL();
}
OpenSpaceEngine::CallbackOption::InitializeGL,
[this]() {
LDEBUG("Initializing WebGUI RenderHandler OpenGL");
initializeGL();
}
);
}
void GUIRenderHandler::initializeGL() {
LDEBUG("Initializing CEF GL environment...");
_programObject = ghoul::opengl::ProgramObject::Build(
"WebGUICEFProgram",
absPath("${MODULE_CEFWEBGUI}/shaders/gui_vs.glsl"),
absPath("${MODULE_CEFWEBGUI}/shaders/gui_fs.glsl")
"WebGUICEFProgram",
absPath("${MODULE_CEFWEBGUI}/shaders/gui_vs.glsl"),
absPath("${MODULE_CEFWEBGUI}/shaders/gui_fs.glsl")
);
float data[] = {-1.0f, -1.0f, -1.0f,
1.0f, 1.0f, -1.0f,
1.0f, -1.0f, -1.0f,
1.0f, 1.0f, 1.0f};
float data[] = {
-1.0f, -1.0f, -1.0f,
1.0f, 1.0f, -1.0f,
1.0f, -1.0f, -1.0f,
1.0f, 1.0f, 1.0f
};
glGenVertexArrays(1, &_vao);
glBindVertexArray(_vao);
glGenBuffers(1, &_vbo);
@@ -65,7 +72,14 @@ void GUIRenderHandler::initializeGL() {
LDEBUG("Initializing CEF GL environment... done!");
}
void GUIRenderHandler::draw(void) {
void GUIRenderHandler::deinitializeGL() {
_programObject = nullptr;
glDeleteVertexArrays(1, &_vao);
glDeleteBuffers(1, &_vbo);
}
void GUIRenderHandler::draw() {
if (_programObject->isDirty()) {
_programObject->rebuildFromFile();
}
@@ -92,4 +106,6 @@ void GUIRenderHandler::draw(void) {
glEnable(GL_CULL_FACE);
}
void GUIRenderHandler::render() {}
} // namespace openspace