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

Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz

Browse Source
This commit is contained in:
Alexander Bock
2015-02-19 16:24:01 +01:00
parent f00158969c 4487bc3500
commit 9bad48ae2e
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/openspaceengine.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
bool initializeGL();
void preSynchronization();
void postSynchronizationPreDraw();
void render();
void render(const glm::mat4 &projectionMatrix, const glm::mat4 &viewMatrix);
void postDraw();
void keyboardCallback(int key, int action);
void charCallback(unsigned int codepoint);
include/openspace/rendering/renderengine.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
bool initializeGL();
void postSynchronizationPreDraw();
void preSynchronization();
void render();
void render(const glm::mat4 &projectionMatrix, const glm::mat4 &viewMatrix);
void postDraw();
void takeScreenshot();