teien 0.0.1 → 0.0.2

data/bin/teien

@@ -15,15 +15,15 @@ end
 # RUBYLIB and LD_LIBRARY_PATH. (check sample code)
 #
 require 'rbconfig'
-require 'OgreConfig'
+require 'ogre_config'
 
 $topDir = File.dirname(File.dirname(File.expand_path(__FILE__)))
 libPath  = $topDir  + "/lib"
-extPath  = OgreConfig::getDepsLibPath
+extPath  = OgreConfig::get_deps_lib_path
 
 # needed by dynamic library.
 if (/mingw/ =~ RUBY_PLATFORM)
-  ldLibPath = extPath + ";" + OgreConfig::getLib + ";" + libPath
+  ldLibPath = extPath + ";" + OgreConfig::get_lib + ";" + libPath
   if (ENV["PATH"] == nil)
     ENV["PATH"] =  ldLibPath
     exec("ruby #{$0} #{ARGV.join(" ")}")

data/lib/teien/animation_operator.rb

@@ -17,28 +17,28 @@ class AnimationOperator
   end
 
   def init(name, loop)
-    initializeAllAnimations()
+    initialize_all_animations()
     play(name, loop)
   end
 
-  def initializeAllAnimations()
-    set = @entity.getAllAnimationStates()
-    set.each_AnimationState {|state|
-      state.setEnabled(false)
-      state.setWeight(0)
-      state.setTimePosition(0)
+  def initialize_all_animations()
+    set = @entity.get_all_animation_states()
+    set.each_animation_state {|state|
+      state.set_enabled(false)
+      state.set_weight(0)
+      state.set_time_position(0)
     }
   end
 
-  def setEnabled(bl)
+  def set_enabled(bl)
 #    @blender.getSource().setEnabled(bl)
   end
 
-  def setBlendingMode(mode)
+  def set_blending_mode(mode)
     @mode = mode
   end
 
-  def setBlengingDuration(duration)
+  def set_blenging_duration(duration)
     @duration = duration
   end
 
@@ -46,28 +46,28 @@ class AnimationOperator
     @loop = loop
 
     unless @state
-      @state = @entity.getAnimationState(name)
-      @state.setEnabled(true)
-      @state.setWeight(1)
-      @state.setTimePosition(0)
-      @state.setLoop(loop)
+      @state = @entity.get_animation_state(name)
+      @state.set_enabled(true)
+      @state.set_weight(1)
+      @state.set_time_position(0)
+      @state.set_loop(loop)
       return
     end
 
     case @mode
     when BL_MODE_SWITCH
-      @state.setEnabled(false)
-      @state = @entity.getAnimationState(name)
-      @state.setEnabled(true)
-      @state.setWeight(1)
-      @state.setTimePosition(0)
+      @state.set_enabled(false)
+      @state = @entity.get_animation_state(name)
+      @state.set_enabled(true)
+      @state.set_weight(1)
+      @state.set_time_position(0)
       @timeLeft = 0
     else
-      newState = @entity.getAnimationState(name)
+      newState = @entity.get_animation_state(name)
       if @timeLeft > 0
-        if newState.getAnimationName == @nextState.getAnimationName
+        if newState.get_animation_name == @nextState.get_animation_name
           return
-        elsif newState.getAnimationName == @state.getAnimationName
+        elsif newState.get_animation_name == @state.get_animation_name
           # going back to the source state
           @state = @nextState
           @nextState = newState
@@ -75,22 +75,22 @@ class AnimationOperator
         else
           if @timeLeft < @duration * 0.5
             # simply replace the target with this one
-            @nextState.setEnabled(false)
-            @nextState.setWeight(0)
+            @nextState.set_enabled(false)
+            @nextState.set_weight(0)
           else
             # old target becomes new source
-            @state.setEnabled(false)
-            @state.setWeight(0)
+            @state.set_enabled(false)
+            @state.set_weight(0)
             @state = @nextState
           end
 
           @nextState = newState
-          @nextState.setEnabled(true)
-          @nextState.setWeight( 1.0 - @timeLeft / @duration )
-          @nextState.setTimePosition(0)
+          @nextState.set_enabled(true)
+          @nextState.set_weight( 1.0 - @timeLeft / @duration )
+          @nextState.set_time_position(0)
         end
       else
-        return if newState.getAnimationName == @state.getAnimationName
+        return if newState.get_animation_name == @state.get_animation_name
                   
         # assert( target == 0, "target should be 0 when not blending" )
         # @state.setEnabled(true)
@@ -98,44 +98,44 @@ class AnimationOperator
         # mTransition = transition;
         @timeLeft = @duration
         @nextState = newState
-        @nextState.setEnabled(true)
-        @nextState.setWeight(0)
-        @nextState.setTimePosition(0)
+        @nextState.set_enabled(true)
+        @nextState.set_weight(0)
+        @nextState.set_time_position(0)
       end
     end
 #    @blender.blend(name, Ogrelet::AnimationBlender::BlendWhileAnimating, 0.2, loop)
   end
 
-  def addTime(delta)
+  def add_time(delta)
     if @state
       if @timeLeft > 0
         @timeLeft -= delta
         
         if @timeLeft < 0
-          @state.setEnabled(false)
-          @state.setWeight(0)
+          @state.set_enabled(false)
+          @state.set_weight(0)
           @state = @nextState
-          @state.setEnabled(true)
-          @state.setWeight(1)
+          @state.set_enabled(true)
+          @state.set_weight(1)
           @nextState = nil
         else
           # still blending, advance weights
-          @state.setWeight(@timeLeft / @duration)
-          @nextState.setWeight(1.0 - @timeLeft / @duration)
+          @state.set_weight(@timeLeft / @duration)
+          @nextState.set_weight(1.0 - @timeLeft / @duration)
           if(@mode  == BL_MODE_CONCURRENT)
-            @nextState.addTime(delta)
+            @nextState.add_time(delta)
           end
         end
       end
       
-      if @state.getTimePosition() >= @state.getLength()
+      if @state.get_time_position() >= @state.get_length()
         @complete = true
       else
         @complete = false
       end
 
-      @state.addTime(delta)
-      @state.setLoop(@loop)
+      @state.add_time(delta)
+      @state.set_loop(@loop)
     end
     #    @blender.addTime(delta)
   end

data/lib/teien/camera.rb

@@ -14,11 +14,11 @@ class Camera
     end
 
     def get_position
-      return Vector3D.to_self(@camera.getPosition())
+      return Vector3D.to_self(@camera.get_position())
     end
 
     def get_direction
-      return Vector3D.to_self(@camera.getDirection())
+      return Vector3D.to_self(@camera.get_direction())
     end
 end
 

data/lib/teien/camera_mover.rb

@@ -14,22 +14,22 @@ class CameraMover
 
   def initialize(cam)
     @camera = cam
-    @camera.setPosition(0, 0, 0)
-    @camera.setNearClipDistance(0.1)
+    @camera.set_position(0, 0, 0)
+    @camera.set_near_clip_distance(0.1)
 
     @style = CS_FREELOOK
 
     # CS_FREELOOK, CS_ORBIT, CS_MANUAL
-    @sdk_camera_man = OgreBites::SdkCameraMan.new(@camera)
+    @sdk_camera_man = Ogrebites::SdkCameraMan.new(@camera)
     @evt_frame = Ogre::FrameEvent.new
 
     # CS_TPS
     @height = CAM_HEIGHT
-    @camera_pivot = cam.getSceneManager().getRootSceneNode().createChildSceneNode()
-    @camera_goal = @camera_pivot.createChildSceneNode(Ogre::Vector3.new(0, 0, 5))
+    @camera_pivot = cam.get_scene_manager().get_root_scene_node().create_child_scene_node()
+    @camera_goal = @camera_pivot.create_child_scene_node(Ogre::Vector3.new(0, 0, 5))
 
-    @camera_pivot.setFixedYawAxis(true)
-    @camera_goal.setFixedYawAxis(true)
+    @camera_pivot.set_fixed_yaw_axis(true)
+    @camera_goal.set_fixed_yaw_axis(true)
 
     @pivot_pitch = 0
 
@@ -39,31 +39,31 @@ class CameraMover
     @style = style
     case @style
     when CS_FREELOOK
-      @sdk_camera_man.setStyle(OgreBites::CS_FREELOOK)
+      @sdk_camera_man.set_style(Ogrebites::CS_FREELOOK)
     when CS_ORBIT
-      @sdk_camera_man.setStyle(OgreBites::CS_ORBIT)
+      @sdk_camera_man.set_style(Ogrebites::CS_ORBIT)
     else  # CS_MANUAL, CS_TPS
-      @sdk_camera_man.setStyle(OgreBites::CS_MANUAL)
+      @sdk_camera_man.set_style(Ogrebites::CS_MANUAL)
     end
   end
 
   def set_target(target)
     @target = target
     if @style == CS_TPS
-      @camera.setAutoTracking(false)
-      @camera.moveRelative(Ogre::Vector3.new(0, 0, 0))
+      @camera.set_auto_tracking(false)
+      @camera.move_relative(Ogre::Vector3.new(0, 0, 0))
       update_camera(1.0)
     else
-      @sdk_camera_man.setTarget(target.pivotSceneNode)
+      @sdk_camera_man.set_target(target.pivotSceneNode)
     end
   end
 
   def set_position(pos)
-    @camera.setPosition(Vector3D.to_ogre(pos)) if @style == CS_FREELOOK
+    @camera.set_position(Vector3D.to_ogre(pos)) if @style == CS_FREELOOK
   end
 
   def look_at(pos)
-    @camera.lookAt(Vector3D.to_ogre(pos)) if @style == CS_FREELOOK
+    @camera.look_at(Vector3D.to_ogre(pos)) if @style == CS_FREELOOK
   end
 
   def set_yaw_pitch_dist(yaw, pitch, dist)
@@ -71,38 +71,38 @@ class CameraMover
   end
 
   def move_forward(bl)
-    evt = OIS::KeyEvent.new(nil, OIS::KC_W, 0)
+    evt = Ois::KeyEvent.new(nil, Ois::KC_W, 0)
     if bl
-      @sdk_camera_man.injectKeyDown(evt)
+      @sdk_camera_man.inject_key_down(evt)
     else
-      @sdk_camera_man.injectKeyUp(evt)
+      @sdk_camera_man.inject_key_up(evt)
     end
   end
 
   def move_backward(bl)
-    evt = OIS::KeyEvent.new(nil, OIS::KC_S, 0)
+    evt = Ois::KeyEvent.new(nil, Ois::KC_S, 0)
     if bl
-      @sdk_camera_man.injectKeyDown(evt)
+      @sdk_camera_man.inject_key_down(evt)
     else
-      @sdk_camera_man.injectKeyUp(evt)
+      @sdk_camera_man.inject_key_up(evt)
     end
   end
 
   def move_left(bl)
-    evt = OIS::KeyEvent.new(nil, OIS::KC_A, 0)
+    evt = Ois::KeyEvent.new(nil, Ois::KC_A, 0)
     if bl
-      @sdk_camera_man.injectKeyDown(evt)
+      @sdk_camera_man.inject_key_down(evt)
     else
-      @sdk_camera_man.injectKeyUp(evt)
+      @sdk_camera_man.inject_key_up(evt)
     end
   end
 
   def move_right(bl)
-    evt = OIS::KeyEvent.new(nil, OIS::KC_D, 0)
+    evt = Ois::KeyEvent.new(nil, Ois::KC_D, 0)
     if bl
-      @sdk_camera_man.injectKeyDown(evt)
+      @sdk_camera_man.inject_key_down(evt)
     else
-      @sdk_camera_man.injectKeyUp(evt)
+      @sdk_camera_man.inject_key_up(evt)
     end
   end
 
@@ -112,7 +112,7 @@ class CameraMover
       update_camera(delta)
     else
       @evt_frame.timeSinceLastFrame = delta
-      @sdk_camera_man.frameRenderingQueued(@evt_frame)
+      @sdk_camera_man.frame_rendering_queued(@evt_frame)
     end
   end
 
@@ -122,28 +122,30 @@ class CameraMover
   #
   def update_camera(deltaTime)
     # place the camera pivot roughly at the character's shoulder
-    @camera_pivot.setPosition(Vector3D::to_ogre(@target.get_position()) + Ogre::Vector3.UNIT_Y * @height)
+    @camera_pivot.set_position(Vector3D::to_ogre(@target.get_position()) + Ogre::Vector3.UNIT_Y * @height)
     # move the camera smoothly to the goal
-    goalOffset = @camera_goal._getDerivedPosition() - @camera.getPosition()
+    goalOffset = @camera_goal._get_derived_position() - @camera.get_position()
     @camera.move(goalOffset * deltaTime * 9.0)
     # always look at the pivot
-    @camera.lookAt(@camera_pivot._getDerivedPosition())
+    @camera.look_at(@camera_pivot._get_derived_position())
   end
 
   def mouse_moved(evt)
-    if @style == CS_TPS
+#    puts "#{evt.state.X.rel}, #{evt.state.X.abs}"
+#    puts "#{evt.state.Y.rel}, #{evt.state.Y.abs}"
+#    puts ""
 
-      # deal with a warp.
-      if evt.state.X.rel.abs > 300
-        #puts "#{evt.state.X.rel}, #{evt.state.X.abs}"
-        return true
-      end
+    # deal with a warp.
+    if evt.state.X.rel.abs > 300
+      return true
+    end
 
+    if @style == CS_TPS
       update_camera_goal(-0.05 * evt.state.X.rel, 
                          -0.05 * evt.state.Y.rel, 
                          -0.0005 * evt.state.Z.rel)
     else
-      @sdk_camera_man.injectMouseMove(evt)      
+      @sdk_camera_man.inject_mouse_move(evt)      
     end    
     return true
   end
@@ -165,7 +167,7 @@ class CameraMover
       @camera_pivot.pitch(Ogre::Radian.new(Ogre::Degree.new(deltaPitch)), Ogre::Node::TS_LOCAL)
       @pivot_pitch += deltaPitch;
     end
-    dist = @camera_goal._getDerivedPosition().distance(@camera_pivot._getDerivedPosition())
+    dist = @camera_goal._get_derived_position().distance(@camera_pivot._get_derived_position())
     distChange = deltaZoom * dist;
 
 #    puts "dist: #{dist}:#{distChange}"
@@ -179,12 +181,12 @@ class CameraMover
   end
 
   def mouse_pressed(mouseEvent, mouseButtonID)
-    @sdk_camera_man.injectMouseDown(mouseEvent, mouseButtonID) if @style == CS_ORBIT
+    @sdk_camera_man.inject_mouse_down(mouseEvent, mouseButtonID) if @style == CS_ORBIT
     return true
   end
 
   def mouse_released(mouseEvent, mouseButtonID)
-    @sdk_camera_man.injectMouseUp(mouseEvent, mouseButtonID) if @style == CS_ORBIT
+    @sdk_camera_man.inject_mouse_up(mouseEvent, mouseButtonID) if @style == CS_ORBIT
     return true
   end
   

data/lib/teien/garden.rb

@@ -63,18 +63,18 @@ class Garden
   # _color_:: : set a color(Color).
   #
   def set_ambient_light(color)
-    @view.scene_mgr.setAmbientLight(color)
+    @view.scene_mgr.set_ambient_light(color)
   end
 
   def set_sky_dome(enable, materialName, curvature = 10, tiling = 8, distance = 4000)
-    @view.scene_mgr.setSkyDome(enable, materialName, curvature, tiling, distance)
+    @view.scene_mgr.set_sky_dome(enable, materialName, curvature, tiling, distance)
   end
 
   def set_debug_draw(bl)
     if (bl)
       @debug_draw = bl
-      @debug_drawer = Ogrelet::DebugDrawer.new(@view.scene_mgr)
-      @physics.dynamicsWorld.setDebugDrawer(@debug_drawer)
+      @debug_drawer = Teienlib::DebugDrawer.new(@view.scene_mgr)
+      @physics.dynamicsWorld.set_debug_drawer(@debug_drawer)
     end      
   end
 
@@ -160,7 +160,7 @@ class Garden
 
   
   def update(delta)
-    @physics.dynamics_world.debugDrawWorld() if @debug_draw
+    @physics.dynamics_world.debug_draw_world() if @debug_draw
 
     return @view.update(delta)
   end
@@ -168,7 +168,7 @@ class Garden
   # called from view.update()
   # This function is divided from update() by the purpose of an optimization, 
   # which archives to run in parallel with GPU process.
-  def updateInFrameRenderingQueued(delta)
+  def update_in_frame_rendering_queued(delta)
     return false unless @physics.update(delta)
       
     @objects.each_value {|obj|
@@ -188,7 +188,7 @@ class Garden
   # clear all managers.
   def finalize()
     @physics.finalize()
-    @view.root.saveConfig()
+    @view.root.save_config()
     @view.finalize()
     @objects = {}
   end