teien 0.0.3 → 0.1.0

data/{sample/hello_garden/app/models/hello_garden_model.rb → mods/hello_garden/apps/server/server_application.rb}

@@ -1,61 +1,70 @@
-require 'teien'
-
-require_relative '../helpers/user_event'
+require_relative '../common/browser_event'
 
 include Teien
 
-class HelloGardenModel < Teien::Model
-  def setup(garden)
+class ServerApplication < Teien::Application
+  def setup()
     puts "model setup"
     @quit = false
+    @first_connection = true
     @shot_num = 0
 
-    @garden.set_ambient_light(Color.new(0.1, 0.1, 0.1))
-    @garden.set_sky_dome(true, "Examples/CloudySky", 5, 8)
-    @garden.set_gravity(Vector3D.new(0.0, -9.8, 0.0))
+    @base_object_manager.set_ambient_light(Color.new(0.1, 0.1, 0.1))
+    @base_object_manager.set_sky_dome(true, "Examples/CloudySky", 5, 8)
+    @base_object_manager.set_gravity(Vector3D.new(0.0, -9.8, 0.0))
 
     # create a light
     object_info = LightObjectInfo.new(LightObjectInfo::DIRECTIONAL)
     object_info.diffuse_color = Color.new(1.0, 1.0, 1.0)
     object_info.specular_color = Color.new(0.25, 0.25, 0)
     object_info.direction = Vector3D.new( -1, -1, -1 )
-    light = @garden.create_object("light", object_info, PhysicsInfo.new(0))
+    light = @base_object_manager.create_object("light", object_info)
     light.set_position(Vector3D.new(0, 0, 0))
 
     # create a floor.
     object_info = FloorObjectInfo.new(50, 50, 0.5, 1, 1, 5, 5)
     object_info.material_name = "Examples/Rockwall"
-    floor = @garden.create_object("Floor", object_info, PhysicsInfo.new(0))
+    floor = @base_object_manager.create_object("Floor", object_info, PhysicsInfo.new(0))
     floor.set_position(Vector3D.new(0, 0, 0))
+  end
+
+  def update(delta)
+    return !@quit
+  end
 
+  def connection_binded(from)
+    puts "connection_binded"
+  end
+
+  def create_objects()
     # create a box.
     object_info = BoxObjectInfo.new(Vector3D.new(1, 1, 1))
     object_info.material_name = "Examples/BumpyMetal"
-    box = @garden.create_object("boxTest", object_info, PhysicsInfo.new(10))
+    box = @base_object_manager.create_object("boxTest", object_info, PhysicsInfo.new(10))
     box.set_position(Vector3D.new(0, 1.0, 0))
 
     # create a sphere
     object_info = SphereObjectInfo.new(1.0)
     object_info.material_name = "Examples/SphereMappedRustySteel"
-    sphere = @garden.create_object("sphere", object_info, PhysicsInfo.new(10))
+    sphere = @base_object_manager.create_object("sphere", object_info, PhysicsInfo.new(10))
     sphere.set_position(Vector3D.new(0, 1.0, -2))
 
     # create a capsule
     object_info = CapsuleObjectInfo.new(1.0, 2.0)
     object_info.material_name = "Examples/RustySteel"
-    capsule = @garden.create_object("capsule", object_info, PhysicsInfo.new(10))
+    capsule = @base_object_manager.create_object("capsule", object_info, PhysicsInfo.new(10))
     capsule.set_position(Vector3D.new(1, 5, 1))
 
     # create a cone
     object_info = ConeObjectInfo.new(1.0, 2.0)
     object_info.material_name = "Examples/BeachStones"
-    cone = @garden.create_object("cone", object_info, PhysicsInfo.new(10))
+    cone = @base_object_manager.create_object("cone", object_info, PhysicsInfo.new(10))
     cone.set_position(Vector3D.new(1, 10, 1))
 
     # create a cylinder
     object_info = CylinderObjectInfo.new(1.0, 2.0)
     object_info.material_name = "Examples/BumpyMetal"
-    cylinder = @garden.create_object("cylinder", object_info, PhysicsInfo.new(10))
+    cylinder = @base_object_manager.create_object("cylinder", object_info, PhysicsInfo.new(10))
     cylinder.set_position(Vector3D.new(-1, 10, -1))
 
     # create a meshBB object
@@ -63,39 +72,39 @@ class HelloGardenModel < Teien::Model
     object_info.scale = Vector3D.new(1.0 / 20.0, 1.0 / 20.0, 1.0 / 20.0)
     object_info.physics_offset = Vector3D.new(0, 1.0, 0)
     object_info.view_offset = Vector3D.new(0, 1.2, 0)
-    pen = @garden.create_object("pen", object_info, PhysicsInfo.new(10))
+    pen = @base_object_manager.create_object("pen", object_info, PhysicsInfo.new(10))
     pen.set_position(Vector3D.new(1, 15, 0))
 
 =begin
     # create a mesh object
     object_info = MeshObjectInfo.new("penguin.mesh")
     object_info.scale = Vector3D.new(1.0 / 20.0, 1.0 / 20.0, 1.0 / 20.0)
-    pen = @garden.create_object("penpen", object_info, PhysicsInfo.new(10))
+    pen = @base_object_manager.create_object("penpen", object_info, PhysicsInfo.new(10))
     pen.set_position(Vector3D.new(1, 20, 0))
 =end
   end
 
-  def update(delta)
-#    print "Garden tick is called: ", evt.timeSinceLastFrame * 1000, "\n"
-    return !@quit
-  end
-
   def receive_event(event, from)
     case event
-    when Event::ShotBox
-      shot_box(event.pos, event.dir)
+    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"
-    box = @garden.create_object("shotBox#{@shot_num}", object_info, PhysicsInfo.new(1.0))
+    box = @base_object_manager.create_object("shotBox#{@shot_num}", object_info, PhysicsInfo.new(1.0))
     box.set_position(pos + (dir * 5.0))
     @shot_num += 1
     force = dir * Vector3D.new(100.0, 100.0, 100.0)
     box.apply_impulse(force, Vector3D.new(0.0, 0.0, 0.0))
-    @garden.send_event(Event::SyncObject.new(box))
+    @event_router.send_event(Teien::Event::BaseObject::SyncObject.new(box))
   end
 end
 

data/teien.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'eventmachine'
-  gem.add_dependency 'ruby-ogre'
+  gem.add_dependency 'ruby-ois'
+  gem.add_dependency 'ruby-ogre-installer'
+  gem.add_dependency 'ruby-procedural'
   gem.add_dependency 'ruby-bullet'
   gem.add_dependency 'teienlib'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teien
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &79258170 !ruby/object:Gem::Requirement
+  requirement: &74612360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79258170
+  version_requirements: *74612360
 - !ruby/object:Gem::Dependency
-  name: ruby-ogre
-  requirement: &79257660 !ruby/object:Gem::Requirement
+  name: ruby-ois
+  requirement: &74611650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79257660
+  version_requirements: *74611650
+- !ruby/object:Gem::Dependency
+  name: ruby-ogre-installer
+  requirement: &74611040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *74611040
+- !ruby/object:Gem::Dependency
+  name: ruby-procedural
+  requirement: &74610390 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *74610390
 - !ruby/object:Gem::Dependency
   name: ruby-bullet
-  requirement: &79257300 !ruby/object:Gem::Requirement
+  requirement: &74609840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79257300
+  version_requirements: *74609840
 - !ruby/object:Gem::Dependency
   name: teienlib
-  requirement: &79309410 !ruby/object:Gem::Requirement
+  requirement: &74609510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79309410
+  version_requirements: *74609510
 description: An easy 3D world maker.
 email:
 - abexsoft@gmail.com
@@ -70,51 +92,88 @@ files:
 - Rakefile
 - bin/teien
 - lib/teien.rb
-- lib/teien/ai.rb
-- lib/teien/animation.rb
-- lib/teien/animation_operator.rb
-- lib/teien/camera.rb
-- lib/teien/camera_mover.rb
-- lib/teien/controller.rb
-- lib/teien/dispatcher.rb
-- lib/teien/event.rb
-- lib/teien/event_router.rb
-- lib/teien/garden.rb
-- lib/teien/garden_base.rb
-- lib/teien/garden_object.rb
-- lib/teien/model.rb
-- lib/teien/network.rb
-- lib/teien/object_info.rb
-- lib/teien/physics.rb
-- lib/teien/physics_info.rb
-- lib/teien/physics_object.rb
-- lib/teien/physics_object_factory.rb
-- lib/teien/proxy_garden.rb
-- lib/teien/remote_info.rb
-- lib/teien/sky_dome.rb
-- lib/teien/smooth_mover.rb
-- lib/teien/synchronizer.rb
-- lib/teien/tools.rb
-- lib/teien/ui_listener.rb
-- lib/teien/user_interface.rb
+- lib/teien/action_model/smooth_moving.rb
+- lib/teien/actor/actor.rb
+- lib/teien/actor/actor_event.rb
+- lib/teien/actor/actor_factory.rb
+- 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/base_object/attachment_info.rb
+- lib/teien/base_object/base_object.rb
+- lib/teien/base_object/base_object_event.rb
+- lib/teien/base_object/base_object_manager.rb
+- lib/teien/base_object/base_object_manager_base.rb
+- lib/teien/base_object/base_object_manager_proxy.rb
+- lib/teien/base_object/object_info.rb
+- lib/teien/base_object/physics.rb
+- lib/teien/base_object/physics_info.rb
+- lib/teien/base_object/physics_object.rb
+- lib/teien/base_object/physics_object_factory.rb
+- lib/teien/base_object/sky_dome.rb
+- lib/teien/base_object/std_objects/box_object_info.rb
+- lib/teien/base_object/std_objects/capsule_object_info.rb
+- lib/teien/base_object/std_objects/cone_object_info.rb
+- lib/teien/base_object/std_objects/cylinder_object_info.rb
+- lib/teien/base_object/std_objects/floor_object_info.rb
+- lib/teien/base_object/std_objects/light_object_info.rb
+- 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
+- lib/teien/core/tools.rb
+- lib/teien/ui/camera.rb
+- lib/teien/ui/camera_mover.rb
+- lib/teien/ui/std_objects/box_object_info.rb
+- lib/teien/ui/std_objects/capsule_object_info.rb
+- lib/teien/ui/std_objects/cone_object_info.rb
+- lib/teien/ui/std_objects/cylinder_object_info.rb
+- lib/teien/ui/std_objects/floor_object_info.rb
+- lib/teien/ui/std_objects/light_object_info.rb
+- lib/teien/ui/std_objects/mesh_bb_object_info.rb
+- lib/teien/ui/std_objects/mesh_object_info.rb
+- lib/teien/ui/std_objects/sphere_object_info.rb
+- lib/teien/ui/ui_listener.rb
+- lib/teien/ui/user_interface.rb
+- lib/teien/ui/view.rb
+- lib/teien/ui/view_object.rb
+- lib/teien/ui/view_object_factory.rb
 - lib/teien/version.rb
-- lib/teien/view.rb
-- lib/teien/view_object.rb
-- lib/teien/view_object_factory.rb
-- sample/actor/app/ais/actor_ai.rb
-- sample/actor/app/controllers/actor_controller.rb
-- sample/actor/app/helpers/sinbad/sinbad.rb
-- sample/actor/app/helpers/sinbad/sinbad_state.rb
-- sample/actor/app/helpers/user_event.rb
-- sample/actor/app/models/actor_model.rb
-- sample/actor/config/plugins.cfg
-- sample/actor/config/resources.cfg
-- sample/hello_garden/app/controllers/hello_garden_controller.rb
-- sample/hello_garden/app/helpers/user_event.rb
-- sample/hello_garden/app/models/hello_garden_model.rb
-- sample/hello_garden/config/plugins.cfg
-- sample/hello_garden/config/resources.cfg
-- sample/hello_garden/run
+- 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
 - teien.gemspec
 homepage: https://github.com/abexsoft/teien
 licenses: []

data/lib/teien/ai.rb

@@ -1,27 +0,0 @@
-require 'teien'
-
-module Teien
-
-class Ai
-  @@ais = Array.new
-  @@loaded_ais = Array.new
-
-  @garden = nil
-
-  def initialize(garden)
-    @garden = garden
-    @garden.register_receiver(self)
-  end
-
-  def self.inherited(klass)
-    @@ais.push(klass)
-  end
-
-  def self.load(garden)
-    @@ais.each {|ctl|
-      @@loaded_ais.push(ctl.new(garden))
-    }
-  end
-end
-
-end

data/lib/teien/controller.rb

@@ -1,30 +0,0 @@
-require 'teien'
-
-module Teien
-
-class Controller
-  @@controllers = Array.new
-  @@loaded_controllers = Array.new
-
-  @garden = nil
-  @ui = nil
-
-  def initialize(garden, ui)
-    @garden = garden
-    @garden.register_receiver(self)
-    @ui = ui
-    @ui.register_receiver(self)
-  end
-
-  def self.inherited(klass)
-    @@controllers.push(klass)
-  end
-
-  def self.load(garden, ui)
-    @@controllers.each {|ctl|
-      @@loaded_controllers.push(ctl.new(garden, ui))
-    }
-  end
-end
-
-end

data/lib/teien/dispatcher.rb

@@ -1,22 +0,0 @@
-module Teien
-
-module Dispatcher
-  def initialize(*args, &block)
-    super
-    @receivers = Array.new
-  end
-
-  def register_receiver(recv)
-    @receivers.push(recv)
-  end
-
-  def notify(method, *argv)
-    @receivers.each {|recv|
-      if (recv.respond_to?(method))
-        recv.method(method).call(*argv)
-      end
-    }
-  end
-end
-
-end

data/lib/teien/event_router.rb

@@ -1,118 +0,0 @@
-require "eventmachine"
-require "teien/event"
-require "teien/network"
-
-module Teien
-
-##
-# EventRouter routes events in this region and communicate with the other region routers.
-#
-# ====Usage
-#  1. register a new event type name with registerEventType().
-#  2. register a receiver object which receives the eventType with registerReceiver().
-#     The receiver object must have action(event) method.
-#  3. call notify(event) which issues the event.
-#     The event must have eventType() method which returns event type name.
-#
-class EventRouter
-  attr_accessor :connected_regions
-
-  def initialize()
-    @connected_regions = Array.new
-
-    @event_type_receiver_hash = {}  # event_type => receivers
-
-    @last_time = 0    
-    @tick_event = Event::Tick.new(0)
-    register_event_type(Event::Tick)
-  end
-
-  def finalize()
-  end
-
-  # eventmachine
-  def send_all_regions(obj)
-    @connected_regions.each { |c|
-      c.send_object(obj)
-    }
-  end
-  
-  # event_type: the class name of a event.
-  def register_event_type(event_type)
-    @event_type_receiver_hash[event_type] = Array.new
-  end
-
-  ##
-  # 
-  # The event receiver must have action(anEvent) method.
-  #
-  def register_receiver(event_name, receiver)
-    if (@event_type_receiver_hash.has_key?(event_name))
-      @event_type_receiver_hash[event_name].push(receiver)
-    else
-      print "No such event type(#{event_name}) in EventRouter.\n"
-      print "Use EventRouter::register_event_type(event_type) at first.\n"
-    end
-  end
-
-  ##
-  # The event notified by this method must have a event_type attribute and
-  # the event_yype must be registered with register_event_type()
-  #
-  def notify(event)
-    if (@event_type_receiver_hash.has_key?(event.class))
-      @event_type_receiver_hash[event.class].each {|receiver|
-        receiver.receive_event(event)
-      }
-    else
-      print "No such event type(#{event.class}) in EventRouter.\n"
-      print "Use EventRouter::register_event_type(event_type) at first.\n"
-    end
-  end
-
-  def run()
-    EM.run do
-      Signal.trap("INT")  { EM.stop; self.finalize() }
-      Signal.trap("TERM") { EM.stop; self.finalize() }
-
-      EM.add_periodic_timer(0) do
-        notify(@tick_event)
-#        update(delta)
-      end
-
-#      EM.start_server("0.0.0.0", 11922, ServerNetwork, @event_router)
-    end
-  end
-
-  # ip: string(ex. "0.0.0.0" means to accept all), 
-  # port: num
-  def start_region(ip, port)
-    EM.run do
-      Signal.trap("INT")  { EM.stop; self.finalize() }
-      Signal.trap("TERM") { EM.stop; self.finalize() }
-      
-      EM.add_periodic_timer(0) do
-        notify(@tick_event)
-      end
-      
-      EM.start_server(ip, port, Network, self)
-    end
-  end
-
-  def connect_to_region(ip, port)
-    EM.run do
-      # setting signals
-      Signal.trap("INT")  { EM.stop; self.finalize() }
-      Signal.trap("TERM") { EM.stop; self.finalize() }
-      
-      # main loop
-      EM.add_periodic_timer(0) do
-        notify(Event::Tick.new(@tick_event))
-      end
-      
-      EM.connect('49.212.146.194', 11922, Network, self)
-    end
-  end
-end
-
-end 

data/lib/teien/garden.rb

@@ -1,91 +0,0 @@
-require "teien/garden_base.rb"
-require "teien/network.rb"
-require "teien/event.rb"
-
-module Teien
-
-class Garden < GardenBase
-  def initialize()
-    super
-  end
-
-  def run(ip = nil, port = 11922)
-    return false unless setup()
-
-    @last_time = 0
-    EM.run do
-      EM.add_periodic_timer(0.01) do
-        if @last_time == 0
-          @last_time = Time.now.to_f 
-        else
-          now = Time.now.to_f
-          delta = now - @last_time
-          @last_time = now
-
-          unless update(delta)
-            EM.stop
-            self.finalize()
-          end
-        end
-      end
-
-      Signal.trap("INT")  { EM.stop; self.finalize() }
-      Signal.trap("TERM") { EM.stop; self.finalize() }
-
-      if (ip)
-        EM.start_server(ip, port, Network, self)
-      end
-    end
-  end    
-
-  def setup()
-    @physics.setup(self)
-    notify(:setup, self)
-    return true
-  end
-
-  def update(delta)
-    @physics.update(delta)
-    @actors.each_value {|actor|
-      actor.update(delta)
-    }
-    notify(:update, delta)
-    return !@quit
-  end
-
-  # receive handler of Network.
-  def receive_event(event, from)
-    case event
-    when Event::ClientConnected
-      from.send_object(Event::SyncEnv.new(@gravity, @ambient_light_color, @sky_dome))      
-      notify_objects(from)
-    end
-    notify(:receive_event, event, from)
-  end
-
-  def send_event(event, to = nil)
-    if (to)
-      to.send_object(event)
-    else
-      Network::send_all(event)
-    end
-  end
-
-  def notify_objects(to = nil)
-    @objects.each_value { |obj|
-      if to == nil
-        Network::send_all(Event::SyncObject.new(obj))
-      else
-        to.send_object(Event::SyncObject.new(obj))
-      end
-    }
-  end
-
-  def finalize()
-    @physics.finalize()
-    @objects = {}
-  end
-
-end
-
-end