ruby2d 0.9.2 → 0.10.0

data/ext/ruby2d/tileset.c

@@ -0,0 +1,30 @@
+// tileset.c
+
+#include "ruby2d.h"
+
+
+/*
+ * Draw a tile
+ */
+void R2D_DrawTile(R2D_Image *img, int tw, int th, int padding, int spacing, int tx, int ty, int x, int y) {
+  if (!img) return;
+
+  if (img->texture_id == 0) {
+    R2D_GL_CreateTexture(&img->texture_id, img->format,
+                         img->width, img->height,
+                         img->surface->pixels, GL_NEAREST);
+    SDL_FreeSurface(img->surface);
+  }
+
+  GLfloat tx1 = (double)(padding + ((spacing + tw) * tx)) / (double) img->width ;
+  GLfloat tx2 = tx1 + ((double)tw / (double) img->width);
+  GLfloat tx3 = tx2;
+  GLfloat tx4 = tx1;
+
+  GLfloat ty1 = (double)(padding + ((spacing + th) * ty)) / (double) img ->height;
+  GLfloat ty2 = ty1;
+  GLfloat ty3 = ty1 + ((double)th / (double) img->height);
+  GLfloat ty4 = ty3;
+
+  R2D_GL_DrawTile(img, x, y, tw, th, tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);
+}

data/{assets/linux/simple2d/src → ext/ruby2d}/window.c

@@ -1,25 +1,25 @@
 // window.c
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 
 /*
  * Create a window
  */
-S2D_Window *S2D_CreateWindow(const char *title, int width, int height,
-                             S2D_Update update, S2D_Render render, int flags) {
+R2D_Window *R2D_CreateWindow(const char *title, int width, int height,
+                             R2D_Update update, R2D_Render render, int flags) {
 
-  S2D_Init();
+  R2D_Init();
 
   SDL_DisplayMode dm;
   SDL_GetCurrentDisplayMode(0, &dm);
-  S2D_Log(S2D_INFO, "Current display mode is %dx%dpx @ %dhz", dm.w, dm.h, dm.refresh_rate);
+  R2D_Log(R2D_INFO, "Current display mode is %dx%dpx @ %dhz", dm.w, dm.h, dm.refresh_rate);
 
-  width  = width  == S2D_DISPLAY_WIDTH  ? dm.w : width;
-  height = height == S2D_DISPLAY_HEIGHT ? dm.h : height;
+  width  = width  == R2D_DISPLAY_WIDTH  ? dm.w : width;
+  height = height == R2D_DISPLAY_HEIGHT ? dm.h : height;
 
   // Allocate window and set default values
-  S2D_Window *window      = (S2D_Window *) malloc(sizeof(S2D_Window));
+  R2D_Window *window      = (R2D_Window *) malloc(sizeof(R2D_Window));
   window->sdl             = NULL;
   window->glcontext       = NULL;
   window->title           = title;
@@ -29,7 +29,7 @@ S2D_Window *S2D_CreateWindow(const char *title, int width, int height,
   window->orig_height     = height;
   window->viewport.width  = width;
   window->viewport.height = height;
-  window->viewport.mode   = S2D_SCALE;
+  window->viewport.mode   = R2D_SCALE;
   window->update          = update;
   window->render          = render;
   window->flags           = flags;
@@ -53,10 +53,10 @@ S2D_Window *S2D_CreateWindow(const char *title, int width, int height,
 /*
  * Show the window
  */
-int S2D_Show(S2D_Window *window) {
+int R2D_Show(R2D_Window *window) {
 
   if (!window) {
-    S2D_Error("S2D_Show", "Window cannot be shown (because it's NULL)");
+    R2D_Error("R2D_Show", "Window cannot be shown (because it's NULL)");
     return 1;
   }
 
@@ -68,8 +68,8 @@ int S2D_Show(S2D_Window *window) {
     SDL_WINDOW_OPENGL | window->flags                // flags
   );
 
-  if (!window->sdl) S2D_Error("SDL_CreateWindow", SDL_GetError());
-  if (window->icon) S2D_SetIcon(window, window->icon);
+  if (!window->sdl) R2D_Error("SDL_CreateWindow", SDL_GetError());
+  if (window->icon) R2D_SetIcon(window, window->icon);
 
   // The window created by SDL might not actually be the requested size.
   // If it's not the same, retrieve and store the actual window size.
@@ -77,7 +77,7 @@ int S2D_Show(S2D_Window *window) {
   SDL_GetWindowSize(window->sdl, &actual_width, &actual_height);
 
   if ((window->width != actual_width) || (window->height != actual_height)) {
-    S2D_Log(S2D_INFO,
+    R2D_Log(R2D_INFO,
       "Scaling window to %ix%i (requested size was %ix%i)",
       actual_width, actual_height, window->width, window->height
     );
@@ -89,7 +89,13 @@ int S2D_Show(S2D_Window *window) {
 
   // Set Up OpenGL /////////////////////////////////////////////////////////////
 
-  S2D_GL_Init(window);
+  R2D_GL_Init(window);
+
+  // SDL 2.0.10 and macOS 10.15 fix ////////////////////////////////////////////
+
+  #if MACOS
+    SDL_SetWindowSize(window->sdl, window->width, window->height);
+  #endif
 
   // Set Main Loop Data ////////////////////////////////////////////////////////
 
@@ -110,7 +116,7 @@ int S2D_Show(S2D_Window *window) {
   // Enable VSync
   if (window->vsync) {
     if (!SDL_SetHint(SDL_HINT_RENDER_VSYNC, "1")) {
-      S2D_Log(S2D_WARN, "VSync cannot be enabled");
+      R2D_Log(R2D_WARN, "VSync cannot be enabled");
     }
   }
 
@@ -122,7 +128,7 @@ int S2D_Show(S2D_Window *window) {
 
     // Clear Frame /////////////////////////////////////////////////////////////
 
-    S2D_GL_Clear(window->background);
+    R2D_GL_Clear(window->background);
 
     // Set FPS /////////////////////////////////////////////////////////////////
 
@@ -158,8 +164,8 @@ int S2D_Show(S2D_Window *window) {
 
         case SDL_KEYDOWN:
           if (window->on_key && e.key.repeat == 0) {
-            S2D_Event event = {
-              .type = S2D_KEY_DOWN, .key = SDL_GetScancodeName(e.key.keysym.scancode)
+            R2D_Event event = {
+              .type = R2D_KEY_DOWN, .key = SDL_GetScancodeName(e.key.keysym.scancode)
             };
             window->on_key(event);
           }
@@ -167,8 +173,8 @@ int S2D_Show(S2D_Window *window) {
 
         case SDL_KEYUP:
           if (window->on_key) {
-            S2D_Event event = {
-              .type = S2D_KEY_UP, .key = SDL_GetScancodeName(e.key.keysym.scancode)
+            R2D_Event event = {
+              .type = R2D_KEY_UP, .key = SDL_GetScancodeName(e.key.keysym.scancode)
             };
             window->on_key(event);
           }
@@ -176,11 +182,11 @@ int S2D_Show(S2D_Window *window) {
 
         case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP:
           if (window->on_mouse) {
-            S2D_GetMouseOnViewport(window, e.button.x, e.button.y, &mx, &my);
-            S2D_Event event = {
+            R2D_GetMouseOnViewport(window, e.button.x, e.button.y, &mx, &my);
+            R2D_Event event = {
               .button = e.button.button, .x = mx, .y = my
             };
-            event.type = e.type == SDL_MOUSEBUTTONDOWN ? S2D_MOUSE_DOWN : S2D_MOUSE_UP;
+            event.type = e.type == SDL_MOUSEBUTTONDOWN ? R2D_MOUSE_DOWN : R2D_MOUSE_UP;
             event.dblclick = e.button.clicks == 2 ? true : false;
             window->on_mouse(event);
           }
@@ -188,8 +194,8 @@ int S2D_Show(S2D_Window *window) {
 
         case SDL_MOUSEWHEEL:
           if (window->on_mouse) {
-            S2D_Event event = {
-              .type = S2D_MOUSE_SCROLL, .direction = e.wheel.direction,
+            R2D_Event event = {
+              .type = R2D_MOUSE_SCROLL, .direction = e.wheel.direction,
               .delta_x = e.wheel.x, .delta_y = -e.wheel.y
             };
             window->on_mouse(event);
@@ -198,9 +204,9 @@ int S2D_Show(S2D_Window *window) {
 
         case SDL_MOUSEMOTION:
           if (window->on_mouse) {
-            S2D_GetMouseOnViewport(window, e.motion.x, e.motion.y, &mx, &my);
-            S2D_Event event = {
-              .type = S2D_MOUSE_MOVE,
+            R2D_GetMouseOnViewport(window, e.motion.x, e.motion.y, &mx, &my);
+            R2D_Event event = {
+              .type = R2D_MOUSE_MOVE,
               .x = mx, .y = my, .delta_x = e.motion.xrel, .delta_y = e.motion.yrel
             };
             window->on_mouse(event);
@@ -209,8 +215,8 @@ int S2D_Show(S2D_Window *window) {
 
         case SDL_CONTROLLERAXISMOTION:
           if (window->on_controller) {
-            S2D_Event event = {
-              .which = e.caxis.which, .type = S2D_AXIS,
+            R2D_Event event = {
+              .which = e.caxis.which, .type = R2D_AXIS,
               .axis = e.caxis.axis, .value = e.caxis.value
             };
             window->on_controller(event);
@@ -218,9 +224,9 @@ int S2D_Show(S2D_Window *window) {
           break;
 
         case SDL_JOYAXISMOTION:
-          if (window->on_controller && !S2D_IsController(e.jbutton.which)) {
-            S2D_Event event = {
-              .which = e.jaxis.which, .type = S2D_AXIS,
+          if (window->on_controller && !R2D_IsController(e.jbutton.which)) {
+            R2D_Event event = {
+              .which = e.jaxis.which, .type = R2D_AXIS,
               .axis = e.jaxis.axis, .value = e.jaxis.value
             };
             window->on_controller(event);
@@ -229,35 +235,35 @@ int S2D_Show(S2D_Window *window) {
 
         case SDL_CONTROLLERBUTTONDOWN: case SDL_CONTROLLERBUTTONUP:
           if (window->on_controller) {
-            S2D_Event event = {
+            R2D_Event event = {
               .which = e.cbutton.which, .button = e.cbutton.button
             };
-            event.type = e.type == SDL_CONTROLLERBUTTONDOWN ? S2D_BUTTON_DOWN : S2D_BUTTON_UP;
+            event.type = e.type == SDL_CONTROLLERBUTTONDOWN ? R2D_BUTTON_DOWN : R2D_BUTTON_UP;
             window->on_controller(event);
           }
           break;
 
         case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONUP:
-          if (window->on_controller && !S2D_IsController(e.jbutton.which)) {
-            S2D_Event event = {
+          if (window->on_controller && !R2D_IsController(e.jbutton.which)) {
+            R2D_Event event = {
               .which = e.jbutton.which, .button = e.jbutton.button
             };
-            event.type = e.type == SDL_JOYBUTTONDOWN ? S2D_BUTTON_DOWN : S2D_BUTTON_UP;
+            event.type = e.type == SDL_JOYBUTTONDOWN ? R2D_BUTTON_DOWN : R2D_BUTTON_UP;
             window->on_controller(event);
           }
           break;
 
         case SDL_JOYDEVICEADDED:
-          S2D_Log(S2D_INFO, "Controller connected (%i total)", SDL_NumJoysticks());
-          S2D_OpenControllers();
+          R2D_Log(R2D_INFO, "Controller connected (%i total)", SDL_NumJoysticks());
+          R2D_OpenControllers();
           break;
 
         case SDL_JOYDEVICEREMOVED:
-          if (S2D_IsController(e.jdevice.which)) {
-            S2D_Log(S2D_INFO, "Controller #%i: %s removed (%i remaining)", e.jdevice.which, SDL_GameControllerName(SDL_GameControllerFromInstanceID(e.jdevice.which)), SDL_NumJoysticks());
+          if (R2D_IsController(e.jdevice.which)) {
+            R2D_Log(R2D_INFO, "Controller #%i: %s removed (%i remaining)", e.jdevice.which, SDL_GameControllerName(SDL_GameControllerFromInstanceID(e.jdevice.which)), SDL_NumJoysticks());
             SDL_GameControllerClose(SDL_GameControllerFromInstanceID(e.jdevice.which));
           } else {
-            S2D_Log(S2D_INFO, "Controller #%i: %s removed (%i remaining)", e.jdevice.which, SDL_JoystickName(SDL_JoystickFromInstanceID(e.jdevice.which)), SDL_NumJoysticks());
+            R2D_Log(R2D_INFO, "Controller #%i: %s removed (%i remaining)", e.jdevice.which, SDL_JoystickName(SDL_JoystickFromInstanceID(e.jdevice.which)), SDL_NumJoysticks());
             SDL_JoystickClose(SDL_JoystickFromInstanceID(e.jdevice.which));
           }
           break;
@@ -268,13 +274,13 @@ int S2D_Show(S2D_Window *window) {
               // Store new window size, set viewport
               window->width  = e.window.data1;
               window->height = e.window.data2;
-              S2D_GL_SetViewport(window);
+              R2D_GL_SetViewport(window);
               break;
           }
           break;
 
         case SDL_QUIT:
-          S2D_Close(window);
+          R2D_Close(window);
           break;
       }
     }
@@ -286,8 +292,8 @@ int S2D_Show(S2D_Window *window) {
     for (int i = 0; i < num_keys; i++) {
       if (window->on_key) {
         if (key_state[i] == 1) {
-          S2D_Event event = {
-            .type = S2D_KEY_HELD, .key = SDL_GetScancodeName(i)
+          R2D_Event event = {
+            .type = R2D_KEY_HELD, .key = SDL_GetScancodeName(i)
           };
           window->on_key(event);
         }
@@ -297,7 +303,7 @@ int S2D_Show(S2D_Window *window) {
     // Get and store mouse position relative to the viewport
     int wx, wy;  // mouse x, y coordinates relative to the window
     SDL_GetMouseState(&wx, &wy);
-    S2D_GetMouseOnViewport(window, wx, wy, &window->mouse.x, &window->mouse.y);
+    R2D_GetMouseOnViewport(window, wx, wy, &window->mouse.x, &window->mouse.y);
 
     // Update Window State /////////////////////////////////////////////////////
 
@@ -313,6 +319,11 @@ int S2D_Show(S2D_Window *window) {
     if (window->render) window->render();
 
     // Draw Frame //////////////////////////////////////////////////////////////
+
+    // Render and flush all OpenGL buffers
+    R2D_GL_FlushBuffers();
+
+    // Swap buffers to display drawn contents in the window
     SDL_GL_SwapWindow(window->sdl);
   }
 
@@ -323,14 +334,14 @@ int S2D_Show(S2D_Window *window) {
 /*
  * Set the icon for the window
  */
-void S2D_SetIcon(S2D_Window *window, const char *icon) {
-  S2D_Image *img = S2D_CreateImage(icon);
+void R2D_SetIcon(R2D_Window *window, const char *icon) {
+  R2D_Image *img = R2D_CreateImage(icon);
   if (img) {
     window->icon = icon;
     SDL_SetWindowIcon(window->sdl, img->surface);
-    S2D_FreeImage(img);
+    R2D_FreeImage(img);
   } else {
-    S2D_Log(S2D_WARN, "Could not set window icon");
+    R2D_Log(R2D_WARN, "Could not set window icon");
   }
 }
 
@@ -338,10 +349,10 @@ void S2D_SetIcon(S2D_Window *window, const char *icon) {
 /*
  * Take a screenshot of the window
  */
-void S2D_Screenshot(S2D_Window *window, const char *path) {
+void R2D_Screenshot(R2D_Window *window, const char *path) {
 
   #if GLES
-    S2D_Error("S2D_Screenshot", "Not supported in OpenGL ES");
+    R2D_Error("R2D_Screenshot", "Not supported in OpenGL ES");
   #else
     // Create a surface the size of the window
     SDL_Surface *surface = SDL_CreateRGBSurface(
@@ -357,7 +368,7 @@ void S2D_Screenshot(S2D_Window *window, const char *path) {
 
     void *temp_row = (void *)malloc(surface->pitch);
     if (!temp_row) {
-      S2D_Error("S2D_Screenshot", "Out of memory!");
+      R2D_Error("R2D_Screenshot", "Out of memory!");
       SDL_FreeSurface(surface);
       return;
     }
@@ -382,9 +393,9 @@ void S2D_Screenshot(S2D_Window *window, const char *path) {
 /*
  * Close the window
  */
-int S2D_Close(S2D_Window *window) {
+int R2D_Close(R2D_Window *window) {
   if (!window->close) {
-    S2D_Log(S2D_INFO, "Closing window");
+    R2D_Log(R2D_INFO, "Closing window");
     window->close = true;
   }
   return 0;
@@ -394,8 +405,8 @@ int S2D_Close(S2D_Window *window) {
 /*
  * Free all resources
  */
-int S2D_FreeWindow(S2D_Window *window) {
-  S2D_Close(window);
+int R2D_FreeWindow(R2D_Window *window) {
+  R2D_Close(window);
   SDL_GL_DeleteContext(window->glcontext);
   SDL_DestroyWindow(window->sdl);
   free(window);

data/lib/ruby2d.rb

@@ -1,26 +1,29 @@
 # Ruby2D module and native extension loader, adds DSL
 
 unless RUBY_ENGINE == 'mruby'
-  require 'ruby2d/colorize'
+  require 'ruby2d/cli/colorize'
   require 'ruby2d/exceptions'
   require 'ruby2d/renderable'
   require 'ruby2d/color'
   require 'ruby2d/window'
   require 'ruby2d/dsl'
+  require 'ruby2d/entity'
   require 'ruby2d/quad'
   require 'ruby2d/line'
   require 'ruby2d/circle'
   require 'ruby2d/rectangle'
   require 'ruby2d/square'
   require 'ruby2d/triangle'
+  require 'ruby2d/pixel'
   require 'ruby2d/image'
   require 'ruby2d/sprite'
+  require 'ruby2d/tileset'
   require 'ruby2d/font'
   require 'ruby2d/text'
   require 'ruby2d/sound'
   require 'ruby2d/music'
 
-  if RUBY_PLATFORM =~ /mingw/
+  if defined?(RubyInstaller)
     s2d_dll_path = Gem::Specification.find_by_name('ruby2d').gem_dir + '/assets/mingw/bin'
     RubyInstaller::Runtime.add_dll_directory(File.expand_path(s2d_dll_path))
   end

data/lib/ruby2d/circle.rb

@@ -10,8 +10,8 @@ module Ruby2D
       @x = opts[:x] || 25
       @y = opts[:y] || 25
       @z = opts[:z] || 0
-      @radius = opts[:radius] || 25
-      @sectors = opts[:sectors] || 20
+      @radius = opts[:radius] || 50
+      @sectors = opts[:sectors] || 30
       self.color = opts[:color] || 'white'
       self.opacity = opts[:opacity] if opts[:opacity]
       add
@@ -21,5 +21,21 @@ module Ruby2D
       Math.sqrt((x - @x)**2 + (y - @y)**2) <= @radius
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x], opts[:y], opts[:radius], opts[:sectors],
+        opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]
+      ])
+    end
+
+    private
+
+    def render
+      self.class.ext_draw([
+        @x, @y, @radius, @sectors,
+        @color.r, @color.g, @color.b, @color.a
+      ])
+    end
+
   end
 end

data/lib/ruby2d/cli/build.rb

@@ -7,7 +7,7 @@ require 'fileutils'
 
 # The Ruby 2D library files
 @lib_files = [
-  'colorize',
+  'cli/colorize',
   'exceptions',
   'renderable',
   'color',
@@ -96,7 +96,7 @@ def build_native(rb_file)
   end
 
   # Compile to a native executable
-  `cc build/app.c -lmruby \`simple2d --libs\` -o build/app`
+  `cc build/app.c -lmruby -o build/app`
 
   # Clean up
   clean_up unless @debug
@@ -162,12 +162,6 @@ end
 def build_ios_tvos(rb_file, device)
   check_build_src_file(rb_file)
 
-  # Check for Simple 2D framework,
-  unless File.exist?('/usr/local/Frameworks/Simple2D/iOS/Simple2D.framework') && File.exist?('/usr/local/Frameworks/Simple2D/tvOS/Simple2D.framework')
-    puts "#{'Error:'.error} Simple 2D iOS and tvOS frameworks not found. Install them and try again.\n"
-    exit
-  end
-
   # Check if MRuby exists; if not, quit
   if `which mruby`.empty?
     puts "#{'Error:'.error} Can't find MRuby, which is needed to build native Ruby 2D applications.\n"
@@ -197,6 +191,7 @@ def build_ios_tvos(rb_file, device)
     f << File.read("#{@gem_dir}/ext/ruby2d/ruby2d.c")
   end
 
+  # TODO: Need add this functionality to the gem
   # Build the Xcode project
   `simple2d build --#{device} build/#{device}/MyApp.xcodeproj`