ruby2d 0.9.5 → 0.10.0

data/ext/ruby2d/ruby2d.h

@@ -341,6 +341,7 @@ typedef struct {
 typedef struct {
   const char *path;
   Mix_Music *data;
+  int length; // Length of music track
 } R2D_Music;
 
 // Ruby 2D Functions ///////////////////////////////////////////////////////////
@@ -497,6 +498,13 @@ void R2D_DrawSprite(R2D_Sprite *spr);
  */
 void R2D_FreeSprite(R2D_Sprite *spr);
 
+// Tile ////////////////////////////////////////////////////////////////////////
+
+/*
+ * 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);
+
 // Text ////////////////////////////////////////////////////////////////////////
 
 /*
@@ -536,6 +544,11 @@ R2D_Sound *R2D_CreateSound(const char *path);
  */
 void R2D_PlaySound(R2D_Sound *snd);
 
+/*
+ * Get the sound's length
+ */
+int R2D_GetSoundLength(R2D_Sound *snd);
+
 /*
  * Get the sound's volume
  */
@@ -603,6 +616,11 @@ void R2D_SetMusicVolume(int volume);
  */
 void R2D_FadeOutMusic(int ms);
 
+/*
+ * Get the length of the music in seconds
+ */
+int R2D_GetMusicLength(R2D_Music *mus);
+
 /*
  * Free the music
  */
@@ -704,6 +722,8 @@ void R2D_GL_DrawTriangle(
   GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3);
 void R2D_GL_DrawImage(R2D_Image *img);
 void R2D_GL_DrawSprite(R2D_Sprite *spr);
+void R2D_GL_DrawTile(R2D_Image *img, int x, int y, int tw, int th, GLfloat tx1, GLfloat ty1, GLfloat tx2,
+  GLfloat ty2, GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4);
 void R2D_GL_DrawText(R2D_Text *txt);
 void R2D_GL_FreeTexture(GLuint *id);
 void R2D_GL_Clear(R2D_Color clr);
@@ -723,6 +743,10 @@ void R2D_GL_FlushBuffers();
     GLfloat r3, GLfloat g3, GLfloat b3, GLfloat a3);
   void R2D_GLES_DrawImage(R2D_Image *img);
   void R2D_GLES_DrawSprite(R2D_Sprite *spr);
+    void R2D_GLES_DrawTile(R2D_Image *img, int x, int y,
+    int tw, int th,
+    GLfloat tx1, GLfloat ty1, GLfloat tx2, GLfloat ty2,
+    GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4);
   void R2D_GLES_DrawText(R2D_Text *txt);
 #else
   int R2D_GL2_Init();
@@ -747,6 +771,14 @@ void R2D_GL_FlushBuffers();
   void R2D_GL3_DrawImage(R2D_Image *img);
   void R2D_GL2_DrawSprite(R2D_Sprite *spr);
   void R2D_GL3_DrawSprite(R2D_Sprite *spr);
+  void R2D_GL2_DrawTile(R2D_Image *img, int x, int y,
+    int tw, int th,
+    GLfloat tx1, GLfloat ty1, GLfloat tx2, GLfloat ty2,
+    GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4);
+  void R2D_GL3_DrawTile(R2D_Image *img, int x, int y,
+    int tw, int th,
+    GLfloat tx1, GLfloat ty1, GLfloat tx2, GLfloat ty2,
+    GLfloat tx3, GLfloat ty3, GLfloat tx4, GLfloat ty4);
   void R2D_GL2_DrawText(R2D_Text *txt);
   void R2D_GL3_DrawText(R2D_Text *txt);
   void R2D_GL3_FlushBuffers();

data/ext/ruby2d/sound.c

@@ -46,6 +46,31 @@ void R2D_PlaySound(R2D_Sound *snd) {
 }
 
 
+/*
+ * Get the sound's length in seconds
+ */
+int R2D_GetSoundLength(R2D_Sound *snd) {
+  float points = 0;
+  float frames = 0;
+  int frequency = 0;
+  Uint16 format = 0;
+  int channels = 0;
+
+  // Populate the frequency, format and channel variables
+  if (!Mix_QuerySpec(&frequency, &format, &channels)) return -1; // Querying audio deails failed
+  if (!snd) return -1;
+
+  // points = bytes / samplesize
+  points = (snd->data->alen / ((format & 0xFF) / 8));
+
+  // frames = sample points / channels
+  frames = (points / channels);
+
+  // frames / frequency is seconds of audio
+  return ceil(frames / frequency);
+}
+
+
 /*
  * Get the sound's volume
  */

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/lib/ruby2d.rb

@@ -7,20 +7,23 @@ unless RUBY_ENGINE == 'mruby'
   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/dsl.rb

@@ -2,38 +2,45 @@
 
 module Ruby2D::DSL
 
-  Ruby2D::Window.new
+  @window = Ruby2D::Window.new
+
+  def self.window; @window end
+  def self.window=(w); @window = w end
 
   def get(sym, opts = nil)
-    Window.get(sym, opts)
+    DSL.window.get(sym, opts)
   end
 
   def set(opts)
-    Window.set(opts)
+    DSL.window.set(opts)
   end
 
   def on(event, &proc)
-    Window.on(event, &proc)
+    DSL.window.on(event, &proc)
   end
 
   def off(event_descriptor)
-    Window.off(event_descriptor)
+    DSL.window.off(event_descriptor)
   end
 
   def update(&proc)
-    Window.update(&proc)
+    DSL.window.update(&proc)
+  end
+
+  def render(&proc)
+    DSL.window.render(&proc)
   end
 
   def clear
-    Window.clear
+    DSL.window.clear
   end
 
   def show
-    Window.show
+    DSL.window.show
   end
 
   def close
-    Window.close
+    DSL.window.close
   end
 
 end

data/lib/ruby2d/entity.rb

@@ -0,0 +1,17 @@
+# Ruby2D::Entity
+
+module Ruby2D
+  class Entity
+
+    # Add the entity to the window
+    def add
+      Window.add(self)
+    end
+
+    # Remove the entity from the window
+    def remove
+      Window.remove(self)
+    end
+
+  end
+end

data/lib/ruby2d/font.rb

@@ -63,11 +63,12 @@ module Ruby2D
           end
         # If MRuby
         else
-          if `uname`.include? 'Darwin'  # macOS
+          uname = `uname`
+          if uname.include? 'Darwin' # macOS
             macos_font_path
-          elsif `uname`.include? 'Linux'
+          elsif uname.include? 'Linux'
             linux_font_path
-          elsif `uname`.include? 'MINGW'
+          elsif uname.include? 'MINGW'
             windows_font_path
           end
         end

data/lib/ruby2d/image.rb

@@ -23,7 +23,30 @@ module Ruby2D
       unless ext_init(@path)
         raise Error, "Image `#{@path}` cannot be created"
       end
-      add
+      unless opts[:show] == false then add end
+    end
+
+    def draw(opts = {})
+      opts[:width] = opts[:width] || @width
+      opts[:height] = opts[:height] || @height
+      opts[:rotate] = opts[:rotate] || @rotate
+      unless opts[:color]
+        opts[:color] = [1.0, 1.0, 1.0, 1.0]
+      end
+
+      self.class.ext_draw([
+        self, opts[:x], opts[:y], opts[:width], opts[:height], opts[:rotate],
+        opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]
+      ])
+    end
+
+    private
+
+    def render
+      self.class.ext_draw([
+        self, @x, @y, @width, @height, @rotate,
+        @color.r, @color.g, @color.b, @color.a
+      ])
     end
 
   end

data/lib/ruby2d/line.rb

@@ -38,8 +38,28 @@ module Ruby2D
       (((@y2 - @y1) * x - (@x2 - @x1) * y + @x2 * @y1 - @y2 * @x1).abs / length) <= 0.5 * @width
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x1], opts[:y1], opts[:x2], opts[:y2], opts[:width],
+        opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],
+        opts[:color][1][0], opts[:color][1][1], opts[:color][1][2], opts[:color][1][3],
+        opts[:color][2][0], opts[:color][2][1], opts[:color][2][2], opts[:color][2][3],
+        opts[:color][3][0], opts[:color][3][1], opts[:color][3][2], opts[:color][3][3]
+      ])
+    end
+
     private
 
+    def render
+      self.class.ext_draw([
+        @x1, @y1, @x2, @y2, @width,
+        @c1.r, @c1.g, @c1.b, @c1.a,
+        @c2.r, @c2.g, @c2.b, @c2.a,
+        @c3.r, @c3.g, @c3.b, @c3.a,
+        @c4.r, @c4.g, @c4.b, @c4.a
+      ])
+    end
+
     # Calculate the distance between two points
     def points_distance(x1, y1, x2, y2)
       Math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2)

data/lib/ruby2d/music.rb

@@ -58,5 +58,10 @@ module Ruby2D
       ext_fadeout(ms)
     end
 
+    # Returns the length in seconds
+    def length
+      ext_length
+    end
+
   end
 end

data/lib/ruby2d/pixel.rb

@@ -0,0 +1,17 @@
+# Ruby2D::Pixel
+
+module Ruby2D
+  class Pixel
+
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x]              , opts[:y],
+        opts[:x] + opts[:size], opts[:y],
+        opts[:x] + opts[:size], opts[:y] + opts[:size],
+        opts[:x]              , opts[:y] + opts[:size],
+        opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]
+      ])
+    end
+
+  end
+end

data/lib/ruby2d/quad.rb

@@ -48,8 +48,26 @@ module Ruby2D
       questioned_area <= self_area
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x1], opts[:y1], opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],
+        opts[:x2], opts[:y2], opts[:color][1][0], opts[:color][1][1], opts[:color][1][2], opts[:color][1][3],
+        opts[:x3], opts[:y3], opts[:color][2][0], opts[:color][2][1], opts[:color][2][2], opts[:color][2][3],
+        opts[:x4], opts[:y4], opts[:color][3][0], opts[:color][3][1], opts[:color][3][2], opts[:color][3][3]
+      ])
+    end
+
     private
 
+    def render
+      self.class.ext_draw([
+        @x1, @y1, @c1.r, @c1.g, @c1.b, @c1.a,
+        @x2, @y2, @c2.r, @c2.g, @c2.b, @c2.a,
+        @x3, @y3, @c3.r, @c3.g, @c3.b, @c3.a,
+        @x4, @y4, @c4.r, @c4.g, @c4.b, @c4.a
+      ])
+    end
+
     def triangle_area(x1, y1, x2, y2, x3, y3)
       (x1*y2 + x2*y3 + x3*y1 - x3*y2 - x1*y3 - x2*y1).abs / 2
     end

data/lib/ruby2d/rectangle.rb

@@ -39,6 +39,15 @@ module Ruby2D
       update_coords(@x, @y, @width, h)
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x]               , opts[:y]                , opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],
+        opts[:x] + opts[:width], opts[:y]                , opts[:color][1][0], opts[:color][1][1], opts[:color][1][2], opts[:color][1][3],
+        opts[:x] + opts[:width], opts[:y] + opts[:height], opts[:color][2][0], opts[:color][2][1], opts[:color][2][2], opts[:color][2][3],
+        opts[:x]               , opts[:y] + opts[:height], opts[:color][3][0], opts[:color][3][1], opts[:color][3][2], opts[:color][3][3]
+      ])
+    end
+
     private
 
     def update_coords(x, y, w, h)
@@ -46,10 +55,10 @@ module Ruby2D
       @y1 = y
       @x2 = x + w
       @y2 = y
-      @x4 = x
-      @y4 = y + h
       @x3 = x + w
       @y3 = y + h
+      @x4 = x
+      @y4 = y + h
     end
 
   end

data/lib/ruby2d/renderable.rb

@@ -14,16 +14,12 @@ module Ruby2D
 
     # Add the object to the window
     def add
-      if Module.const_defined? :DSL
-        Window.add(self)
-      end
+      Window.add(self)
     end
 
     # Remove the object from the window
     def remove
-      if Module.const_defined? :DSL
-        Window.remove(self)
-      end
+      Window.remove(self)
     end
 
     # Set the color value
@@ -32,8 +28,8 @@ module Ruby2D
     end
 
     # Allow British English spelling of color
-    def colour; self.color end
-    def colour=(c); self.color = c end
+    alias_method :colour, :color
+    alias_method :colour=, :color=
 
     # Allow shortcuts for setting color values
     def r; self.color.r end