ruby2d 0.9.0 → 0.9.5

data/assets/include/SDL2/SDL_types.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 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

data/assets/include/SDL2/SDL_version.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 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
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   0
-#define SDL_PATCHLEVEL      9
+#define SDL_PATCHLEVEL      10
 
 /**
  *  \brief Macro to determine SDL version program was compiled against.

data/assets/include/SDL2/SDL_video.h

@@ -1,6 +1,6 @@
 /*
   Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 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

data/assets/include/SDL2/SDL_vulkan.h

@@ -98,8 +98,8 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */
  *        applications to link with libvulkan (and historically MoltenVK was
  *        provided as a static library). If it is not found then, on macOS, SDL
  *        will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib,
- *        \c MoltenVK.framework/MoltenVK and \c libMoltenVK.dylib in that order.
- *        On iOS SDL will attempt to load \c libMoltenVK.dylib. Applications
+ *        followed by \c libvulkan.dylib, in that order.
+ *        On iOS SDL will attempt to load \c libvulkan.dylib only. Applications
  *        using a dynamic framework or .dylib must ensure it is included in its
  *        application bundle.
  *
@@ -153,7 +153,7 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void);
  *  is smaller than the number of required extensions, \c SDL_FALSE will be
  *  returned instead of \c SDL_TRUE, to indicate that not all the required
  *  extensions were returned.
- * 
+ *
  *  \note If \c window is not NULL, it will be checked against its creation
  *        flags to ensure that the Vulkan flag is present. This parameter
  *        will be removed in a future major release.

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-2019 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
@@ -105,6 +105,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-2019 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

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'ruby2d/colorize'
+require 'ruby2d/cli/colorize'
 require 'ruby2d/version'
 
 # Debugging command-line flag
@@ -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/ext/ruby2d/common.c

@@ -0,0 +1,185 @@
+// Ruby 2D Shared functions and data
+
+#include "ruby2d.h"
+
+// Initalize shared data
+bool R2D_diagnostics = false;
+
+// Initialization status
+static bool initted = false;
+
+
+/*
+ * Provide a `vasprintf()` implementation for Windows
+ */
+#if WINDOWS && !MINGW
+int vasprintf(char **strp, const char *fmt, va_list ap) {
+  int r = -1, size = _vscprintf(fmt, ap);
+  if ((size >= 0) && (size < INT_MAX)) {
+    *strp = (char *)malloc(size + 1);
+    if (*strp) {
+      r = vsnprintf(*strp, size + 1, fmt, ap);
+      if (r == -1) free(*strp);
+    }
+  } else { *strp = 0; }
+  return(r);
+}
+#endif
+
+
+/*
+ * Checks if a file exists and can be accessed
+ */
+bool R2D_FileExists(const char *path) {
+  if (!path) return false;
+
+  if (access(path, F_OK) != -1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+
+/*
+ * Logs standard messages to the console
+ */
+void R2D_Log(int type, const char *msg, ...) {
+
+  // Always log if diagnostics set, or if a warning or error message
+  if (R2D_diagnostics || type != R2D_INFO) {
+
+    va_list args;
+    va_start(args, msg);
+
+    switch (type) {
+      case R2D_INFO:
+        printf("\033[1;36mInfo:\033[0m ");
+        break;
+      case R2D_WARN:
+        printf("\033[1;33mWarning:\033[0m ");
+        break;
+      case R2D_ERROR:
+        printf("\033[1;31mError:\033[0m ");
+        break;
+    }
+
+    vprintf(msg, args);
+    printf("\n");
+    va_end(args);
+  }
+}
+
+
+/*
+ * Logs Ruby 2D errors to the console, with caller and message body
+ */
+void R2D_Error(const char *caller, const char *msg, ...) {
+  va_list args;
+  va_start(args, msg);
+  char *fmsg;
+  vasprintf(&fmsg, msg, args);
+  R2D_Log(R2D_ERROR, "(%s) %s", caller, fmsg);
+  free(fmsg);
+  va_end(args);
+}
+
+
+/*
+ * Enable/disable logging of diagnostics
+ */
+void R2D_Diagnostics(bool status) {
+  R2D_diagnostics = status;
+}
+
+
+/*
+ * Enable terminal colors in Windows
+ */
+void R2D_Windows_EnableTerminalColors() {
+  #if WINDOWS
+    HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+    DWORD dwMode = 0;
+    GetConsoleMode(hOut, &dwMode);
+    dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+    SetConsoleMode(hOut, dwMode);
+  #endif
+}
+
+
+/*
+ * Initialize Ruby 2D subsystems
+ */
+bool R2D_Init() {
+  if (initted) return true;
+
+  // Enable terminal colors in Windows
+  R2D_Windows_EnableTerminalColors();
+
+  R2D_Log(R2D_INFO, "Initializing Ruby 2D");
+
+  // Initialize SDL
+  if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
+    R2D_Error("SDL_Init", SDL_GetError());
+    return false;
+  }
+
+  // Initialize SDL_ttf
+  if (TTF_Init() != 0) {
+    R2D_Error("TTF_Init", TTF_GetError());
+    return false;
+  }
+
+  // Initialize SDL_mixer
+  int mix_flags = MIX_INIT_FLAC | MIX_INIT_OGG | MIX_INIT_MP3;
+  int mix_initted = Mix_Init(mix_flags);
+
+  // Bug in SDL2_mixer 2.0.2:
+  //   Mix_Init should return OR'ed flags if successful, but returns 0 instead.
+  //   Fixed in: https://hg.libsdl.org/SDL_mixer/rev/7fa15b556953
+  const SDL_version *linked_version = Mix_Linked_Version();
+  if (linked_version->major == 2 && linked_version->minor == 0 && linked_version->patch == 2) {
+    // It's version 2.0.2, don't check for Mix_Init errors
+  } else {
+    if ((mix_initted&mix_flags) != mix_flags) {
+      R2D_Error("Mix_Init", Mix_GetError());
+    }
+  }
+
+  if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 4096) != 0) {
+    R2D_Error("Mix_OpenAudio", Mix_GetError());
+    return false;
+  }
+
+  // Call `R2D_Quit` at program exit
+  atexit(R2D_Quit);
+
+  // All subsystems initted
+  initted = true;
+  return true;
+}
+
+
+/*
+ * Gets the primary display's dimensions
+ */
+void R2D_GetDisplayDimensions(int *w, int *h) {
+  R2D_Init();
+  SDL_DisplayMode dm;
+  SDL_GetCurrentDisplayMode(0, &dm);
+  *w = dm.w;
+  *h = dm.h;
+}
+
+
+/*
+ * Quits Ruby 2D subsystems
+ */
+void R2D_Quit() {
+  IMG_Quit();
+  Mix_CloseAudio();
+  Mix_Quit();
+  TTF_Quit();
+  SDL_Quit();
+  initted = false;
+}

data/ext/ruby2d/controllers.c

@@ -0,0 +1,110 @@
+// controllers.c
+
+#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.
+static int last_intance_id = -1;
+
+
+/*
+ * Add controller mapping from string
+ */
+void R2D_AddControllerMapping(const char *map) {
+  int result = SDL_GameControllerAddMapping(map);
+
+  char guid[33];
+  strncpy(guid, map, 32);
+
+  switch (result) {
+    case 1:
+      R2D_Log(R2D_INFO, "Mapping added for GUID: %s", guid);
+      break;
+    case 0:
+      R2D_Log(R2D_INFO, "Mapping updated for GUID: %s", guid);
+      break;
+    case -1:
+      R2D_Error("SDL_GameControllerAddMapping", SDL_GetError());
+      break;
+  }
+}
+
+
+/*
+ * Add controller mappings from the specified file
+ */
+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) {
+    R2D_Error("SDL_GameControllerAddMappingsFromFile", SDL_GetError());
+  } else {
+    R2D_Log(R2D_INFO, "Added %i controller mapping(s)", mappings_added);
+  }
+}
+
+
+/*
+ * Check if joystick is a controller
+ */
+bool R2D_IsController(SDL_JoystickID id) {
+  return SDL_GameControllerFromInstanceID(id) == NULL ? false : true;
+}
+
+
+/*
+ * Open controllers and joysticks
+ */
+void R2D_OpenControllers() {
+
+  char guid_str[33];
+
+  // Enumerate joysticks
+  for (int device_index = 0; device_index < SDL_NumJoysticks(); ++device_index) {
+
+    // Check if joystick supports SDL's game controller interface (a mapping is available)
+    if (SDL_IsGameController(device_index)) {
+      SDL_GameController *controller = SDL_GameControllerOpen(device_index);
+      SDL_JoystickID intance_id = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller));
+
+      SDL_JoystickGetGUIDString(
+        SDL_JoystickGetGUID(SDL_GameControllerGetJoystick(controller)),
+        guid_str, 33
+      );
+
+      if (intance_id > last_intance_id) {
+        if (controller) {
+          R2D_Log(R2D_INFO, "Controller #%i: %s\n      GUID: %s", intance_id, SDL_GameControllerName(controller), guid_str);
+        } else {
+          R2D_Log(R2D_ERROR, "Could not open controller #%i: %s", intance_id, SDL_GetError());
+        }
+        last_intance_id = intance_id;
+      }
+
+    // Controller interface not supported, try to open as joystick
+    } else {
+      SDL_Joystick *joy = SDL_JoystickOpen(device_index);
+      SDL_JoystickID intance_id = SDL_JoystickInstanceID(joy);
+
+      if (!joy) {
+        R2D_Log(R2D_ERROR, "Could not open controller");
+      } else if(intance_id > last_intance_id) {
+        SDL_JoystickGetGUIDString(
+          SDL_JoystickGetGUID(joy),
+          guid_str, 33
+        );
+        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)
+        );
+        R2D_Log(R2D_WARN, "Controller #%i does not have a mapping available", intance_id);
+        last_intance_id = intance_id;
+      }
+    }
+  }
+}