Update examples

Author: oprypin

examples/diagnostics.cr

@@ -60,14 +60,14 @@ def test_mouse()
     m = SF::Mouse.get_position($window)
 
     shape = SF::CircleShape.new(15)
-    shape.origin = SF.vector2f(15, 15)
-    shape.position = SF.vector2f(m.x, m.y)
+    shape.origin = SF.vector2(15, 15)
+    shape.position = SF.vector2(m.x, m.y)
     shape.fill_color = SF.color(0, 200, 0)
-    shape.scale SF.vector2f(0.9, 1.1)
+    shape.scale SF.vector2(0.9, 1.1)
     $window.draw shape
 
     shape = SF::CircleShape.new(8)
-    shape.origin = SF.vector2f(8, 8)
+    shape.origin = SF.vector2(8, 8)
     shape.fill_color = SF.color(255, 128, 0)
 
     buttons = {
@@ -79,18 +79,18 @@ def test_mouse()
     }
     buttons.each do |btn, delta|
       if SF::Mouse.is_button_pressed(btn)
-        shape.position = SF.vector2f(m.x + delta[0]*20, m.y + delta[1]*20)
+        shape.position = m + SF.vector2(20, 20) * delta
         $window.draw shape
       end
     end
 
     shape = SF::ConvexShape.new()
     shape.point_count = 3
     shape.fill_color = SF.color(128, 0, 255)
-    shape[0] = SF.vector2f(-8, 0)
-    shape[1] = SF.vector2f(8, 0)
-    shape[2] = SF.vector2f(0, -wheel_delta*5)
-    shape.position = SF.vector2f(m.x, m.y-4)
+    shape[0] = SF.vector2(-8, 0)
+    shape[1] = SF.vector2(8, 0)
+    shape[2] = SF.vector2(0, -wheel_delta*5)
+    shape.position = m - {0, 4}
     $window.draw shape
 
     $window.display()
@@ -116,7 +116,7 @@ def test_controller()
     $window.draw text
 
     shape = SF::CircleShape.new(15)
-    shape.origin = SF.vector2f(15, 15)
+    shape.origin = SF.vector2(15, 15)
 
     text = SF::Text.new("", $font, 20)
     text.color = SF.color(0, 0, 0)
@@ -133,13 +133,13 @@ def test_controller()
     ]
     (0...SF::Joystick.get_button_count(js)).each do |btn|
       text.string = (btn+1).to_s
-      text.origin = SF.vector2f(text.local_bounds.width * 0.6, text.local_bounds.height * 0.85)
+      text.origin = SF.vector2(text.local_bounds.width * 0.6, text.local_bounds.height * 0.85)
       begin
         delta = button_pos[btn]
       rescue
         delta = {0, button_pos.length - btn - 1}
       end
-      shape.position = SF.vector2f(400 + delta[0]*30, 300 + delta[1]*30)
+      shape.position = SF.vector2(400, 300) + SF.vector2(delta) * {30, 30}
       text.position = shape.position
       shape.fill_color = SF::Joystick.is_button_pressed(js, btn) ? SF.color(255, 128, 0): SF.color(0, 128, 0)
 
@@ -148,7 +148,7 @@ def test_controller()
     end
 
     shape = SF::CircleShape.new(10)
-    shape.origin = SF.vector2f(10, 10)
+    shape.origin = SF.vector2(10, 10)
     shape.fill_color = SF.color(128, 0, 255)
 
     axis_pos = [
@@ -172,7 +172,7 @@ def test_controller()
         any = true
       end
       next unless any
-      shape.position = SF.vector2f(400 + delta[0]*30 + dx*0.3, 300 + delta[1]*30 + dy*0.3)
+      shape.position = SF.vector2(400, 300) + SF.vector2(delta) * {30, 30} + {dx*0.3, dy*0.3}
 
       $window.draw shape
     end
@@ -192,10 +192,10 @@ class Button < SF::RectangleShape
   include SF::TransformableM
 
   def initialize(message, width, height, color=SF.color(0, 128, 0))
-    super(SF.vector2f(width, height))
+    super(SF.vector2(width, height))
     @text = SF::Text.new(message, $font, (height*0.8).to_i)
     self.fill_color = color
-    @text.position = SF.vector2f((width - @text.global_bounds.width)*0.5, -height/20)
+    @text.position = SF.vector2((width - @text.global_bounds.width) / 2, -height / 20)
   end
 
   def draw(target, states: RenderStates)
@@ -218,7 +218,7 @@ actions = {
 }
 
 actions.each_key do |btn|
-  btn.position = SF.vector2f(x, y)
+  btn.position = SF.vector2(x, y)
   y += h + h/2
 end
 

examples/flippy_bird.cr

@@ -9,9 +9,9 @@ bird_texture = SF::Texture.from_file("resources/bird.png")
 sz = bird_texture.size
 
 bird = SF::Sprite.new(bird_texture)
-bird.origin = SF.vector2f(sz.x / 2.0, sz.y / 2.0)
-bird.scale = SF.vector2f(2.5, 2.5)
-bird.position = SF.vector2f(250, 300)
+bird.origin = SF.vector2(sz.x / 2.0, sz.y / 2.0)
+bird.scale = SF.vector2(2.5, 2.5)
+bird.position = SF.vector2(250, 300)
 
 speed = 0.0
 
@@ -30,7 +30,7 @@ while window.open?
   end
 
   speed += 0.3
-  bird.move SF.vector2f(0.0, speed)
+  bird.move SF.vector2(0.0, speed)
   bird.rotation = speed*8.0 < 90.0 ? speed*8.0 : 90.0
 
   window.clear SF.color(112, 197, 206)

examples/shader.cr

@@ -17,7 +17,7 @@ px_shader.set_parameter "texture", SF::Shader::CurrentTexture
 ipsum = HTTP::Client.get("http://loripsum.net/api/12/short/plaintext").body
 font = SF::Font.from_file("resources/font/Ubuntu-R.ttf")
 text = SF::Text.new(ipsum, font, 22)
-text.position = SF.vector2f(30, 20)
+text.position = {30, 20}
 text.color = SF::Color::Black
 wb_shader = SF::Shader.from_file("resources/shaders/wave.vert", "resources/shaders/blur.frag")
 

examples/snakes.cr

@@ -1,18 +1,13 @@
 require "crsfml"
 
 
-Left = {-1, 0}
-Up = {0, -1}
-Right = {1, 0}
-Down = {0, 1}
+Left = SF.vector2(-1, 0)
+Up =  SF.vector2(0, -1)
+Right =  SF.vector2(1, 0)
+Down = SF.vector2(0, 1)
 Directions = [Left, Up, Right, Down]
 
 
-# https://github.com/manastech/crystal/issues/559
-def modulo(a: Int, b: Int)
-  (a % b + b) % b
-end
-
 # Missing functionality from Ruby
 module Enumerable
   def drop(n)
@@ -34,7 +29,7 @@ struct Food
 
   def draw(target, states)
     circle = SF::CircleShape.new(0.9/2)
-    circle.position = SF.vector2f(@position[0] + 0.05, @position[1] + 0.05)
+    circle.position = position + {0.05, 0.05}
     circle.fill_color = @color
     target.draw circle, states
   end
@@ -45,48 +40,47 @@ class Snake
 
   def initialize(@field, start, @color)
     @direction = Up
-    @body = [] of {Int32, Int32}
+    @body = [] of SF::Vector2(Int32)
     (0...3).each do |i|
-      @body.push({start[0], start[1] + i})
+      @body.push(start + {0, i})
     end
   end
 
   def step()
-    head = {@body[0][0] + @direction[0], @body[0][1] + @direction[1]}
-    head = {modulo(head[0], @field.size[0]), modulo(head[1], @field.size[1])}
+    head = @body[0] + @direction
+    head.x %= @field.size.x
+    head.y %= @field.size.y
     @body.insert(0, head)
     @body.pop()
   end
 
   def turn(direction)
-    if @body[1] != {@body[0][0] + direction[0], @body[0][1] + direction[1]}
-      @direction = direction
-    end
+    @direction = direction unless @body[1] == @body[0] + direction
   end
 
   def grow()
     tail = @body[-1]
-    3.times do |i|
+    3.times do
       @body.push tail
     end
   end
 
-  def collide(other: self)
+  def collides?(other: self)
     other.body.any? { |part| @body[0] == part }
   end
 
-  def collide(food: Food)
+  def collides?(food: Food)
     @body[0] == food.position
   end
 
-  def collide()
+  def collides?()
     @body.drop(1).any? { |part| @body[0] == part }
   end
 
   def draw(target, states)
     @body.each_with_index do |current, i|
       segment = SF::CircleShape.new(0.9 / 2)
-      segment.position = SF.vector2f(current[0] + 0.05, current[1] + 0.05)
+      segment.position = current + {0.05, 0.05}
       segment.fill_color = @color
       target.draw segment, states
 
@@ -96,18 +90,14 @@ class Snake
       # Look in 4 directions around this segment. If there is another one
       # neighboring it, draw a square between them
       Directions.each do |d|
-        td = {
-          modulo((current[0] + d[0]), @field.size[0]),
-          modulo((current[1] + d[1]), @field.size[1])
-        }
-          
+        td = current + d
+        td.x %= @field.size.x
+        td.y %= @field.size.y
+        
         if (i > 0 && td == @body[i-1]) ||\
         (i < @body.length-1 && td == @body[i+1])
-          connection = SF::RectangleShape.new(SF.vector2f(0.9, 0.9))
-          connection.position = SF.vector2f(
-            current[0] + d[0] / 2.0 + 0.05,
-            current[1] + d[1] / 2.0 + 0.05
-          )
+          connection = SF::RectangleShape.new({0.9, 0.9})
+          connection.position = current + d / {2.0, 2.0} + {0.05, 0.05}
           connection.fill_color = @color
           target.draw connection, states
         end
@@ -119,19 +109,13 @@ class Snake
         @color.r / 3, @color.g / 3, @color.b / 3
       )
 
-      delta = {
-        @direction[1].abs / 4.0,
-        @direction[0].abs / 4.0
-      }
-      eye.position = SF.vector2f(
-        @body[0][0] + 0.4 + delta[0],
-        @body[0][1] + 0.4 + delta[1]
+      delta = SF.vector2(
+        @direction.y.abs / 4.0,
+        @direction.x.abs / 4.0
       )
+      eye.position = @body[0] + {0.4, 0.4} + delta
       target.draw eye, states
-      eye.position = SF.vector2f(
-        @body[0][0] + 0.4 - delta[0],
-        @body[0][1] + 0.4 - delta[1]
-      )
+      eye.position = @body[0] + {0.4, 0.4} - delta
       target.draw eye, states
     end
   end
@@ -151,7 +135,7 @@ class Field
 
   def step()
     while @foods.length < @snakes.length + 1
-      food = Food.new({rand(@size[0]), rand(@size[1])}, random_color())
+      food = Food.new(SF.vector2(rand(@size.x), rand(@size.y)), random_color())
 
       @foods.push food unless @snakes.any? do |snake|
         snake.body.any? { |part| part == food.position }
@@ -162,7 +146,7 @@ class Field
       snake.step()
 
       @foods = @foods.reject do |food|
-        if snake.collide food
+        if snake.collides? food
           snake.grow()
           true
         end
@@ -171,8 +155,8 @@ class Field
 
     snakes = @snakes
     @snakes = snakes.reject do |snake|
-      snake.collide ||\
-      snakes.any? { |snake2| snake != snake2 && snake.collide snake2 }
+      snake.collides? ||\
+      snakes.any? { |snake2| snake != snake2 && snake.collides? snake2 }
     end
   end
 
@@ -187,17 +171,17 @@ class Field
 end
 
 
-field = Field.new({40, 40})
+field = Field.new(SF.vector2(40, 40))
 
-snake1 = Snake.new(field, {field.size[0] / 2 - 5, field.size[1] / 2}, random_color())
-snake2 = Snake.new(field, {field.size[0] / 2 + 5, field.size[1] / 2}, random_color())
+snake1 = Snake.new(field, field.size / {2, 2} - {5, 0}, random_color())
+snake2 = Snake.new(field, field.size / {2, 2} + {5, 0}, random_color())
 field.add snake1
 field.add snake2
 
 scale = 20
 
 window = SF::RenderWindow.new(
-  SF.video_mode(field.size[0]*scale, field.size[1]*scale), "Snakes",
+  SF.video_mode(field.size.x*scale, field.size.y*scale), "Snakes",
   settings: SF.context_settings(depth: 32, antialiasing: 8)
 )
 window.vertical_sync_enabled = true

examples/transformable.cr

@@ -9,10 +9,10 @@ class Logo
   def initialize(message="CrSFML")
     @text = SF::Text.new(message, $font, 200)
     bounds = @text.local_bounds
-    @shape = SF::RectangleShape.new(SF.vector2f(bounds.width*1.2, bounds.height*2))
+    @shape = SF::RectangleShape.new(SF.vector2(bounds.width*1.2, bounds.height*2))
     @shape.fill_color = SF.color(0, 0, 128)
-    @shape.origin = SF.vector2f(@shape.size.x / 2, @shape.size.y / 2)
-    @text.origin = SF.vector2f(bounds.width / 2, bounds.height * 0.8)
+    @shape.origin = @shape.size / {2, 2}
+    @text.origin = SF.vector2(bounds.width / 2, bounds.height * 0.8)
   end
 
   def draw(target, states: RenderStates)
@@ -28,7 +28,7 @@ window.vertical_sync_enabled = true
 
 logo = Logo.new()
 
-logo.position = SF.vector2f(400, 300)
+logo.position = SF.vector2(400, 300)
 
 clock = SF::Clock.new()
 
@@ -43,7 +43,7 @@ while window.open?
   t = clock.elapsed_time.as_seconds
 
   logo.rotation = t*50
-  logo.scale = SF.vector2f(Math.sin(t), Math.cos(t))
+  logo.scale = SF.vector2(Math.sin(t), Math.cos(t))
 
   window.clear
   window.draw logo