ruby2d 0.9.3 → 0.11.0

data/assets/include/SDL2/begin_code.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -51,15 +51,11 @@
 
 /* Some compilers use a special export keyword */
 #ifndef DECLSPEC
-# if defined(__WIN32__) || defined(__WINRT__)
-#  ifdef __BORLANDC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC
-#   else
-#    define DECLSPEC    __declspec(dllimport)
-#   endif
-#  else
+# if defined(__WIN32__) || defined(__WINRT__) || defined(__CYGWIN__)
+#  ifdef DLL_EXPORT
 #   define DECLSPEC __declspec(dllexport)
+#  else
+#   define DECLSPEC
 #  endif
 # elif defined(__OS2__)
 #   ifdef BUILD_SDL
@@ -105,6 +101,9 @@
 #ifdef _MSC_VER
 #pragma warning(disable: 4103)
 #endif
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wpragma-pack"
+#endif
 #ifdef __BORLANDC__
 #pragma nopackwarning
 #endif

data/assets/include/SDL2/close_code.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -26,6 +26,9 @@
  *  after you finish any function and structure declarations in your headers
  */
 
+#ifndef _begin_code_h
+#error close_code.h included without matching begin_code.h
+#endif
 #undef _begin_code_h
 
 /* Reset structure packing at previous byte alignment */

data/bin/ruby2d

@@ -115,6 +115,7 @@ when 'launch'
   else
     puts usage_launch
   end
+# TODO: Need add this functionality to the gem
 when 'simulator'
   case ARGV[1]
   when '--list'

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

@@ -1,11 +1,11 @@
-// Simple 2D Shared functions and data
+// Ruby 2D Shared functions and data
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
-// Initalize S2D shared data
-bool S2D_diagnostics = false;
+// Initalize shared data
+bool R2D_diagnostics = false;
 
-// S2D initialization status
+// Initialization status
 static bool initted = false;
 
 
@@ -30,7 +30,7 @@ int vasprintf(char **strp, const char *fmt, va_list ap) {
 /*
  * Checks if a file exists and can be accessed
  */
-bool S2D_FileExists(const char *path) {
+bool R2D_FileExists(const char *path) {
   if (!path) return false;
 
   if (access(path, F_OK) != -1) {
@@ -44,22 +44,22 @@ bool S2D_FileExists(const char *path) {
 /*
  * Logs standard messages to the console
  */
-void S2D_Log(int type, const char *msg, ...) {
+void R2D_Log(int type, const char *msg, ...) {
 
   // Always log if diagnostics set, or if a warning or error message
-  if (S2D_diagnostics || type != S2D_INFO) {
+  if (R2D_diagnostics || type != R2D_INFO) {
 
     va_list args;
     va_start(args, msg);
 
     switch (type) {
-      case S2D_INFO:
+      case R2D_INFO:
         printf("\033[1;36mInfo:\033[0m ");
         break;
-      case S2D_WARN:
+      case R2D_WARN:
         printf("\033[1;33mWarning:\033[0m ");
         break;
-      case S2D_ERROR:
+      case R2D_ERROR:
         printf("\033[1;31mError:\033[0m ");
         break;
     }
@@ -72,14 +72,14 @@ void S2D_Log(int type, const char *msg, ...) {
 
 
 /*
- * Logs Simple 2D errors to the console, with caller and message body
+ * Logs Ruby 2D errors to the console, with caller and message body
  */
-void S2D_Error(const char *caller, const char *msg, ...) {
+void R2D_Error(const char *caller, const char *msg, ...) {
   va_list args;
   va_start(args, msg);
   char *fmsg;
   vasprintf(&fmsg, msg, args);
-  S2D_Log(S2D_ERROR, "(%s) %s", caller, fmsg);
+  R2D_Log(R2D_ERROR, "(%s) %s", caller, fmsg);
   free(fmsg);
   va_end(args);
 }
@@ -88,15 +88,15 @@ void S2D_Error(const char *caller, const char *msg, ...) {
 /*
  * Enable/disable logging of diagnostics
  */
-void S2D_Diagnostics(bool status) {
-  S2D_diagnostics = status;
+void R2D_Diagnostics(bool status) {
+  R2D_diagnostics = status;
 }
 
 
 /*
  * Enable terminal colors in Windows
  */
-void S2D_Windows_EnableTerminalColors() {
+void R2D_Windows_EnableTerminalColors() {
   #if WINDOWS
     HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
     DWORD dwMode = 0;
@@ -108,25 +108,25 @@ void S2D_Windows_EnableTerminalColors() {
 
 
 /*
- * Initialize Simple 2D subsystems
+ * Initialize Ruby 2D subsystems
  */
-bool S2D_Init() {
+bool R2D_Init() {
   if (initted) return true;
 
   // Enable terminal colors in Windows
-  S2D_Windows_EnableTerminalColors();
+  R2D_Windows_EnableTerminalColors();
 
-  S2D_Log(S2D_INFO, "Initializing Simple 2D");
+  R2D_Log(R2D_INFO, "Initializing Ruby 2D");
 
   // Initialize SDL
   if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
-    S2D_Error("SDL_Init", SDL_GetError());
+    R2D_Error("SDL_Init", SDL_GetError());
     return false;
   }
 
   // Initialize SDL_ttf
   if (TTF_Init() != 0) {
-    S2D_Error("TTF_Init", TTF_GetError());
+    R2D_Error("TTF_Init", TTF_GetError());
     return false;
   }
 
@@ -142,17 +142,17 @@ bool S2D_Init() {
     // It's version 2.0.2, don't check for Mix_Init errors
   } else {
     if ((mix_initted&mix_flags) != mix_flags) {
-      S2D_Error("Mix_Init", Mix_GetError());
+      R2D_Error("Mix_Init", Mix_GetError());
     }
   }
 
   if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 4096) != 0) {
-    S2D_Error("Mix_OpenAudio", Mix_GetError());
+    R2D_Error("Mix_OpenAudio", Mix_GetError());
     return false;
   }
 
-  // Call `S2D_Quit` at program exit
-  atexit(S2D_Quit);
+  // Call `R2D_Quit` at program exit
+  atexit(R2D_Quit);
 
   // All subsystems initted
   initted = true;
@@ -161,10 +161,10 @@ bool S2D_Init() {
 
 
 /*
- * Gets the primary display's dimentions
+ * Gets the primary display's dimensions
  */
-void S2D_GetDisplayDimensions(int *w, int *h) {
-  S2D_Init();
+void R2D_GetDisplayDimensions(int *w, int *h) {
+  R2D_Init();
   SDL_DisplayMode dm;
   SDL_GetCurrentDisplayMode(0, &dm);
   *w = dm.w;
@@ -173,9 +173,9 @@ void S2D_GetDisplayDimensions(int *w, int *h) {
 
 
 /*
- * Quits Simple 2D subsystems
+ * Quits Ruby 2D subsystems
  */
-void S2D_Quit() {
+void R2D_Quit() {
   IMG_Quit();
   Mix_CloseAudio();
   Mix_Quit();

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

@@ -1,6 +1,6 @@
 // controllers.c
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 // Stores the last joystick instance ID seen by the system. These instance IDs
 // are unique and increment with each new joystick connected.
@@ -10,7 +10,7 @@ static int last_intance_id = -1;
 /*
  * Add controller mapping from string
  */
-void S2D_AddControllerMapping(const char *map) {
+void R2D_AddControllerMapping(const char *map) {
   int result = SDL_GameControllerAddMapping(map);
 
   char guid[33];
@@ -18,13 +18,13 @@ void S2D_AddControllerMapping(const char *map) {
 
   switch (result) {
     case 1:
-      S2D_Log(S2D_INFO, "Mapping added for GUID: %s", guid);
+      R2D_Log(R2D_INFO, "Mapping added for GUID: %s", guid);
       break;
     case 0:
-      S2D_Log(S2D_INFO, "Mapping updated for GUID: %s", guid);
+      R2D_Log(R2D_INFO, "Mapping updated for GUID: %s", guid);
       break;
     case -1:
-      S2D_Error("SDL_GameControllerAddMapping", SDL_GetError());
+      R2D_Error("SDL_GameControllerAddMapping", SDL_GetError());
       break;
   }
 }
@@ -33,17 +33,17 @@ void S2D_AddControllerMapping(const char *map) {
 /*
  * Add controller mappings from the specified file
  */
-void S2D_AddControllerMappingsFromFile(const char *path) {
-  if (!S2D_FileExists(path)) {
-    S2D_Log(S2D_WARN, "Controller mappings file not found: %s", path);
+void R2D_AddControllerMappingsFromFile(const char *path) {
+  if (!R2D_FileExists(path)) {
+    R2D_Log(R2D_WARN, "Controller mappings file not found: %s", path);
     return;
   }
 
   int mappings_added = SDL_GameControllerAddMappingsFromFile(path);
   if (mappings_added == -1) {
-    S2D_Error("SDL_GameControllerAddMappingsFromFile", SDL_GetError());
+    R2D_Error("SDL_GameControllerAddMappingsFromFile", SDL_GetError());
   } else {
-    S2D_Log(S2D_INFO, "Added %i controller mapping(s)", mappings_added);
+    R2D_Log(R2D_INFO, "Added %i controller mapping(s)", mappings_added);
   }
 }
 
@@ -51,7 +51,7 @@ void S2D_AddControllerMappingsFromFile(const char *path) {
 /*
  * Check if joystick is a controller
  */
-bool S2D_IsController(SDL_JoystickID id) {
+bool R2D_IsController(SDL_JoystickID id) {
   return SDL_GameControllerFromInstanceID(id) == NULL ? false : true;
 }
 
@@ -59,7 +59,7 @@ bool S2D_IsController(SDL_JoystickID id) {
 /*
  * Open controllers and joysticks
  */
-void S2D_OpenControllers() {
+void R2D_OpenControllers() {
 
   char guid_str[33];
 
@@ -78,9 +78,9 @@ void S2D_OpenControllers() {
 
       if (intance_id > last_intance_id) {
         if (controller) {
-          S2D_Log(S2D_INFO, "Controller #%i: %s\n      GUID: %s", intance_id, SDL_GameControllerName(controller), guid_str);
+          R2D_Log(R2D_INFO, "Controller #%i: %s\n      GUID: %s", intance_id, SDL_GameControllerName(controller), guid_str);
         } else {
-          S2D_Log(S2D_ERROR, "Could not open controller #%i: %s", intance_id, SDL_GetError());
+          R2D_Log(R2D_ERROR, "Could not open controller #%i: %s", intance_id, SDL_GetError());
         }
         last_intance_id = intance_id;
       }
@@ -91,18 +91,18 @@ void S2D_OpenControllers() {
       SDL_JoystickID intance_id = SDL_JoystickInstanceID(joy);
 
       if (!joy) {
-        S2D_Log(S2D_ERROR, "Could not open controller");
+        R2D_Log(R2D_ERROR, "Could not open controller");
       } else if(intance_id > last_intance_id) {
         SDL_JoystickGetGUIDString(
           SDL_JoystickGetGUID(joy),
           guid_str, 33
         );
-        S2D_Log(S2D_INFO,
+        R2D_Log(R2D_INFO,
           "Controller #%i: %s\n      GUID: %s\n      Axes: %d\n      Buttons: %d\n      Balls: %d",
           intance_id, SDL_JoystickName(joy), guid_str, SDL_JoystickNumAxes(joy),
           SDL_JoystickNumButtons(joy), SDL_JoystickNumBalls(joy)
         );
-        S2D_Log(S2D_WARN, "Controller #%i does not have a mapping available", intance_id);
+        R2D_Log(R2D_WARN, "Controller #%i does not have a mapping available", intance_id);
         last_intance_id = intance_id;
       }
     }

data/ext/ruby2d/extconf.rb

@@ -1,7 +1,6 @@
 require 'mkmf'
 require_relative '../../lib/ruby2d/cli/colorize'
 
-S2D_VERSION = '1.1.0'  # Simple 2D minimum version required
 $errors = []  # Holds errors
 
 # Set the OS platform
@@ -13,6 +12,8 @@ when /linux/
   if `cat /etc/os-release` =~ /raspbian/
     $platform = :linux_rpi
   end
+when /bsd/
+  $platform = :bsd
 when /mingw/
   $platform = :windows
 else
@@ -31,27 +32,6 @@ def print_errors
 end
 
 
-# Check that Simple 2D is installed and meets minimum version requirements
-def check_s2d
-
-  # Simple 2D not installed
-  if `which simple2d`.empty?
-    $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
-               "To install, follow the instructions at #{"ruby2d.com".bold}"
-    print_errors; exit
-
-  # Simple 2D installed, checking version
-  else
-    unless Gem::Version.new(`bash simple2d --version`) >= Gem::Version.new(S2D_VERSION)
-      $errors << "Simple 2D needs to be updated for this version of Ruby 2D." <<
-                 "Run the following, then try reinstalling this gem:\n" <<
-                 "  simple2d update".bold
-      print_errors; exit
-    end
-  end
-end
-
-
 # Add compiler and linker flags
 def add_flags(type, flags)
   case type
@@ -63,32 +43,38 @@ def add_flags(type, flags)
 end
 
 
-# Check SDL libraries on Linux
-def check_sdl_linux
+# Check for SDL libraries
+def check_sdl
   unless have_library('SDL2') && have_library('SDL2_image') && have_library('SDL2_mixer') && have_library('SDL2_ttf')
 
     $errors << "Couldn't find packages needed by Ruby 2D."
 
-    # Fedora and CentOS
-    if system('which yum')
-      $errors << "Install the following packages using `yum` (or `dnf`) and try again:\n" <<
-      "  SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel".bold
-
-    # Arch
-    elsif system('which pacman')
-      $errors << "Install the following packages using `pacman` and try again:\n" <<
+    case $platform
+    when :linux, :linux_rpi
+      # Fedora and CentOS
+      if system('which yum')
+        $errors << "Install the following packages using `yum` (or `dnf`) and try again:\n" <<
+        "  SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel".bold
+
+      # Arch
+      elsif system('which pacman')
+        $errors << "Install the following packages using `pacman` and try again:\n" <<
+        "  sdl2 sdl2_image sdl2_mixer sdl2_ttf".bold
+
+      # openSUSE
+      elsif system('which zypper')
+        $errors << "Install the following packages using `zypper` and try again:\n" <<
+        "  libSDL2-devel libSDL2_image-devel libSDL2_mixer-devel libSDL2_ttf-devel".bold
+
+      # Ubuntu, Debian, and Mint
+      # `apt` must be last because openSUSE has it aliased to `zypper`
+      elsif system('which apt')
+        $errors << "Install the following packages using `apt` and try again:\n" <<
+        "  libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev".bold
+      end
+    when :bsd
+      $errors << "Install the following packages using `pkg` and try again:\n" <<
       "  sdl2 sdl2_image sdl2_mixer sdl2_ttf".bold
-
-    # openSUSE
-    elsif system('which zypper')
-      $errors << "Install the following packages using `zypper` and try again:\n" <<
-      "  libSDL2-devel libSDL2_image-devel libSDL2_mixer-devel libSDL2_ttf-devel".bold
-
-    # Ubuntu, Debian, and Mint
-    # `apt` must be last because openSUSE has it aliased to `zypper`
-    elsif system('which apt')
-      $errors << "Install the following packages using `apt` and try again:\n" <<
-      "  libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev".bold
     end
 
     $errors << "" << "See #{"ruby2d.com".bold} for additional help."
@@ -106,14 +92,11 @@ def set_rpi_flags
 end
 
 
-# Use the Simple 2D, SDL, and other libraries installed by the user (not those bundled with the gem)
+# Use SDL and other libraries installed by the user (not those bundled with the gem)
 def use_usr_libs
-  check_s2d
-
   # Add flags
   set_rpi_flags
   add_flags(:c, '-I/usr/local/include')
-  add_flags(:ld, `bash simple2d --libs`)
 end
 
 
@@ -134,27 +117,22 @@ else
     add_flags(:c, '-I../../assets/include')
     ldir = "#{Dir.pwd}/../../assets/macos/lib"
 
-    add_flags(:ld, "#{ldir}/libsimple2d.a")
     add_flags(:ld, "#{ldir}/libSDL2.a #{ldir}/libSDL2_image.a #{ldir}/libSDL2_mixer.a #{ldir}/libSDL2_ttf.a")
     add_flags(:ld, "#{ldir}/libjpeg.a #{ldir}/libpng16.a #{ldir}/libtiff.a #{ldir}/libwebp.a")
     add_flags(:ld, "#{ldir}/libmpg123.a #{ldir}/libogg.a #{ldir}/libFLAC.a #{ldir}/libvorbis.a #{ldir}/libvorbisfile.a")
     add_flags(:ld, "#{ldir}/libfreetype.a")
-    add_flags(:ld, "-Wl,-framework,Cocoa -Wl,-framework,ForceFeedback")
-
-  when :linux, :linux_rpi
-    check_sdl_linux
-    simple2d_dir = "#{Dir.pwd}/../../assets/linux/simple2d"
+    add_flags(:ld, "-Wl,-framework,Cocoa -Wl,-framework,GameController -Wl,-framework,ForceFeedback")
 
-    `(cd #{simple2d_dir} && make)`
+  when :linux, :linux_rpi, :bsd
+    check_sdl
 
     set_rpi_flags
-    add_flags(:c, "-I#{simple2d_dir}/include")
-    add_flags(:ld, "#{simple2d_dir}/build/libsimple2d.a -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lm")
+    add_flags(:ld, "-lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lm")
     if $platform == :linux then add_flags(:ld, '-lGL') end
 
   when :windows
     add_flags(:c, '-I../../assets/include')
-    add_flags(:ld, '-L../../assets/mingw/lib -lsimple2d -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf')
+    add_flags(:ld, '-L../../assets/mingw/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf')
     add_flags(:ld, '-lmingw32 -lopengl32 -lglew32')
 
   # If can't detect the platform, use libraries installed by the user
@@ -165,5 +143,5 @@ end
 
 $LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they can cause problems
 
-# Create the Makefile
+# Create Makefile
 create_makefile('ruby2d/ruby2d')