Code cleanup branch (#618)

* 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
+10 -11
View File
@@ -25,14 +25,12 @@
#ifndef __OPENSPACE_MODULE_CEFWEBGUI___GUI_RENDER_HANDLER___H__
#define __OPENSPACE_MODULE_CEFWEBGUI___GUI_RENDER_HANDLER___H__
#include <memory>
#include <include/openspace/engine/openspaceengine.h>
#include <include/openspace/rendering/renderengine.h>
#include <include/openspace/engine/wrapper/windowwrapper.h>
#include <modules/webbrowser/include/webrenderhandler.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <fmt/format.h>
#include <include/cef_app.h>
#include "modules/webbrowser/include/webrenderhandler.h"
#include <memory>
namespace ghoul::opengl { class ProgramObject; }
namespace openspace {
@@ -41,14 +39,15 @@ public:
GUIRenderHandler();
void initializeGL();
void deinitializeGL();
void draw();
void render() {};
void render();
private:
std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
GLuint _program;
GLuint _vao;
GLuint _vbo;
GLuint _vao = 0;
GLuint _vbo = 0;
};
} // namespace openspace