ruby2d 0.10.0 → 0.11.0

data/lib/ruby2d/texture.rb

@@ -0,0 +1,28 @@
+# Ruby2D::Text
+
+module Ruby2D
+    class Texture
+      attr_reader :width, :height, :texture_id
+
+      def initialize(pixel_data, width, height)
+        @pixel_data = pixel_data
+        @width = width
+        @height = height
+        @texture_id = 0
+      end
+
+      def draw(coordinates, texture_coordinates, color)
+        if @texture_id == 0
+          @texture_id = ext_create(@pixel_data, @width, @height)
+          @pixel_data = nil
+        end
+
+        color = [color.r, color.g, color.b, color.a]
+        ext_draw(coordinates, texture_coordinates, color, @texture_id)
+      end
+
+      def delete
+        ext_delete(@texture_id)
+      end
+    end
+end

data/lib/ruby2d/tileset.rb

@@ -5,26 +5,27 @@ module Ruby2D
     include Renderable
 
     def initialize(path, opts = {})
-      unless File.exist? path
-        raise Error, "Cannot find tileset image file `#{path}`"
-      end
       @path = path
+
+      # Initialize the tileset texture
+      @texture = Texture.new(*Image.load_image(@path))
+      @width = opts[:width] || @texture.width
+      @height = opts[:height] || @texture.height
+      @z = opts[:z] || 0
+
       @tiles = []
       @defined_tiles = {}
       @padding = opts[:padding] || 0
       @spacing = opts[:spacing] || 0
       @tile_width = opts[:tile_width]
       @tile_height = opts[:tile_height]
-
-      unless ext_init(@path)
-        raise Error, "Tileset `#{@path}` cannot be created"
-      end
+      @scale = opts[:scale] || 1
 
       unless opts[:show] == false then add end
     end
 
-    def define_tile(name, x, y)
-      @defined_tiles[name] = { x: x, y: y }
+    def define_tile(name, x, y, rotate: 0, flip: nil)
+      @defined_tiles[name] = { x: x, y: y , rotate: rotate, flip: flip }
     end
 
     def set_tile(name, coordinates)
@@ -34,6 +35,8 @@ module Ruby2D
         @tiles.push({
           tile_x: tile.fetch(:x), 
           tile_y: tile.fetch(:y), 
+          tile_rotate: tile.fetch(:rotate),
+          tile_flip: tile.fetch(:flip),
           x: coordinate.fetch(:x),
           y: coordinate.fetch(:y)
         })
@@ -45,25 +48,40 @@ module Ruby2D
     end
   end
 
-  def draw(opts = {})
-    render(opts)
+  def draw
+    Window.render_ready_check
+
+    render
   end
 
   private
 
-  def render(opts = {})
-    opts[:tile_width] = opts[:tile_width] || @tile_width
-    opts[:tile_height] = opts[:tile_height] || @tile_height
-    opts[:padding] = opts[:padding] || @padding
-    opts[:spacing] = opts[:spacing] || @spacing
+
+  def render
+    scaled_padding = @padding * @scale
+    scaled_spacing = @spacing * @scale
+    scaled_tile_width = @tile_width * @scale
+    scaled_tile_height = @tile_height * @scale
+    scaled_width = @width * @scale
+    scaled_height = @height * @scale
 
     @tiles.each do |tile|
-      self.class.ext_draw(
-        [
-          self, opts[:tile_width], opts[:tile_height], opts[:padding], opts[:spacing],
-          tile.fetch(:tile_x), tile.fetch(:tile_y), tile.fetch(:x),
-          tile.fetch(:y)
-        ])
+      crop = {
+        x: scaled_padding + (tile.fetch(:tile_x) * (scaled_spacing + scaled_tile_width)),
+        y: scaled_padding + (tile.fetch(:tile_y) * (scaled_spacing + scaled_tile_height)),
+        width: scaled_tile_width,
+        height: scaled_tile_height,
+        image_width: scaled_width,
+        image_height: scaled_height,
+      }
+
+      color = defined?(@color) ? @color : Color.new([1.0, 1.0, 1.0, 1.0])
+
+      vertices = Vertices.new(tile.fetch(:x), tile.fetch(:y), scaled_tile_width, scaled_tile_height, tile.fetch(:tile_rotate), crop: crop, flip: tile.fetch(:tile_flip))
+
+      @texture.draw(
+        vertices.coordinates, vertices.texture_coordinates, color
+      )
     end
   end
 end

data/lib/ruby2d/triangle.rb

@@ -17,7 +17,7 @@ module Ruby2D
       @y3 = opts[:y3] || 100
       @z  = opts[:z]  || 0
       self.color = opts[:color] || 'white'
-      self.opacity = opts[:opacity] if opts[:opacity]
+      self.color.opacity = opts[:opacity] if opts[:opacity]
       add
     end
 
@@ -39,6 +39,8 @@ module Ruby2D
     end
 
     def self.draw(opts = {})
+      Window.render_ready_check
+
       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],

data/lib/ruby2d/version.rb

@@ -1,5 +1,5 @@
 # Ruby2D::VERSION
 
 module Ruby2D
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/lib/ruby2d/vertices.rb

@@ -0,0 +1,84 @@
+# Ruby2D::Vertices
+
+# This class generates a vertices array which are passed to the openGL rendering code.
+# The vertices array is split up into 4 groups (1 - top left, 2 - top right, 3 - bottom right, 4 - bottom left)
+# This class is responsible for transforming textures, it can scale / crop / rotate and flip textures
+
+module Ruby2D
+  class Vertices
+    def initialize(x, y, width, height, rotate, crop: nil, flip: nil)
+      @flip = flip
+      @x = x
+      @y = y
+      @width = width.to_f
+      @height = height.to_f
+
+      if @flip == :horizontal || @flip == :both
+        @x = @x + @width
+        @width = -@width
+      end
+
+      if @flip == :vertical || @flip == :both
+        @y = y + @height
+        @height = -@height
+      end
+
+      @rotate = rotate
+      @rx = @x + (@width / 2.0)
+      @ry = @y + (@height / 2.0)
+      @crop = crop
+    end
+
+    def coordinates
+      x1, y1 = rotate(@x,          @y);           # Top left
+      x2, y2 = rotate(@x + @width, @y);           # Top right
+      x3, y3 = rotate(@x + @width, @y + @height); # Bottom right
+      x4, y4 = rotate(@x,          @y + @height); # Bottom left
+
+      [ x1, y1, x2, y2, x3, y3, x4, y4 ]
+    end
+
+    def texture_coordinates
+      if @crop.nil?
+        tx1 = 0.0; ty1 = 0.0 # Top left
+        tx2 = 1.0; ty2 = 0.0 # Top right
+        tx3 = 1.0; ty3 = 1.0 # Bottom right
+        tx4 = 0.0; ty4 = 1.0 # Bottom left
+      else
+        tx1 = @crop[:x] / @crop[:image_width].to_f; ty1 = @crop[:y] / @crop[:image_height].to_f # Top left
+        tx2 = tx1 + (@crop[:width] / @crop[:image_width].to_f); ty2 = ty1                       # Top right
+        tx3 = tx2; ty3 = ty1 + (@crop[:height] / @crop[:image_height].to_f)                     # Botttom right
+        tx4 = tx1; ty4 = ty3                                                                    # Bottom left
+      end
+
+      [ tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4 ]
+    end
+
+    private
+
+    def rotate(x, y)
+      return [x, y] if @rotate == 0
+
+      # Convert from degrees to radians
+      angle = @rotate * Math::PI / 180.0
+
+      # Get the sine and cosine of the angle
+      sa = Math.sin(angle)
+      ca = Math.cos(angle)
+
+      # Translate point to origin
+      x -= @rx
+      y -= @ry
+
+      # Rotate point
+      xnew = x * ca - y * sa;
+      ynew = x * sa + y * ca;
+
+      # Translate point back
+      x = xnew + @rx;
+      y = ynew + @ry;
+
+      [x, y]
+    end
+  end
+end

data/lib/ruby2d/window.rb

@@ -4,6 +4,7 @@
 
 module Ruby2D
   class Window
+    @@open_window = false
 
     # Event structures
     EventDescriptor       = Struct.new(:type, :id)
@@ -109,9 +110,7 @@ module Ruby2D
       @render_proc = Proc.new {}
 
       # Detect if window is being used through the DSL or as a class instance
-      unless method(:update).parameters.empty? || method(:render).parameters.empty?
-        @using_dsl = true
-      end
+      @using_dsl = !(method(:update).parameters.empty? || method(:render).parameters.empty?)
 
       # Whether diagnostic messages should be printed
       @diagnostics = false
@@ -190,6 +189,12 @@ module Ruby2D
       def close
         DSL.window.close
       end
+
+      def render_ready_check
+        unless @@open_window
+          raise Error, "Attempting to draw before the window is ready. Please put calls to draw() inside of a render block."
+        end
+      end
     end
 
     # Public instance methods
@@ -616,6 +621,11 @@ module Ruby2D
 
     # Show the window
     def show
+      if @@open_window
+        raise Error, "Window#show called multiple times, Ruby2D only supports a single open window"
+      end
+
+      @@open_window = true
       ext_show
     end
 

data/lib/ruby2d.rb

@@ -22,6 +22,8 @@ unless RUBY_ENGINE == 'mruby'
   require 'ruby2d/text'
   require 'ruby2d/sound'
   require 'ruby2d/music'
+  require 'ruby2d/texture'
+  require 'ruby2d/vertices'
 
   if defined?(RubyInstaller)
     s2d_dll_path = Gem::Specification.find_by_name('ruby2d').gem_dir + '/assets/mingw/bin'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Tom Black
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -274,6 +274,7 @@ files:
 - ext/ruby2d/common.c
 - ext/ruby2d/controllers.c
 - ext/ruby2d/extconf.rb
+- ext/ruby2d/font.c
 - ext/ruby2d/gl.c
 - ext/ruby2d/gl2.c
 - ext/ruby2d/gl3.c
@@ -285,9 +286,7 @@ files:
 - ext/ruby2d/ruby2d.h
 - ext/ruby2d/shapes.c
 - ext/ruby2d/sound.c
-- ext/ruby2d/sprite.c
 - ext/ruby2d/text.c
-- ext/ruby2d/tileset.c
 - ext/ruby2d/window.c
 - lib/ruby2d.rb
 - lib/ruby2d/circle.rb
@@ -312,9 +311,11 @@ files:
 - lib/ruby2d/sprite.rb
 - lib/ruby2d/square.rb
 - lib/ruby2d/text.rb
+- lib/ruby2d/texture.rb
 - lib/ruby2d/tileset.rb
 - lib/ruby2d/triangle.rb
 - lib/ruby2d/version.rb
+- lib/ruby2d/vertices.rb
 - lib/ruby2d/window.rb
 homepage: http://www.ruby2d.com
 licenses:
@@ -335,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
+rubygems_version: 3.2.27
 signing_key:
 specification_version: 4
 summary: Ruby 2D

data/ext/ruby2d/sprite.c

@@ -1,147 +0,0 @@
-// sprite.c
-
-#include "ruby2d.h"
-
-
-/*
- * Create a sprite, given an image file path
- */
-R2D_Sprite *R2D_CreateSprite(const char *path) {
-
-  // Check if image file exists
-  if (!R2D_FileExists(path)) {
-    R2D_Error("R2D_CreateSprite", "Sprite image file `%s` not found", path);
-    return NULL;
-  }
-
-  // Allocate the sprite structure
-  R2D_Sprite *spr = (R2D_Sprite *) malloc(sizeof(R2D_Sprite));
-  if (!spr) {
-    R2D_Error("R2D_CreateSprite", "Out of memory!");
-    return NULL;
-  }
-
-  // Load the sprite image file
-  spr->img = R2D_CreateImage(path);
-  if (!spr->img) {
-    R2D_Error("R2D_CreateSprite", "Cannot create sprite image `%s`", path);
-    free(spr);
-    return NULL;
-  }
-
-  // Initialize values
-  spr->path = path;
-  spr->x = 0;
-  spr->y = 0;
-  spr->color.r = 1.f;
-  spr->color.g = 1.f;
-  spr->color.b = 1.f;
-  spr->color.a = 1.f;
-  spr->width  = spr->img->width;
-  spr->height = spr->img->height;
-  spr->clip_width  = spr->img->width;
-  spr->clip_height = spr->img->height;
-  spr->rotate = 0;
-  spr->rx = 0;
-  spr->ry = 0;
-  spr->tx1 = 0.f;
-  spr->ty1 = 0.f;
-  spr->tx2 = 1.f;
-  spr->ty2 = 0.f;
-  spr->tx3 = 1.f;
-  spr->ty3 = 1.f;
-  spr->tx4 = 0.f;
-  spr->ty4 = 1.f;
-
-  return spr;
-}
-
-
-/*
- * Clip a sprite
- */
-void R2D_ClipSprite(R2D_Sprite *spr, int x, int y, int w, int h) {
-  if (!spr) return;
-
-  // Calculate ratios
-  // rw = ratio width; rh = ratio height
-  double rw = w / (double)spr->img->width;
-  double rh = h / (double)spr->img->height;
-
-  // Apply ratios to x, y coordinates
-  // cx = crop x coord; cy = crop y coord
-  double cx = x * rw;
-  double cy = y * rh;
-
-  // Convert given width, height to doubles
-  // cw = crop width; ch = crop height
-  double cw = (double)w;
-  double ch = (double)h;
-
-  // Apply ratio to texture width and height
-  // tw = texture width; th = texture height
-  double tw = rw * w;
-  double th = rh * h;
-
-  // Calculate and store sprite texture values
-
-  spr->tx1 =  cx       / cw;
-  spr->ty1 =  cy       / ch;
-
-  spr->tx2 = (cx + tw) / cw;
-  spr->ty2 =  cy       / ch;
-
-  spr->tx3 = (cx + tw) / cw;
-  spr->ty3 = (cy + th) / ch;
-
-  spr->tx4 =  cx       / cw;
-  spr->ty4 = (cy + th) / ch;
-
-  // Store the sprite dimensions
-  spr->width  = (spr->width  / (double)spr->clip_width ) * w;
-  spr->height = (spr->height / (double)spr->clip_height) * h;
-  spr->clip_width  = w;
-  spr->clip_height = h;
-}
-
-
-/*
- * Rotate a sprite
- */
-void R2D_RotateSprite(R2D_Sprite *spr, GLfloat angle, int position) {
-
-  R2D_GL_Point p = R2D_GetRectRotationPoint(
-    spr->x, spr->y, spr->width, spr->height, position
-  );
-
-  spr->rotate = angle;
-  spr->rx = p.x;
-  spr->ry = p.y;
-}
-
-
-/*
- * Draw a sprite
- */
-void R2D_DrawSprite(R2D_Sprite *spr) {
-  if (!spr) return;
-
-  if (spr->img->texture_id == 0) {
-    R2D_GL_CreateTexture(&spr->img->texture_id, spr->img->format,
-                         spr->img->width, spr->img->height,
-                         spr->img->surface->pixels, GL_NEAREST);
-    SDL_FreeSurface(spr->img->surface);
-  }
-
-  R2D_GL_DrawSprite(spr);
-}
-
-
-/*
- * Free a sprite
- */
-void R2D_FreeSprite(R2D_Sprite *spr) {
-  if (!spr) return;
-  R2D_FreeImage(spr->img);
-  free(spr);
-}