Gosuplus 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be3141ac9cbf6ae61c2d33c1a2fe60eae5c755a4
-  data.tar.gz: 9ce70ac4b13234b71749e1cdfbb830fedfddb8f8
+  metadata.gz: 0f1cf51c1664c32d665169a7e2ae59ecde5cc3f9
+  data.tar.gz: d5c7b1f247083360b3552365500b4903a3f20e3a
 SHA512:
-  metadata.gz: 50d30a60837d3c01771bd2469d4c7ccb10d2b92a250bddc402eb920920b9c617552144fd3f6931f33d5b4b20e0af7ae7772d57fac003846514f97fd5358a70b7
-  data.tar.gz: cbeecd746c7ec36dbd2f99f7eb13d11f25cdba2f862dce7ec63096b25e32233baf9b23e4a21f87208e0bfe4fde1e0305f0bd11e9b98eec6c512e3f178309b3cd
+  metadata.gz: c6262830c074e21d1f6e81c004888349eba26e1b5beaea22db42352d0c335990cc8f6757235400839ea4cd9566ada44a0a04c6f9df6d0040863617f618cbc79f
+  data.tar.gz: f1c41a68149b91243b7d7dcd957d371dc808258f19ac9079547d6fa5817a5d2ff6d786dc72cb2c3c07f125ebb89529f37da4fda349fdca556793324a220a911c

data/lib/Gosuplus/body.rb

@@ -1,9 +1,11 @@
-class Body
-  attr_accessor :position, :a, :width, :height
-  
-  def initialize(position, width, height, angle = 90)
-    raise ArgumentError, 'Position is not a instance of Vec2' unless position.is_a? Vec2
+module Gosuplus
+  class Body
+    attr_accessor :position, :a, :width, :height
     
-    @position, @width, @height, @angle = position, width, height, angle
+    def initialize(position, width, height, angle = 90)
+      raise ArgumentError, 'Position is not a instance of Vec2' unless position.is_a? Vec2
+      
+      @position, @width, @height, @angle = position, width, height, angle
+    end
   end
 end

data/lib/Gosuplus/collision.rb

@@ -1,13 +1,15 @@
-module Collision
-  def self.rectangular_collision?(body, body2)
-    b1 = generate_quadratic_sides body
-    b2 = generate_quadratic_sides body2
+module Gosuplus
+  module Collision
+    def self.rectangular_collision?(body, body2)
+      b1 = generate_quadratic_sides body
+      b2 = generate_quadratic_sides body2
 
-    ((b1[:left] >= b2[:left] and b1[:left] <= b2[:right]) || (b2[:left] >= b1[:left] && b2[:left] <= b1[:right])) &&
-    ((b1[:top] >= b2[:top] && b1[:top] <= b2[:bottom]) || (b2[:top] >= b1[:top] && b2[:top] <= b1[:bottom]))
-  end
+      ((b1[:left] >= b2[:left] and b1[:left] <= b2[:right]) || (b2[:left] >= b1[:left] && b2[:left] <= b1[:right])) &&
+      ((b1[:top] >= b2[:top] && b1[:top] <= b2[:bottom]) || (b2[:top] >= b1[:top] && b2[:top] <= b1[:bottom]))
+    end
 
-  def self.generate_quadratic_sides(body)
-    @sides = {left: body.position.x, right: body.position.x + body.width, top: body.position.y, bottom: body.position.y + body.height}
+    def self.generate_quadratic_sides(body)
+      @sides = {left: body.position.x, right: body.position.x + body.width, top: body.position.y, bottom: body.position.y + body.height}
+    end
   end
 end

data/lib/Gosuplus/contentmanager.rb

@@ -1,31 +1,33 @@
-class ContentManager
-  def initialize
-    # [Y, X]
-    @grid_width, @grid_height = 32, 32
-    @content_grid = Array.new(GameWindow::HEIGHT/@grid_height + 1) { Array.new(GameWindow::WIDTH/@grid_width + 1) { nil }}
-  end
+module Gosuplus
+  class ContentManager
+    def initialize
+      # [Y, X]
+      @grid_width, @grid_height = 32, 32
+      @content_grid = Array.new(GameWindow::HEIGHT/@grid_height + 1) { Array.new(GameWindow::WIDTH/@grid_width + 1) { nil }}
+    end
 
-  def update(objects)
-    clean_array
-    objects.each do |object|
-      @content_grid[(object.y/@grid_height).round][(object.x/@grid_width).round] = object
-    end  
-  end
+    def update(objects)
+      clean_array
+      objects.each do |object|
+        @content_grid[(object.y/@grid_height).round][(object.x/@grid_width).round] = object
+      end  
+    end
 
-  def surrounding_objects(object)
-    surrounding_objects = []
-    ((object.x/@grid_width-1).round..(object.x/@grid_width+1).round).each do |x|
-      ((object.y/@grid_height-1).round..(object.y/@grid_height+1).round).each do |y|
-        if @content_grid[y][x] and object != @content_grid[y][x]
-          surrounding_objects << @content_grid[y][x]
+    def surrounding_objects(object)
+      surrounding_objects = []
+      ((object.x/@grid_width-1).round..(object.x/@grid_width+1).round).each do |x|
+        ((object.y/@grid_height-1).round..(object.y/@grid_height+1).round).each do |y|
+          if @content_grid[y][x] and object != @content_grid[y][x]
+            surrounding_objects << @content_grid[y][x]
+          end
         end
       end
-    end
 
-    surrounding_objects
-  end
+      surrounding_objects
+    end
 
-  def clean_array
-    @content_grid = Array.new(GameWindow::HEIGHT/@grid_height + 1) { Array.new(GameWindow::WIDTH/@grid_width + 1) { nil }}
+    def clean_array
+      @content_grid = Array.new(GameWindow::HEIGHT/@grid_height + 1) { Array.new(GameWindow::WIDTH/@grid_width + 1) { nil }}
+    end
   end
 end

data/lib/Gosuplus/drawable.rb

@@ -1,5 +1,7 @@
-module Drawable
-  def draw
-    @image.draw(@body.position.x, @body.position.y, @body.position.z)
+module Gosuplus
+  module Drawable
+    def draw
+      @image.draw(@body.position.x, @body.position.y, @body.position.z)
+    end
   end
 end

data/lib/Gosuplus/drawable_rot.rb

@@ -1,5 +1,7 @@
-module DrawableRot
-  def draw
-    @image.draw_rot(@body.position.x, @body.position.y, @body.position.z, @body.a)
+module Gosuplus
+  module DrawableRot
+    def draw
+      @image.draw_rot(@body.position.x, @body.position.y, @body.position.z, @body.a)
+    end
   end
 end

data/lib/Gosuplus/entity.rb

@@ -1,3 +1,5 @@
-module Entity
-  attr_accessor :id
+module Gosuplus
+  module Entity
+    attr_accessor :id
+  end
 end

data/lib/Gosuplus/essentials.rb

@@ -1,5 +1,7 @@
-module Essentials
-  def center(area)
-    @body.position = Vec2.new(area.body.position.x + area.body.width/2 - @body.width/2, area.body.position.y + area.body.height/2 - @body.height/2)
+module Gosuplus
+  module Essentials
+    def center(area)
+      @body.position = Vec2.new(area.body.position.x + area.body.width/2 - @body.width/2, area.body.position.y + area.body.height/2 - @body.height/2)
+    end
   end
 end

data/lib/Gosuplus/gui/button.rb

@@ -1,41 +1,43 @@
-module GUI
-  class Button
-    attr_accessor :timer
-    def initialize(position, image, input_handler, key_id, text = nil, font = nil)
-      @icon = Icon.new(image, position)
-      @input_handler, @key_id = input_handler, key_id
-      if text && font
-        @text = Text.new(text, font)
-        @text.center(@icon)
+module Gosuplus
+  module GUI
+    class Button
+      attr_accessor :timer
+      def initialize(position, image, input_handler, key_id, text = nil, font = nil)
+        @icon = Icon.new(image, position)
+        @input_handler, @key_id = input_handler, key_id
+        if text && font
+          @text = Text.new(text, font)
+          @text.center(@icon)
+        end
       end
-    end
 
-    def draw
-      ButtonRenderer.draw(@icon, @text)
-    end
+      def draw
+        ButtonRenderer.draw(@icon, @text)
+      end
 
-    def update(x, y)
-      @active = false if @active
+      def update(x, y)
+        @active = false if @active
 
-      unless @timer.nil?
-        if activated?(x, y)
-          @timer.reset
-          @active = true
+        unless @timer.nil?
+          if activated?(x, y)
+            @timer.reset
+            @active = true
+          end
+        else
+          @active = false
         end
-      else
-        @active = false
-      end
 
-      @timer.update
-    end
+        @timer.update
+      end
 
-    def active?
-      @active
-    end
+      def active?
+        @active
+      end
 
-    private
-    def activated?(x, y)
-      Collision.rectangular_collision?(@icon.body, Body.new(Vec2.new(x, y), 1, 1)) && @timer.ready? && @input_handler.get_state(256)
+      private
+      def activated?(x, y)
+        Collision.rectangular_collision?(@icon.body, Body.new(Vec2.new(x, y), 1, 1)) && @timer.ready? && @input_handler.get_state(256)
+      end
     end
   end
 end

data/lib/Gosuplus/gui/buttonrenderer.rb

@@ -1,5 +1,7 @@
-class ButtonRenderer
-  def self.draw(*entities)
-    entities.each {|entity| entity.draw unless entity.is_a? NilClass}
+module Gosuplus
+  class ButtonRenderer
+    def self.draw(*entities)
+      entities.each {|entity| entity.draw unless entity.is_a? NilClass}
+    end
   end
 end

data/lib/Gosuplus/gui/form/base.rb

@@ -1,24 +1,26 @@
-module GUI
-  module Form
-    class Base
-      def initialize(position, image, input_handler, key_id, font, text = nil)
-        @icon = Icon.new(image, position)
-        @input_handler, @key_id, @font = input_handler, key_id, font
+module Gosuplus
+  module GUI
+    module Form
+      class Base
+        def initialize(position, image, input_handler, key_id, font, text = nil)
+          @icon = Icon.new(image, position)
+          @input_handler, @key_id, @font = input_handler, key_id, font
 
-        @visible_text = text ? text : String
-        @actual_text = String
-      end
+          @visible_text = text ? text : String
+          @actual_text = String
+        end
 
-      def draw
+        def draw
 
-      end
+        end
 
-      def update(x, y)
+        def update(x, y)
 
-      end
+        end
 
-      def activated?(x, y)
+        def activated?(x, y)
 
+        end
       end
     end
   end

data/lib/Gosuplus/gui/form/renderer.rb

@@ -1,8 +1,10 @@
-module GUI
-  module Form
-    class Renderer
-      def self.draw(*entities)
-        entities.each {|entity| entity.draw unless entity.is_a? NilClass}
+module Gosuplus
+  module GUI
+    module Form
+      class Renderer
+        def self.draw(*entities)
+          entities.each {|entity| entity.draw unless entity.is_a? NilClass}
+        end
       end
     end
   end

data/lib/Gosuplus/gui/form/text.rb

@@ -1,8 +1,10 @@
-module GUI
-  module Form
-    class Text < Base
-      def initialize
+module Gosuplus
+  module GUI
+    module Form
+      class Text < Base
+        def initialize
 
+        end
       end
     end
   end

data/lib/Gosuplus/gui/gui.rb

@@ -1,42 +1,44 @@
-module GUI
-  class GUI
-    include Collision
-    def initialize(renderer)
-      @renderer = renderer
-      @items = {}
-    end
+module Gosuplus
+  module GUI
+    class GUI
+      include Collision
+      def initialize(renderer)
+        @renderer = renderer
+        @items = {}
+      end
 
-    def draw
-      @renderer.draw(@items)
-    end
+      def draw
+        @renderer.draw(@items)
+      end
 
-    def update(mouse_x, mouse_y)
-      @items.each {|key, element| element.update(mouse_x, mouse_y)}
-    end
+      def update(mouse_x, mouse_y)
+        @items.each {|key, element| element.update(mouse_x, mouse_y)}
+      end
 
-    def set_font(font)
-      @font = font
-    end
+      def set_font(font)
+        @font = font
+      end
 
-    def get_button(key)
-      @items[key]
-    end
+      def get_button(key)
+        @items[key]
+      end
 
-    def add_button(key, button)
-      @items[key] = button
-    end
+      def add_button(key, button)
+        @items[key] = button
+      end
 
-    def add_text(key, text, position)
-      raise ArgumentError, 'Font has not been set!' unless @font
-      @items[key] = Text.new(text, @font, position)
-    end
+      def add_text(key, text, position)
+        raise ArgumentError, 'Font has not been set!' unless @font
+        @items[key] = Text.new(text, @font, position)
+      end
 
-    def add_icon(key, image, position)
-      @items[key] = Icon.new(image, position)
-    end
-    
-    def [](key)
-      @items[key]
+      def add_icon(key, image, position)
+        @items[key] = Icon.new(image, position)
+      end
+      
+      def [](key)
+        @items[key]
+      end
     end
   end
 end

data/lib/Gosuplus/gui/guirenderer.rb

@@ -1,19 +1,21 @@
-class GUIRenderer
-  attr_reader :visible
+module Gosuplus
+  class GUIRenderer
+    attr_reader :visible
 
-  def initialize(visible = true)
-    @visible = visible
-  end
+    def initialize(visible = true)
+      @visible = visible
+    end
 
-  def draw(items)
-    items.each {|key, value| value.draw} if @visible && items.size > 0
-  end
+    def draw(items)
+      items.each {|key, value| value.draw} if @visible && items.size > 0
+    end
 
-  def hide
-    @visible = false
-  end
+    def hide
+      @visible = false
+    end
 
-  def display
-    @visible = true
+    def display
+      @visible = true
+    end
   end
 end

data/lib/Gosuplus/gui/icon.rb

@@ -1,14 +1,16 @@
-module GUI
-  class Icon
-    include Essentials
-    attr_accessor :body
+module Gosuplus
+  module GUI
+    class Icon
+      include Essentials
+      attr_accessor :body
 
-    def initialize(image, position)
-      @image = image
-      @body = Body.new(position, image.width, image.height)
-    end
+      def initialize(image, position)
+        @image = image
+        @body = Body.new(position, image.width, image.height)
+      end
 
-    def update; end
-    def draw; @image.draw(@body.position.x, @body.position.y, 499); end
+      def update; end
+      def draw; @image.draw(@body.position.x, @body.position.y, 499); end
+    end
   end
 end

data/lib/Gosuplus/gui/text.rb

@@ -1,21 +1,23 @@
-module GUI
-  class Text
-    include Essentials
-    attr_accessor :body
-  
-    def initialize(text, font, position = nil)
-      position = Vec2.new(0, 0) if position.is_a? NilClass
+module Gosuplus
+  module GUI
+    class Text
+      include Essentials
+      attr_accessor :body
+    
+      def initialize(text, font, position = nil)
+        position = Vec2.new(0, 0) if position.is_a? NilClass
 
-      @text, @font = text, font
-      @body = Body.new(position, font.text_width(text), font.height)
-    end
+        @text, @font = text, font
+        @body = Body.new(position, font.text_width(text), font.height)
+      end
 
-    def update; end
-    def draw; @font.draw(@text, @body.position.x, @body.position.y, 500); end
+      def update; end
+      def draw; @font.draw(@text, @body.position.x, @body.position.y, 500); end
 
-    def text=(new_text)
-      @text = new_text
-      @width = @font.text_width(text)
+      def text=(new_text)
+        @text = new_text
+        @width = @font.text_width(text)
+      end
     end
   end
 end

data/lib/Gosuplus/gui/toggleable.rb

@@ -1,29 +1,31 @@
-module GUI
-  class Toggleable < Button
-    attr_reader :state
-    def initialize(position, image, checkbox, checkmark, input_handler, key_id)
-      super(position, image, input_handler, key_id)
+module Gosuplus
+  module GUI
+    class Toggleable < Button
+      attr_reader :state
+      def initialize(position, image, checkbox, checkmark, input_handler, key_id)
+        super(position, image, input_handler, key_id)
 
-      @checkbox = Icon.new(checkbox, position)
-      @checkmark = Icon.new(checkmark, position)
-      @checkbox.center(@icon)
-      @checkmark.center(@icon)
-      @state = :checked
-    end
+        @checkbox = Icon.new(checkbox, position)
+        @checkmark = Icon.new(checkmark, position)
+        @checkbox.center(@icon)
+        @checkmark.center(@icon)
+        @state = :checked
+      end
 
-    def draw
-      super
-      ButtonRenderer.draw(@checkbox)
-      ButtonRenderer.draw(@checkmark) if @state == :checked
-    end
+      def draw
+        super
+        ButtonRenderer.draw(@checkbox)
+        ButtonRenderer.draw(@checkmark) if @state == :checked
+      end
 
-    def update(x, y)
-      super(x, y)
-      next_state if @active
-    end
+      def update(x, y)
+        super(x, y)
+        next_state if @active
+      end
 
-    def next_state; @state = @state == :checked ? :unchecked : :checked; end
-    def set_checkbox(image); @checkbox = image; end
-    def set_checker(image); @checker = image; end
+      def next_state; @state = @state == :checked ? :unchecked : :checked; end
+      def set_checkbox(image); @checkbox = image; end
+      def set_checker(image); @checker = image; end
+    end
   end
 end

data/lib/Gosuplus/resourceloader.rb

@@ -1,45 +1,47 @@
-class ResourceLoader
-  def initialize(window, state_name)
-    @state_name, @window = window, state_name
-    @resources = {}
-  end
+module Gosuplus
+  class ResourceLoader
+    def initialize(window, state_name)
+      @state_name, @window = window, state_name
+      @resources = {}
+    end
 
-  def load_resources
-    filepath = "./lib/states/#{@state_name}_resources.txt".downcase
-    File.new(filepath, 'w') unless File.file?(filepath)
+    def load_resources
+      filepath = "./lib/states/#{@state_name}_resources.txt".downcase
+      File.new(filepath, 'w') unless File.file?(filepath)
 
-    data = File.readlines(filepath)
+      data = File.readlines(filepath)
 
-    data.each do |content|
-      content = content.strip.split(" ")
-      content[2].insert(0, './assets/')
-      content[1] = content[1].to_sym
+      data.each do |content|
+        content = content.strip.split(" ")
+        content[2].insert(0, './assets/')
+        content[1] = content[1].to_sym
 
-      case content[0]
-        when 'image'
-          load_image(content[1], content[2])
-        when 'font'
-          load_font(content[1], content[2], content[3].to_i)
-        when 'spritesheet'
-          load_spritesheet(content[1], content[2], content[3].to_i, content[4].to_i)
+        case content[0]
+          when 'image'
+            load_image(content[1], content[2])
+          when 'font'
+            load_font(content[1], content[2], content[3].to_i)
+          when 'spritesheet'
+            load_spritesheet(content[1], content[2], content[3].to_i, content[4].to_i)
+        end
       end
+      @resources
     end
-    @resources
-  end
 
-  private
-  def load_image(key, path)
-    raise IOError, 'path must point to a existing file!' unless File.file?(path)
-    @resources[key] = Gosu::Image.new(@window, path, false) if @resources[key].nil?
-  end
+    private
+    def load_image(key, path)
+      raise IOError, 'path must point to a existing file!' unless File.file?(path)
+      @resources[key] = Gosu::Image.new(@window, path, false) if @resources[key].nil?
+    end
 
-  def load_font(key, path, height)
-    raise IOError, 'path must point to a existing file!' unless File.file?(path)
-    @resources[key] = Gosu::Font.new(@window, path, height) if @resources[key].nil?
-  end
+    def load_font(key, path, height)
+      raise IOError, 'path must point to a existing file!' unless File.file?(path)
+      @resources[key] = Gosu::Font.new(@window, path, height) if @resources[key].nil?
+    end
 
-  def load_spritesheet(key, path, width, height)
-    raise IOError, 'path must point to a existing file!' unless File.file?(path)
-    @resources[key] = Gosu::Image.load_tiles(@window, path, width, height, true) if @resources[key].nil?
+    def load_spritesheet(key, path, width, height)
+      raise IOError, 'path must point to a existing file!' unless File.file?(path)
+      @resources[key] = Gosu::Image.load_tiles(@window, path, width, height, true) if @resources[key].nil?
+    end
   end
 end

data/lib/Gosuplus/resourcemanager.rb

@@ -1,15 +1,17 @@
-class ResourceManager
-  def initialize(window)
-    @window = window
-    @resources = {}
-  end
+module Gosuplus
+  class ResourceManager
+    def initialize(window)
+      @window = window
+      @resources = {}
+    end
 
-  def load_resources(state_name)
-    @resources = ResourceLoader.new(state_name, @window).load_resources
-  end
+    def load_resources(state_name)
+      @resources = ResourceLoader.new(state_name, @window).load_resources
+    end
 
-  def [](*keys)
-    return @resources[keys[0]] if keys.size == 1
-    keys.map {|key| @resources[key]}
+    def [](*keys)
+      return @resources[keys[0]] if keys.size == 1
+      keys.map {|key| @resources[key]}
+    end
   end
 end

data/lib/Gosuplus/state.rb

@@ -1,25 +1,27 @@
-class State
-  def initialize(window, rm, input_handler)
-    @window, @rm, @input_handler = window, rm, input_handler
-    @GUI = GUI::GUI.new(GUIRenderer.new)
-    @objects = []
-  end
+module Gosuplus
+  class State
+    def initialize(window, rm, input_handler)
+      @window, @rm, @input_handler = window, rm, input_handler
+      @GUI = GUI::GUI.new(GUIRenderer.new)
+      @objects = []
+    end
 
-  def update
-    StateUpdater.update(@objects)
-    @GUI.update(@window.mouse_x, @window.mouse_y)
-  end
+    def update
+      StateUpdater.update(@objects)
+      @GUI.update(@window.mouse_x, @window.mouse_y)
+    end
 
-  def draw
-    StateRenderer.render(@objects)
-    @GUI.draw
-  end
+    def draw
+      StateRenderer.render(@objects)
+      @GUI.draw
+    end
 
-  def handle_input(key, state)
-    @input_handler.set_state(key, state)
-  end
+    def handle_input(key, state)
+      @input_handler.set_state(key, state)
+    end
 
-  def load; end
-  def on_load; @rm.load_resources(self.class.name); load; end
-  def on_exit; end
+    def load; end
+    def on_load; @rm.load_resources(self.class.name); load; end
+    def on_exit; end
+  end
 end

data/lib/Gosuplus/stateinputhandler.rb

@@ -1,13 +1,15 @@
-class StateInputHandler
-  def initialize
-    @button_state = {}
-  end
+module Gosuplus
+  class StateInputHandler
+    def initialize
+      @button_state = {}
+    end
 
-  def set_state(key, state)
-    @button_state[key] = state
-  end
+    def set_state(key, state)
+      @button_state[key] = state
+    end
 
-  def get_state(key)
-    @button_state[key]
+    def get_state(key)
+      @button_state[key]
+    end
   end
 end

data/lib/Gosuplus/statemanager.rb

@@ -1,36 +1,38 @@
-class StateManager
-  def initialize(window)
-    @states = []
-    @index = 0
-  end
+module Gosuplus
+  class StateManager
+    def initialize(window)
+      @states = []
+      @index = 0
+    end
 
-  def update
-    @states[@index].update
-  end
+    def update
+      @states[@index].update
+    end
 
-  def draw
-    @states[@index].draw
-  end
+    def draw
+      @states[@index].draw
+    end
 
-  def handle_input(key, type)
-    @states[@index].handle_input(key, type)
-  end
+    def handle_input(key, type)
+      @states[@index].handle_input(key, type)
+    end
 
-  def next
-    @states[@index].on_exit
-    @states[@index].on_load
-    @index += 1
-  end
+    def next
+      @states[@index].on_exit
+      @states[@index].on_load
+      @index += 1
+    end
 
-  def previous
-    @states[@index].on_exit
-    @states[@index].on_load
-    @index -= 1
-  end
+    def previous
+      @states[@index].on_exit
+      @states[@index].on_load
+      @index -= 1
+    end
 
-  def add(state)
-    state.on_load unless @states.size > 0
+    def add(state)
+      state.on_load unless @states.size > 0
 
-    @states << state
+      @states << state
+    end
   end
 end

data/lib/Gosuplus/staterenderer.rb

@@ -1,5 +1,7 @@
-class StateRenderer
-  def self.render(entities)
-    entities.each(&:draw)
+module Gosuplus
+  class StateRenderer
+    def self.render(entities)
+      entities.each(&:draw)
+    end
   end
 end

data/lib/Gosuplus/states/example_state.rb

@@ -1,32 +1,34 @@
-class ExampleState < State
-  def load
-    button = GUI::Button.new(Vec2.new(50, 50), @rm[:background], @input_handler,
-                             256,'Calculate', @rm[:font_default])
+module Gosuplus
+  class ExampleState < State
+    def load
+      button = GUI::Button.new(Vec2.new(50, 50), @rm[:background], @input_handler,
+                               256,'Calculate', @rm[:font_default])
 
-    button_2 = GUI::Button.new(Vec2.new(250, 50), @rm[:background], @input_handler,
-                             256,'Calculate', @rm[:font_default])
+      button_2 = GUI::Button.new(Vec2.new(250, 50), @rm[:background], @input_handler,
+                               256,'Calculate', @rm[:font_default])
 
-    checkbox = GUI::Toggleable.new(Vec2.new(50, 100), @rm[:background], @rm[:checkbox],
-                                   @rm[:checkmark], @input_handler, 256)
+      checkbox = GUI::Toggleable.new(Vec2.new(50, 100), @rm[:background], @rm[:checkbox],
+                                     @rm[:checkmark], @input_handler, 256)
 
-    checkbox_2 = GUI::Toggleable.new(Vec2.new(50, 150), @rm[:background], @rm[:checkbox],
-                                   @rm[:checkmark], @input_handler, 256)
+      checkbox_2 = GUI::Toggleable.new(Vec2.new(50, 150), @rm[:background], @rm[:checkbox],
+                                     @rm[:checkmark], @input_handler, 256)
 
-    button.timer = Timer.new(120)
-    button_2.timer = Timer.new(120)
-    checkbox.timer = Timer.new(30)
-    checkbox_2.timer = Timer.new(30, 0)
+      button.timer = Timer.new(120)
+      button_2.timer = Timer.new(120)
+      checkbox.timer = Timer.new(30)
+      checkbox_2.timer = Timer.new(30, 0)
 
-    @GUI.add_button(:default, button)
-    @GUI.add_button(:button_2, button_2)
-    @GUI.add_button(:checkbox, checkbox)
-    @GUI.add_button(:checkbox_2, checkbox_2)
-  end
+      @GUI.add_button(:default, button)
+      @GUI.add_button(:button_2, button_2)
+      @GUI.add_button(:checkbox, checkbox)
+      @GUI.add_button(:checkbox_2, checkbox_2)
+    end
 
-  def update
-    super
-    puts "CLICKED 2" if @GUI.get_button(:button_2).active?
-    puts "clicked" if @GUI.get_button(:default).active?
-    puts "CHECKED" if @GUI.get_button(:checkbox).active?
+    def update
+      super
+      puts "CLICKED 2" if @GUI.get_button(:button_2).active?
+      puts "clicked" if @GUI.get_button(:default).active?
+      puts "CHECKED" if @GUI.get_button(:checkbox).active?
+    end
   end
 end

data/lib/Gosuplus/stateupdater.rb

@@ -1,5 +1,7 @@
-class StateUpdater
-  def self.update(entities)
-    entities.each(&:update)
+module Gosuplus
+  class StateUpdater
+    def self.update(entities)
+      entities.each(&:update)
+    end
   end
 end

data/lib/Gosuplus/timer.rb

@@ -1,17 +1,19 @@
-class Timer
-  def initialize(time, time_start = 0)
-    @time, @time_ready = time_start, time
-  end
+module Gosuplus
+  class Timer
+    def initialize(time, time_start = 0)
+      @time, @time_ready = time_start, time
+    end
 
-  def update
-    @time += 1 if @time < @time_ready
-  end
+    def update
+      @time += 1 if @time < @time_ready
+    end
 
-  def ready?
-    @time_ready == @time
-  end
+    def ready?
+      @time_ready == @time
+    end
 
-  def reset
-    @time = 0
+    def reset
+      @time = 0
+    end
   end
 end

data/lib/Gosuplus/vec2.rb

@@ -1,7 +1,9 @@
-class Vec2
-  attr_accessor :x, :y
-  
-  def initialize(x, y)
-    @x, @y = x, y
+module Gosuplus
+  class Vec2
+    attr_accessor :x, :y
+    
+    def initialize(x, y)
+      @x, @y = x, y
+    end
   end
-end
+module Gosuplus

data/lib/Gosuplus/vec3.rb

@@ -1,7 +1,9 @@
-class Vec3
-  attr_accessor :x, :y, :z
+module Gosuplus
+  class Vec3
+    attr_accessor :x, :y, :z
 
-  def initialize(x, y, z)
-    @x, @y, @z = x, y, z
+    def initialize(x, y, z)
+      @x, @y, @z = x, y, z
+    end
   end
 end

data/lib/Gosuplus/version.rb

@@ -1,3 +1,3 @@
 module Gosuplus
-  VERSION = "1.0"
+  VERSION = "1.0.1"
 end

data/lib/Gosuplus/window.rb

@@ -0,0 +1,30 @@
+module Gosuplus
+  class Window < Gosu::Window
+    def initialize
+      super 640, 480, false
+      self.caption = "GosuPlus"
+      @state_manager = StateManager.new(self)
+      @state_manager.add(ExampleState.new(self, ResourceManager.new(self), StateInputHandler.new))
+    end
+
+    def update
+      @state_manager.update
+    end
+
+    def draw
+      @state_manager.draw
+    end
+
+    def button_down(id)
+      @state_manager.handle_input(id, true)
+    end
+
+    def button_up(id)
+      @state_manager.handle_input(id, false)
+    end
+
+    def needs_cursor?
+      true
+    end
+  end
+end

data/lib/Gosuplus.rb

@@ -1,33 +1,2 @@
 require 'gosu'
-Dir['/lib/Gosuplus/.*rb'].each {|file| require file}
-
-module Gosuplus
-  class Window < Gosu::Window
-    def initialize
-      super 640, 480, false
-      self.caption = "GosuPlus"
-      @state_manager = StateManager.new(self)
-      @state_manager.add(ExampleState.new(self, ResourceManager.new(self), StateInputHandler.new))
-    end
-
-    def update
-      @state_manager.update
-    end
-
-    def draw
-      @state_manager.draw
-    end
-
-    def button_down(id)
-      @state_manager.handle_input(id, true)
-    end
-
-    def button_up(id)
-      @state_manager.handle_input(id, false)
-    end
-
-    def needs_cursor?
-      true
-    end
-  end
-end
+Dir['/lib/Gosuplus/.*rb'].each {|file| require file}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Gosuplus
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Freddan962
@@ -84,6 +84,7 @@ files:
 - lib/Gosuplus/vec2.rb
 - lib/Gosuplus/vec3.rb
 - lib/Gosuplus/version.rb
+- lib/Gosuplus/window.rb
 homepage: https://github.com/Freddan962/GosuPlus
 licenses:
 - MIT