Commit: 8d3413fedb7a5eb55898802e9342d7a06806388d - glow (git)

Cross-Platform OpenGL Windowing Library

Commit MetaInfo

• Révision: 8d3413fedb7a5eb55898802e9342d7a06806388d (tree)
• l'heure: 2018-08-29 08:51:57
• Auteur: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Message de Log

Add the very beginnings of Haiku support

Change Summary

• modified: GNUmakefile
• modified: glow.h
• add: glow_haiku.cpp

Modification

--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,32 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
+UNAME=$(shell uname)
+HAIKU=Haiku
+
+ifeq "$(UNAME)" "Haiku"
+
+all: libglow.so libglow.a
+
+CXXFLAGS=-fno-rtti -fno-exceptions -g -std=c++98 -Wall
+
+glow_haiku.os: glow_haiku.cpp glow.h
+	g++ $(CXXFLAGS) -fPIC -c glow_haiku.cpp -o glow_haiku.os
+
+glow_haiku.o: glow_haiku.cpp glow.h
+	g++ $(CXXFLAGS) -c glow_haiku.cpp -o glow_haiku.o
+
+libglow.a: glow_haiku.o
+	ar rc libglow.a glow_haiku.o
+	ranlib libglow.a
+
+libglow.so: glow_haiku.os
+	g++ -g -fPIC -shared glow_haiku.os -o libglow.so
+
+else
+
 all: libglow.so libglow.a
 
 include gcc.mk
+
+endif

--- a/glow.h
+++ b/glow.h
@@ -12,7 +12,7 @@
 extern "C" {
 #endif
 
-#ifdef __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 4
 #define GLOW_CONST __attribute__((const))
 #define GLOW_PURE __attribute__((pure))
 #define GLOW_RETURNS_NOT_NULL __attribute__((returns_nonnull))
@@ -109,7 +109,7 @@ GLOW_EXPORT void Glow_ViewportSize(unsigned w, unsigned h,
  * @brief Gets the underlying OS window for this GLow Window.
  *
  * On Win32 this is a HWND
- * On Haiku, the BGLView is returned.
+ * On Haiku, the BGLView is returned (not a window technically, but still)
  * On X11, the Window is returned.
  * On Cocoa, Something happens (TODO!)
  * On SDL2, the system's window is passed back.
@@ -128,7 +128,7 @@ GLOW_EXPORT GLOW_CONST unsigned Glow_WindowStructSize(void);
  * @brief Creates a Window
  *
  * The window is hidden by default.
- * 
+ *
  * @sa Glow_ShowWindow
  */
 GLOW_EXPORT void Glow_CreateWindow(struct Glow_Window *out,
@@ -250,7 +250,7 @@ GLOW_EXPORT void Glow_MakeCurrent(struct Glow_Context *ctx);
  * @warning Unlike all the other calls for Glow, this one uses malloc to
  * allocate memory. You must call Glow_DestroyWindow and then free on the
  * returned Window to properly free the memory.
- * 
+ *
  * @sa Glow_CreateLegacyContext
  * @sa Glow_CreateWindow
  */

--- /dev/null
+++ b/glow_haiku.cpp
@@ -0,0 +1,59 @@
+// Copyright (C) 2018 Alaskan Emily, Transnat Games
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+#include "glow.h"
+
+#include <interface/Window.h>
+#include <opengl/GLView.h>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+struct Glow_Window {
+    BGLView *gl_view;
+    BWindow *b_window;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+static const int glow_gl_view_flags = BGL_RGB|BGL_ALPHA|BGL_DEPTH|BGL_DOUBLE|BGL_ACCUM|BGL_STENCIL;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void Glow_ViewportSize(unsigned w, unsigned h, unsigned *out_w, unsigned *out_h){
+    out_w[0] = w;
+    out_h[0] = h;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void *Glow_GetSystemWindow(Glow_Window *window){
+    return window->gl_view;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+unsigned Glow_WindowStructSize(){
+    return sizeof(Glow_Window);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void Glow_CreateWindow(Glow_Window *out, unsigned w, unsigned h, const char *title, int flags){
+    const BRect rect = BRect(0.0f, 0.0f, static_cast<float>(w), static_cast<float>(h));
+    const window_look look = ((flags & GLOW_UNDECORATED) != 0) ?
+        B_NO_BORDER_WINDOW_LOOK :
+        B_DOCUMENT_WINDOW_LOOK;
+    const window_feel feel = B_NORMAL_WINDOW_FEEL;
+    const int window_flags = ((flags & GLOW_RESIZABLE) != 0) ?
+        B_NOT_RESIZABLE : 0;
+
+    BWindow *const b_window = new BWindow(rect, title, look, feel, window_flags);
+    BGLView *const gl_view = new BGLView(rect, "Glow", B_FOLLOW_ALL_SIDES, 0, glow_gl_view_flags);
+    b_window->AddChild(gl_view);
+    out->b_window = b_window;
+    out->gl_view = gl_view;
+}