ray 0.1.1 → 0.2.0

data/ext/say_view.c

@@ -4,22 +4,12 @@ static void say_view_update_matrix(say_view *view) {
   if (!view->custom_matrix) {
     say_matrix_reset(view->matrix);
 
-    if (view->flip_y) {
-      say_matrix_set_ortho(view->matrix,
-                           view->center.x - view->size.x / 2,
-                           view->center.x + view->size.x / 2,
-                           view->center.y + view->size.y / 2,
-                           view->center.y - view->size.y / 2,
-                           -1, 1);
-    }
-    else {
-      say_matrix_set_ortho(view->matrix,
-                           view->center.x - view->size.x / 2,
-                           view->center.x + view->size.x / 2,
-                           view->center.y - view->size.y / 2,
-                           view->center.y + view->size.y / 2,
-                           -1, 1);
-    }
+    say_matrix_set_ortho(view->matrix,
+                         view->center.x - view->size.x / 2,
+                         view->center.x + view->size.x / 2,
+                         view->center.y + view->size.y / 2,
+                         view->center.y - view->size.y / 2,
+                         -1, 1);
   }
 
   view->matrix_updated = 1;
@@ -37,8 +27,6 @@ say_view *say_view_create() {
 
   view->viewport = say_make_rect(0, 0, 1, 1);
 
-  view->flip_y = 1;
-
   return view;
 }
 
@@ -102,17 +90,6 @@ say_rect say_view_get_viewport(say_view *view) {
   return view->viewport;
 }
 
-
-void say_view_flip_y(say_view *view, uint8_t val) {
-  view->flip_y = val;
-  view->matrix_updated = 0;
-  view->has_changed = 1;
-}
-
-uint8_t say_view_is_y_flipped(say_view *view) {
-  return view->flip_y;
-}
-
 say_matrix *say_view_get_matrix(say_view *view) {
   if (!view->matrix_updated)
     say_view_update_matrix(view);
@@ -123,13 +100,15 @@ void say_view_set_matrix(say_view *view, say_matrix *matrix) {
   if (matrix) {
     view->custom_matrix = 1;
     say_matrix_set_content(view->matrix, matrix->content);
+
+    view->matrix_updated = 1;
   }
   else {
     say_matrix_reset(view->matrix);
-    view->custom_matrix = 0;
+    view->custom_matrix  = 0;
+    view->matrix_updated = 0;
   }
 
-  view->matrix_updated = 1;
   view->has_changed = 1;
 }
 

data/ext/say_view.h

@@ -2,6 +2,7 @@
 #define SAY_VIEW_H_
 
 #include "say_matrix.h"
+#include "say_shader.h"
 
 typedef struct {
   say_matrix *matrix;
@@ -14,8 +15,6 @@ typedef struct {
 
   say_rect viewport;
   uint8_t viewport_changed;
-
-  uint8_t flip_y;
 } say_view;
 
 say_view *say_view_create();
@@ -32,9 +31,6 @@ say_vector2 say_view_get_size(say_view *view);
 say_vector2 say_view_get_center(say_view *view);
 say_rect say_view_get_viewport(say_view *view);
 
-void say_view_flip_y(say_view *view, uint8_t val);
-uint8_t say_view_is_y_flipped(say_view *view);
-
 say_matrix *say_view_get_matrix(say_view *view);
 void say_view_set_matrix(say_view *view, say_matrix *matrix);
 

data/ext/say_win.h

@@ -4,7 +4,7 @@
 
 #include <stdbool.h>
 
-struct say_array;
+#include "mo.h"
 
 typedef struct say_win_window {
   HWND    win;
@@ -12,7 +12,7 @@ typedef struct say_win_window {
   HCURSOR cursor;
   bool    cursor_inside;
   
-  struct say_array *events;
+  mo_array events;
 } say_win_window;
 
 typedef struct say_win_context {

data/ext/say_win_context.h

@@ -1,7 +1,20 @@
+#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
+#define WGL_CONTEXT_FLAGS_ARB	      0x2094
+#define WGL_CONTEXT_PROFILE_MASK_ARB  0x9126
+
+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB          1
+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 2
+#define WGL_CONTEXT_DEBUG_BIT_ARB                 1
+
+typedef HGLRC (*say_gl_create_context)(HDC dc, HGLRC share, const GLint *attr);
+
 static void say_win_set_pixel_format(HDC dc) {
+  say_context_config *conf = say_context_get_config();
+
   PIXELFORMATDESCRIPTOR pfd = { 
     sizeof(PIXELFORMATDESCRIPTOR),   // size of this pfd  
-    1,                    // version number  
+    1,                     // version number  
     PFD_DRAW_TO_WINDOW |   // support window  
     PFD_SUPPORT_OPENGL |   // support OpenGL  
     PFD_DOUBLEBUFFER,      // double buffered  
@@ -12,18 +25,45 @@ static void say_win_set_pixel_format(HDC dc) {
     0,                     // shift bit ignored  
     0,                     // no accumulation buffer  
     0, 0, 0, 0,            // accum bits ignored  
-    24,                    // 24-bit z-buffer  
-    0,                     // no stencil buffer  
+    conf->depth_size,      // z-buffer  
+    conf->stencil_size,    // stencil buffer  
     0,                     // no auxiliary buffer  
     PFD_MAIN_PLANE,        // main layer  
     0,                     // reserved  
     0, 0, 0                // layer masks ignored  
   };
-
   int format = ChoosePixelFormat(dc, &pfd);
   SetPixelFormat(dc, format, &pfd);
 }
 
+static HGLRC say_win_context_build(HDC device, HGLRC share) {
+  say_gl_create_context create = (say_gl_create_context)
+    say_get_proc("wglCreateContextAttribsARB");
+
+  say_context_config *conf = say_context_get_config();
+
+  if (create && (conf->major_version > 3 || conf->debug)) {
+    GLint attribs[] = {
+      WGL_CONTEXT_MAJOR_VERSION_ARB, conf->major_version,
+      WGL_CONTEXT_MINOR_VERSION_ARB, conf->minor_version,
+      WGL_CONTEXT_FLAGS_ARB, conf->debug ? WGL_CONTEXT_DEBUG_BIT_ARB :
+      0,
+      WGL_CONTEXT_PROFILE_MASK_ARB, conf->core_profile ?
+      WGL_CONTEXT_CORE_PROFILE_BIT_ARB :
+      WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB
+    };
+    
+    HGLRC ctxt = create(device, share, attribs);
+    if (ctxt)
+      return ctxt;
+  }
+
+  HGLRC ctxt = wglCreateContext(device);
+  if (share) wglShareLists(share, ctxt);
+
+  return ctxt;
+}
+
 void say_imp_context_free(say_imp_context ctxt) {
   if (ctxt->context) {
     if (wglGetCurrentContext() == ctxt->context) {
@@ -57,9 +97,8 @@ say_imp_context say_imp_context_create_shared(say_imp_context shared) {
   ctxt->device = GetDC(ctxt->win);
   say_win_set_pixel_format(ctxt->device);
   
-  ctxt->context = wglCreateContext(ctxt->device);
-  if (shared)
-    wglShareLists(shared->context, ctxt->context);
+  ctxt->context = say_win_context_build(ctxt->device,
+					shared ? shared->context : NULL);
 
   return ctxt;
 }
@@ -75,9 +114,8 @@ say_imp_context  say_imp_context_create_for_window(say_imp_context shared,
   
   say_win_set_pixel_format(ctxt->device);
   
-  ctxt->context = wglCreateContext(ctxt->device);
-  if (shared)
-    wglShareLists(shared->context, ctxt->context);
+  ctxt->context = say_win_context_build(ctxt->device,
+					shared ? shared->context : NULL);
 
   return ctxt;  
 }
@@ -88,4 +126,4 @@ void say_imp_context_make_current(say_imp_context ctxt) {
 
 void say_imp_context_update(say_imp_context ctxt) {
   SwapBuffers(ctxt->device);
-}
+}

data/ext/say_win_window.h

@@ -200,7 +200,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
     case WM_CLOSE: {
       say_event ev;
       ev.type = SAY_EVENT_QUIT;
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -214,7 +214,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
         say_event ev;
         ev.type = SAY_EVENT_RESIZE;
         ev.ev.resize.size = say_make_vector2(w, h);
-        say_array_push(win->events, &ev);
+        mo_array_push(&win->events, &ev);
       }
 
       break;
@@ -223,14 +223,14 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
     case WM_SETFOCUS: {
       say_event ev;
       ev.type = SAY_EVENT_FOCUS_GAIN;
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
     case WM_KILLFOCUS: {
       say_event ev;
       ev.type = SAY_EVENT_FOCUS_LOSS;
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -239,7 +239,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.type = SAY_EVENT_TEXT_ENTERED;
       ev.ev.text.text = (uint32_t)wparam;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
 
       break;
     }
@@ -253,7 +253,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
         ev.ev.key.native_code = (uint32_t)wparam;
         ev.ev.key.code        = say_win_get_key(wparam, lparam);
 
-        say_array_push(win->events, &ev);
+        mo_array_push(&win->events, &ev);
       }
       break;
     }
@@ -266,7 +266,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.key.native_code = (uint32_t)wparam;
       ev.ev.key.code        = say_win_get_key(wparam, lparam);
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -281,7 +281,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.wheel.pos   = say_make_vector2(pos.x, pos.y);
       ev.ev.wheel.delta = (int16_t)(HIWORD(wparam)) / 120;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -291,7 +291,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.button.pos = say_make_vector2(LOWORD(lparam), HIWORD(lparam));
       ev.ev.button.button = SAY_BUTTON_LEFT;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -301,7 +301,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.button.pos = say_make_vector2(LOWORD(lparam), HIWORD(lparam));
       ev.ev.button.button = SAY_BUTTON_LEFT;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -311,7 +311,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.button.pos = say_make_vector2(LOWORD(lparam), HIWORD(lparam));
       ev.ev.button.button = SAY_BUTTON_RIGHT;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -321,7 +321,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.button.pos = say_make_vector2(LOWORD(lparam), HIWORD(lparam));
       ev.ev.button.button = SAY_BUTTON_RIGHT;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -331,7 +331,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.button.pos = say_make_vector2(LOWORD(lparam), HIWORD(lparam));
       ev.ev.button.button = SAY_BUTTON_MIDDLE;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -341,7 +341,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
       ev.ev.button.pos = say_make_vector2(LOWORD(lparam), HIWORD(lparam));
       ev.ev.button.button = SAY_BUTTON_MIDDLE;
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -357,14 +357,14 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
 
         say_event ev;
         ev.type = SAY_EVENT_MOUSE_ENTERED;
-        say_array_push(win->events, &ev);
+        mo_array_push(&win->events, &ev);
       }
 
       say_event ev;
       ev.type = SAY_EVENT_MOUSE_MOTION;
       ev.ev.motion.pos = say_make_vector2(LOWORD(lparam), HIWORD(lparam));
 
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
 
@@ -373,7 +373,7 @@ static void say_win_window_translate(say_win_window *win, UINT msg, WPARAM wpara
 
       say_event ev;
       ev.type = SAY_EVENT_MOUSE_LEFT;
-      say_array_push(win->events, &ev);
+      mo_array_push(&win->events, &ev);
       break;
     }
   }
@@ -466,14 +466,14 @@ say_imp_window say_imp_window_create() {
   win->icon   = 0;
   win->cursor = LoadCursor(NULL, IDC_ARROW);;
 
-  win->events = say_array_create(sizeof(say_event), NULL, NULL);
+  mo_array_init(&win->events, sizeof(say_event));
 
   return win;
 }
 
 void say_imp_window_free(say_imp_window win) {
   say_imp_window_close(win);
-  say_array_free(win->events);
+  mo_array_release(&win->events);
   free(win);
 }
 
@@ -588,7 +588,8 @@ bool say_imp_window_set_icon(say_imp_window win, struct say_image *img) {
     return false;
   }
 
-  say_color *orig = say_image_get_buffer(img);
+  say_color *orig = say_flip_color_buffer_copy(say_image_get_buffer(img),
+                                               w, h);
 
   for (size_t i = 0; i < w * h; i++) {
     buf[i * 4 + 0] =  orig[i].b;
@@ -597,6 +598,8 @@ bool say_imp_window_set_icon(say_imp_window win, struct say_image *img) {
     buf[i * 4 + 3] =  orig[i].a;
   }
 
+  free(orig);
+
   win->icon = CreateIcon(GetModuleHandle(NULL), w, h, 1, 32, NULL, buf);
 
   if (!win->icon) {
@@ -634,7 +637,7 @@ bool say_imp_window_resize(say_imp_window win, size_t w, size_t h) {
 bool say_imp_window_poll_event(say_imp_window win, struct say_event *ev,
                                struct say_input *input) {
 
-  if (say_array_get_size(win->events) == 0) {
+  if (win->events.size == 0) {
     MSG message;
     while (PeekMessage(&message, win->win, 0, 0, PM_REMOVE)) {
       TranslateMessage(&message);
@@ -642,20 +645,20 @@ bool say_imp_window_poll_event(say_imp_window win, struct say_event *ev,
     }
   }
 
-  if (say_array_get_size(win->events) == 0) {
+  if (win->events.size == 0) {
     ev->type = SAY_EVENT_NONE;
     return false;
   }
   else {
-    *ev = *(say_event*)say_array_get(win->events, 0);
-    say_array_delete(win->events, 0);
+    *ev = mo_array_get_as(&win->events, 0, say_event);
+    mo_array_delete(&win->events, 0);
     return true;
   }
 }
 
 void say_imp_window_wait_event(say_imp_window win, struct say_event *ev,
                                struct say_input *input) {
-  while (say_array_get_size(win->events) == 0) {
+  while (win->events.size == 0) {
     WaitMessage();
 
     MSG message;
@@ -665,6 +668,6 @@ void say_imp_window_wait_event(say_imp_window win, struct say_event *ev,
     }
   }
 
-  *ev = *(say_event*)say_array_get(win->events, 0);
-  say_array_delete(win->events, 0);
+  *ev = mo_array_get_as(&win->events, 0, say_event);
+  mo_array_delete(&win->events, 0);
 }

data/ext/say_window.c

@@ -25,7 +25,7 @@ say_window *say_window_create() {
   win->show_cursor = true;
 
   win->win = say_imp_window_create();
-  
+
   return win;
 }
 
@@ -46,7 +46,7 @@ int say_window_open(say_window *win, size_t w, size_t h, const char *title,
   }
 
   win->show_cursor = true;
-  
+
   if (!say_imp_window_open(win->win, title, w, h, style))
     return false;
 
@@ -121,7 +121,7 @@ static void say_window_process_event(say_window *win, say_event *ev) {
       say_input_release(&win->input, ev->ev.key.code);
       break;
     }
-    
+
     case SAY_EVENT_MOUSE_MOTION: {
       say_input_set_mouse_pos(&win->input, ev->ev.motion.pos);
       break;