ruby_rpg 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330046e92f39eef55aa6eb2a9e3af5661d1fb32980caa763f7ab74271a34453b
-  data.tar.gz: 7ac94c71a7603d20a403a987f9dd7ade66a965aeb55a10c27fc8b6316f0b8eac
+  metadata.gz: bb76dd99560004e92918ecdb5910847e8939eb844488d04b2267c1f1cf044d10
+  data.tar.gz: 899699b008c112d351ae98e9ac2162995af0e83e5d001bbfebabc1f470f3821f
 SHA512:
-  metadata.gz: 72447d06c63adfb058bdfba8743bd7254480729758f1145d2f66e671aac0051c2e978bf986d96822920a9b120d3b963458817c515c0e483eb25699b82f980863
-  data.tar.gz: d6014f3da11f6a6694dfc31977b4ceb1f5140c08a5f27bb0b7045225b3362f709e81cfc12c2539ee415232d999540697f0510ce3dd5ba4b4b4653d2c00033d47
+  metadata.gz: d3a81d3ea6a574b25e7e17de6cf736becfbb2cfba20a82e90c7f0044bc37ab0c282bef5f07cbdb414ff037fe8d9151c281291bf86db9c081ddb3b973961ba8d4
+  data.tar.gz: 3141f56c495b22b7ffc587a1b3d136b8546c9da599a7391d63cb5cdee05a20bd0116fe25931365d1c93c4016fda32de1b96074bab7c970d05f3a97039fe32527

data/ext/gl_native/extconf.rb

@@ -2,6 +2,10 @@
 
 require 'mkmf'
 
+# A GL call with no prototype gets an implicit int return, which truncates
+# pointers on 64-bit — fail the build instead
+$CFLAGS << " -Werror=implicit-function-declaration" unless RUBY_PLATFORM =~ /mswin/
+
 # Find OpenGL
 case RUBY_PLATFORM
 when /darwin/
@@ -9,6 +13,7 @@ when /darwin/
   $CFLAGS << " -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenGL.framework/Headers"
 when /linux/
   have_library('GL') or abort "OpenGL not found"
+  have_library('GLEW') or abort "GLEW not found (install libglew-dev)"
 when /mingw|mswin/
   glew_dir = File.expand_path('../../../vendor/glew-2.2.0-win32', __FILE__)
   $CFLAGS << " -I#{glew_dir}/include"

data/ext/gl_native/gl_native.c

@@ -6,7 +6,7 @@
 extern void glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
 extern void glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
 extern void glMemoryBarrier(GLbitfield barriers);
-#elif defined(_WIN32) || defined(__MINGW32__)
+#elif defined(_WIN32) || defined(__MINGW32__) || defined(__linux__)
 #include <GL/glew.h>
 #else
 #include <GL/gl.h>
@@ -490,9 +490,9 @@ static VALUE rb_gl_memory_barrier(VALUE self, VALUE barriers) {
     return Qnil;
 }
 
-/* Initialize GLEW (Windows only) */
+/* Initialize GLEW (Windows and Linux) */
 static VALUE rb_gl_init_glew(VALUE self) {
-#if defined(_WIN32) || defined(__MINGW32__)
+#if defined(_WIN32) || defined(__MINGW32__) || defined(__linux__)
     GLenum err = glewInit();
     if (err != GLEW_OK) {
         rb_raise(rb_eRuntimeError, "Failed to initialize GLEW: %s", glewGetErrorString(err));
@@ -579,6 +579,6 @@ void Init_gl_native(void) {
     rb_define_module_function(mGLNative, "dispatch_compute", rb_gl_dispatch_compute, 3);
     rb_define_module_function(mGLNative, "memory_barrier", rb_gl_memory_barrier, 1);
 
-    /* GLEW initialization (Windows only, no-op on other platforms) */
+    /* GLEW initialization (Windows and Linux, no-op on macOS) */
     rb_define_module_function(mGLNative, "init_glew", rb_gl_init_glew, 0);
 }

data/ext/glfw_native/glfw_native.c

@@ -52,6 +52,7 @@ typedef const GLFWvidmode* (*PFN_glfwGetVideoMode)(GLFWmonitor*);
 typedef const GLFWvidmode* (*PFN_glfwGetVideoModes)(GLFWmonitor*, int*);
 typedef void (*PFN_glfwSetInputMode)(GLFWwindow*, int, int);
 typedef int (*PFN_glfwGetInputMode)(GLFWwindow*, int);
+typedef int (*PFN_glfwGetError)(const char**);
 
 /* Function pointers storage */
 static PFN_glfwInit pfn_glfwInit = NULL;
@@ -78,6 +79,7 @@ static PFN_glfwGetVideoMode pfn_glfwGetVideoMode = NULL;
 static PFN_glfwGetVideoModes pfn_glfwGetVideoModes = NULL;
 static PFN_glfwSetInputMode pfn_glfwSetInputMode = NULL;
 static PFN_glfwGetInputMode pfn_glfwGetInputMode = NULL;
+static PFN_glfwGetError pfn_glfwGetError = NULL;
 
 /* Library handle */
 static void* glfw_lib = NULL;
@@ -145,6 +147,7 @@ static VALUE rb_glfw_load_lib(VALUE self, VALUE path) {
     pfn_glfwGetVideoModes = (PFN_glfwGetVideoModes)load_func("glfwGetVideoModes");
     pfn_glfwSetInputMode = (PFN_glfwSetInputMode)load_func("glfwSetInputMode");
     pfn_glfwGetInputMode = (PFN_glfwGetInputMode)load_func("glfwGetInputMode");
+    pfn_glfwGetError = (PFN_glfwGetError)load_func("glfwGetError");
 
     return Qtrue;
 }
@@ -215,6 +218,14 @@ static VALUE rb_glfw_set_window_monitor(VALUE self, VALUE window, VALUE monitor,
     return Qnil;
 }
 
+/* GetError() */
+static VALUE rb_glfw_get_error(VALUE self) {
+    if (!pfn_glfwGetError) return Qnil;
+    const char* description = NULL;
+    int code = pfn_glfwGetError(&description);
+    return rb_ary_new3(2, INT2NUM(code), description ? rb_str_new2(description) : Qnil);
+}
+
 /* WindowShouldClose(window) */
 static VALUE rb_glfw_window_should_close(VALUE self, VALUE window) {
     if (!pfn_glfwWindowShouldClose) rb_raise(rb_eRuntimeError, "GLFW not loaded");
@@ -424,6 +435,7 @@ void Init_glfw_native(void) {
     rb_define_module_function(mGLFWNative, "set_window_attrib", rb_glfw_set_window_attrib, 3);
     rb_define_module_function(mGLFWNative, "set_window_title", rb_glfw_set_window_title, 2);
     rb_define_module_function(mGLFWNative, "set_window_monitor", rb_glfw_set_window_monitor, 7);
+    rb_define_module_function(mGLFWNative, "get_error", rb_glfw_get_error, 0);
     rb_define_module_function(mGLFWNative, "window_should_close", rb_glfw_window_should_close, 1);
     rb_define_module_function(mGLFWNative, "set_window_should_close", rb_glfw_set_window_should_close, 2);
     rb_define_module_function(mGLFWNative, "focus_window", rb_glfw_focus_window, 1);

data/lib/engine/engine.rb

@@ -4,10 +4,11 @@ GAME_DIR = File.expand_path(File.dirname($PROGRAM_NAME))
 ENGINE_DIR = File.expand_path(File.dirname(__FILE__))
 
 module Engine
-  def self.start(close_key: Input::KEY_ESCAPE, debug_key: nil, fullscreen_key: nil, &first_frame_block)
+  def self.start(close_key: Input::KEY_ESCAPE, debug_key: nil, fullscreen_key: nil, opengl_version: nil, &first_frame_block)
     Engine::AutoLoader.load
     return if ENV["BUILDING"] == "true"
 
+    Window.opengl_version = opengl_version if opengl_version
     Input.close_key = close_key
     Input.debug_key = debug_key
     Input.fullscreen_key = fullscreen_key
@@ -39,7 +40,7 @@ module Engine
     Engine::GL.Enable(Engine::GL::CULL_FACE)
     Engine::GL.CullFace(Engine::GL::BACK)
 
-    GLFW.SwapInterval(OS.windows? ? 1 : 0)
+    GLFW.SwapInterval(OS.mac? ? 0 : 1)
   end
 
   def self.main_game_loop(&first_frame_block)
@@ -74,13 +75,16 @@ module Engine
 
       Window.get_framebuffer_size
 
-      if OS.windows?
-        GLFW.SwapBuffers(Window.window)
-      else
+      if OS.mac?
+        # Async swap keeps the main thread free while waiting on the display link
         @swap_buffers_promise = Concurrent::Promise.new do
           GLFW.SwapBuffers(Window.window)
         end
         @swap_buffers_promise.execute
+      else
+        # GLX requires SwapBuffers on the thread owning the context, so
+        # Windows and Linux swap synchronously
+        GLFW.SwapBuffers(Window.window)
       end
 
       Engine::Input.update_key_states

data/lib/engine/gl.rb

@@ -377,6 +377,7 @@ module Engine
     READ_FRAMEBUFFER = 0x8CA8
     READ_WRITE = 0x88BA
     REPEAT = 0x2901
+    RENDERER = 0x1F01
     REPLACE = 0x1E01
     RGB = 0x1907
     RGB16F = 0x881B
@@ -408,6 +409,7 @@ module Engine
     UNSIGNED_BYTE = 0x1401
     UNSIGNED_INT = 0x1405
     UNSIGNED_INT_24_8 = 0x84FA
+    VENDOR = 0x1F00
     VERTEX_SHADER = 0x8B31
     VERSION = 0x1F02
 

data/lib/engine/glfw.rb

@@ -54,6 +54,10 @@ module GLFW
       GLFWNative.terminate
     end
 
+    def GetError
+      GLFWNative.get_error
+    end
+
     def CreateWindow(width, height, title, monitor, share)
       GLFWNative.create_window(width, height, title, monitor, share)
     end

data/lib/engine/window.rb

@@ -8,6 +8,7 @@ module Engine
     class << self
       attr_accessor :full_screen, :window, :window_title
       attr_reader :framebuffer_height, :framebuffer_width
+      attr_writer :opengl_version
 
       def create_window
         set_opengl_version
@@ -18,6 +19,10 @@ module Engine
         @window = GLFW.CreateWindow(
           initial_video_mode.width, initial_video_mode.height, DEFAULT_TITLE, nil, nil
         )
+        if @window.nil?
+          code, description = GLFW.GetError
+          raise "Failed to create GLFW window (error #{code}: #{description})"
+        end
         GLFW.SetWindowMonitor(
           @window, nil, 0, 0,
           initial_video_mode.width, initial_video_mode.height,
@@ -114,9 +119,14 @@ module Engine
         @framebuffer_height = height_buf.unpack1('L')
       end
 
+      def opengl_version
+        @opengl_version || (OS.mac? ? "4.1" : "4.3")
+      end
+
       def set_opengl_version
-        GLFW.WindowHint(GLFW::CONTEXT_VERSION_MAJOR, 4)
-        GLFW.WindowHint(GLFW::CONTEXT_VERSION_MINOR, OS.mac? ? 1 : 3)
+        major, minor = opengl_version.split(".").map { |part| Integer(part) }
+        GLFW.WindowHint(GLFW::CONTEXT_VERSION_MAJOR, major)
+        GLFW.WindowHint(GLFW::CONTEXT_VERSION_MINOR, minor)
         GLFW.WindowHint(GLFW::OPENGL_PROFILE, GLFW::OPENGL_CORE_PROFILE)
         GLFW.WindowHint(GLFW::OPENGL_FORWARD_COMPAT, GLFW::TRUE)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rpg
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Max Hatfull
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A game engine written in Ruby
 test_files: []