teien 0.1.0 → 0.2.0

data/{mods/actor/apps/browser/browser_application.rb → samples/actor/lib/ui.rb}

@@ -1,21 +1,8 @@
-require_relative "../common/browser_event"
+require_relative "event"
+require_relative "sinbad"
 
-include Teien
-
-class BrowserApplication < Teien::Application
-  def initialize()
-    super
-
-    @ui = Teien::get_component("user_interface")
-    @ui.register_receiver(self)
-    @camera_mover = nil
-  end
-
-  ##
-  # handlers of EventRouter.
-  #
-
-  def setup()
+module Ui
+  def ui_setup()
     puts "browser setup"
     @controllable_actor_name = nil
 
@@ -30,12 +17,12 @@ class BrowserApplication < Teien::Application
     @ui.hide_cursor()
   end
 
-  def connection_completed(from)
-    event = Teien::Event::Browser::ReadyToGo.new
+  def ui_connection_completed(from)
+    event = Teien::Event::ReadyToGo.new
     @event_router.send_event(event, from)
   end
 
-  def update(delta)
+  def ui_update(delta)
     @camera_mover.update(delta)
 
     if @controllable_actor_name
@@ -45,9 +32,9 @@ class BrowserApplication < Teien::Application
     end
   end
 
-  def receive_event(event, from)
+  def ui_receive_event(event, from)
     case event
-    when Teien::Event::Browser::ControllableActor
+    when Teien::Event::ControllableActor
       @controllable_actor_name = event.actor_name
 
       actor = Teien::get_component("actor_manager").actors[@controllable_actor_name]
@@ -105,7 +92,7 @@ class BrowserApplication < Teien::Application
       @event_router.quit = true
     end
 
-    event = Event::Browser::KeyPressed.new(keyEvent.key)
+    event = Event::KeyPressed.new(keyEvent.key)
     @event_router.send_event(event)
 
     return true
@@ -153,7 +140,7 @@ class BrowserApplication < Teien::Application
       end
     end
 
-    event = Event::Browser::KeyReleased.new(keyEvent.key)
+    event = Event::KeyReleased.new(keyEvent.key)
     @event_router.send_event(event)
 
     return true
@@ -167,7 +154,7 @@ class BrowserApplication < Teien::Application
   def mouse_pressed(mouseEvent, mouseButtonID)
     @camera_mover.mouse_pressed(mouseEvent, mouseButtonID) 
 
-    event = Event::Browser::MousePressed.new(mouseEvent, mouseButtonID, @ui.get_camera())
+    event = Event::MousePressed.new(mouseEvent, mouseButtonID, @ui.get_camera())
     @event_router.send_event(event)
 
     return true
@@ -176,10 +163,9 @@ class BrowserApplication < Teien::Application
   def mouse_released(mouseEvent, mouseButtonID)
     @camera_mover.mouse_released(mouseEvent, mouseButtonID) 
 
-    event = Event::Browser::MouseReleased.new(mouseEvent, mouseButtonID, @ui.get_camera())
+    event = Event::MouseReleased.new(mouseEvent, mouseButtonID, @ui.get_camera())
     @event_router.send_event(event)
 
     return true
   end
 end
-

data/samples/actor/local

@@ -0,0 +1,2 @@
+teien lib/local.rb
+#../../bin/teien lib/local.rb

data/samples/actor/server

@@ -0,0 +1,2 @@
+teien lib/server.rb
+#../../bin/teien lib/server.rb

data/samples/hello_garden/client

@@ -0,0 +1,2 @@
+teien lib/client.rb
+#../../bin/teien lib/client.rb

data/samples/hello_garden/lib/client.rb

@@ -0,0 +1,41 @@
+require "teien"
+require_relative "ui"
+require "teien/application/proxy_application"
+
+include Teien
+
+class Client < ProxyApplication
+  include Ui
+
+  def initialize
+    super
+
+    require 'teien/ui/user_interface'
+    @ui = Teien::UserInterface.new()
+    Teien::register_component("user_interface", @ui )
+
+    @event_router.register_receiver(self)
+    @ui.register_receiver(self)
+  end
+
+  ##
+  # EventRouter handlers
+  #
+
+  def setup
+    ui_setup()
+
+  end
+
+  def connection_completed(from)
+    ui_connection_completed(from)
+  end
+
+  def update(delta)
+    ui_update(delta)
+    @camera_mover.update(delta)
+  end
+
+end
+
+Client.new.connect_to_server("0.0.0.0", 11922)

data/{mods/hello_garden/apps/common/browser_event.rb → samples/hello_garden/lib/event.rb}

@@ -1,4 +1,5 @@
-module Teien::Event::Browser
+module Teien
+module Event
   class KeyPressed
     attr_accessor :key
 
@@ -54,5 +55,5 @@ module Teien::Event::Browser
   class ReadyToGo
   end
 end
-
+end
 

data/samples/hello_garden/lib/local.rb

@@ -0,0 +1,56 @@
+require 'teien'
+require "teien/application/local_application"
+require_relative 'model'
+require_relative 'ui'
+
+include Teien
+
+class Local < LocalApplication
+  include Model
+  include Ui
+
+  def initialize(sync_period = 0)
+    super(sync_period)
+
+    require 'teien/ui/user_interface'
+    @ui = Teien::UserInterface.new()
+    Teien::register_component("user_interface", @ui )
+
+    @event_router.register_receiver(self)
+    @ui.register_receiver(self)
+
+    @first_update = true
+  end
+
+  def setup()
+    model_setup()
+    ui_setup()
+  end
+
+  def connection_binded(from)
+    model_connection_binded(from)
+  end
+
+  def connection_unbinded(from)
+    model_connection_unbinded(from)
+  end
+
+  def connection_completed(from)
+    ui_connection_completed(from)
+  end
+
+  ##
+  # EventRouter handlers
+  #
+
+  def update(delta)
+    ui_update(delta)
+  end
+
+  def receive_event(event, from)
+    model_receive_event(event, from)
+    ui_receive_event(event, from)
+  end
+end
+
+Local.new.start_application

data/{mods/hello_garden/apps/server/server_application.rb → samples/hello_garden/lib/model.rb}

@@ -1,10 +1,7 @@
-require_relative '../common/browser_event'
+require_relative "event"
 
-include Teien
-
-class ServerApplication < Teien::Application
-  def setup()
-    puts "model setup"
+module Model
+  def model_setup
     @quit = false
     @first_connection = true
     @shot_num = 0
@@ -28,14 +25,28 @@ class ServerApplication < Teien::Application
     floor.set_position(Vector3D.new(0, 0, 0))
   end
 
-  def update(delta)
-    return !@quit
+  def model_connection_binded(from)
+  end
+
+  def model_connection_unbinded(from)
   end
 
-  def connection_binded(from)
-    puts "connection_binded"
+  def model_receive_event(event, from)
+    case event
+    when Teien::Event::ReadyToGo
+      if @first_connection
+        create_objects()
+        @first_connection = false
+      end
+    when Teien::Event::MousePressed
+      shot_box(event.camera_pos, event.camera_dir)
+    end
   end
 
+  ##
+  # Helper methods
+  #
+
   def create_objects()
     # create a box.
     object_info = BoxObjectInfo.new(Vector3D.new(1, 1, 1))
@@ -84,18 +95,6 @@ class ServerApplication < Teien::Application
 =end
   end
 
-  def receive_event(event, from)
-    case event
-    when Teien::Event::Browser::ReadyToGo
-      if @first_connection
-        create_objects()
-        @first_connection = false
-      end
-    when Teien::Event::Browser::MousePressed
-      shot_box(event.camera_pos, event.camera_dir)
-    end
-  end
-
   def shot_box(pos, dir)
     object_info = BoxObjectInfo.new(Vector3D.new(1, 1, 1))
     object_info.material_name = "Examples/SphereMappedRustySteel"
@@ -106,5 +105,6 @@ class ServerApplication < Teien::Application
     box.apply_impulse(force, Vector3D.new(0.0, 0.0, 0.0))
     @event_router.send_event(Teien::Event::BaseObject::SyncObject.new(box))
   end
+  
 end
 

data/samples/hello_garden/lib/server.rb

@@ -0,0 +1,34 @@
+require 'teien'
+require_relative "model"
+require "teien/application/server_application"
+
+include Teien
+
+class Server < ServerApplication
+  include Model
+
+  def initialize(sync_period = 0.3)
+    super(sync_period)
+
+    @event_router.register_receiver(self)
+  end
+
+  def setup()
+    model_setup()
+  end
+
+  def connection_binded(from)
+    model_connection_binded(from)
+  end
+
+  def connection_unbinded(from)
+    model_connection_unbinded(from)
+  end
+
+  def receive_event(event, from)
+    model_receive_event(event, from)
+  end
+
+end
+
+Server.new.start_server("0.0.0.0", 11922)

data/{mods/hello_garden/apps/browser/browser_application.rb → samples/hello_garden/lib/ui.rb}

@@ -1,21 +1,7 @@
-require_relative "../common/browser_event"
+require_relative 'event'
 
-include Teien
-
-class BrowserApplication < Teien::Application
-  def initialize()
-    super
-
-    @ui = Teien::get_component("user_interface")
-    @ui.register_receiver(self)
-    @camera_mover = nil
-  end
-
-  ##
-  # handlers of EventRouter.
-  #
-
-  def setup()
+module Ui
+  def ui_setup()
     puts "browser setup"
     @controllable_actor_name = nil
 
@@ -30,17 +16,20 @@ class BrowserApplication < Teien::Application
     @ui.hide_cursor()
   end
 
-  def connection_completed(from)
-    event = Teien::Event::Browser::ReadyToGo.new
+  def ui_connection_completed(from)
+    event = Teien::Event::ReadyToGo.new
     @event_router.send_event(event, from)
   end
 
-  def update(delta)
+  def ui_update(delta)
     @camera_mover.update(delta)
   end
 
+  def ui_receive_event(event, from)
+  end
+
   ##
-  # handlers of UserInterface.
+  # UserInterface handlers 
   #
 
   def key_pressed(keyEvent)
@@ -62,7 +51,7 @@ class BrowserApplication < Teien::Application
       @event_router.quit = true
     end
 
-    event = Event::Browser::KeyPressed.new(keyEvent.key)
+    event = Event::KeyPressed.new(keyEvent.key)
     @event_router.send_event(event)
 
     return true
@@ -81,7 +70,7 @@ class BrowserApplication < Teien::Application
       @camera_mover.move_right(false) 
     end
 
-    event = Event::Browser::KeyReleased.new(keyEvent.key)
+    event = Event::KeyReleased.new(keyEvent.key)
     @event_router.send_event(event)
 
     return true
@@ -95,7 +84,7 @@ class BrowserApplication < Teien::Application
   def mouse_pressed(mouseEvent, mouseButtonID)
     @camera_mover.mouse_pressed(mouseEvent, mouseButtonID) 
 
-    event = Event::Browser::MousePressed.new(mouseEvent, mouseButtonID, @ui.get_camera())
+    event = Event::MousePressed.new(mouseEvent, mouseButtonID, @ui.get_camera())
     @event_router.send_event(event)
 
     return true
@@ -104,10 +93,9 @@ class BrowserApplication < Teien::Application
   def mouse_released(mouseEvent, mouseButtonID)
     @camera_mover.mouse_released(mouseEvent, mouseButtonID) 
 
-    event = Event::Browser::MouseReleased.new(mouseEvent, mouseButtonID, @ui.get_camera())
+    event = Event::MouseReleased.new(mouseEvent, mouseButtonID, @ui.get_camera())
     @event_router.send_event(event)
 
     return true
   end
 end
-

data/samples/hello_garden/local

@@ -0,0 +1,2 @@
+teien lib/local.rb
+#../../bin/teien lib/local.rb

data/samples/hello_garden/server

@@ -0,0 +1,2 @@
+teien lib/server.rb
+#../../bin/teien lib/server.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teien
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &74612360 !ruby/object:Gem::Requirement
+  requirement: &74100690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74612360
+  version_requirements: *74100690
 - !ruby/object:Gem::Dependency
   name: ruby-ois
-  requirement: &74611650 !ruby/object:Gem::Requirement
+  requirement: &74096570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74611650
+  version_requirements: *74096570
 - !ruby/object:Gem::Dependency
   name: ruby-ogre-installer
-  requirement: &74611040 !ruby/object:Gem::Requirement
+  requirement: &74096300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74611040
+  version_requirements: *74096300
 - !ruby/object:Gem::Dependency
   name: ruby-procedural
-  requirement: &74610390 !ruby/object:Gem::Requirement
+  requirement: &74095850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74610390
+  version_requirements: *74095850
 - !ruby/object:Gem::Dependency
   name: ruby-bullet
-  requirement: &74609840 !ruby/object:Gem::Requirement
+  requirement: &74095380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74609840
+  version_requirements: *74095380
 - !ruby/object:Gem::Dependency
   name: teienlib
-  requirement: &74609510 !ruby/object:Gem::Requirement
+  requirement: &74095070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74609510
+  version_requirements: *74095070
 description: An easy 3D world maker.
 email:
 - abexsoft@gmail.com
@@ -99,13 +99,14 @@ files:
 - lib/teien/actor/actor_info.rb
 - lib/teien/actor/actor_manager.rb
 - lib/teien/actor/actor_manager_proxy.rb
-- lib/teien/addon/addon.rb
 - lib/teien/animation/animation.rb
 - lib/teien/animation/animation_event.rb
 - lib/teien/animation/animation_manager.rb
 - lib/teien/animation/animation_manager_proxy.rb
 - lib/teien/animation/animation_operator.rb
-- lib/teien/application/application.rb
+- lib/teien/application/local_application.rb
+- lib/teien/application/proxy_application.rb
+- lib/teien/application/server_application.rb
 - lib/teien/base_object/attachment_info.rb
 - lib/teien/base_object/base_object.rb
 - lib/teien/base_object/base_object_event.rb
@@ -127,16 +128,11 @@ files:
 - lib/teien/base_object/std_objects/mesh_bb_object_info.rb
 - lib/teien/base_object/std_objects/mesh_object_info.rb
 - lib/teien/base_object/std_objects/sphere_object_info.rb
-- lib/teien/commands/browser_command.rb
-- lib/teien/commands/local_command.rb
-- lib/teien/commands/server_command.rb
-- lib/teien/commands/std_command.rb
 - lib/teien/core/client_network.rb
 - lib/teien/core/component_manager.rb
 - lib/teien/core/core_event.rb
 - lib/teien/core/dispatcher.rb
 - lib/teien/core/event_router.rb
-- lib/teien/core/launcher.rb
 - lib/teien/core/network.rb
 - lib/teien/core/remote_info.rb
 - lib/teien/core/server_network.rb
@@ -158,22 +154,31 @@ files:
 - lib/teien/ui/view_object.rb
 - lib/teien/ui/view_object_factory.rb
 - lib/teien/version.rb
-- mods/actor/addons/sinbad/lib/sinbad.rb
-- mods/actor/addons/sinbad/lib/sinbad/sinbad_info.rb
-- mods/actor/addons/sinbad/lib/sinbad/sinbad_state.rb
-- mods/actor/apps/browser/browser_application.rb
-- mods/actor/apps/common/browser_event.rb
-- mods/actor/apps/server/server_application.rb
-- mods/actor/commands/ai/actor_ai.rb
-- mods/actor/commands/ai_command.rb
-- mods/actor/configs/plugins.cfg
-- mods/actor/configs/resources.cfg
-- mods/hello_garden/apps/browser/browser_application.rb
-- mods/hello_garden/apps/common/browser_event.rb
-- mods/hello_garden/apps/server/server_application.rb
-- mods/hello_garden/configs/plugins.cfg
-- mods/hello_garden/configs/resources.cfg
-- mods/hello_garden/run
+- samples/actor/client
+- samples/actor/config/plugins.cfg
+- samples/actor/config/resources.cfg
+- samples/actor/lib/client.rb
+- samples/actor/lib/event.rb
+- samples/actor/lib/local.rb
+- samples/actor/lib/model.rb
+- samples/actor/lib/server.rb
+- samples/actor/lib/sinbad.rb
+- samples/actor/lib/sinbad/sinbad_info.rb
+- samples/actor/lib/sinbad/sinbad_state.rb
+- samples/actor/lib/ui.rb
+- samples/actor/local
+- samples/actor/server
+- samples/hello_garden/client
+- samples/hello_garden/config/plugins.cfg
+- samples/hello_garden/config/resources.cfg
+- samples/hello_garden/lib/client.rb
+- samples/hello_garden/lib/event.rb
+- samples/hello_garden/lib/local.rb
+- samples/hello_garden/lib/model.rb
+- samples/hello_garden/lib/server.rb
+- samples/hello_garden/lib/ui.rb
+- samples/hello_garden/local
+- samples/hello_garden/server
 - teien.gemspec
 homepage: https://github.com/abexsoft/teien
 licenses: []

data/lib/teien/addon/addon.rb

@@ -1,25 +0,0 @@
-require 'teien'
-
-module Teien
-
-class Addon
-  @@addons = Array.new
-  @@loaded_addons = Array.new
-
-  def self.inherited(klass)
-    @@addons.push(klass)
-  end
-
-  def self.load()
-    require 'teien/addon/addon'
-    Dir.glob("#{Dir.getwd}/addons/**/lib/*.rb") {|file| require "#{file}" }
-  end
-
-  def self.instantiate()
-   @@addons.each {|addon|
-      @@loaded_addons.push(addon.new())
-    }
-  end
-end
-
-end

data/lib/teien/application/application.rb

@@ -1,43 +0,0 @@
-require 'teien'
-
-module Teien
-
-class Application
-  @@apps = Array.new
-  @@loaded_apps = Array.new
-
-  def initialize()
-    @event_router = Teien::get_component("event_router")
-    @event_router.register_receiver(self)
-    @base_object_manager = Teien::get_component("base_object_manager")
-    @base_object_manager.register_receiver(self)
-
-=begin
-    # set config files.
-    fileDir = File.dirname(File.expand_path(__FILE__))
-    @base_object_manager.plugins_cfg = "#{fileDir}/plugins.cfg"
-    @base_object_manager.resources_cfg = "#{fileDir}/resources.cfg"
-=end
-  end
-
-  def self.inherited(klass)
-    @@apps.push(klass)
-  end
-
-  def self.load(command)
-    require "teien/application/application"
-    Dir.glob("#{Dir.getwd}/apps/#{command}/*.rb") {|file| require "#{file}" }
-  end
-
-  def self.instantiate()
-    @@apps.each {|app|
-      @@loaded_apps.push(app.new())
-    }
-  end
-
-  def self.loaded_apps
-    return @@loaded_apps
-  end
-end
-
-end