ruby2d 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083de7264ef6e1144cd11683c383edf8fbac309d9cd648637301ce3bfcc804a8'
-  data.tar.gz: c0b437bd8f4dfe93994645308a44ea299dfd72259d2d00b67a162cdc2cefb758
+  metadata.gz: bbdaa086d718eacee3d9af77fd86b464ebf8cbb4db4bfbf796663c6fbbbd491c
+  data.tar.gz: 6167710b57e59b5635b3818687ca94175b98ab7d05c94bbd55d9fbf6744f299b
 SHA512:
-  metadata.gz: 17010953aceed980d3c6c01856a375c98e964f11eebf53eccf4fef7b6244cb4797e0bb8bc5202ccee16882f9d1e3fce55d741b78a15f28ba780dd69715e90332
-  data.tar.gz: 324e529ed71ce795ce8c86d281a245e569e8f1fd491f25d011089a8ed8fb1734b4abc288008355d6bbbd4548bbb231ff01e4711c9f10600f93a90ea4f383c69a
+  metadata.gz: 2a8e81e3f9313feaeda6e45e24b06c8bcf7c4e1436635dc06ea8504448a6f8734174c3c2c55fc6678ff2e48522aebe1bd8e6d9ab8aa670da683373473f7f8270
+  data.tar.gz: 4f31cf8d067c851de3a043a7716803e42c37bb4144a55087fce61b2270e53dc94130a3e87b6943b7e07625b4024c7640a9c357bbc5d15253cda8adacd1e95d74

data/bin/ruby2d

@@ -18,10 +18,10 @@ end
   'exceptions',
   'color',
   'window',
-  'application',
   'dsl',
   'quad',
   'line',
+  'circle',
   'rectangle',
   'square',
   'triangle',
@@ -60,8 +60,8 @@ def make_lib
   end
 
   lib << "
-include Ruby2D::DSL
-include Ruby2D\n"
+include Ruby2D
+extend  Ruby2D::DSL\n"
 
   File.write('build/lib.rb', lib)
 end
@@ -87,13 +87,16 @@ def build_native(rb_file)
     exit
   end
 
+  # Add debugging information to produce backtrace
+  if @debug then debug_flag = '-g' end
+
   # Assemble the Ruby 2D library in one `.rb` file and compile to bytecode
   make_lib
-  `mrbc -Bruby2d_lib -obuild/lib.c build/lib.rb`
+  `mrbc #{debug_flag} -Bruby2d_lib -obuild/lib.c build/lib.rb`
 
   # Read the provided Ruby source file, copy to build dir and compile to bytecode
   File.open('build/src.rb', 'w') { |file| file << strip_require(rb_file) }
-  `mrbc -Bruby2d_app -obuild/src.c build/src.rb`
+  `mrbc #{debug_flag} -Bruby2d_app -obuild/src.c build/src.rb`
 
   # Combine contents of C source files and bytecode into one file
   open('build/app.c', 'w') do |f|
@@ -165,13 +168,16 @@ def build_apple(rb_file, device)
     exit
   end
 
+  # Add debugging information to produce backtrace
+  if @debug then debug_flag = '-g' end
+
   # Assemble the Ruby 2D library in one `.rb` file and compile to bytecode
   make_lib
-  `mrbc -Bruby2d_lib -obuild/lib.c build/lib.rb`
+  `mrbc #{debug_flag} -Bruby2d_lib -obuild/lib.c build/lib.rb`
 
   # Read the provided Ruby source file, copy to build dir and compile to bytecode
   File.open('build/src.rb', 'w') { |file| file << strip_require(rb_file) }
-  `mrbc -Bruby2d_app -obuild/src.c build/src.rb`
+  `mrbc #{debug_flag} -Bruby2d_app -obuild/src.c build/src.rb`
 
   # Copy over iOS project
   FileUtils.cp_r "#{@gem_dir}/assets/#{device}", "build"
@@ -249,7 +255,7 @@ def launch_apple(device)
       puts "No iOS app built!"
       exit
     end
-    puts `simple2d simulator --open "iPhone 8" &&
+    puts `simple2d simulator --open "iPhone XR" &&
           simple2d simulator --install "build/ios/build/Release-iphonesimulator/MyApp.app" &&
           simple2d simulator --launch "Ruby2D.MyApp"`
   when 'tvos'
@@ -257,7 +263,7 @@ def launch_apple(device)
       puts "No tvOS app built!"
       exit
     end
-    puts `simple2d simulator --open "Apple TV" &&
+    puts `simple2d simulator --open "Apple TV 4K" &&
           simple2d simulator --install "build/tvos/build/Release-appletvsimulator/MyApp.app" &&
           simple2d simulator --launch "Ruby2D.MyApp"`
   end
@@ -325,8 +331,6 @@ Choose an option with the #{"simulator".bold} command:
   --log <app>     Stream log for the app only, given the app name
   --log-errors    Stream log containing only error messages\n\n"
 
-# puts ARGV.inspect
-
 case ARGV[0]
 when 'build'
   if ARGV.delete '--debug' then @debug = true end

data/ext/ruby2d/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-S2D_VERSION = '0.9.0'  # Simple 2D minimum version required
+S2D_VERSION = '1.0.1'  # Simple 2D minimum version required
 $errors = []
 
 class String
@@ -76,6 +76,6 @@ check_s2d_version
 # Add flags
 $CFLAGS  << ' -std=c11 -I/usr/local/include'
 $LDFLAGS << ' ' << `bash simple2d --libs`
-$LDFLAGS.gsub!(/\n/, ' ')  # Remove newlines in flags, they cause problems
+$LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they cause problems
 
 create_makefile('ruby2d/ruby2d')

data/ext/ruby2d/ruby2d-opal.rb

@@ -1,4 +1,4 @@
-# ruby2d-opal.rb
+# Web extension for Opal
 
 # Ruby 2D window
 $R2D_WINDOW = nil

data/ext/ruby2d/ruby2d.c

@@ -1,4 +1,4 @@
-// ruby2d.c – Native C extension for Ruby and MRuby
+// Native C extension for Ruby and MRuby
 
 // Simple 2D includes
 #if RUBY2D_IOS_TVOS
@@ -62,8 +62,8 @@
   #define r_ary_entry(ary, pos)  mrb_ary_entry(ary, pos)
   #define r_data_wrap_struct(name, data)  mrb_obj_value(Data_Wrap_Struct(mrb, mrb->object_class, &name##_data_type, data))
   #define r_data_get_struct(self, var, mrb_type, rb_type, data)  Data_Get_Struct(mrb, r_iv_get(self, var), mrb_type, data)
-  #define r_define_module(name)  mrb_module_get(mrb, name)
-  #define r_define_class(module, name)  mrb_class_get_under(mrb, module, name)
+  #define r_define_module(name)  mrb_define_module(mrb, name)
+  #define r_define_class(module, name)  mrb_define_class_under(mrb, module, name, mrb->object_class)
   #define r_define_method(class, name, function, args)  mrb_define_method(mrb, class, name, function, args)
   #define r_args_none  (MRB_ARGS_NONE())
   #define r_args_req(n)  MRB_ARGS_REQ(n)
@@ -152,18 +152,6 @@ double normalize_controller_axis(int val) {
 }
 
 
-/*
- * File#exists? for MRuby
- */
-#if MRUBY
-static R_VAL file_exists(mrb_state* mrb, R_VAL self) {
-  mrb_value path;
-  mrb_get_args(mrb, "o", &path);
-  return S2D_FileExists(RSTRING_PTR(path)) ? R_TRUE : R_FALSE;
-}
-#endif
-
-
 /*
  * Ruby2D::Triangle#ext_render
  */
@@ -295,6 +283,31 @@ static R_VAL ruby2d_line_ext_render(R_VAL self) {
 }
 
 
+/*
+ * Ruby2D::Circle#ext_render
+ */
+#if MRUBY
+static R_VAL ruby2d_circle_ext_render(mrb_state* mrb, R_VAL self) {
+#else
+static R_VAL ruby2d_circle_ext_render(R_VAL self) {
+#endif
+  R_VAL c = r_iv_get(self, "@color");
+
+  S2D_DrawCircle(
+    NUM2DBL(r_iv_get(self, "@x")),
+    NUM2DBL(r_iv_get(self, "@y")),
+    NUM2DBL(r_iv_get(self, "@radius")),
+    NUM2DBL(r_iv_get(self, "@sectors")),
+    NUM2DBL(r_iv_get(c, "@r")),
+    NUM2DBL(r_iv_get(c, "@g")),
+    NUM2DBL(r_iv_get(c, "@b")),
+    NUM2DBL(r_iv_get(c, "@a"))
+  );
+
+  return R_NIL;
+}
+
+
 /*
  * Ruby2D::Image#ext_init
  * Initialize image structure data
@@ -340,6 +353,8 @@ static R_VAL ruby2d_image_ext_render(R_VAL self) {
   if (r_test(w)) img->width  = NUM2INT(w);
   if (r_test(h)) img->height = NUM2INT(h);
 
+  S2D_RotateImage(img, NUM2DBL(r_iv_get(self, "@rotate")), S2D_CENTER);
+
   R_VAL c = r_iv_get(self, "@color");
   img->color.r = NUM2DBL(r_iv_get(c, "@r"));
   img->color.g = NUM2DBL(r_iv_get(c, "@g"));
@@ -361,7 +376,7 @@ static void free_image(mrb_state *mrb, void *p_) {
 #else
 static void free_image(S2D_Image *img) {
 #endif
-  S2D_Log(S2D_INFO, "Free image: %i, %i", img->x, img->y);
+  S2D_Log(S2D_INFO, "Free image `%s` at %i, %i", img->path, img->x, img->y);
   S2D_FreeImage(img);
 }
 
@@ -379,7 +394,11 @@ static R_VAL ruby2d_sprite_ext_init(R_VAL self, R_VAL path) {
 #endif
   S2D_Log(S2D_INFO, "Init sprite: %s", RSTRING_PTR(path));
   S2D_Sprite *spr = S2D_CreateSprite(RSTRING_PTR(path));
+
+  r_iv_set(self, "@img_width" , INT2NUM(spr->width));
+  r_iv_set(self, "@img_height", INT2NUM(spr->height));
   r_iv_set(self, "@data", r_data_wrap_struct(sprite, spr));
+
   return R_NIL;
 }
 
@@ -392,18 +411,28 @@ static R_VAL ruby2d_sprite_ext_render(mrb_state* mrb, R_VAL self) {
 #else
 static R_VAL ruby2d_sprite_ext_render(R_VAL self) {
 #endif
+  r_funcall(self, "update", 0);
+
   S2D_Sprite *spr;
   r_data_get_struct(self, "@data", &sprite_data_type, S2D_Sprite, spr);
 
-  spr->x = NUM2DBL(r_iv_get(self, "@x"));
-  spr->y = NUM2DBL(r_iv_get(self, "@y"));
+  spr->x = NUM2DBL(r_iv_get(self, "@flip_x"));
+  spr->y = NUM2DBL(r_iv_get(self, "@flip_y"));
+
+  R_VAL w = r_iv_get(self, "@flip_width");
+  if (r_test(w)) spr->width = NUM2DBL(w);
+
+  R_VAL h = r_iv_get(self, "@flip_height");
+  if (r_test(h)) spr->height = NUM2DBL(h);
+
+  S2D_RotateSprite(spr, NUM2DBL(r_iv_get(self, "@rotate")), S2D_CENTER);
 
   S2D_ClipSprite(
     spr,
     NUM2INT(r_iv_get(self, "@clip_x")),
     NUM2INT(r_iv_get(self, "@clip_y")),
-    NUM2INT(r_iv_get(self, "@clip_w")),
-    NUM2INT(r_iv_get(self, "@clip_h"))
+    NUM2INT(r_iv_get(self, "@clip_width")),
+    NUM2INT(r_iv_get(self, "@clip_height"))
   );
 
   S2D_DrawSprite(spr);
@@ -421,7 +450,7 @@ static void free_sprite(mrb_state *mrb, void *p_) {
 #else
 static void free_sprite(S2D_Sprite *spr) {
 #endif
-  S2D_Log(S2D_INFO, "Free sprite: %i, %i", spr->x, spr->y);
+  S2D_Log(S2D_INFO, "Free sprite `%s` at %i, %i", spr->path, spr->x, spr->y);
   S2D_FreeSprite(spr);
 }
 
@@ -487,6 +516,8 @@ static R_VAL ruby2d_text_ext_render(R_VAL self) {
   txt->x = NUM2DBL(r_iv_get(self, "@x"));
   txt->y = NUM2DBL(r_iv_get(self, "@y"));
 
+  S2D_RotateText(txt, NUM2DBL(r_iv_get(self, "@rotate")), S2D_CENTER);
+
   R_VAL c = r_iv_get(self, "@color");
   txt->color.r = NUM2DBL(r_iv_get(c, "@r"));
   txt->color.g = NUM2DBL(r_iv_get(c, "@g"));
@@ -508,7 +539,7 @@ static void free_text(mrb_state *mrb, void *p_) {
 #else
 static void free_text(S2D_Text *txt) {
 #endif
-  S2D_Log(S2D_INFO, "Free text: %s", txt->msg);
+  S2D_Log(S2D_INFO, "Free text \"%s\" with font `%s`", txt->msg, txt->font);
   S2D_FreeText(txt);
 }
 
@@ -555,7 +586,7 @@ static void free_sound(mrb_state *mrb, void *p_) {
 #else
 static void free_sound(S2D_Sound *snd) {
 #endif
-  S2D_Log(S2D_INFO, "Free sound");
+  S2D_Log(S2D_INFO, "Free sound `%s`", snd->path);
   S2D_FreeSound(snd);
 }
 
@@ -656,7 +687,7 @@ static void free_music(mrb_state *mrb, void *p_) {
 #else
 static void free_music(S2D_Music *mus) {
 #endif
-  S2D_Log(S2D_INFO, "Free music");
+  S2D_Log(S2D_INFO, "Free music `%s`", mus->path);
   S2D_FreeMusic(mus);
 }
 
@@ -895,6 +926,22 @@ static R_VAL ruby2d_window_ext_get_display_dimensions(R_VAL self) {
 }
 
 
+/*
+ * Ruby2D::Window#ext_add_controller_mappings
+ */
+#if MRUBY
+static R_VAL ruby2d_window_ext_add_controller_mappings(mrb_state* mrb, R_VAL self) {
+  mrb_value path;
+  mrb_get_args(mrb, "o", &path);
+#else
+static R_VAL ruby2d_window_ext_add_controller_mappings(R_VAL self, R_VAL path) {
+#endif
+  S2D_Log(S2D_INFO, "Adding controller mappings from `%s`", RSTRING_PTR(path));
+  S2D_AddControllerMappingsFromFile(RSTRING_PTR(path));
+  return R_NIL;
+}
+
+
 /*
  * Ruby2D::Window#ext_show
  */
@@ -905,23 +952,27 @@ static R_VAL ruby2d_window_ext_show(R_VAL self) {
 #endif
   ruby2d_window = self;
 
+  // Set Simple 2D diagnostics
   if (r_test(r_iv_get(self, "@diagnostics"))) {
     S2D_Diagnostics(true);
   }
 
-  // Load controller mappings, if DB file exists
-  char *controller_mappings_path = RSTRING_PTR(r_iv_get(self, "@controller_mappings_path"));
-  if (S2D_FileExists(controller_mappings_path)) {
-    S2D_LoadControllerMappingsFromFile(controller_mappings_path);
-  }
+  // Add controller mappings from file
+  r_funcall(self, "add_controller_mappings", 0);
 
   // Get window attributes
   char *title = RSTRING_PTR(r_iv_get(self, "@title"));
   int width   = NUM2INT(r_iv_get(self, "@width"));
   int height  = NUM2INT(r_iv_get(self, "@height"));
-  int flags   = 0;
+  int fps_cap = NUM2INT(r_iv_get(self, "@fps_cap"));
+
+  // Get the window icon
+  char *icon = NULL;
+  R_VAL iv_icon = r_iv_get(self, "@icon");
+  if (r_test(iv_icon)) icon = RSTRING_PTR(iv_icon);
 
   // Get window flags
+  int flags = 0;
   if (r_test(r_iv_get(self, "@resizable"))) {
     flags = flags | S2D_RESIZABLE;
   }
@@ -951,6 +1002,8 @@ static R_VAL ruby2d_window_ext_show(R_VAL self) {
 
   window->viewport.width  = viewport_width;
   window->viewport.height = viewport_height;
+  window->fps_cap         = fps_cap;
+  window->icon            = icon;
   window->on_key          = on_key;
   window->on_mouse        = on_mouse;
   window->on_controller   = on_controller;
@@ -983,10 +1036,6 @@ int main() {
   // Load the Ruby 2D library
   mrb_load_irep(mrb, ruby2d_lib);
 
-  // Add missing MRuby classes, methods
-  R_CLASS file_class = mrb_define_class(mrb, "File", mrb->object_class);
-  mrb_define_class_method(mrb, file_class, "exists?", file_exists, r_args_req(1));
-
 #else
 /*
  * Ruby C extension init
@@ -1015,6 +1064,12 @@ void Init_ruby2d() {
   // Ruby2D::Line#ext_render
   r_define_method(ruby2d_line_class, "ext_render", ruby2d_line_ext_render, r_args_none);
 
+  // Ruby2D::Circle
+  R_CLASS ruby2d_circle_class = r_define_class(ruby2d_module, "Circle");
+
+  // Ruby2D::Circle#ext_render
+  r_define_method(ruby2d_circle_class, "ext_render", ruby2d_circle_ext_render, r_args_none);
+
   // Ruby2D::Image
   R_CLASS ruby2d_image_class = r_define_class(ruby2d_module, "Image");
 
@@ -1081,6 +1136,9 @@ void Init_ruby2d() {
   // Ruby2D::Window#ext_get_display_dimensions
   r_define_method(ruby2d_window_class, "ext_get_display_dimensions", ruby2d_window_ext_get_display_dimensions, r_args_none);
 
+  // Ruby2D::Window#ext_add_controller_mappings
+  r_define_method(ruby2d_window_class, "ext_add_controller_mappings", ruby2d_window_ext_add_controller_mappings, r_args_req(1));
+
   // Ruby2D::Window#ext_show
   r_define_method(ruby2d_window_class, "ext_show", ruby2d_window_ext_show, r_args_none);
 

data/lib/ruby2d.rb

@@ -1,13 +1,13 @@
-# ruby2d.rb
+# Ruby2D module and native extension loader, adds DSL
 
 require 'ruby2d/renderable'
 require 'ruby2d/exceptions'
 require 'ruby2d/color'
 require 'ruby2d/window'
-require 'ruby2d/application'
 require 'ruby2d/dsl'
 require 'ruby2d/quad'
 require 'ruby2d/line'
+require 'ruby2d/circle'
 require 'ruby2d/rectangle'
 require 'ruby2d/square'
 require 'ruby2d/triangle'

data/lib/ruby2d/circle.rb

@@ -0,0 +1,29 @@
+# Ruby2D::Circle
+
+module Ruby2D
+  class Circle
+    include Renderable
+
+    attr_reader :color
+    attr_accessor :x, :y, :radius, :sectors
+
+    def initialize(opts = {})
+      @x = opts[:x] || 25
+      @y = opts[:y] || 25
+      @z = opts[:z] || 0
+      @radius = opts[:radius] || 25
+      @sectors = opts[:sectors] || 20
+      self.color = opts[:color] || 'white'
+      add
+    end
+
+    def color=(c)
+      @color = Color.from(c)
+    end
+
+    def contains?(x, y)
+      Math.sqrt((x - @x)**2 + (y - @y)**2) <= @radius
+    end
+
+  end
+end

data/lib/ruby2d/color.rb

@@ -1,11 +1,12 @@
-# color.rb
+# Ruby2D::Color
 
 module Ruby2D
   class Color
+
     # Color::Set represents an array of colors
     class Set
       def initialize(colors)
-        @colors = colors.map{|c| Color.new(c)}
+        @colors = colors.map { |c| Color.new(c) }
       end
 
       def [](i)
@@ -25,7 +26,7 @@ module Ruby2D
       end
     end
 
-    attr_reader :r, :g, :b, :a
+    attr_accessor :r, :g, :b, :a
 
     # Based on clrs.cc
     @@colors = {
@@ -83,31 +84,28 @@ module Ruby2D
 
       # Array of Floats from 0.0..1.0
       c.class == Array && c.length == 4 &&
-      c.all? { |el|
-        el.is_a?(Numeric)
-      }
+      c.all? { |el| el.is_a?(Numeric) }
     end
 
+    # Create a color from whatever is provided
     def self.from(input)
-      # If a valid array of colors, return a Color::Set with those colors
-      # Else return single color
+      # If a valid array of colors, return a `Color::Set` with those colors
       if input.is_a? Array and input.all? { |el| Color.is_valid? el }
         Color::Set.new(input)
+      # Otherwise, return single color
       else
         Color.new(input)
       end
     end
 
+    # Convenience methods to alias `opacity` to `@a`
     def opacity; @a end
-
-    def opacity=(opacity)
-      @a = opacity
-    end
+    def opacity=(opacity); @a = opacity end
 
     private
 
-    # TODO: Only `Number` supported in JS
     # Convert from Fixnum (0..255) to Float (0.0..1.0)
+    #   TODO: Only `Number` is supported in JS
     def to_f(a)
       b = []
       a.each do |n|
@@ -130,4 +128,7 @@ module Ruby2D
     end
 
   end
+
+  # Allow British English spelling of color
+  Colour = Color
 end