projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quick backup of changes:
[demo]
/
src
/
opengl
/
opengl.cc
diff --git
a/src/opengl/opengl.cc
b/src/opengl/opengl.cc
index
f05ea61
..
d2aea3b
100644
(file)
--- a/
src/opengl/opengl.cc
+++ b/
src/opengl/opengl.cc
@@
-2,9
+2,15
@@
#include <stdio.h>
#include "opengl/opengl.h"
#include <stdio.h>
#include "opengl/opengl.h"
-#include "common-ui.h"
extern GLFWwindow *win;
extern GLFWwindow *win;
+extern int win_h;
+extern int win_w;
+
+/* static test_* functions are going to be removed: just to test the shaders */
+static void test_draw();
+static void test_torus();
+
bool init_opengl()
{
if(!glfwInit()) {
bool init_opengl()
{
if(!glfwInit()) {
@@
-37,4
+43,11
@@
void display_opengl()
{
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(0.5, 0.5, 0.5, 1.0);
{
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(0.5, 0.5, 0.5, 1.0);
+
+}
+
+static void test_draw()
+{
+ /* this function is going to be removed, it's here only to test the shaders */
+
}
\ No newline at end of file
}
\ No newline at end of file