teien 0.1.0 → 0.2.0

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
     $ gem install ruby-procedural 
     $ gem install ruby-bullet 
     $ gem install teienlib 
-    $ gem build teine.gemspec
+    $ gem build teien.gemspec
     $ gem install teien-<version>.gem 
 
 ## Usage
@@ -28,9 +28,9 @@ Or install it yourself as:
 Run a sample application.
 
      $ mkdir mywork/ 
-     $ cp -r <gems>/teien-<version>/mods/   mywork/
-     $ cd mywork/mods/hello_garden/
-     $ teien local 
+     $ cp -r <gems>/teien-<version>/samples/   mywork/
+     $ cd mywork/samples/hello_garden/
+     $ ./local 
 
 ## Contributing
 

data/bin/teien

@@ -46,12 +46,16 @@ end
 
 $LOAD_PATH.push(lib_path)
 
+load ARGV[0]
+
+=begin
 require "teien/core/launcher.rb"
 
 # include standard commands.
 require "teien/commands/browser_command"
 require "teien/commands/server_command"
 require "teien/commands/local_command"
+require "teien/commands/new_command"
 
 # include user commands.
 Dir.glob("#{Dir.getwd}/commands/*.rb") {|file|
@@ -59,4 +63,4 @@ Dir.glob("#{Dir.getwd}/commands/*.rb") {|file|
 }
 
 Teien::Launcher::launch(ARGV)
-
+=end

data/lib/teien/animation/animation_manager.rb

@@ -6,9 +6,9 @@ module Teien
 class AnimationManager
   attr_accessor :animations
 
-  def initialize(event_router)
+  def initialize()
     @animations = Hash.new
-    @event_router = event_router
+    @event_router = Teien::get_component("event_router")
     @event_router.register_receiver(self)
   end
 

data/lib/teien/animation/animation_manager_proxy.rb

@@ -6,9 +6,9 @@ module Teien
 class AnimationManagerProxy
   attr_accessor :animations
 
-  def initialize(event_router)
+  def initialize()
     @animations = Hash.new
-    @event_router = event_router
+    @event_router = Teien::get_component("event_router")
     @event_router.register_receiver(self)
   end
 

data/lib/teien/application/local_application.rb

@@ -0,0 +1,12 @@
+require "teien/application/server_application"
+
+module Teien
+
+class LocalApplication < ServerApplication
+  def start_application
+    @event_router.start_application()
+  end
+
+end
+
+end

data/lib/teien/application/proxy_application.rb

@@ -0,0 +1,28 @@
+module Teien
+
+class ProxyApplication
+  def initialize()
+    require 'teien'
+
+    @event_router = Teien::EventRouter.new()
+    Teien::register_component("event_router", @event_router)
+    
+    require "teien/base_object/base_object_manager_proxy"
+    @base_object_manager = Teien::BaseObjectManagerProxy.new()
+    Teien::register_component("base_object_manager", @base_object_manager)
+    
+    require 'teien/animation/animation_manager_proxy'
+    @animation_manager = Teien::AnimationManagerProxy.new()
+    Teien::register_component("animation_manager", @animation_manager)
+    
+    require 'teien/actor/actor_manager_proxy'
+    @actor_manager = Teien::ActorManagerProxy.new()
+    Teien::register_component("actor_manager", @actor_manager)
+  end
+
+  def connect_to_server(ip, port)
+    @event_router.connect_to_server(ip, port)
+  end
+end
+
+end

data/lib/teien/application/server_application.rb

@@ -0,0 +1,28 @@
+module Teien
+
+class ServerApplication
+  def initialize(sync_period = 0.3)
+    require 'teien'
+
+    @event_router = Teien::EventRouter.new()
+    Teien::register_component("event_router", @event_router)
+
+    require "teien/base_object/base_object_manager"
+    @base_object_manager = Teien::BaseObjectManager.new(sync_period)
+    Teien::register_component("base_object_manager", @base_object_manager)
+
+    require 'teien/animation/animation_manager'
+    @animation_manager = Teien::AnimationManager.new()
+    Teien::register_component("animation_manager", @animation_manager)
+
+    require 'teien/actor/actor_manager'
+    @actor_manager = Teien::ActorManager.new()
+    Teien::register_component("actor_manager", @actor_manager)
+  end
+
+  def start_server(ip, port)
+    @event_router.start_server(ip, port)
+  end
+end
+
+end

data/lib/teien/base_object/base_object_manager.rb

@@ -5,16 +5,14 @@ require "teien/base_object/base_object_event.rb"
 module Teien
 
 class BaseObjectManager < BaseObjectManagerBase
-  def initialize(event_router, sync_period)
-    super(event_router)
+  def initialize(sync_period)
+    super()
     @sync_period = sync_period
     @sync_timer = sync_period
   end
 
   # EventRouter handler
   def setup()
-    
-    @physics.setup(self)
   end
 
   # EventRouter handler

data/lib/teien/base_object/base_object_manager_base.rb

@@ -23,15 +23,15 @@ class BaseObjectManagerBase
   #
   # _script_klass_:: : set a user define class.
   # 
-  def initialize(event_router)
+  def initialize()
     super()
 
     puts "initialize base_object_manager_base"
 
-    @event_router = event_router
+    @event_router = Teien::get_component("event_router")
     @event_router.register_receiver(self)
 
-    @physics = Physics.new()
+    @physics = Physics.new(self)
 
     @objects = {}
     @object_num = 0

data/lib/teien/base_object/base_object_manager_proxy.rb

@@ -5,15 +5,13 @@ require "teien/base_object/base_object_event.rb"
 module Teien
 
 class BaseObjectManagerProxy < BaseObjectManagerBase
-  def initialize(event_router)
-    super(event_router)
+  def initialize()
+    super()
     @quit = false
   end
 
   # EventRouter handler
   def setup()
-    @physics.setup(self)
-    return true
   end
 
   # EventRouter handler

data/lib/teien/base_object/physics.rb

@@ -30,21 +30,15 @@ class Physics < Bullet::TickListener
   attr_accessor :fixed_time_step
 #  attr_accessor :softBodyWorldInfo
 
-  def initialize()
+  def initialize(object_manager)
     super()
 
     @rigid_bodies = []
 
     @max_sub_steps = 1
     @fixed_time_step = 1.0 / 60.0
-  end
-
-  def set_gravity(vec)
-    @dynamics_world.set_gravity(vec)
-  end
 
-  def setup(garden)
-    @garden = garden
+    @object_manager = object_manager
     @collision_config = Bullet::BtDefaultCollisionConfiguration.new()
     @collision_dispatcher = Bullet::BtCollisionDispatcher.new(@collision_config)
 
@@ -72,6 +66,11 @@ class Physics < Bullet::TickListener
     softBodyWorldInfo.m_gravity.setValue(0, -9.8, 0)
 #    softBodyWorldInfo.m_sparsesdf.Initialize();
 =end
+
+  end
+
+  def set_gravity(vec)
+    @dynamics_world.set_gravity(vec)
   end
 
   def finalize
@@ -140,7 +139,7 @@ class Physics < Bullet::TickListener
 #    print "pre_tick_callback: ", timeStep * 1000, "ms\n"
     delta = Bullet::BtVector3.new(timeStep, timeStep, timeStep)
 
-    @garden.objects.each {|name, obj|
+    @object_manager.objects.each {|name, obj|
       if (obj.get_mass() > 0)
         newVel = obj.get_linear_velocity() + Vector3D.to_bullet(obj.get_acceleration()) * delta
         obj.set_linear_velocity(obj.limit_velocity(newVel))

data/lib/teien/core/component_manager.rb

@@ -6,6 +6,8 @@ module Teien
   end
 
   def self.get_component(name)
-    return @@components[name]
+    component = @@components[name]
+    return component if component
+    raise RuntimeError, "There is no such component registered: '#{name}'."
   end
 end

data/lib/teien/core/event_router.rb

@@ -50,12 +50,6 @@ class EventRouter
       EM.add_periodic_timer(tick_period) do
         if @last_time == 0
           @last_time = Time.now.to_f 
-          if ip == nil  
-            # dummy connection for alone 
-            Network::connections[nil] = RemoteInfo.new(nil)
-            notify(:connection_binded, nil)
-            notify(:connection_completed, nil)
-          end
         else
           now = Time.now.to_f
           delta = now - @last_time
@@ -111,6 +105,38 @@ class EventRouter
       end
     end
   end
-end
 
+  def start_application(tick_period = 0.001)
+    notify(:setup)
+
+    @last_time = 0
+    EM.run do
+      EM.add_periodic_timer(tick_period) do
+        if @last_time == 0
+          @last_time = Time.now.to_f 
+
+          # dummy connection for local
+          Network::add_dummy_connection(nil)
+          notify(:connection_binded, nil)
+          notify(:connection_completed, nil)
+        else
+          now = Time.now.to_f
+          delta = now - @last_time
+          @last_time = now
+
+          notify(:update, delta)
+
+          if @quit
+            EM.stop 
+            Teien::get_component("base_object_manager").finalize()
+          end
+        end
+      end
+
+      Signal.trap("INT")  { EM.stop; Teien::get_component("base_object_manager").finalize() }
+      Signal.trap("TERM") { EM.stop; Teien::get_component("base_object_manager").finalize() }
+    end
+  end
+
+end
 end

data/lib/teien/core/network.rb

@@ -15,6 +15,10 @@ class Network < EM::Connection
     @@connections
   end
 
+  def self.add_dummy_connection(from)
+    @@connections[from] = RemoteInfo.new(from)
+  end
+
   include EM::P::ObjectProtocol
 
 

data/lib/teien/ui/user_interface.rb

@@ -4,17 +4,15 @@ require 'teien/ui/view'
 module Teien
 
 class UserInterface
-#  include Dispatcher  
-
   attr_accessor :base_object_manager
   attr_accessor :debug_draw
 
-  def initialize(event_router, base_object_manager)
+  def initialize()
     super()
 
-    @event_router = event_router
+    @event_router = Teien::get_component("event_router")
     @event_router.register_receiver(self)
-    @base_object_manager = base_object_manager
+    @base_object_manager = Teien::get_component("base_object_manager")
     @base_object_manager.register_receiver(self)
 
     @view = View.new()

data/lib/teien/ui/view.rb

@@ -46,14 +46,17 @@ class View < Ogre::FrameListener
   def setup(base_object_manager)
     puts "view setup"
     @base_object_manager = base_object_manager
-    @plugins_cfg   = @base_object_manager.plugins_cfg ? @base_object_manager.plugins_cfg : "configs/plugins.cfg"
-    @resources_cfg = @base_object_manager.resources_cfg ? @base_object_manager.resources_cfg : "configs/resources.cfg"
+    @plugins_cfg   = @base_object_manager.plugins_cfg ? @base_object_manager.plugins_cfg : "config/plugins.cfg"
+    @resources_cfg = @base_object_manager.resources_cfg ? @base_object_manager.resources_cfg : "config/resources.cfg"
 
     @root = Ogre::Root.new("")
     load_plugins()
 
-#    return false unless (@root.restoreConfig())
-    return false unless (@root.show_config_dialog())
+    if File.exist?("ogre.cfg")
+      return false unless (@root.restore_config())
+    else
+      return false unless (@root.show_config_dialog())
+    end
 
     @window = @root.initialise(true, @window_title)
     

data/lib/teien/version.rb

@@ -1,3 +1,3 @@
 module Teien
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/samples/actor/client

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

data/samples/actor/lib/client.rb

@@ -0,0 +1,38 @@
+require "teien"
+require "teien/application/proxy_application"
+require_relative 'ui'
+
+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
+
+  def setup()
+    ui_setup()
+  end
+
+  def connection_completed(from)
+    ui_connection_completed(from)
+  end
+
+  def update(delta)
+    ui_update(delta)
+  end
+
+  def receive_event(event, from)
+    ui_receive_event(event, from)
+  end
+end
+
+Client.new.connect_to_server("0.0.0.0", 11922)

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

@@ -1,4 +1,5 @@
-module Teien::Event::Browser
+module Teien
+module Event
   class KeyPressed
     attr_accessor :key
 
@@ -64,5 +65,5 @@ module Teien::Event::Browser
 
 
 end
-
+end
 

data/samples/actor/lib/local.rb

@@ -0,0 +1,63 @@
+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)
+    puts "connection_binded"
+    model_connection_binded(from)
+  end
+
+  def connection_unbinded(from)
+    puts "connection_unbinded"
+    model_connection_unbinded(from)
+  end
+
+  def connection_completed(from)
+    puts "connection_completed"
+    ui_connection_completed(from)
+  end
+
+  ##
+  # EventRouter handlers
+  #
+
+  def update(delta)
+    if @first_update
+      @first_update = false
+    end
+
+    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/actor/apps/server/server_application.rb → samples/actor/lib/model.rb}

@@ -1,15 +1,8 @@
-require_relative "../common/browser_event"
+require_relative "event"
+require_relative "sinbad"
 
-include Teien
-
-class ServerApplication < Teien::Application
-  attr_accessor :remote_to_controllables
-
-  ##
-  # handlers of EventRouter
-  #
-
-  def setup()
+module Model
+  def model_setup()
     @remote_to_controllables = Hash.new
 
     @sync_period = 0.5
@@ -37,7 +30,10 @@ class ServerApplication < Teien::Application
     floor.set_position(Vector3D.new(0, 0, 0))
   end
 
-  def connection_unbinded(from)
+  def model_connection_binded(from)
+  end
+
+  def model_connection_unbinded(from)
     actor = @remote_to_controllables[from]
     if actor
       @remote_to_controllables.delete(from)
@@ -46,9 +42,13 @@ class ServerApplication < Teien::Application
     end
   end
 
-  def receive_event(event, from)
+  ##
+  # EventRouter handlers
+  #
+
+  def model_receive_event(event, from)
     case event
-    when Teien::Event::Browser::ReadyToGo
+    when Teien::Event::ReadyToGo
       puts "ReadyToGo"
 
       remote_info = Network.connections[from]
@@ -61,7 +61,7 @@ class ServerApplication < Teien::Application
       event = Teien::Event::Actor::SyncActor.new(actor_info)
       @event_router.send_event(event)
 
-      event = Teien::Event::Browser::ControllableActor.new(@sinbad.name)
+      event = Teien::Event::ControllableActor.new(@sinbad.name)
       @event_router.send_event(event, from)
 
     when Teien::Event::Actor::RequestSetForwardDirection
@@ -98,4 +98,3 @@ class ServerApplication < Teien::Application
     end
   end
 end
-

data/samples/actor/lib/server.rb

@@ -0,0 +1,37 @@
+require 'teien'
+require "teien/application/server_application"
+require_relative 'model'
+
+include Teien
+
+class Server < ServerApplication
+  include Model
+
+  def initialize()
+    super(0.3)
+
+    @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
+
+  ##
+  # EventRouter handlers
+  #
+
+  def receive_event(event, from)
+    model_receive_event(event, from)
+  end
+end
+
+Server.new.start_server("0.0.0.0", 11922)

data/{mods/actor/addons/sinbad → samples/actor}/lib/sinbad/sinbad_info.rb

@@ -1,3 +1,4 @@
+require "teien/actor/actor_factory"
 require "teien/actor/actor_info"
 
 class SinbadInfo < Teien::ActorInfo

data/{mods/actor/addons/sinbad → samples/actor}/lib/sinbad.rb

@@ -1,3 +1,4 @@
+require "teien/actor/actor"
 require_relative "sinbad/sinbad_state"
 require_relative "sinbad/sinbad_info"