minigl 1.3.10 → 2.0.0

data/test/data/img/square.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="50"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="square.svg"
+   inkscape:export-filename="/home/victor/Projects/TCC/minigl/test/data/img/square.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.68"
+     inkscape:cx="25"
+     inkscape:cy="25"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1364"
+     inkscape:window-height="718"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1002.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3753"
+       width="50"
+       height="50"
+       x="0"
+       y="1002.3622" />
+  </g>
+</svg>

data/test/game.rb

@@ -1,23 +1,30 @@
 require_relative '../lib/minigl'
-include AGL
+include MiniGL
 
-class MyGame < Gosu::Window
+class MyGame < GameWindow
   def initialize
-    super 800, 600, false # creating a 800 x 600 window, not full screen
-    Game.initialize self, Vector.new(0, 1), 10, 2
+    super 800, 600, false
 
     @obj1 = GameObject.new 10, 10, 80, 80, :img1, Vector.new(-10, -10)
     @obj2 = Sprite.new 400, 0, :img1
 
-    @font = Res.font :font1, 20
-    @writer = TextHelper.new @font, 5
-    @btn = Button.new(10, 560, @font, 'Test', :btn, 0x008000, 0x808080, true, false, 0, 4, 0, 0, 'friends') { |x| puts "hello #{x}" }
+    @font1 = Res.font :font1, 20
+    @font2 = Res.font :font1, 50
+    @writer1 = TextHelper.new @font1, 5
+    @writer2 = TextHelper.new @font2, 5
+    @btn = Button.new(10, 560, @font1, 'Test', :btn, 0x008000, 0x808080, 0xffffff, 0xff9980, true, false, 0, 4, 0, 0, 'friends') { |x| puts "hello #{x}" }
     @btn.enabled = false
-    @chk = ToggleButton.new(40, 300, @font, 'Click me', :check, false, 0xffffff, 0x808080, false, true, 36, 0, 0, 0, 'friends') { |c, x|
-             puts "hello #{x}, checked: #{c}"
-           }
-    @txt = TextField.new(10, 520, @font, :text, nil, nil, 15, 5, 16, false, '', nil, 0, 0, 0x0000ff, 'test') { |t, x| puts "field #{x}, text: #{t}" }
+    @chk =
+      ToggleButton.new(40, 300, @font1, 'Click me', :check, false, 0xffffff, 0x808080, 0x008000, 0xff9980, false, true, 36, 0, 0, 0, 'friends') { |c, x|
+        puts "hello #{x}, checked: #{c}"
+      }
+    @txt = TextField.new(10, 520, @font1, :text, nil, nil, 15, 5, 16, false, '', nil, 0, 0, 0x0000ff, 'PT-BR')
     @txt.visible = false
+
+    @pb = ProgressBar.new(5, 240, 200, 20, 0xff0000, 0x00ff00, 3456, 70, 0, 0, @font1, 0xff000080)
+    @ddl = DropDownList.new(5, 270, @font1, nil, nil, ['olá amigos', 'opção 2', 'terceira'], 0, 3, 150, 25, 0, 0x808080, 0xffffff, 0xffff00)
+
+    @eff = Effect.new(100, 100, :check, 2, 4, 10, nil, nil, '1')
   end
 
   def needs_cursor?
@@ -36,6 +43,20 @@ class MyGame < Gosu::Window
     @chk.enabled = !@chk.enabled if KB.key_pressed? Gosu::KbRightControl
     @txt.visible = !@txt.visible if KB.key_pressed? Gosu::KbReturn
     @txt.enabled = !@txt.enabled if KB.key_pressed? Gosu::KbLeftAlt
+    @txt.locale = 'en-us' if KB.key_pressed? Gosu::KbX
+    @txt.locale = 'pt-br' if KB.key_pressed? Gosu::KbC
+    @pb.visible = !@pb.visible if KB.key_pressed? Gosu::KbE
+    @ddl.enabled = !@ddl.enabled if KB.key_pressed? Gosu::KbQ
+    @ddl.visible = !@ddl.visible if KB.key_pressed? Gosu::KbW
+
+    @pb.increase 1 if KB.key_down? Gosu::KbD
+    @pb.decrease 1 if KB.key_down? Gosu::KbA
+    @pb.percentage = 0.5 if KB.key_pressed? Gosu::KbS
+    @pb.value = 10000 if KB.key_pressed? Gosu::KbZ
+
+    @ddl.value = 'olá amigos' if KB.key_pressed? Gosu::Kb1
+    @ddl.value = 'segunda' if KB.key_pressed? Gosu::Kb2
+    @ddl.value = 'terceira' if KB.key_pressed? Gosu::Kb3
 
     Mouse.update
     if Mouse.double_click? :left
@@ -46,21 +67,32 @@ class MyGame < Gosu::Window
     @btn.update
     @chk.update
     @txt.update
+    @ddl.update
+
+    @eff.update
   end
 
   def draw
+    clear 0xffabcdef
+
     @obj1.draw nil, 1, 1, 255, 0x33ff33, 30, 1
     @obj2.draw nil, 0.6, 1.4, 0x99
-    @writer.write_breaking "Testing multiple line text.\nThis should draw text "\
-                           "across multiple lines, respecting a limit width. "\
-                           "Furthermore, the text must be right-aligned.",
-                           780, 300, 300, :right, 0xff0000, 255, 1
+    @writer1.write_line 'Testing effect 1', 400, 260, :center, 0xffffff, :border
+    @writer2.write_line 'Second effect test', 400, 280, :center, 0xffffff, :border, 0xff0000, 2
+    @writer2.write_line 'Text with shadow!!', 400, 340, :center, 0xffff00, :shadow, 0, 2, 0x80
+    @writer1.write_breaking "Testing multiple line text.\nThis should draw text "\
+                           'across multiple lines, respecting a limit width. '\
+                           'Furthermore, the text must be right-aligned.',
+                           780, 450, 300, :right, 0xff0000, 255, 1
 
+    @ddl.draw 0x80, 1
     @btn.draw 0xcc
     @chk.draw
     @txt.draw
+    @pb.draw 0x66
+
+    @eff.draw
   end
 end
 
-game = MyGame.new
-game.show
+MyGame.new.show

data/test/game_object_tests.rb

@@ -1,11 +1,10 @@
 require 'test/unit'
 require_relative '../lib/minigl'
-include AGL
+include MiniGL
 
 class SpriteTest < Test::Unit::TestCase
   def setup
-    @window = Gosu::Window.new 800, 600, false
-    Game.initialize @window
+    @window = GameWindow.new 800, 600, false
     Res.prefix = File.expand_path(File.dirname(__FILE__)) + '/data'
   end
 
@@ -27,12 +26,25 @@ class SpriteTest < Test::Unit::TestCase
     5.times { s.animate indices, interval }
     assert_equal 2, s.img_index
   end
+
+  def test_sprite_visibility
+    # m = Map.new(1, 1, 800, 600)
+    s = Sprite.new 10, 20, :image, 3, 1 # the sprite will be 1 x 1 pixel
+    assert s.visible?
+    s.x = 800
+    assert(!(s.visible?))
+    s.x = -1
+    assert(!(s.visible?))
+    s.x = 0
+    assert s.visible?
+    s.y = 600
+    assert(!(s.visible?))
+  end
 end
 
 class GameObjectTest < Test::Unit::TestCase
   def setup
-    @window = Gosu::Window.new 800, 600, false
-    Game.initialize @window
+    @window = GameWindow.new 800, 600, false
     Res.prefix = File.expand_path(File.dirname(__FILE__)) + '/data'
   end
 
@@ -60,4 +72,22 @@ class GameObjectTest < Test::Unit::TestCase
     5.times { o.animate indices, interval }
     assert_equal 1, o.img_index
   end
+
+  def test_game_object_visibility
+    # m = Map.new(1, 1, 800, 600)
+    o = GameObject.new 10, 20, 30, 30, :square, Vector.new(-10, -10)
+    assert o.visible?
+    o.x = 800
+    assert o.visible?
+    o.x = 810
+    assert(!(o.visible?))
+    o.x = -30
+    assert o.visible?
+    o.y = -50
+    assert(!(o.visible?))
+    o.x = 0; o.y = -30
+    assert o.visible?
+    o.y = 610
+    assert(!(o.visible?))
+  end
 end

data/test/iso_game.rb

@@ -1,10 +1,10 @@
 require_relative '../lib/minigl'
-include AGL
+include MiniGL
 
 class MyGame < Gosu::Window
   def initialize
     super 800, 600, false
-    Game.initialize self
+    GameWindow.initialize self
 
     @tile1 = Res.img :tile2
     @tile2 = Res.img :tile2b

data/test/map_tests.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require_relative '../lib/minigl'
-include AGL
+include MiniGL
 
 class MapTest < Test::Unit::TestCase
   def test_map_attributes

data/test/mov_game.rb

@@ -0,0 +1,72 @@
+require 'gosu'
+require_relative '../lib/minigl'
+include MiniGL
+
+class MyGame < GameWindow
+  def initialize
+    super 800, 600, false
+
+    @obj = GameObject.new(0, 0, 50, 50, :square)
+    # @obj.max_speed.x = 3
+    @obsts = [
+      Block.new(0, 600, 800, 1, false),
+      Block.new(-1, 0, 1, 600, false),
+      Block.new(800, 0, 1, 600, false),
+      # Block.new(375, 550, 50, 50, true),
+      # Block.new(150, 200, 20, 300, false),
+      # Block.new(220, 300, 100, 20, true),
+      # Block.new(485, 490, 127, 10, false),
+    ]
+    @ramps = [
+      # Ramp.new(200, 550, 200, 50, true),
+      Ramp.new(0, 300, 150, 200, false),
+      Ramp.new(150, 500, 150, 100, false),
+      Ramp.new(500, 500, 150, 100, true),
+      Ramp.new(650, 300, 150, 200, true),
+    ]
+
+    @cyc_obj = GameObject.new(0, 0, 50, 50, :square)
+    @cycle = [Vector.new(0, 0), Vector.new(430, 107), Vector.new(265, 324)]
+  end
+
+  def update
+    KB.update
+
+    forces = Vector.new(0, 0)
+    if @obj.bottom
+      forces.y -= 15 if KB.key_pressed?(Gosu::KbSpace)
+      if KB.key_down?(Gosu::KbLeft)
+        forces.x -= 0.5
+      end
+      if KB.key_down?(Gosu::KbRight)
+        forces.x += 0.5
+      end
+      forces.x -= @obj.speed.x * 0.1
+    else
+      forces.x -= 0.2 if KB.key_down?(Gosu::KbLeft)
+      forces.x += 0.2 if KB.key_down?(Gosu::KbRight)
+    end
+    @obj.move(forces, @obsts, @ramps)
+    # puts @obj.x
+    @cyc_obj.cycle(@cycle, 5, [@obj])
+    # puts @obj.bottom
+  end
+
+  def draw
+    @obj.draw
+    @cyc_obj.draw
+    @obsts.each do |o|
+      draw_quad o.x, o.y, 0xffffffff,
+                o.x + o.w, o.y, 0xffffffff,
+                o.x + o.w, o.y + o.h, 0xffffffff,
+                o.x, o.y + o.h, 0xffffffff, 0
+    end
+    @ramps.each do |r|
+      draw_triangle r.left ? r.x + r.w : r.x, r.y, 0xffffffff,
+                    r.x + r.w, r.y + r.h, 0xffffffff,
+                    r.x, r.y + r.h, 0xffffffff, 0
+    end
+  end
+end
+
+MyGame.new.show

data/test/movement_tests.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require_relative '../lib/minigl'
-include AGL
+include MiniGL
 
 class MovingObject
   include Movement
@@ -16,8 +16,7 @@ end
 
 class MovementTest < Test::Unit::TestCase
   def setup
-    @window = Gosu::Window.new 800, 600, false
-    Game.initialize @window
+    @window = GameWindow.new 800, 600, false
     @obsts = [
       Block.new(-1, 0, 1, 600, false),
       Block.new(0, -1, 800, 1, false),

data/test/res_tests.rb

@@ -1,11 +1,10 @@
 require 'test/unit'
 require_relative '../lib/minigl'
-include AGL
+include MiniGL
 
 class ResTest < Test::Unit::TestCase
   def setup
-    @window = Gosu::Window.new 800, 600, false
-    Game.initialize @window
+    @window = GameWindow.new 800, 600, false
     Res.prefix = File.expand_path(File.dirname(__FILE__)) + '/data'
   end
 
@@ -20,4 +19,19 @@ class ResTest < Test::Unit::TestCase
     assert_equal 48, t1[0].width
     assert_equal 48, t1[0].width
   end
+
+  def test_dirs_and_separator
+    assert_nothing_raised do
+      img1 = Res.img :img1
+    end
+    Res.img_dir = 'img/sub'
+    assert_nothing_raised do
+      img2 = Res.img :image
+    end
+    Res.img_dir = 'img'
+    Res.separator = '~'
+    assert_nothing_raised do
+      img3 = Res.img 'sub~image'
+    end
+  end
 end

data/test/vector_tests.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require_relative '../lib/minigl'
-include AGL
+include MiniGL
 
 class VectorTest < Test::Unit::TestCase
   def test_vector_comparison

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 2.0.0
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -41,10 +41,20 @@ files:
 - lib/minigl/movement.rb
 - lib/minigl/text.rb
 - test/data/font/font1.ttf
+- test/data/img/barbg.png
+- test/data/img/barbg.svg
+- test/data/img/barfg.png
+- test/data/img/barfg.svg
+- test/data/img/barfgl.png
+- test/data/img/barfgl.svg
+- test/data/img/barfgr.png
+- test/data/img/barfgr.svg
 - test/data/img/btn.png
 - test/data/img/check.png
 - test/data/img/image.png
 - test/data/img/img1.png
+- test/data/img/square.png
+- test/data/img/square.svg
 - test/data/img/text.png
 - test/data/img/tile1.png
 - test/data/img/tile1.svg
@@ -52,11 +62,13 @@ files:
 - test/data/img/tile2.png
 - test/data/img/tile2.svg
 - test/data/img/tile2b.png
+- test/data/sound/1.wav
 - test/data/tileset/tileset1.png
 - test/game.rb
 - test/game_object_tests.rb
 - test/iso_game.rb
 - test/map_tests.rb
+- test/mov_game.rb
 - test/movement_tests.rb
 - test/res_tests.rb
 - test/vector_tests.rb
@@ -92,16 +104,28 @@ test_files:
 - test/iso_game.rb
 - test/res_tests.rb
 - test/game_object_tests.rb
+- test/mov_game.rb
 - test/data/tileset/tileset1.png
+- test/data/img/barfg.png
 - test/data/img/tile2b.png
+- test/data/img/barfgr.svg
+- test/data/img/barfgl.svg
 - test/data/img/tile1.png
+- test/data/img/barfgl.png
 - test/data/img/btn.png
+- test/data/img/barfgr.png
+- test/data/img/square.png
 - test/data/img/tile1b.png
 - test/data/img/text.png
 - test/data/img/img1.png
+- test/data/img/square.svg
+- test/data/img/barbg.svg
 - test/data/img/tile1.svg
 - test/data/img/image.png
 - test/data/img/check.png
 - test/data/img/tile2.svg
+- test/data/img/barfg.svg
+- test/data/img/barbg.png
 - test/data/img/tile2.png
+- test/data/sound/1.wav
 - test/data/font/font1.ttf