ruby2d 0.0.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08baf6549c1222c6f6abaaea8b243b6b0730c1c6
-  data.tar.gz: 67937402604698cc1ccc510816b73aac3f148e81
+  metadata.gz: b065d85656f0f67ae270a815252551c10985caf1
+  data.tar.gz: 6ed2d44d184eb36daabd4711e4ef7c74729d693c
 SHA512:
-  metadata.gz: 70c35ab9dc0771d662eccc54ce2d29298a75e512e610420ba5fe4118a25997894d407bdb29b5848c753982b1a98dd958fb2005d3053d27cf490e0ab83153b790
-  data.tar.gz: 579701806b2a0e4236d0798613626adec74b202d23cad4e434792e1b79149304731156c138f33c287820b1db40721fb4a883fa45ea9efc14f9aeeee793fbf1ef
+  metadata.gz: 29b0dff61f4a04bbb2bed6904a5c2c10aa6e1cf43e8114f0fecae6d77b19700ee430b087dec6e193cc6dd4210d5d11379a72ee9bde8b1b52d2ef4102f1a66153
+  data.tar.gz: c08fda4f13944a3a3e8709a405f7c6f884596dc63d1be90d096614391468491b4b9d3a0d00aeb2d5617f9d3026d87f9dba382fc89cc99309ee4df94c6f90016b

data/bin/ruby2d

@@ -0,0 +1,116 @@
+#!/usr/bin/env ruby
+require 'ruby2d/version'
+
+class String
+  def colorize(c); "\e[#{c}m#{self}\e[0m" end
+  def error; colorize('1;31') end
+  def bold; colorize('1') end
+end
+
+
+def build_native(rb_file)
+  if `which mruby`.empty?
+    puts "",
+         "  mruby not found!".error, "",
+         "  mruby is needed to build a native Ruby 2D applications.".bold, "",
+         "  Install using Homebrew on OS X:",
+         "    brew install mruby", ""
+    exit
+  end
+  
+  `mkdir -p build`
+  `mrbc -Bruby2d_app_symbol -obuild/app.c #{rb_file}`
+  
+  open('build/app.c', 'a') do |f|
+    f << %(
+#include "mruby.h"
+#include "mruby/irep.h"
+
+int main(void) {
+  mrb_state *mrb = mrb_open();
+  if (!mrb) { /* handle error */ }
+  mrb_load_irep(mrb, ruby2d_app_symbol);
+  mrb_close(mrb);
+}
+    )
+  end
+  
+  `cc -std=c99 -lmruby build/app.c -o build/app`
+end
+
+
+def build_package
+  require 'fileutils'
+  
+  icon_path = "#{Gem::Specification.find_by_name('ruby2d').gem_dir}/assets/app.icns"
+  
+  FileUtils.mkpath "build/App.app/Contents/MacOS"
+  FileUtils.mkpath "build/App.app/Contents/Resources"
+  FileUtils.cp icon_path, "build/App.app/Contents/Resources"
+  
+  info_plist = %(
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleExecutable</key>
+  <string>app</string>
+  <key>CFBundleIconFile</key>
+  <string>app.icns</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>1.0</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0</string>
+</dict>
+</plist>
+)
+  
+  File.open("build/App.app/Contents/Info.plist", 'w') { |f| f.write(info_plist) }
+  
+  FileUtils.cp "build/app", "build/App.app/Contents/MacOS/"
+  
+  puts "App written to `build/App.app`."
+end
+
+
+# Command line usage and tree ##################################################
+
+usage = "
+Usage: ruby2d [-v|--version]
+              <command> <options>
+
+Summary of commands and options:
+  build         Build the application...
+    native        ...compile with mruby.
+    web           ...for web platform.
+  package       Create application package.
+  -v|--version  Prints the installed version.
+
+"
+
+case ARGV[0]
+when 'build'
+  puts "Running build..."
+  case ARGV[1]
+  when 'native'
+    puts "Running build native..."
+    build_native ARGV[2]
+  when 'web'
+    puts "Running build web..."
+  else
+    puts usage
+  end
+when 'package'
+  puts "Running package..."
+  build_package
+when '-v', '--version'
+  puts Ruby2D::VERSION
+else
+  puts usage
+end
+
+exit

data/ext/ruby2d/extconf.rb

@@ -0,0 +1,84 @@
+require 'mkmf'
+
+class String
+  def colorize(c); "\e[#{c}m#{self}\e[0m" end
+  def error; colorize('1;31') end
+  def bold; colorize('1') end
+end
+
+def print_errors(errors)
+  puts "
+#{"== Ruby 2D Installation Errors =============================".bold}
+  
+  #{"Ruby 2D found some problems and was not installed:".error}
+  
+  #{errors.join("\n  ")}
+  
+#{"============================================================".bold}"
+end
+
+errors = []
+
+# Install Simple 2D on supported platforms
+
+# OS X
+if RUBY_PLATFORM =~ /darwin/
+  unless ARGV.include? "--no-brew"
+    # Simple 2D not installed
+    if `which simple2d`.empty?
+      # Homebrew not installed, print and quit
+      if `which brew`.empty?
+        errors << "Ruby 2D uses a library called Simple 2D." <<
+                  "On OS X, this can be installed using Homebrew." <<
+                  "Install Homebrew, then try installing this gem again.\n" <<
+                  "Learn more at http://brew.sh"
+        print_errors(errors)
+        exit
+      # Install Simple 2D using Homebrew
+      else
+        `brew tap simple2d/tap`
+        `brew install simple2d`
+      end
+      
+    # Simple 2D installed, update to latest version
+    else
+      # Homebrew not installed
+      if `which brew`.empty?
+        # TODO: Check for latest version manually and update
+      # Homebrew installed, get latest version of Simple 2D
+      else
+        # An alternative, but slower and updates all formulas:
+        #   `brew update`
+        #   `brew upgrade simple2d`
+        
+        `brew untap simple2d/tap`
+        `brew tap simple2d/tap`
+        `brew upgrade simple2d`
+      end
+    end
+  end
+  
+# Linux
+elsif RUBY_PLATFORM =~ /linux/
+  # If Simple 2D not installed
+  if `which simple2d`.empty?
+    errors << "Ruby 2D uses a library called Simple 2D." <<
+              "There's a script to make installation easy on Linux.\n" <<
+              "Follow the instructions in the README to get started:" <<
+              "  https://github.com/simple2d/simple2d"
+    print_errors(errors)
+    exit
+  end
+  
+# Windows
+elsif RUBY_PLATFORM =~ /mingw/
+  puts "Ruby 2D doesn't support Windows yet :("
+  exit
+end
+
+# Configure Simple 2D and create Makefile
+
+$LDFLAGS << ' ' << `simple2d --libs`
+$LDFLAGS.gsub!(/\n/, ' ')  # remove newlines in flags, they cause problems
+
+create_makefile('ruby2d/ruby2d')

data/ext/ruby2d/ruby2d.c

@@ -0,0 +1,288 @@
+#include <ruby.h>
+#include <simple2d.h>
+
+// @type_id values for rendering
+#define TRIANGLE 1
+#define QUAD     2
+#define IMAGE    3
+#define TEXT     4
+
+// Ruby 2D window
+VALUE self;
+
+// Simple 2D window
+Window *window;
+
+// Ruby data types
+static VALUE ruby2d_module;
+static VALUE ruby2d_window_klass;
+static VALUE c_data_klass;
+
+// Structures for Ruby 2D classes
+struct image_data {
+  Image img;
+};
+struct text_data {
+  Text txt;
+};
+struct sound_data {
+  Sound snd;
+};
+
+
+/*
+ * Function pointer to close the Simple 2D window
+ */
+static void close_window() {
+  S2D_Close(window);
+}
+
+
+/*
+ * Free image structure attached to Ruby 2D `Image` class
+ */
+static void free_image(struct image_data *data) {
+  S2D_FreeImage(data->img);
+  xfree(data);
+}
+
+
+/*
+ * Initialize image structure data
+ */
+static VALUE init_image(char *path) {
+  struct image_data *data = ALLOC(struct image_data);
+  data->img = S2D_CreateImage(path);
+  return Data_Wrap_Struct(c_data_klass, NULL, free_image, data);
+}
+
+
+/*
+ * Free text structure attached to Ruby 2D `Text` class
+ */
+static void free_text(struct text_data *data) {
+  S2D_FreeText(data->txt);
+  xfree(data);
+}
+
+
+/*
+ * Initialize text structure data
+ */
+static VALUE init_text(char *font, char *msg, int size) {
+  struct text_data *data = ALLOC(struct text_data);
+  data->txt = S2D_CreateText(font, msg, size);
+  return Data_Wrap_Struct(c_data_klass, NULL, free_text, data);
+}
+
+
+/*
+ * Simple 2D `on_key` input callback function
+ */
+void on_key(const char *key) {
+  rb_funcall(self, rb_intern("key_callback"), 1, rb_str_new2(key));
+}
+
+
+/*
+ * Simple 2D `on_key_down` input callback function
+ */
+void on_key_down(const char *key) {
+  rb_funcall(self, rb_intern("key_down_callback"), 1, rb_str_new2(key));
+}
+
+
+/*
+ * Simple 2D `on_controller` input callback function
+ */
+void on_controller(bool is_axis, int axis, int val, bool is_btn, int btn) {
+  rb_funcall(self, rb_intern("controller_callback"), 5,
+    is_axis ? Qtrue : Qfalse, INT2NUM(axis), INT2NUM(val),
+    is_btn  ? Qtrue : Qfalse, INT2NUM(btn)
+  );
+}
+
+
+/*
+ * Simple 2D `update` callback function
+ */
+void update() {
+  
+  // Set the cursor
+  rb_iv_set(self, "@mouse_x", INT2NUM(window->mouse.x));
+  rb_iv_set(self, "@mouse_y", INT2NUM(window->mouse.y));
+  
+  // Store frame rate
+  rb_iv_set(self, "@fps", INT2NUM(window->fps));
+  
+  // Call update proc, `window.update`
+  rb_funcall(self, rb_intern("update_callback"), 0);
+}
+
+
+/*
+ * Simple 2D `render` callback function
+ */
+void render() {
+  
+  // Read window objects
+  VALUE objects = rb_iv_get(self, "@objects");
+  int num_objects = NUM2INT(rb_funcall(objects, rb_intern("count"), 0));
+  
+  // Switch on each object type
+  for (int i = 0; i < num_objects; ++i) {
+    
+    VALUE el = rb_ary_entry(objects, i);
+    int type_id = NUM2INT(rb_iv_get(el, "@type_id"));
+    
+    // Switch on the object's type_id
+    switch(type_id) {
+      
+      case TRIANGLE: {
+        VALUE c1 = rb_iv_get(el, "@c1");
+        VALUE c2 = rb_iv_get(el, "@c2");
+        VALUE c3 = rb_iv_get(el, "@c3");
+        
+        S2D_DrawTriangle(
+          NUM2DBL(rb_iv_get(el, "@x1")),
+          NUM2DBL(rb_iv_get(el, "@y1")),
+          NUM2DBL(rb_iv_get(c1, "@r")),
+          NUM2DBL(rb_iv_get(c1, "@g")),
+          NUM2DBL(rb_iv_get(c1, "@b")),
+          NUM2DBL(rb_iv_get(c1, "@a")),
+          
+          NUM2DBL(rb_iv_get(el, "@x2")),
+          NUM2DBL(rb_iv_get(el, "@y2")),
+          NUM2DBL(rb_iv_get(c2, "@r")),
+          NUM2DBL(rb_iv_get(c2, "@g")),
+          NUM2DBL(rb_iv_get(c2, "@b")),
+          NUM2DBL(rb_iv_get(c2, "@a")),
+          
+          NUM2DBL(rb_iv_get(el, "@x3")),
+          NUM2DBL(rb_iv_get(el, "@y3")),
+          NUM2DBL(rb_iv_get(c3, "@r")),
+          NUM2DBL(rb_iv_get(c3, "@g")),
+          NUM2DBL(rb_iv_get(c3, "@b")),
+          NUM2DBL(rb_iv_get(c3, "@a"))
+        );
+      }
+      break;
+      
+      case QUAD: {
+        VALUE c1 = rb_iv_get(el, "@c1");
+        VALUE c2 = rb_iv_get(el, "@c2");
+        VALUE c3 = rb_iv_get(el, "@c3");
+        VALUE c4 = rb_iv_get(el, "@c4");
+        
+        S2D_DrawQuad(
+          NUM2DBL(rb_iv_get(el, "@x1")),
+          NUM2DBL(rb_iv_get(el, "@y1")),
+          NUM2DBL(rb_iv_get(c1, "@r")),
+          NUM2DBL(rb_iv_get(c1, "@g")),
+          NUM2DBL(rb_iv_get(c1, "@b")),
+          NUM2DBL(rb_iv_get(c1, "@a")),
+
+          NUM2DBL(rb_iv_get(el, "@x2")),
+          NUM2DBL(rb_iv_get(el, "@y2")),
+          NUM2DBL(rb_iv_get(c2, "@r")),
+          NUM2DBL(rb_iv_get(c2, "@g")),
+          NUM2DBL(rb_iv_get(c2, "@b")),
+          NUM2DBL(rb_iv_get(c2, "@a")),
+
+          NUM2DBL(rb_iv_get(el, "@x3")),
+          NUM2DBL(rb_iv_get(el, "@y3")),
+          NUM2DBL(rb_iv_get(c3, "@r")),
+          NUM2DBL(rb_iv_get(c3, "@g")),
+          NUM2DBL(rb_iv_get(c3, "@b")),
+          NUM2DBL(rb_iv_get(c3, "@a")),
+
+          NUM2DBL(rb_iv_get(el, "@x4")),
+          NUM2DBL(rb_iv_get(el, "@y4")),
+          NUM2DBL(rb_iv_get(c4, "@r")),
+          NUM2DBL(rb_iv_get(c4, "@g")),
+          NUM2DBL(rb_iv_get(c4, "@b")),
+          NUM2DBL(rb_iv_get(c4, "@a"))
+        );
+      }
+      break;
+      
+      case IMAGE: {
+        if (rb_iv_get(el, "@data") == Qnil) {
+          VALUE data = init_image(RSTRING_PTR(rb_iv_get(el, "@path")));
+          rb_iv_set(el, "@data", data);
+        }
+        
+        struct image_data *data;
+        Data_Get_Struct(rb_iv_get(el, "@data"), struct image_data, data);
+        
+        data->img.x = NUM2DBL(rb_iv_get(el, "@x"));
+        data->img.y = NUM2DBL(rb_iv_get(el, "@y"));
+        S2D_DrawImage(data->img);
+      }
+      break;
+      
+      case TEXT: {
+        if (rb_iv_get(el, "@data") == Qnil) {
+          VALUE data = init_text(
+            RSTRING_PTR(rb_iv_get(el, "@font")),
+            RSTRING_PTR(rb_iv_get(el, "@text")),
+            NUM2DBL(rb_iv_get(el, "@size"))
+          );
+          rb_iv_set(el, "@data", data);
+        }
+        
+        struct text_data *data;
+        Data_Get_Struct(rb_iv_get(el, "@data"), struct text_data, data);
+        
+        data->txt.x = NUM2DBL(rb_iv_get(el, "@x"));
+        data->txt.y = NUM2DBL(rb_iv_get(el, "@y"));
+        S2D_DrawText(data->txt);
+      }
+      break;
+    }
+  }
+}
+
+
+/*
+ * Ruby2D::Window#show
+ */
+static VALUE ruby2d_show(VALUE s) {
+  self = s;
+  
+  char *title = RSTRING_PTR(rb_iv_get(self, "@title"));
+  int width   = NUM2INT(rb_iv_get(self, "@width"));
+  int height  = NUM2INT(rb_iv_get(self, "@height"));
+  
+  window = S2D_CreateWindow(
+    title, width, height, update, render, 0
+  );
+  
+  window->on_key = on_key;
+  window->on_key_down = on_key_down;
+  window->on_controller = on_controller;
+  
+  S2D_Show(window);
+  
+  atexit(close_window);
+  return Qnil;
+}
+
+
+/*
+ * Ruby C extension init
+ */
+void Init_ruby2d() {
+  
+  // Ruby2D
+  ruby2d_module = rb_define_module("Ruby2D");
+  
+  // Ruby2D::Window
+  ruby2d_window_klass = rb_define_class_under(ruby2d_module, "Window", rb_cObject);
+  
+  // Ruby2D::Window#show
+  rb_define_method(ruby2d_window_klass, "show", ruby2d_show, 0);
+  
+  // Ruby2D::CData
+  c_data_klass = rb_define_class_under(ruby2d_module, "CData", rb_cObject);
+}

data/lib/ruby2d.rb

@@ -1,5 +1,17 @@
-class R2D
-  def self.hi
-    puts "Hello world!"
-  end
-end
+# ruby2d.rb
+
+require 'ruby2d/window'
+require 'ruby2d/application'
+require 'ruby2d/color'
+require 'ruby2d/quad'
+require 'ruby2d/rectangle'
+require 'ruby2d/square'
+require 'ruby2d/triangle'
+require 'ruby2d/image'
+require 'ruby2d/text'
+require 'ruby2d/dsl'
+require 'ruby2d/exceptions'
+require 'ruby2d/ruby2d'  # load native extension
+
+include Ruby2D::DSL
+include Ruby2D

data/lib/ruby2d/application.rb

@@ -0,0 +1,39 @@
+# application.rb
+
+module Ruby2D::Application
+  class << self
+    @@window = Ruby2D::Window.new
+    
+    def get(sym)
+      @@window.get(sym)
+    end
+    
+    def set(opts)
+      @@window.set(opts)
+    end
+    
+    def on(mouse: nil, key: nil, key_down: nil, controller: nil, &proc)
+      @@window.on(mouse: mouse, key: key, key_down: key_down, controller: controller, &proc)
+    end
+    
+    def add(o)
+      @@window.add(o)
+    end
+    
+    def remove(o)
+      @@window.remove(o)
+    end
+    
+    def clear
+      @@window.clear
+    end
+    
+    def update(&proc)
+      @@window.update(&proc)
+    end
+    
+    def show
+      @@window.show
+    end
+  end
+end

data/lib/ruby2d/color.rb

@@ -0,0 +1,72 @@
+# color.rb
+
+module Ruby2D
+  class Color
+    
+    attr_reader :r, :g, :b, :a
+    
+    @@colors = {
+      'black'   => [  0,   0,   0, 255],
+      'gray'    => [170, 170, 170, 255],
+      'silver'  => [221, 221, 221, 255],
+      'white'   => [255, 255, 255, 255],
+      'navy'    => [  0,  31,  63, 255],
+      'blue'    => [  0, 116, 217, 255],
+      'aqua'    => [127, 219, 255, 255],
+      'teal'    => [ 57, 204, 204, 255],
+      'olive'   => [ 61, 153, 112, 255],
+      'green'   => [ 46, 204,  64, 255],
+      'lime'    => [  1, 255, 112, 255],
+      'yellow'  => [255, 220,   0, 255],
+      'orange'  => [255, 133,  27, 255],
+      'red'     => [255,  65,  54, 255],
+      'maroon'  => [133,  20,  75, 255],
+      'fuchsia' => [240,  18, 190, 255],
+      'purple'  => [177,  13, 201, 255],
+      'brown'   => [102,  51,   0, 255],
+      'random'  => []
+    }
+    
+    def initialize(c)
+      if !self.class.is_valid? c
+        raise Error, "`#{c}` is not a valid color"
+      else
+        case c
+        when String
+          if c == 'random'
+            @r, @g, @b, @a = rand(0..1.0), rand(0..1.0), rand(0..1.0), 1.0
+          else
+            @r, @g, @b, @a = to_f(@@colors[c])
+          end
+        when Array
+          @r, @g, @b, @a = to_f([c[0], c[1], c[2], c[3]])
+        end
+      end
+    end
+    
+    # Color must be String, like 'red', or Array, like [1.0, 0, 0, 1.0]
+    def self.is_valid?(c)
+      (c.class == String && @@colors.key?(c)) ||
+      (c.class == Array && c.length == 4 &&
+       c.all? { |el| el.is_a? Numeric } &&
+       c.all? { |el| el.class == Fixnum && (0..255).include?(el) ||
+                     el.class == Float  && (0.0..1.0).include?(el) })
+    end
+    
+    private
+    
+    # Convert from Fixnum (0..255) to Float (0.0..1.0)
+    def to_f(a)
+      b = []
+      a.each do |n|
+        if n.class == Fixnum
+          b.push(n / 255.0)
+        else
+          b.push(n)
+        end
+      end
+      return b
+    end
+    
+  end
+end

data/lib/ruby2d/dsl.rb

@@ -0,0 +1,31 @@
+# dsl.rb
+
+module Ruby2D::DSL
+  def hello
+    puts "hi"
+  end
+  
+  def get(sym)
+    Ruby2D::Application.get(sym)
+  end
+  
+  def set(opts)
+    Ruby2D::Application.set(opts)
+  end
+  
+  def on(mouse: nil, key: nil, key_down: nil, controller: nil, &proc)
+    Ruby2D::Application.on(mouse: mouse, key: key, key_down: key_down, controller: controller, &proc)
+  end
+  
+  def update(&proc)
+    Ruby2D::Application.update(&proc)
+  end
+  
+  def show
+    Ruby2D::Application.show
+  end
+  
+  def clear
+    Ruby2D::Application.clear
+  end
+end

data/lib/ruby2d/exceptions.rb

@@ -0,0 +1,16 @@
+# exceptions.rb
+
+module Ruby2D
+  class Error < StandardError
+    def colorize(msg, c); "\e[#{c}m#{msg}\e[0m" end
+    def error(msg); colorize(msg, '4;31') end
+    def bold(msg); colorize(msg, '1') end
+    
+    def initialize(msg)
+      super(msg)
+      puts error("\nRuby 2D Error:") << " " << msg
+      puts bold("Occurred in:")
+      puts bold("  " + caller.last), "\n"
+    end
+  end
+end

data/lib/ruby2d/image.rb

@@ -0,0 +1,29 @@
+# image.rb
+
+module Ruby2D
+  class Image
+    
+    attr_accessor :x, :y
+    
+    def initialize(x, y, path)
+      
+      unless File.exists? path
+        raise Error, "Cannot find image file `#{path}`"
+      end
+      
+      @type_id = 3
+      @x, @y, @path = x, y, path
+      
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.add(self)
+      end
+    end
+    
+    def remove
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.remove(self)
+      end
+    end
+    
+  end
+end

data/lib/ruby2d/quad.rb

@@ -0,0 +1,62 @@
+# quad.rb
+
+module Ruby2D
+  class Quad
+    # Coordinates in clockwise order, starting at top left:
+    # x1,y1 == top left
+    # x2,y2 == top right
+    # x3,y3 == bottom right
+    # x4,y4 == bottom left
+    attr_accessor :x1, :y1, :c1,
+                  :x2, :y2, :c2,
+                  :x3, :y3, :c3,
+                  :x4, :y4, :c4
+    
+    attr_reader :color
+    
+    def initialize(x1=0, y1=0, x2=100, y2=0, x3=100, y3=100, x4=100, y4=100, c='white')
+      @type_id = 2
+      @x1, @y1, @x2, @y2, @x3, @y3, @x4, @y4 = x1, y1, x2, y2, x3, y3, x4, y4
+      @color = c
+      update_color(c)
+      
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.add(self)
+      end
+    end
+    
+    def color=(c)
+      @color = c
+      update_color(c)
+    end
+    
+    def remove
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.remove(self)
+      end
+    end
+    
+    private
+    
+    def update_color(c)
+      
+      # If a valid color, use it for each vertex
+      if Color.is_valid? c
+        @c1 = Ruby2D::Color.new(c)
+        @c2 = Ruby2D::Color.new(c)
+        @c3 = Ruby2D::Color.new(c)
+        @c4 = Ruby2D::Color.new(c)
+      
+      # If a valid array of colors, assign them to each vertex, respectively
+      elsif c.all? { |el| Color.is_valid? el }
+        @c1 = Ruby2D::Color.new(c[0])
+        @c2 = Ruby2D::Color.new(c[1])
+        @c3 = Ruby2D::Color.new(c[2])
+        @c4 = Ruby2D::Color.new(c[3])
+      else
+        raise Error, "Not a valid color for #{self.class}"
+      end
+      
+    end
+  end
+end

data/lib/ruby2d/rectangle.rb

@@ -0,0 +1,57 @@
+# rectangle.rb
+
+module Ruby2D
+  class Rectangle < Ruby2D::Quad
+    
+    attr_reader :x, :y, :width, :height
+    
+    def initialize(x=0, y=0, w=200, h=100, c='white')
+      @type_id = 2
+      @x, @y, @width, @height, @color = x, y, w, h, c
+      update_coords(x, y, w, h)
+      update_color(c)
+      
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.add(self)
+      end
+    end
+    
+    def x=(x)
+      @x = @x1 = x
+      @x2 = x + @width
+      @x3 = x + @width
+      @x4 = x
+    end
+    
+    def y=(y)
+      @y = @y1 = y
+      @y2 = y
+      @y3 = y + @height
+      @y4 = y + @height
+    end
+    
+    def width=(w)
+      @width = w
+      update_coords(@x, @y, w, @height)
+    end
+    
+    def height=(h)
+      @height = h
+      update_coords(@x, @y, @width, h)
+    end
+    
+    private
+    
+    def update_coords(x, y, w, h)
+      @x1 = x
+      @y1 = y
+      @x2 = x + w
+      @y2 = y
+      @x4 = x
+      @y4 = y + h
+      @x3 = x + w
+      @y3 = y + h
+    end
+    
+  end
+end

data/lib/ruby2d/sound.rb

@@ -0,0 +1,19 @@
+# sound.rb
+
+module Ruby2D
+  class Sound
+    
+    def initialize(window, path)
+      unless File.exists? path
+        raise Error, "Cannot find sound file!"
+      end
+      window.create_audio(self, path)
+      @window, @path = window, path
+    end
+    
+    def play
+      @window.play_audio(self)
+    end
+    
+  end
+end

data/lib/ruby2d/square.rb

@@ -0,0 +1,26 @@
+# square.rb
+
+module Ruby2D
+  class Square < Ruby2D::Rectangle
+    
+    attr_reader :size
+    
+    def initialize(x=0, y=0, s=100, c='white')
+      @type_id = 2
+      @x, @y, @color = x, y, c
+      @width = @height = @size = s
+      update_coords(x, y, s, s)
+      update_color(c)
+      
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.add(self)
+      end
+    end
+    
+    def size=(s)
+      self.width = self.height = @size = s
+    end
+    
+    private :width=, :height=
+  end
+end

data/lib/ruby2d/text.rb

@@ -0,0 +1,62 @@
+# text.rb
+
+module Ruby2D
+  class Text
+    
+    attr_accessor :x, :y, :size, :text
+    
+    def initialize(x=0, y=0, size=20, text="Hello World!", font="Arial", c="white")
+      if font.include? '.'
+        unless File.exists? font
+          raise Error, "Cannot find font file!"
+        else
+          @font = font
+        end
+      else
+        @font = resolve_path(font)
+      end
+      
+      @type_id = 4
+      @x, @y, @size = x, y, size
+      @text, @color = text, c
+      update_color(c)
+      
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.add(self)
+      end
+    end
+    
+    def color=(c)
+      @color = c
+      update_color(c)
+    end
+    
+    def text=(t)
+      
+    end
+    
+    def remove
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.remove(self)
+      end
+    end
+    
+    private
+    
+    def resolve_path(font)
+      # TODO: Consider CSS names, like 'serif', 'san-serif', 'monospace'
+      if RUBY_PLATFORM =~ /darwin/
+        font_path = "/Library/Fonts/#{font}.ttf"
+        unless File.exists? font_path
+          raise Error, "Cannot find system font!"
+        end
+      end
+      font_path
+    end
+    
+    def update_color(c)
+      @c = Ruby2D::Color.new(c)
+    end
+    
+  end
+end

data/lib/ruby2d/triangle.rb

@@ -0,0 +1,51 @@
+# triangle.rb
+
+module Ruby2D
+  class Triangle
+    
+    attr_accessor :x1, :y1, :c1,
+                  :x2, :y2, :c2,
+                  :x3, :y3, :c3
+    attr_reader :color
+    
+    def initialize(x1=50, y1=0, x2=100, y2=100, x3=0, y3=100, c='white')
+      @type_id = 1
+      @x1, @y1 = x1, y1
+      @x2, @y2 = x2, y2
+      @x3, @y3 = x3, y3
+      @color = c
+      update_color(c)
+      
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.add(self)
+      end
+    end
+    
+    def color=(c)
+      update_color(c)
+      @color = c
+    end
+    
+    def remove
+      if defined? Ruby2D::DSL
+        Ruby2D::Application.remove(self)
+      end
+    end
+    
+    private
+    
+    def update_color(c)
+      # If a 2D array
+      if c.class == Array && c.all? { |el| el.class == Array }
+        @c1 = Ruby2D::Color.new(c[0])
+        @c2 = Ruby2D::Color.new(c[1])
+        @c3 = Ruby2D::Color.new(c[2])
+      else
+        @c1 = Ruby2D::Color.new(c)
+        @c2 = Ruby2D::Color.new(c)
+        @c3 = Ruby2D::Color.new(c)
+      end
+    end
+    
+  end
+end

data/lib/ruby2d/version.rb

@@ -0,0 +1,5 @@
+# version.rb
+
+module Ruby2D
+  VERSION = '0.2.0'
+end

data/lib/ruby2d/window.rb

@@ -0,0 +1,176 @@
+# window.rb
+
+module Ruby2D
+  class Window
+    attr_reader :title, :width, :height, :mouse_x, :mouse_y
+    
+    def initialize(width: 640, height: 480, title: "Ruby 2D", fps: 60, vsync: true)
+      @width, @height, @title = width, height, title
+      @mouse_x = @mouse_y = 0
+      @fps_cap = fps
+      @fps = 60
+      @vsync = vsync
+      
+      @objects = []
+      @keys = {}
+      @keys_down = {}
+      @controller = {}
+      @update_proc = Proc.new {}
+    end
+    
+    def get(sym)
+      case sym
+      when :window
+        return self
+      when :title
+        return @title
+      when :width
+        return @width
+      when :height
+        return @height
+      when :fps
+        return @fps
+      when :mouse_x
+        return @mouse_x
+      when :mouse_y
+        return @mouse_y
+      end
+    end
+    
+    def set(opts)
+      if opts.include? :title
+        @title = opts[:title]
+      end
+      
+      if opts.include? :width
+        @width = opts[:width]
+      end
+      
+      if opts.include? :height
+        @height = opts[:height]
+      end
+    end
+    
+    def add(o)
+      case o
+      when nil
+        raise Error, "Cannot add '#{o.class}' to window!"
+      when Array
+        o.each { |x| add_object(x) }
+      else
+        add_object(o)
+      end
+    end
+    
+    def remove(o)
+      if o == nil
+        raise Error, "Cannot remove '#{o.class}' from window!"
+      end
+      
+      if i = @objects.index(o)
+        @objects.slice!(i)
+        true
+      else
+        false
+      end
+    end
+    
+    def clear
+      @objects.clear
+    end
+    
+    def update(&proc)
+      @update_proc = proc
+      true
+    end
+    
+    def on(mouse: nil, key: nil, key_down: nil, controller: nil, &proc)
+      unless mouse.nil?
+        # reg_mouse(btn, &proc)
+      end
+      
+      unless key.nil?
+        reg_key(key, &proc)
+      end
+      
+      unless key_down.nil?
+        reg_key_down(key_down, &proc)
+      end
+      
+      unless controller.nil?
+        reg_controller(controller, &proc)
+      end
+    end
+    
+    def key_callback(key)
+      key.downcase!
+      if @keys.has_key? key
+        @keys[key].call
+      end
+    end
+    
+    def key_down_callback(key)
+      key.downcase!
+      if @keys_down.has_key? key
+        @keys_down[key].call
+      end
+    end
+    
+    def controller_callback(is_axis, axis, val, is_btn, btn)
+      
+      # puts "is_axis: #{is_axis}, axis: #{axis}, val: #{val}, is_btn: #{is_btn}, btn: #{btn}"
+      
+      if is_axis
+        if axis == 0 && val == -32768
+          event = 'left'
+        elsif axis == 0 && val == 32767
+          event = 'right'
+        elsif axis == 1 && val == -32768
+          event = 'up'
+        elsif axis == 1 && val == 32767
+          event = 'down'
+        end
+      elsif is_btn
+        event = btn
+      end
+      
+      if @controller.has_key? event
+        @controller[event].call
+      end
+    end
+    
+    def update_callback
+      @update_proc.call
+    end
+    
+    private
+    
+    def add_object(o)
+      if !@objects.include?(o)
+        @objects.push(o)
+        true
+      else
+        false
+      end
+    end
+    
+    # Register key string with proc
+    def reg_key(key, &proc)
+      @keys[key] = proc
+      true
+    end
+    
+    # Register key string with proc
+    def reg_key_down(key, &proc)
+      @keys_down[key] = proc
+      true
+    end
+    
+    # Register controller string with proc
+    def reg_controller(event, &proc)
+      @controller[event] = proc
+      true
+    end
+    
+  end
+end

metadata

@@ -1,23 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
-dependencies: []
-description: A gem for 2D graphics in Ruby.
+date: 2016-01-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+description: Make cross-platform 2D applications in Ruby
 email: "@blacktm"
-executables: []
-extensions: []
+executables:
+- ruby2d
+extensions:
+- ext/ruby2d/extconf.rb
 extra_rdoc_files: []
 files:
+- assets/app.icns
+- bin/ruby2d
+- ext/ruby2d/extconf.rb
+- ext/ruby2d/ruby2d.c
 - lib/ruby2d.rb
-homepage: https://github.com/blacktm/ruby2d
+- lib/ruby2d/application.rb
+- lib/ruby2d/color.rb
+- lib/ruby2d/dsl.rb
+- lib/ruby2d/exceptions.rb
+- lib/ruby2d/image.rb
+- lib/ruby2d/quad.rb
+- lib/ruby2d/rectangle.rb
+- lib/ruby2d/sound.rb
+- lib/ruby2d/square.rb
+- lib/ruby2d/text.rb
+- lib/ruby2d/triangle.rb
+- lib/ruby2d/version.rb
+- lib/ruby2d/window.rb
+homepage: http://www.ruby2d.com
 licenses:
 - MIT
 metadata: {}
@@ -29,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -37,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby 2D