kawaii 0.1.0 → 0.1.1

data/.gitignore

@@ -1,2 +1,6 @@
 # don't version gem files
 /*.gem
+
+# don't version gem publish files
+/vendor
+/pkg

data/README.md

@@ -1,42 +1,36 @@
 # Kawaii <3
 
-[Feature list and development progress](https://github.com/eriksk/kawaii/blob/master/backlog.md)
+* [Change log](https://github.com/eriksk/kawaii/blob/master/changelog.md)
+* [Feature list and development progress](https://github.com/eriksk/kawaii/blob/master/backlog.md)
 
 ## What is Kawaii?
 Kawaii is a tiny game library for ruby built on top of gosu. It makes it quick and easy to create 2D games.
 
 ## How do I use it?
-I will show this soon... in the mean time, this is what I'm aiming for.
+To create a basic kawaii game, just install the gem
+
+	gem install kawaii
+
+And then run the following command
 
-	kawaii new MyAwesomeGame 800 600
+	kawaii new mysuperawesomefirstgame
 
-This will create a new game named "MyAwesomeGame" with a default resolution set to 800 x 600.
-To run the game just run the command:
-	
-	ruby my_awesome_game.rb
+This will create a new basic game with a default resolution set to 800 x 600.
 
-This is NOT implemented yet though...
+To change the configuration for the game simply edit the config.yml file that is created along with the game file. The config file itself is rather self-explanatory.
 
 ## Why does Kawaii exist?
 I wanted a way of quickly prototyping games for iPhone and iPad without Objective-C. Being pretty comfy with Ruby, I thought, why not!? 
 
 ## Will this be distributed as a gem?
-Yes, sooner or later.
+It is! Just run this command to install it!
+
+	gem install kawaii
 
 ## What kind of features will it have?
-Aside from being totally cute (hence the name) it will have:
-* Integrated physics with [chipmunk](https://github.com/beoran/chipmunk)
-* Content management
-	* Sharing sprites with nodes
-	* Tiling made easy
-* Animated sprites
-* Node management, a tree of nodes can be easily created and managed.
-* Menu system
-* Input management
-* Helper functions/math
-* Lots of tweenings & other juicyness
-* Tiled importer (<del>xml</del> & json)
-	* Imports maps from Tiled and draws them
+A lot! Check out the full list of implemented & to be implemented features 
+
+[Feature list and development progress](https://github.com/eriksk/kawaii/blob/master/backlog.md)
 
 ##  Dependencies
 * [gosu '0.7.43'](https://github.com/jlnr/gosu)

data/backlog.md

@@ -1,19 +1,17 @@
 # Kawaii backlog
 
 ## Next up
-* Camera
-* Animated entities/sprites
 * Audio
 * Tweenings & juice
-* Make a super cute awesome kawaii logo
-* gem commands
 * Platform example game
+* Create a few video tutorials on how to use Kawaii
 
 ## Working on
-* <del>Physics integration w/ chipmunk</del> (paused, need more graphics to test)
-* Vectors/Math
+* Physics integration with chipmunk
+* Animated entities/sprites
 
 ## Completed
+* Make a super cute awesome kawaii logo
 * Tiled importer
 	* JSON importer
 	* <del>XML importer</del> (removed, don't want more dependencies. Besides, json works just fine)
@@ -22,5 +20,10 @@
 * Entity management
 * Content manager
 * Scene management
+	* Default intro and better scene handling
 * Input
-* Tiled maps usage
+* Tiled maps usage
+* gem commands
+* Camera
+* Vectors/Math
+* Config file

data/changelog.md

@@ -0,0 +1,18 @@
+# Kawaii change log
+
+## 0.1.1
+* New scripts for creating basic game
+* Minor bug fixes
+* Configuration file added when generating game
+* Scene manager now handles the entire flow of games
+	* Scene now contains all managers:
+		* Node manager
+		* Input manager
+		* Content manager
+		* TmxTileMap
+* TmxTileMaps now automatically load textures based on what's specified in Tiled.
+* Super awesome logo
+* Splash screen (can easily be removed)
+
+## 0.1.0
+* First release

data/lib/kawaii.rb

@@ -17,6 +17,8 @@ require_relative 'kawaii/constants'
 require_relative 'kawaii/scene_manager'
 require_relative 'kawaii/scene'
 require_relative 'kawaii/helpers'
+require_relative 'kawaii/camera'
+require_relative 'kawaii/intro'
 
 module Kawaii
 end

data/lib/kawaii/camera.rb

@@ -0,0 +1,24 @@
+module Kawaii
+	class Camera
+		
+		def initialize game
+			@game = game
+			@pos = Vector2.new
+			@origin = Vector2.new(@game.width / 2, @game.height / 2)
+			@destination = Vector2.new
+			@speed = 0.05
+		end
+
+		def move x, y
+			@destination.x, @destination.y = x - @origin.x, y - @origin.y
+			@pos.x = Kawaii::lerp(@pos.x, @destination.x, @speed)
+			@pos.y = Kawaii::lerp(@pos.y, @destination.y, @speed)	
+		end
+
+		def translate(&block)
+			@game.translate(@pos.x, @pos.y) do
+				block.call()
+			end
+		end
+	end
+end

data/lib/kawaii/command.rb

@@ -34,53 +34,53 @@ module Kawaii
 
 		private
 			def self.new_game_template args
-				width = 800
-				height = 600
-				fullscreen = false
 				game_class_name = args.first.capitalize 
 				File.open(args.first + ".rb", "w+") do |f|
 					f.write <<-EOF
 require 'kawaii'
 
-class #{game_class_name} < Kawaii::Game
-  
-  WIDTH = #{width}
-  HEIGHT = #{height}
-  FULLSCREEN = #{fullscreen}
-  CONTENT_ROOT = "content"
-  
-  def initialize
-    super WIDTH, HEIGHT, FULLSCREEN, CONTENT_ROOT
-    load_game
-  end
-  
-  def load_game
-  	# TODO: load code goes here	
-  end
+module #{game_class_name}
+	class Game < Kawaii::Game
+	  
+	  def initialize
+	    super
+	    load_game
+	  end
+	  
+	  def load_game
+	  	# TODO: create and load a scene
+	  	# example:	
+	    # @scene_manager.on_scene_activated lambda {
+	   	#	  @scene_manager.push_scene(MySceneClass.new(@scene_manager)) 
+	    # }	    	
+	  end
 
-  def input
-  	# TODO: input goes here
-    if button_down?Gosu::KbEscape
-      exit
-    end  
-  end
-
-  def before_update
-  	# TODO: game logic goes here
-    input
-  end
-
-  def after_update
-  	# TODO: game logic goes here	
-  end
+	  def before_update
+	  	# allows the game to exit
+	    exit() if button_down?(Gosu::KbEscape)
+	  end
+	end
 end
 
 # entry point
-game = #{game_class_name}.new
+game = #{game_class_name}::Game.new
 game.show
 				EOF
 				end
 
+				# write config file
+				File.open("config.yml", "w+") do |f|
+					f.write <<-EOF
+# kawaii configuration
+resolution:
+  width: 800
+  height: 600
+fullscreen: false
+content_root: content
+debug: true
+					EOF
+				end
+
 				puts "Successfully created new game '#{game_class_name}'".green
 				puts "Run it with the command: " + "ruby #{args.first}.rb".yellow
 			end

data/lib/kawaii/game.rb

@@ -1,62 +1,46 @@
 require 'gosu'
+require 'yaml'
 
 module Kawaii
   class Game < Gosu::Window
   
-    attr_accessor :width, :height, :fullscreen, :show_fps, :font, :node_manager, :content_manager, :physics_manager
-  
-    def initialize width = 800, height = 600, fullscreen = false, content_root = "content", debug = true
-      super width, height, fullscreen
-      @width, @height, @fullscreen = width, height, fullscreen    
+    CONFIG_PATH = File.expand_path(".") +'/config.yml'
+    CONFIG = YAML.load_file(CONFIG_PATH) if File.exist?(CONFIG_PATH)
+
+    attr_accessor :width, :height, :fullscreen, :show_fps, :font, :content_root
+      
+    def initialize
+      super CONFIG['resolution']['width'], CONFIG['resolution']['height'], CONFIG['fullscreen']
+      @width, @height, @fullscreen = CONFIG['resolution']['width'], CONFIG['resolution']['height'], CONFIG['fullscreen']
+      @content_root = CONFIG['content_root']
       
-      # managers
-      @node_manager = Kawaii::NodeManager.new
-      @content_manager = Kawaii::ContentManager.new(self, content_root)  
-      @audio_manager = Kawaii::AudioManager.new(self)
-      @input_manager = Kawaii::InputManager.new(self)
-      @physics_manager = Kawaii::PhysicsManager.new
+      @scene_manager = Kawaii::SceneManager.new(self) 
+      # load intro scene
+      @scene_manager.push_scene Kawaii::Intro.new @scene_manager
 
       # stats
       @top_color = Gosu::Color.new(0xFF1EB1FA)
       @bottom_color = Gosu::Color.new(0xFF1D4DB5)
       @font = Gosu::Font.new(self, Gosu::default_font_name, 18)
-      @debug = debug
+      @debug = CONFIG['debug']
       
       if @debug
         puts "Game settings:"
         puts "\tResolution: #{width}:#{height}"
         puts "\tFullscreen: #{fullscreen}"
         puts "\tContent root: #{content_root}"
-        print_stats
       end
     end
-    
-    def add_child node
-      @node_manager.nodes.push node
-    end
-    
-    def remove_child node
-      @node_manager.nodes.delete node
+  
+    def update
+      before_update()
+      @dt = delta()
+      @scene_manager.update @dt
     end
     
-    def print_stats
-      puts "Statistics:"
-      puts "Nodes: #{node_manager.count}"
+    def before_update
     end
-    
-    def update
-      if self.class.method_defined? :before_update
-        before_update
-      end
-
-      @dt = delta()
-      @node_manager.update @dt
 
-      if self.class.method_defined? :after_update
-        after_update
-      end
-    end
-  
     def delta
       16.0 # TODO: real delta
     end
@@ -65,12 +49,6 @@ module Kawaii
       1000.0 / delta
     end
   
-    def before_draw
-    end
-
-    def after_draw
-    end
-
     def draw
       draw_quad(
         0, 0, @top_color,
@@ -78,12 +56,10 @@ module Kawaii
         @width, @height, @bottom_color,
         0, @height, @bottom_color,
       )
-      before_draw
-      @node_manager.draw
+      @scene_manager.draw
       if @debug
-        @font.draw("FPS: #{get_fps}", 14, 14, 0)
+          @font.draw("FPS: #{get_fps}", 14, 14, 0)
       end
-      after_draw
     end 
   end
 end

data/lib/kawaii/input_manager.rb

@@ -12,6 +12,10 @@ module Kawaii
 			@old_mouse_y = 0.0
 		end
 
+		def bind buttons = []
+			@bound_buttons = buttons
+		end
+
 		def update
 			@buttons.clear
 			@bound_buttons.each do |btn|

data/lib/kawaii/intro.rb

@@ -1,4 +1,47 @@
 module Kawaii
-	class Intro
+	class Intro < Scene
+
+		def load
+			@logo = Gosu::Image.new(game(), File.dirname(__FILE__) + '/logo.png', false)	
+			@rotation = 0
+			@position = Vector2.new(game().width / 2, game().height / 2)
+			@scale = 1
+			@transition_duration = 2500
+			@color = Gosu::Color::WHITE
+			@color.alpha = 0
+		end
+
+		def transition_in current, duration
+			fake_duration = 750
+			dead_zone = 1200
+			if current <= fake_duration
+				@rotation = Kawaii::clerp(0, (360 * 2) - 145, current / (fake_duration * 0.7))
+				@scale = Kawaii::clerp(0.1, 1.0, current / (fake_duration * 0.8))
+			elsif current <= dead_zone
+			else
+				@rotation = Kawaii::clerp(@rotation, 0, (current - dead_zone) / ((duration - dead_zone) * 1.4))
+				@scale = Kawaii::clerp(@scale, 0, (current - dead_zone) / ((duration - dead_zone) * 1.4))
+				@position.x = Kawaii::clerp(game().width / 2, game().width + 400, (current - dead_zone) / ((duration - dead_zone) * 1.3))
+				@position.y += 5
+				@color.alpha = Kawaii::clerp(0, 255, (current - dead_zone) / ((duration - dead_zone)))
+			end
+		end
+
+		def transition_out current, duration
+		end
+
+		def update dt
+		end
+
+		def draw
+			@logo.draw_rot(@position.x, @position.y, 0, @rotation, 0.5, 0.5, @scale, @scale)
+		
+			game.draw_quad(
+		        0, 0, @color,
+		        game.width, 0, @color,
+		        game.width, game.height, @color,
+		        0, game.height, @color,
+		      )
+		end
 	end
 end

data/lib/kawaii/scene.rb

@@ -1,9 +1,39 @@
 module Kawaii
 	class Scene
-		attr_accessor :name, :scene_manager
+		attr_accessor :name, :scene_manager, :transition_duration
 
 		def initialize scene_manager
 			@scene_manager = scene_manager
+			
+			# managers
+			@node_manager = Kawaii::NodeManager.new
+			@content = Kawaii::ContentManager.new(scene_manager.game, scene_manager.game.content_root)  
+			@audio = Kawaii::AudioManager.new(scene_manager.game)
+			@input = Kawaii::InputManager.new(scene_manager.game)
+			@physics = Kawaii::PhysicsManager.new
+
+			# cam
+			@cam = Kawaii::Camera.new(scene_manager.game)
+
+			# set default duration
+			@transition_duration = SCENE_TRANSITION_DURATION
+
+			load()
+		end
+
+		def add_child node
+			@node_manager.nodes.push node
+		end
+
+		def remove_child node
+			@node_manager.nodes.delete node
+		end
+
+		def load
+		end
+
+		def game
+			@scene_manager.game
 		end
 
 		def transition_in current, duration
@@ -13,9 +43,31 @@ module Kawaii
 		end
 
 		def update dt
+			@input.update
+			before_update()
+      		@node_manager.update dt
+      		after_update()
 		end
 
-		def draw
+		def before_update
+		end
+		def after_update
 		end
+		def before_draw
+		end
+		def draw_hud
+		end
+	    def after_draw
+	    end
+
+	    def draw
+	      @cam.translate do 
+	        before_draw
+	        @node_manager.draw  
+	        after_draw
+	      end
+	      
+	      draw_hud
+	    end
 	end
 end

data/lib/kawaii/scene_manager.rb

@@ -1,34 +1,58 @@
 module Kawaii
 	class SceneManager
-		attr_accessor :scene
+		attr_accessor :game, :scene
 
-		def initialize scene = nil
+		def initialize game, scene = nil
+			@game = game
 			@scene = scene
 			@old_scene = nil
 			@current_transition = 0.0
 			@state = :none
 			@state = :transition if @scene != nil
+			@on_scene_activated = []
 		end
 
+		# switches to a new scene and loads it
 		def push_scene scene
 			@old_scene = @scene
 			@scene = scene		
+			@scene.load
+			@current_transition = 0.0
+			@state = :transition
+		end
+
+		# removes the current scene
+		def pop_scene
+			@state = :none
+			@old_scene = nil
+			@scene = nil
+		end
+
+		def on_scene_activated(lmbda)
+			@on_scene_activated << lmbda
 		end
 
 		def update dt
 			case @state
 				when :none
+					@scene.update dt
 				when :transition
 					if @scene != nil
-						@scene.transition_in @current_transition, SCENE_TRANSITION_DURATION
+						@scene.transition_in @current_transition, @scene.transition_duration
 					end
 					if @old_scene != nil
-						@old_scene.transition_out @current_transition, SCENE_TRANSITION_DURATION
+						@old_scene.transition_out @current_transition, @old_scene.transition_duration
 					end
 
 					@current_transition += dt
-					if @current_transition > SCENE_TRANSITION_DURATION
+					if @current_transition > @scene.transition_duration
 						@state = :transition_done
+						@current_transition = 0.0
+						@on_scene_activated.each do |l|
+							l.call()
+						end
+						# remove jobs
+						@on_scene_activated.clear
 					end
 				when :transition_done
 					@current_transition = 0.0

data/lib/kawaii/tmx_tile_map.rb

@@ -8,6 +8,7 @@ module Kawaii
 		def initialize
 			@layers = []
 			@properties = {}
+			@tilesets = []
 		end
 
 		def draw
@@ -20,7 +21,7 @@ module Kawaii
 			if path.end_with? ".json"
 				load_json path
 				@layers.each do |layer|
-					layer.textures = content_manager.load_tiled_images("gfx/map1.png", 32)
+					layer.textures = content_manager.load_tiled_images(@tilesets.first.gsub(/\.\.\//, ""), 32)
 				end
 			else
 				raise UnsupportedFormatError, "only json is supported"
@@ -46,7 +47,7 @@ module Kawaii
 			end
 		end
 
-		private
+		protected
 			def load_json path
 				File.open(path) do |f|
 					populate JSON.parse(f.read)
@@ -65,6 +66,9 @@ module Kawaii
 				hash['properties'].each do |property|
 					@properties[property['key']] = property['value']
 				end
+				hash['tilesets'].each do|tileset|
+					@tilesets.push tileset['image']
+				end
 			end
 	end
 end

data/lib/kawaii/version.rb

@@ -1,3 +1,3 @@
 module Kawaii
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/kawaii/tmx_tile_map_spec.rb

@@ -21,10 +21,13 @@ module Kawaii
 		it "should contain properties" do
 			@tile_map.should respond_to :properties
 		end
+		it "should contain tilesets" do
+			@tile_map.should respond_to :tilesets
+		end
 
 		describe "#load" do
 			it "should be able to load a tmx.json file" do
-				@tile_map.load('/Users/ILab/Documents/ruby/kawaii/spec/kawaii/content/maps/test_map.json')
+				@tile_map.load('content/maps/test_map.json')
 				@tile_map.width.should == 32
 				@tile_map.height.should == 32
 				@tile_map.layers.size.should be(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kawaii
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &70144030207060 !ruby/object:Gem::Requirement
+  requirement: &70350239722340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.43
   type: :runtime
   prerelease: false
-  version_requirements: *70144030207060
+  version_requirements: *70350239722340
 - !ruby/object:Gem::Dependency
   name: chipmunk
-  requirement: &70144030206460 !ruby/object:Gem::Requirement
+  requirement: &70350239721740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 5.3.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70144030206460
+  version_requirements: *70350239721740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144030206060 !ruby/object:Gem::Requirement
+  requirement: &70350239721180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144030206060
+  version_requirements: *70350239721180
 description: kawaii provides a tiny game library that extends gosu
 email: erikskoglund88@gmail.com
 executables:
@@ -64,6 +64,7 @@ files:
 - Rakefile
 - backlog.md
 - bin/kawaii
+- changelog.md
 - doc/Kawaii.html
 - doc/Kawaii/Animation.html
 - doc/Kawaii/AudioManager.html
@@ -101,6 +102,7 @@ files:
 - lib/kawaii.rb
 - lib/kawaii/animation.rb
 - lib/kawaii/audio_manager.rb
+- lib/kawaii/camera.rb
 - lib/kawaii/command.rb
 - lib/kawaii/constants.rb
 - lib/kawaii/content_manager.rb
@@ -110,6 +112,7 @@ files:
 - lib/kawaii/helpers.rb
 - lib/kawaii/input_manager.rb
 - lib/kawaii/intro.rb
+- lib/kawaii/logo.png
 - lib/kawaii/math.rb
 - lib/kawaii/node.rb
 - lib/kawaii/node_manager.rb