yeah 0.3.5 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17da100f4d2feff2cb2eefb5f5f779d56404f044
-  data.tar.gz: ff877fec7e0cab390ebf0419e4aaf74dc93ae415
+  metadata.gz: 9358d3033c95b213ffc6f6b8e34880d247aa8a34
+  data.tar.gz: 636ce5c237cc12d40f0f1fc832e5433df6d92182
 SHA512:
-  metadata.gz: 255e45b43495db3c4bf644a62b821bd7d8d34067f67f6be77f4bd19515d8b2813bd28e43d9612ae474bc3761f19c59286b7467f5095200e8debb7b844dcfb657
-  data.tar.gz: 4ad59ff0f089d070c2975a384e81a2124fbd653fb4cdb15a7388cb413fec3590f9162cf33b0ff3272f248df7d4ae11bc36e44202e794f1b59424d8180c42377a
+  metadata.gz: 3115c006cadf70c7e3052cb4cb6937e17a3be3b0389791e61ec2103581d73a197fbc4dcfa1e1ebc34501b789ffa2af0914a2e88fc6363db4a45f3697d55a145d
+  data.tar.gz: 481caa7ec53564160a1ac3edb80f052a4a115c5b9ff2d83fd13071dbd4cda26bf629600dda30669ab227e824aa521c80e1060e422ad0d03928cf7a95994cdec0

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+0.4.2 (2014-09-14)
+------------------
+* Need sleep.
+
+0.4.1 (2014-09-14)
+------------------
+* Fixed `yeah build`.
+
+0.4.0 (2014-09-14)
+------------------
+* New `Font` class
+* `Web` runner scales game display to use all available space
+* New configuration system; title and factorial scaling configuration
+* `Display` replaced `#font_family` & `#font_size` with `#text_font` & `#text_size`
+* `Vector` added `#==`, `#add[!]`, `#subtract[!]`, `#multiply[!]`, `#divide[!]`
+* `Vector#toward[!]` works in 3 dimensions
+* `Display#rotate` takes `Vector` instead of `Numeric`
+* `Display#[translate|scale|rotate]_[x|y|z]` added
+* `Display` added `#stroke_curve` and `#stroke_curve2`
+* `Display#transformation` removed
+* `Game::config` removed
+* `yeah build` builds to `builds`
+* Secure Rubygems for Gemfile in game projects (thanks cokernel)
+* Tests made platform-agnostic
+* Interface tests for most classes, some `Display` draw tests, some `Color` initialization tests
+* Benchmarks made more consistent
+* Various bug fixes
+* Documentation cleanup
+
 0.3.5 (2014-08-24)
 ------------------
 * Updated project structure; new entrypoint is `code/game.rb`

data/README.md

@@ -16,16 +16,15 @@ Practical Ruby video game framework, alpha stage
 
 ## Examples
 
-[Code for all examples](https://github.com/yeahrb/examples)
+[Code for all examples][Example code]
 
-[![Asteroids](https://cdn.mediacru.sh/IkYZP46TmCsd.png)](https://yeahrb.github.io/examples/asteroids/runner.html)
+[![Asteroids](https://cdn.mediacru.sh/IkYZP46TmCsd.png)][Asteroids example]
 
-[*Asteroids*](https://yeahrb.github.io/examples/asteroids/runner.html)
+[*Asteroids*][Asteroids example]
 
-[![Random](https://cdn.mediacru.sh/KW9M6TndLry0.png)](https://yeahrb.github.io/examples/random/runner.html)
-
-[*Random*](https://yeahrb.github.io/examples/random/runner.html)
+[![Random](https://cdn.mediacru.sh/KW9M6TndLry0.png)][Random example]
 
+[*Random*][Random example]
 
 ## Usage
 
@@ -40,17 +39,26 @@ NOTE: This is alpha-stage software, expect changes!
 ### Making a game
 
 1. In a command line, enter `yeah new` to generate a new game project.
-2. Change into the new `game` directory, then enter `bundle install`.
-3. Add game code to `code/game.rb`. No tutorials yet; please take a look at the [example code](https://github.com/yeahrb/examples) and [API reference](http://rdoc.info/github/yeahrb/yeah/85e75c5/frames).
+2. Change into the new project directory, then enter `bundle install`.
+3. Add game code to `code/game.rb`. No tutorials yet; please take a look at the [example code][Example code] and [API reference][0.4.2 API].
 4. Enter `yeah serve` and visit [http://localhost:1234](http://localhost:1234) to try the game.
 
 
 ## Links
 
-[0.3.4 API reference](http://rdoc.info/github/yeahrb/yeah/85e75c5/frames)
+API reference: [0.4.2][0.4.2 API], [0.3.5][0.3.5 API]
+
+[Version upgrade notes](https://github.com/yeahrb/yeah/blob/master/UPGRADING.md)
 
 [Issue & feature tracker](https://github.com/yeahrb/yeah/issues)
 
 [Discussion via Gitter](https://gitter.im/yeahrb/yeah)
 
 [Author's email](mailto:skoofoo@gmail.com)
+
+
+[0.4.2 API]: http://rdoc.info/github/yeahrb/yeah/32a50f5/frames
+[0.3.5 API]: http://rdoc.info/github/yeahrb/yeah/5efbbc9/frames
+[Example code]: https://github.com/yeahrb/examples
+[Asteroids example]: https://yeahrb.github.io/examples/asteroids/runner.html
+[Random example]: https://yeahrb.github.io/examples/random/runner.html

data/lib/yeah/_platform/class_methods.rb

@@ -0,0 +1,9 @@
+module Yeah
+  # @!method self.configure
+  # @abstract Provided by a `Platform`.
+  # @yield [config] configuration block
+  # @yieldparam [Struct] configuration
+  # @note Configuration struct attributes: `title` (String),
+  #   `factorial_scaling` (Boolean)
+  # @return [nil]
+end

data/lib/yeah/_platform/display.rb

@@ -7,22 +7,22 @@ class Display
   # @param [Hash] options for new object
   # @option options [Vector] :size (V[1280, 720]) of display
   # @option options [String] :canvas_selector ('canvas') for canvas HTML
-  #   element (applicable only to `Web::Display`)
+  #   element (applies only to `Web::Display`)
   def initialize(options = {})
     raise NotImplementedError
   end
 
   # @!attribute size
-  # @param [Vector] size to make display
-  # @return [Vector] size of display
+  # @param [Vector] size to make display in pixels
+  # @return [Vector] size of display in pixels
 
   # @!attribute width
-  # @param [Vector] width to make display
-  # @return [Vector] width of display
+  # @param [Integer] width to make display in pixels
+  # @return [Integer] width of display in pixels
 
   # @!attribute height
-  # @param [Vector] height to make display
-  # @return [Vector] height of display
+  # @param [Integer] height to make display in pixels
+  # @return [Integer] height of display in pixels
 
   # @!attribute fill_color
   # @param [Color] color for fill
@@ -33,78 +33,146 @@ class Display
   # @return [Color] color for stroke
 
   # @!attribute stroke_width
-  # @param [Numeric] width for stroke
-  # @return [Numeric] width for stroke
+  # @param [Numeric] width for stroke in pixels
+  # @return [Numeric] width for stroke in pixels
 
-  # @!attribute font_family
-  # @param [String] font family for text
-  # @return [String] font family for text
+  # @!attribute text_font
+  # @param [Font] font for text
+  # @return [Font] font for text
 
-  # @!attribute font_size
-  # @param [String] font size for text
-  # @return [String] font size for text
+  # @!attribute text_size
+  # @param [Integer] size for text in pixels
+  # @return [Integer] size for text in pixels
 
   # @!method color_at(position)
   # @param [Vector] position of pixel from which to get color
   # @return [Color] color of pixel
 
-  # @!attribute [r] transformation
-  # @return [Array] transformation matrix
-
   # @!method translate(displacement)
-  # @param [Vector] displacement in 2D
+  # @param [Vector] displacement
+  # @return [nil]
+  # @note `Web::Display#translate` is currently 2D (only X and Y apply).
+  # Move the transformation by a vector displacement.
+
+  # @!method translate_x(displacement)
+  # @param [Numeric] displacement
+  # @return [nil]
+  # Move the transformation by a displacement on the X axis.
+
+  # @!method translate_y(displacement)
+  # @param [Numeric] displacement
+  # @return [nil]
+  # Move the transformation by a displacement on the Y axis.
+
+  # @!method translate_z(displacement)
+  # @param [Numeric] displacement
   # @return [nil]
-  # @todo Make this work in 3D.
-  # Move the transformation by a 2D displacement.
+  # @note No-op in `Web::Display`, which is currently 2D.
+  # Move the transformation by a displacement on the Z axis.
 
   # @!method scale(multiplier)
-  # @param [Vector] multiplier in 2D
+  # @param [Vector] multiplier
   # @return [nil]
-  # @todo Make this work in 3D.
-  # Scale the transformation by a 2D multiplier.
+  # @note `Web::Display#scale` is currently 2D (only X and Y apply).
+  # Scale the transformation by a vector multiplier.
+
+  # @!method scale_x(multiplier)
+  # @param [Numeric] multiplier
+  # @return [nil]
+  # Scale the transformation by a multiplier on the X axis.
+
+  # @!method scale_y(multiplier)
+  # @param [Numeric] multiplier
+  # @return [nil]
+  # Scale the transformation by a multiplier on the Y axis.
+
+  # @!method scale_z(multiplier)
+  # @param [Numeric] multiplier
+  # @return [nil]
+  # @note No-op in `Web::Display`, which is currently 2D.
+  # Scale the transformation by a multiplier on the Z axis.
 
   # @!method rotate(radians)
-  # @param [Numeric] radians in 2D
+  # @param [Vector] radians
+  # @return [nil]
+  # @note `Web::Display#rotate` is currently 2D (only Z applies).
+  # Rotate the transformation by vector radians.
+
+  # @!method rotate_x(radians)
+  # @param [Numeric] radians
+  # @return [nil]
+  # @note No-op in `Web::Display`, which is currently 2D.
+  # Rotate the transformation by radians on the X axis.
+
+  # @!method rotate_y(radians)
+  # @param [Numeric] radians
   # @return [nil]
-  # @todo Make this work in 3D.
-  # Rotate the transformation by radians.
+  # @note No-op in `Web::Display`, which is currently 2D.
+  # Rotate the transformation by radians on the Y axis.
+
+  # @!method rotate_z(radians)
+  # @param [Numeric] radians
+  # @return [nil]
+  # Rotate the transformation by radians on the Z axis.
 
   # @!method push
   # @return [nil]
-  # Push transformation to the transformation stack.
+  # Push current transformation to the transformation stack.
 
   # @!method pop
   # @return [nil]
-  # Pop a transformation off the transformation stack.
+  # Pop a transformation off the transformation stack and use it.
 
   # @!method stroke_line(start_pos, end_pos)
-  # @param [Vector] start position in 2D
-  # @param [Vector] end position in 2D
+  # @param [Vector] start position
+  # @param [Vector] end position
   # @return [nil]
+  # @note `Web::Display#stroke_line` is currently 2D (only X and Y apply).
   # Stroke a line between two positions.
 
+  # @!method stroke_curve(start_pos, end_pos, control)
+  # @param [Vector] start position
+  # @param [Vector] end position
+  # @param [Vector] control point position
+  # @return [nil]
+  # @note `Web::Display#stroke_curve` is currently 2D (only X and Y apply).
+  # Stroke curve with a control point between two positions.
+
+  # @!method stroke_curve2(start_pos, end_pos, control1, control2)
+  # @param [Vector] start position
+  # @param [Vector] end position
+  # @param [Vector] first control point position
+  # @param [Vector] second control point position
+  # @return [nil]
+  # @note `Web::Display#stroke_curve2` is currently 2D (only X and Y apply).
+  # Stroke curve with 2 control points between two positions.
+
   # @!method stroke_rectangle(position, size)
-  # @param [Vector] position in 2D
-  # @param [Vector] size in 2D
+  # @param [Vector] position
+  # @param [Vector] size
   # @return [nil]
+  # @note `Web::Display#stroke_rectangle` is currently 2D (only X and Y apply).
   # Stroke a rectangle at a position and size.
 
   # @!method fill_rectangle(position, size)
-  # @param [Vector] position in 2D
-  # @param [Vector] size in 2D
+  # @param [Vector] position
+  # @param [Vector] size
   # @return [nil]
+  # @note `Web::Display#fill_rectangle` is currently 2D (only X and Y apply).
   # Fill a rectangle at a position and size.
 
   # @!method stroke_ellipse(center, radius)
-  # @param [Vector] center position in 2D
-  # @param [Vector] radius in 2D
+  # @param [Vector] center position
+  # @param [Vector] radius in pixels in 2D
   # @return [nil]
+  # @note `Web::Display#stroke_ellipse` is currently 2D (only X and Y apply).
   # Stroke an ellipse at a center position and 2D radius.
 
   # @!method fill_ellipse(center, radius)
-  # @param [Vector] center position in 2D
-  # @param [Vector] radius in 2D
+  # @param [Vector] center position
+  # @param [Vector] radius in pixels in 2D
   # @return [nil]
+  # @note `Web::Display#fill_ellipse` is currently 2D (only X and Y apply).
   # Fill an ellipse at a center position and 2D radius.
 
   # @!method clear
@@ -127,20 +195,20 @@ class Display
   # @!method line_to(position)
   # @param [Vector] position
   # @return [nil]
-  # Draw line to position as part of shape.
+  # Trace line to position as part of shape.
 
   # @!method curve_to(position, control)
   # @param [Vector] position
   # @param [Vector] control point position
   # @return [nil]
-  # Draw curve with a control point to position as part of shape.
+  # Trace curve with a control point to position as part of shape.
 
   # @!method curve2_to(position, control1, control2)
   # @param [Vector] position
   # @param [Vector] first control point position
   # @param [Vector] second control point position
   # @return [nil]
-  # Draw curve with 2 control points to position as part of shape.
+  # Trace curve with 2 control points to position as part of shape.
 
   # @!method stroke_shape
   # @return [nil]
@@ -155,13 +223,13 @@ class Display
   # @param [Vector] position
   # @return [nil]
   # @example Draw a duck within a game
-  #   display.image Image['images/duck.png'], V[80, 80]
+  #   display.image(Image['images/duck.png'], V[80, 80])
   # Draw an image at a position.
 
   # @!method image_cropped(image, position, crop_position, crop_size)
   # @param [Image] image to draw
   # @param [Vector] position
-  # @param [Vector] start point of crop
+  # @param [Vector] start position of crop
   # @param [Vector] size of crop
   # @return [nil]
   # Draw a cropped image at a position.

data/lib/yeah/_platform/font.rb

@@ -0,0 +1,10 @@
+module Yeah
+
+# A `Font` is an asset that is used to set `Display#text_font` in order to be
+# drawn using `Display#fill_text` and `Display#stroke_text`.
+# @abstract Provided by a `Platform`.
+# @see Yeah::Display#text_font
+class Font < Asset
+end
+
+end

data/lib/yeah/_template/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'yeah', '~> 0.3.5'
-gem 'opal', github: 'opal/opal', ref: '7e843b0'
+gem 'yeah', '~> 0.4.2'
+gem 'opal', github: 'opal/opal', ref: '78b4fb9'

data/lib/yeah/_template/code/config.rb

@@ -0,0 +1,4 @@
+Yeah.configure do |c|
+  c.title = "Game"
+  c.factorial_scaling = false
+end

data/lib/yeah/constants.rb

@@ -1,6 +1,5 @@
 module Yeah
   DEFAULT_DISPLAY_SIZE = V[1280, 720]
-  DEFAULT_DISPLAY_FONT_FAMILY = 'DejaVu Serif'
-  DEFAULT_DISPLAY_FONT_SIZE = 36
+  DEFAULT_DISPLAY_TEXT_SIZE = 36
   DEFAULT_TICKER_RATE = 60
 end

data/lib/yeah/game.rb

@@ -9,21 +9,6 @@ module Yeah
 # @abstract Subclass this to make a game.
 class Game
   class << self
-    # @param [Hash] configuration used for new game instances
-    # @option configuration [Hash] :ticker options
-    # @option configuration [Hash] :display options
-    # @option configuration [Hash] :keyboard options
-    # @option configuration [Hash] :mouse options
-    # @return [Hash] configuration for new game instances
-    def config
-      @config ||= {
-        ticker: {},
-        display: {},
-        keyboard: {},
-        mouse: {}
-      }
-    end
-
     # @return [Game] default subclass (i.e. project game)
     def default
       subclasses.last
@@ -84,18 +69,14 @@ class Game
 
   private
 
-  def config
-    self.class.config
-  end
-
   def defaults
-    ticker = Ticker.new(config[:ticker])
+    ticker = Ticker.new
 
     {
       ticker: ticker,
-      display: Display.new(config[:display]),
-      keyboard: Keyboard.new({ ticker: ticker }.merge(config[:keyboard])),
-      mouse: Mouse.new({ ticker: ticker }.merge(config[:mouse]))
+      display: Display.new,
+      keyboard: Keyboard.new(ticker: ticker),
+      mouse: Mouse.new(ticker: ticker)
     }
   end
 end

data/lib/yeah/vector.rb

@@ -74,6 +74,12 @@ class Vector
 
   alias :unit :normalize
 
+  # @param [Vector] vector to equate
+  # @return [Boolean] whether self equals vector
+  def ==(other)
+    @components == other.components
+  end
+
   # @param [Vector] vector to add
   # @return [Vector] vector sum
   def +(vector)
@@ -106,11 +112,56 @@ class Vector
                    @components[2] / numeric)
   end
 
-  # @return [Vector] identical vector
-  def +@
-    self.class.new(*@components)
+  alias :add :+
+
+  alias :subtract :-
+
+  alias :multiply :*
+
+  alias :divide :/
+
+  # @param (see #add)
+  # @return [Vector] self after adding vector
+  def add!(vector)
+    @components[0] += vector.components[0]
+    @components[1] += vector.components[1]
+    @components[2] += vector.components[2]
+
+    self
   end
 
+  # @param (see #subtract)
+  # @return [Vector] self after subtracting vector
+  def subtract!(vector)
+    @components[0] -= vector.components[0]
+    @components[1] -= vector.components[1]
+    @components[2] -= vector.components[2]
+
+    self
+  end
+
+  # @param (see #multiply)
+  # @return [Vector] self after multiplying by numeric
+  def multiply!(numeric)
+    @components[0] *= numeric
+    @components[1] *= numeric
+    @components[2] *= numeric
+
+    self
+  end
+
+  # @param (see #divide)
+  # @return [Vector] self after dividing by numeric
+  def divide!(numeric)
+    @components[0] /= numeric
+    @components[1] /= numeric
+    @components[2] /= numeric
+
+    self
+  end
+
+  alias :+@ :dup
+
   # @return [Vector] negative vector
   def -@
     self.class.new(-@components[0],
@@ -138,7 +189,8 @@ class Vector
   # @return [Vector] position moved along an angle for a distance in 2D
   def along(angle, distance)
     self.class.new(@components[0] + Math.cos(angle) * distance,
-                   @components[1] + Math.sin(angle) * distance)
+                   @components[1] + Math.sin(angle) * distance,
+                   @components[2])
   end
 
   # @param (see #along)
@@ -152,18 +204,15 @@ class Vector
 
   # @param [Vector] position to move to
   # @param [Vector] distance to move
-  # @return [Vector] position moved toward other position for a distance in 2D
-  # @todo Make work in 3D.
+  # @return [Vector] position moved toward other position for a distance
   def toward(position, distance)
-    along angle_to(position), amount
+    self + (position - self).unit * distance
   end
 
   # @param (see #toward)
-  # @return [Vector] self after moving toward other position for a distance in
-  #   2D
-  # @todo Make work in 3D.
-  def toward!(position, amount)
-    along! angle_to(position), amount
+  # @return [Vector] self after moving toward other position for a distance
+  def toward!(position, distance)
+    self.add! (position - self).unit * distance
   end
 end
 end

data/lib/yeah/version.rb

@@ -1,3 +1,3 @@
 module Yeah
-  VERSION = '0.3.5'
+  VERSION = '0.4.2'
 end

data/lib/yeah/web/builder.rb

@@ -18,14 +18,14 @@ class Builder
     setup_compiler
     compile
 
-    puts "Built game package to `build/web/`."
+    puts "Built game package to `builds/web`."
   end
 
   private
 
   def make_build_dirs
     # Make build directories.
-    FileUtils.mkpath 'build/web/assets/yeah/web'
+    FileUtils.mkpath 'builds/web/assets/yeah/web'
   end
 
   def setup_compiler
@@ -46,7 +46,7 @@ class Builder
   def compile
     runner_path = Pathname.new(__FILE__).join('..', 'runner.html.erb')
     html = ERB.new(File.read(runner_path)).result(binding)
-    File.write('build/web/runner.html', html)
+    File.write('builds/web/runner.html', html)
   end
 
   def asset_include_tags
@@ -58,6 +58,10 @@ class Builder
       case path
       when /\.(ogg|wav|mp3)$/
         "<audio src=\"./#{path}\"></audio>"
+      when /\.(otf|ttf|woff)$/
+        "<style>" +
+        "@font-face { font-family: \"#{path[7..-1]}\"; src: url(#{path}) }" +
+        "</style>"
       else
         "<img src=\"./#{path}\" />"
       end
@@ -81,7 +85,7 @@ class Builder
   end
 
   def build_path
-    @build_path ||= Pathname.new("build/web")
+    @build_path ||= Pathname.new("builds/web")
   end
 
   def gem_path

data/lib/yeah/web/runner.html.erb

@@ -1,49 +1,62 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Game</title>
+  <title>Game</title>
 
   <style>
+    html, body {
+      overflow: hidden;
+      height: 100%;
+      margin: 0;
+    }
+
     body {
       background: black;
-      margin: 0;
     }
 
     .center-content {
-      /* Internet Explorer 10 */
       display: -ms-flexbox;
       -ms-flex-pack: center;
       -ms-flex-align: center;
-      /* Firefox */
       display: -moz-box;
       -moz-box-pack: center;
       -moz-box-align: center;
-      /* Safari, Opera, and Chrome */
       display: -webkit-box;
       -webkit-box-pack: center;
       -webkit-box-align: center;
-      /* W3C */
       display: box;
       box-pack: center;
       box-align: center;
     }
 
-    html, body{
-      width: 100%;
-      height: 100%;
-    }
-
-    canvas {
-      max-width: 100%;
-      max-height: 100%;
-    }
-
     .hidden {
       display: none;
     }
   </style>
+
+  <script>
+    function scaleDisplay() {
+      var canvas = document.getElementsByTagName('canvas')[0],
+
+          width_scale = window.innerWidth / canvas.width,
+          height_scale = window.innerHeight / canvas.height,
+
+          scale = Math.min(width_scale, height_scale);
+
+      if (FACTORIAL_SCALING && scale >= 1) {
+        scale = Math.floor(scale);
+      }
+
+      var width = canvas.width * scale,
+          height = canvas.height * scale,
+
+          sizeStyle = "width:"+width+"px; height:"+height+"px";
+
+      canvas.setAttribute('style', sizeStyle);
+    }
+  </script>
 </head>
-<body class="center-content">
+<body class="center-content" onresize="scaleDisplay()">
   <canvas></canvas>
 
   <div class="hidden">
@@ -54,8 +67,11 @@
   <%= script_include_tag 'yeah/web' %>
   <%= script_include_tag 'yeah/web/setup' %>
 
+  <%= script_include_tag 'config' %>
   <%= script_include_tag 'game' %>
 
   <%= script_include_tag 'yeah/web/start' %>
+
+  <script>scaleDisplay()</script>
 </body>
 </html>

data/lib/yeah/web/server.rb

@@ -69,6 +69,10 @@ class Server
         case path
         when /\.(ogg|wav|mp3)$/
           "<audio src=\"/#{path}\"></audio>"
+        when /\.(otf|ttf|woff)$/
+          "<style>" +
+          "@font-face { font-family: \"#{path[7..-1]}\"; src: url(#{path}) }" +
+          "</style>"
         else
           "<img src=\"/#{path}\" />"
         end

data/lib/yeah/web/setup.rb

@@ -1,5 +1,6 @@
 module Yeah
   include Web
+  extend Web::ClassMethods
 end
 
 include Yeah

data/opal/yeah/web.rb

@@ -1,7 +1,11 @@
+require 'math'
+
 require 'yeah/web/constants'
+require 'yeah/web/class_methods'
 require 'yeah/web/asset'
 require 'yeah/web/image'
 require 'yeah/web/sound'
+require 'yeah/web/font'
 require 'yeah/web/display'
 require 'yeah/web/keyboard'
 require 'yeah/web/mouse'

data/opal/yeah/web/class_methods.opal

@@ -0,0 +1,14 @@
+module Yeah
+module Web
+  module ClassMethods
+    def configure(&block)
+      config = Struct.new(:title, :factorial_scaling).new
+
+      yield config
+
+      `window.document.title = #{config.title}` unless config.title.nil?
+      `FACTORIAL_SCALING = #{config.factorial_scaling}`
+    end
+  end
+end
+end

data/opal/yeah/web/display.opal

@@ -1,7 +1,7 @@
 module Yeah
 module Web
 class Display
-  attr_reader :font_family, :font_size
+  attr_reader :text_font, :text_size
 
   def initialize(options = {})
     canvas_selector = options.fetch(:canvas_selector, DEFAULT_CANVAS_SELECTOR)
@@ -9,8 +9,8 @@ class Display
     @canvas = `document.querySelectorAll(#{canvas_selector})[0]`
     @context = `#@canvas.getContext('2d')`
     self.size = options.fetch(:size, DEFAULT_DISPLAY_SIZE)
-    self.font_family = DEFAULT_DISPLAY_FONT_FAMILY
-    self.font_size = DEFAULT_DISPLAY_FONT_SIZE
+    self.text_font = Font['']
+    self.text_size = DEFAULT_DISPLAY_TEXT_SIZE
     @transform = [1, 0, 0, 1, 0, 0]
     @transforms = []
   end
@@ -27,14 +27,14 @@ class Display
     `#@canvas.width`
   end
   def width=(value)
-    `#@canvas.width =  #{value.x}`
+    `#@canvas.width =  #{value}`
   end
 
   def height
     `#@canvas.height`
   end
   def height=(value)
-    `#@canvas.height =  #{value.x}`
+    `#@canvas.height =  #{value}`
   end
 
   def fill_color
@@ -58,17 +58,17 @@ class Display
     `#@context.lineWidth = #{numeric}`
   end
 
-  def font_family=(type)
-    @font_family= type
+  def text_font=(font)
+    @text_font = font
 
-    font = "#{@font_size}px #{@font_family}"
+    font = "#{@text_size}px \"#{@text_font.path}\""
     `#@context.font = #{font}`
   end
 
-  def font_size=(size)
-    @font_size = size
+  def text_size=(size)
+    @text_size = size
 
-    font = "#{@font_size}px #{@font_family}"
+    font = "#{@text_size}px \"#{@text_font.path}\""
     `#@context.font = #{font}`
   end
 
@@ -77,10 +77,6 @@ class Display
     C[`data[0]`, `data[1]`, `data[2]`]
   end
 
-  def transformation
-    @transform + [0, 0, 1] # appendage to fulfill signature
-  end
-
   def translate(displacement)
     @transform[4] += `#{@transform[0]} * #{displacement.x} +
                       #{@transform[2]} * #{displacement.y}`
@@ -93,6 +89,29 @@ class Display
                              #{@transform[4]}, #{@transform[5]}); }
   end
 
+  def translate_x(displacement)
+    @transform[4] += `#{@transform[0]} * #{displacement} + #{@transform[2]}`
+    @transform[5] += `#{@transform[1]} * #{displacement} + #{@transform[3]}`
+
+    %x{
+      #@context.setTransform(#{@transform[0]}, #{@transform[1]},
+                             #{@transform[2]}, #{@transform[3]},
+                             #{@transform[4]}, #{@transform[5]}); }
+  end
+
+  def translate_y(displacement)
+    @transform[4] += `#{@transform[0]} + #{@transform[2]} * #{displacement}`
+    @transform[5] += `#{@transform[1]} + #{@transform[3]} * #{displacement}`
+
+    %x{
+      #@context.setTransform(#{@transform[0]}, #{@transform[1]},
+                             #{@transform[2]}, #{@transform[3]},
+                             #{@transform[4]}, #{@transform[5]}); }
+  end
+
+  def translate_z(displacement)
+  end
+
   def scale(multiplier)
     %x{
       #{@transform} = [#{@transform[0]} * #{multiplier.x},
@@ -106,7 +125,44 @@ class Display
                              #{@transform[4]}, #{@transform[5]}); }
   end
 
+  def scale_x(multiplier)
+    %x{
+      #{@transform} = [#{@transform[0]} * #{multiplier},
+                       #{@transform[1]} * #{multiplier},
+                       #{@transform[2]}, #{@transform[3]},
+                       #{@transform[4]}, #{@transform[5]}];
+
+      #@context.setTransform(#{@transform[0]}, #{@transform[1]},
+                             #{@transform[2]}, #{@transform[3]},
+                             #{@transform[4]}, #{@transform[5]}); }
+  end
+
+  def scale_y(multiplier)
+    %x{
+      #{@transform} = [#{@transform[0]}, #{@transform[1]},
+                       #{@transform[2]} * #{multiplier},
+                       #{@transform[3]} * #{multiplier},
+                       #{@transform[4]}, #{@transform[5]}];
+
+      #@context.setTransform(#{@transform[0]}, #{@transform[1]},
+                             #{@transform[2]}, #{@transform[3]},
+                             #{@transform[4]}, #{@transform[5]}); }
+  end
+
+  def scale_z(multiplier)
+  end
+
   def rotate(radians)
+    rotate_z(radians.z)
+  end
+
+  def rotate_x(radians)
+  end
+
+  def rotate_y(radians)
+  end
+
+  def rotate_z(radians)
     %x{
       var cos = Math.cos(#{radians}),
           sin = Math.sin(#{radians}),
@@ -145,6 +201,29 @@ class Display
     }
   end
 
+  def stroke_curve(start_pos, end_pos, control)
+    %x{
+      #@context.beginPath();
+      #@context.moveTo(#{start_pos.x}, #{start_pos.y});
+      #@context.quadraticCurveTo(#{control.x}, #{control.y},
+                                 #{end_pos.x}, #{end_pos.y});
+      #@context.closePath();
+      #@context.stroke();
+    }
+  end
+
+  def stroke_curve2(start_pos, end_pos, control1, control2)
+    %x{
+      #@context.beginPath();
+      #@context.moveTo(#{start_pos.x}, #{start_pos.y});
+      #@context.bezierCurveTo(#{control1.x}, #{control1.y},
+                              #{control2.x}, #{control2.y},
+                              #{end_pos.x}, #{end_pos.y});
+      #@context.closePath();
+      #@context.stroke();
+    }
+  end
+
   def stroke_rectangle(position, size)
     `#@context.strokeRect(#{position.x}, #{position.y}, #{size.x}, #{size.y})`
   end

data/opal/yeah/web/font.opal

@@ -0,0 +1,6 @@
+module Yeah
+module Web
+class Font < Asset
+end
+end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yeah
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.2
 platform: ruby
 authors:
 - Artur Ostrega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -94,13 +94,16 @@ files:
 - bin/yeah
 - lib/yeah.rb
 - lib/yeah/_platform/asset.rb
+- lib/yeah/_platform/class_methods.rb
 - lib/yeah/_platform/display.rb
+- lib/yeah/_platform/font.rb
 - lib/yeah/_platform/image.rb
 - lib/yeah/_platform/keyboard.rb
 - lib/yeah/_platform/mouse.rb
 - lib/yeah/_platform/sound.rb
 - lib/yeah/_platform/ticker.rb
 - lib/yeah/_template/Gemfile
+- lib/yeah/_template/code/config.rb
 - lib/yeah/_template/code/game.rb
 - lib/yeah/_web.rb
 - lib/yeah/color.rb
@@ -116,8 +119,10 @@ files:
 - lib/yeah/web/start.rb
 - opal/yeah/web.rb
 - opal/yeah/web/asset.opal
+- opal/yeah/web/class_methods.opal
 - opal/yeah/web/constants.opal
 - opal/yeah/web/display.opal
+- opal/yeah/web/font.opal
 - opal/yeah/web/image.opal
 - opal/yeah/web/keyboard.opal
 - opal/yeah/web/mouse.opal