tweaks

glisy · Feb 4, 2016 · 1bf8bc3 · 1bf8bc3
1 parent aaf2c4d
commit 1bf8bc3
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 33 deletions.
diff --git a/include/glisy/context.h b/include/glisy/context.h
@@ -1,8 +1,6 @@
 #ifndef GLISY_CONTEXT_H
 #define GLISY_CONTEXT_H
 
-#include <glisy/window.h>
-#include <glisy/events.h>
 #include <glisy/program.h>
 
 /**
@@ -18,18 +16,6 @@ struct glisy_context {
 
   glisy_program program;
 
-  /**
-   * glisy window interface.
-   */
-
-  glisy_window window;
-
-  /**
-   * glisy event manager.
-   */
-
-  glisy_events events;
-
   /**
    * Optional program name.
    */

diff --git a/src/context.c b/src/context.c
@@ -1,4 +1,3 @@
-
 #include <stdio.h>
 #include <glisy/gl.h>
 #include <glisy/context.h>

diff --git a/src/glisy.c b/src/glisy.c
@@ -1,16 +1,10 @@
-
 #include <glisy/glisy.h>
 
 int
 glisy_init () {
-  if (GL_TRUE != glfwInit()) {
-    // @TODO(werle) - handle error
-    return 0;
-  }
-  return 1;
+  return GL_TRUE;
 }
 
 void
 glisy_terminate (void) {
-  glfwTerminate();
 }
diff --git a/src/renderer.c b/src/renderer.c
@@ -1,14 +1,9 @@
-#include <glisy/window.h>
 #include <glisy/renderer.h>
 
 void
 glisy_renderer_size (glisy_renderer this, int width, int height) {
-  glisy_window *window = &this.ctx.window;
-  glisy_window_set_size(window, width, height);
 }
 
 void
 glisy_renderer_update (glisy_renderer this) {
-  // update window
-  glisy_window_update(&this.ctx.window);
 }
diff --git a/src/shader.c b/src/shader.c
@@ -1,4 +1,3 @@
-
 #include <string.h>
 #include <glisy/gl.h>
 #include <glisy/shader.h>

diff --git a/test/context/context.c b/test/context/context.c
@@ -18,11 +18,6 @@ main (void) {
   glisy_context_use(&ctx, &data);
   glisy_context_init(&ctx);
 
-  // ensure defaults were used
-  assert(ctx.window.height == GLISY_DEFAULT_WINDOW_HEIGHT);
-  assert(ctx.window.width == GLISY_DEFAULT_WINDOW_WIDTH);
-  assert(0 == strcmp(ctx.name, ctx.window.name));
-
   assert(id == ((data_t *) ctx.data)->id);
   assert(glisy_context_should_update(&ctx));
   return 0;