sgl 0.4.0 → 1.0.0

data/lib/sgl/sgl-connect.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby -w
-# Copyright (C) 2004-2007 Kouichirou Eto, All rights reserved.
-# License: Ruby License
-
-require "drb/drb"
-
-module Sgl
-  DEFAULT_URI = "druby://localhost:12345"
-end
+#!/usr/bin/env ruby -w
+# Copyright (C) 2004-2007 Kouichirou Eto, All rights reserved.
+# License: Ruby License
+
+require "drb/drb"
+
+module Sgl
+  DEFAULT_URI = "druby://localhost:12345"
+end

data/lib/sgl/sgl-server.rb

@@ -1,58 +1,58 @@
-#!/usr/bin/env ruby -w
-# Copyright (C) 2004-2007 Kouichirou Eto, All rights reserved.
-# License: Ruby License
-
-$LOAD_PATH.unshift("..") if !$LOAD_PATH.include?("..")
-require "sgl/sgl-connect"
-
-module Sgl
-  class Puts
-    def initialize(stream=$stdout)
-      stream.sync = true
-      @stream = stream
-    end
-
-    def puts(str)
-      @stream.puts(str)
-    end
-  end
-
-  class Server
-    def self.main(argv)
-      server = self.new
-      server.run
-    end
-
-    def run(duration=0)
-      uri = DEFAULT_URI
-      DRb.start_service(uri, Puts.new)
-      puts DRb.uri
-
-      if duration == 0
-	sleep
-      else
-	sleep duration
-      end
-    end
-  end
-end
-
-if $0 == __FILE__
-  require "test/unit"
-  $__test_sgl__ = true
-end
-
-if defined?($__test_sgl__) && $__test_sgl__
-  class TestSglServer < Test::Unit::TestCase #:nodoc:
-    def test_all
-      server = Sgl::Server.new
-      Thread.start {
-	server.run(5)
-      }
-
-      uri = Sgl::DEFAULT_URI
-      there = DRbObject.new_with_uri(uri)
-      there.puts('Hello, World.')
-    end
-  end
-end
+#!/usr/bin/env ruby -w
+# Copyright (C) 2004-2007 Kouichirou Eto, All rights reserved.
+# License: Ruby License
+
+$LOAD_PATH.unshift("..") if !$LOAD_PATH.include?("..")
+require "sgl/sgl-connect"
+
+module Sgl
+  class Puts
+    def initialize(stream=$stdout)
+      stream.sync = true
+      @stream = stream
+    end
+
+    def puts(str)
+      @stream.puts(str)
+    end
+  end
+
+  class Server
+    def self.main(argv)
+      server = self.new
+      server.run
+    end
+
+    def run(duration=0)
+      uri = DEFAULT_URI
+      DRb.start_service(uri, Puts.new)
+      puts DRb.uri
+
+      if duration == 0
+	sleep
+      else
+	sleep duration
+      end
+    end
+  end
+end
+
+if $0 == __FILE__
+  require "test/unit"
+  $__test_sgl__ = true
+end
+
+if defined?($__test_sgl__) && $__test_sgl__
+  class TestSglServer < Test::Unit::TestCase #:nodoc:
+    def test_all
+      server = Sgl::Server.new
+      Thread.start {
+	server.run(5)
+      }
+
+      uri = Sgl::DEFAULT_URI
+      there = DRbObject.new_with_uri(uri)
+      there.puts('Hello, World.')
+    end
+  end
+end

data/lib/sgl/sgl-spring.rb

@@ -1,216 +1,216 @@
-# Copyright (C) 2004-2007 Kouichirou Eto, All rights reserved.
-# License: Ruby License
-
-$LOAD_PATH.unshift("..") if !$LOAD_PATH.include?("..")
-
-module SGL
-=begin
-  # not yet.
-  module SpringModule
-  end
-=end
-
-  class Spring
-    EPSILON = 0.01
-
-    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
-    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
-      @target, @initial, @ks, @kd, @e, @v = target, initial, ks, kd, e, v
-      @x = @initial
-      @moving = true
-    end
-
-    attr_reader :x, :target
-    attr_accessor :v, :ks, :kd
-
-    def inspect
-      mov = @moving ? "��" : "��"
-      sprintf("[%s%.1f %.1f %.1f %.1f %.1f]", mov, @target, @x, @v, @ks, @kd)
-    end
-
-    def target=(num)
-      @target = num
-      @moving = true
-    end
-
-    def x=(num)
-      @x = num
-      @moving = true
-    end
-
-    def move
-      return if ! @moving
-      if @x.is_a?(Vector)
-	l = @x - @target
-	diff = l.length
-	if diff < @e && @v.length < @e
-	  @moving = false
-	  return
-	end
-	#fa = -(@ks * diff + @kd * @v)
-	ln = l.normalize
-	fak = -(@ks * diff + @kd * @v.length)
-	fa = ln.scale(fak)
-	@v += fa
-	@x += @v
-	#p ['sp', fa, fak, @v, @x]
-      else
-	diff = @x - @target
-	if diff.abs < @e && @v.abs < @e
-	  @moving = false
-	  return
-	end
-	fa = -(@ks * diff + @kd * @v)
-	@v += fa
-	@x += @v
-      end
-    end
-  end
-
-  class ISpring < Spring
-    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
-    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
-      super(target, initial, 1.0/ks, 1.0/kd, e, v) # ks��kd��inverse����B
-    end
-  end
-
-  class NumSpring
-    EPSILON = 0.01
-
-    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
-    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
-      @target, @initial, @ks, @kd, @e, @v = target, initial, ks, kd, e, v
-      @x = @initial
-      @moving = true
-    end
-
-    attr_reader :x, :target
-    attr_accessor :v, :ks, :kd, :moving
-
-    def inspect
-      mov = @moving ? "��" : "��"
-      sprintf("[%s%.1f %.1f %.1f %.1f %.1f]", mov, @target, @x, @v, @ks, @kd)
-    end
-
-    def target=(num)
-      @target = num
-      @moving = true
-    end
-
-    def x=(num)
-      @x = num
-      @moving = true
-    end
-
-    def move
-      return if ! @moving
-      diff = @target - @x
-      if diff.abs < @e && @v.abs < @e
-	@moving = false
-	return
-      end
-      @v += (diff / @ks)
-      @v *= @kd
-      @x += @v
-    end
-  end
-
-  class INumSpring < NumSpring
-    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
-    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
-      super(target, initial, ks, 1.0 - 1.0/kd, e, v) # kd����inverse����B
-    end
-  end
-end
-
-=begin
-class NuSpringPos
-  EPSILON = 0.01
-
-  # �����l�A�ڕW�ƂȂ�l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
-  def initialize(x, y, ks, kd, e=EPSILON)
-    @x, @y, @ks, @kd, @e = x, y, ks, kd, e
-    @vx, @vy, @tx, @ty = 0, 0, 0, 0
-    @moving = true
-  end
-
-  attr_reader :x, :y, :moving
-
-  def set_target(tx, ty)
-    @tx, @ty = tx, ty
-  end
-
-  def move
-    return if ! @moving
-
-    #diff = @target - @x
-    diff = @tx - @x
-    if diff.abs < @e && @v.abs < @e
-      @moving = false
-      return
-    end
-    @v += (diff / @ks)
-    @v *= @kd
-    @x += @v
-  end
-end
-
-class NuNumSpring
-  EPSILON = 0.01
-
-  # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
-  def initialize(target, initial, ks, kd, e=EPSILON)
-    @target, @initial, @ks, @kd, @e = target, initial, ks, kd, e
-    @x = @initial
-    @v = 0
-    @moving = true
-  end
-
-  attr_reader :v
-  attr_accessor :x, :target, :moving, :ks, :kd
-
-  def inspect
-    mov = @moving ? "��" : "��"
-    sprintf("[%s%.1f %.1f %.1f %.1f %.1f]", mov, @target, @x, @v, @ks, @kd)
-  end
-
-  def move
-    return if ! @moving
-    diff = @target - @x
-    if diff.abs < @e && @v.abs < @e
-      @moving = false
-      return
-    end
-    @v += (diff / @ks)
-    @v *= @kd
-    @x += @v
-  end
-
-  def rel_ks_notuse(r)
-    @ks += r
-    @ks = 1 if @ks <= 0
-  end
-end
-=end
-
-if $0 == __FILE__
-  require "test/unit"
-  $__test_sgl__ = true
-end
-
-if defined?($__test_sgl__) && $__test_sgl__
-  class TestSglSpring < Test::Unit::TestCase #:nodoc:
-    def test_all
-
-      s = SGL::NumSpring.new(0, 1, 0.1, 0.1)
-      assert_equal(1, s.x)
-      assert_equal(true, s.moving)
-
-      s.move
-      assert_equal(0.0, s.x)
-
-      s.move
-      assert_equal(-0.1, s.x)
-    end
-  end
-end
+# Copyright (C) 2004-2007 Kouichirou Eto, All rights reserved.
+# License: Ruby License
+
+$LOAD_PATH.unshift("..") if !$LOAD_PATH.include?("..")
+
+module SGL
+=begin
+  # not yet.
+  module SpringModule
+  end
+=end
+
+  class Spring
+    EPSILON = 0.01
+
+    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
+    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
+      @target, @initial, @ks, @kd, @e, @v = target, initial, ks, kd, e, v
+      @x = @initial
+      @moving = true
+    end
+
+    attr_reader :x, :target
+    attr_accessor :v, :ks, :kd
+
+    def inspect
+      mov = @moving ? "��" : "��"
+      sprintf("[%s%.1f %.1f %.1f %.1f %.1f]", mov, @target, @x, @v, @ks, @kd)
+    end
+
+    def target=(num)
+      @target = num
+      @moving = true
+    end
+
+    def x=(num)
+      @x = num
+      @moving = true
+    end
+
+    def move
+      return if ! @moving
+      if @x.is_a?(Vector)
+	l = @x - @target
+	diff = l.length
+	if diff < @e && @v.length < @e
+	  @moving = false
+	  return
+	end
+	#fa = -(@ks * diff + @kd * @v)
+	ln = l.normalize
+	fak = -(@ks * diff + @kd * @v.length)
+	fa = ln.scale(fak)
+	@v += fa
+	@x += @v
+	#p ['sp', fa, fak, @v, @x]
+      else
+	diff = @x - @target
+	if diff.abs < @e && @v.abs < @e
+	  @moving = false
+	  return
+	end
+	fa = -(@ks * diff + @kd * @v)
+	@v += fa
+	@x += @v
+      end
+    end
+  end
+
+  class ISpring < Spring
+    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
+    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
+      super(target, initial, 1.0/ks, 1.0/kd, e, v) # ks��kd��inverse����B
+    end
+  end
+
+  class NumSpring
+    EPSILON = 0.01
+
+    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
+    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
+      @target, @initial, @ks, @kd, @e, @v = target, initial, ks, kd, e, v
+      @x = @initial
+      @moving = true
+    end
+
+    attr_reader :x, :target
+    attr_accessor :v, :ks, :kd, :moving
+
+    def inspect
+      mov = @moving ? "��" : "��"
+      sprintf("[%s%.1f %.1f %.1f %.1f %.1f]", mov, @target, @x, @v, @ks, @kd)
+    end
+
+    def target=(num)
+      @target = num
+      @moving = true
+    end
+
+    def x=(num)
+      @x = num
+      @moving = true
+    end
+
+    def move
+      return if ! @moving
+      diff = @target - @x
+      if diff.abs < @e && @v.abs < @e
+	@moving = false
+	return
+      end
+      @v += (diff / @ks)
+      @v *= @kd
+      @x += @v
+    end
+  end
+
+  class INumSpring < NumSpring
+    # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
+    def initialize(target, initial, ks, kd, e=EPSILON, v=0)
+      super(target, initial, ks, 1.0 - 1.0/kd, e, v) # kd����inverse����B
+    end
+  end
+end
+
+=begin
+class NuSpringPos
+  EPSILON = 0.01
+
+  # �����l�A�ڕW�ƂȂ�l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
+  def initialize(x, y, ks, kd, e=EPSILON)
+    @x, @y, @ks, @kd, @e = x, y, ks, kd, e
+    @vx, @vy, @tx, @ty = 0, 0, 0, 0
+    @moving = true
+  end
+
+  attr_reader :x, :y, :moving
+
+  def set_target(tx, ty)
+    @tx, @ty = tx, ty
+  end
+
+  def move
+    return if ! @moving
+
+    #diff = @target - @x
+    diff = @tx - @x
+    if diff.abs < @e && @v.abs < @e
+      @moving = false
+      return
+    end
+    @v += (diff / @ks)
+    @v *= @kd
+    @x += @v
+  end
+end
+
+class NuNumSpring
+  EPSILON = 0.01
+
+  # �ڕW�ƂȂ�l�A�����l�A�o�l�萔�A�e���萔�A�C�v�V����(�\���������l)
+  def initialize(target, initial, ks, kd, e=EPSILON)
+    @target, @initial, @ks, @kd, @e = target, initial, ks, kd, e
+    @x = @initial
+    @v = 0
+    @moving = true
+  end
+
+  attr_reader :v
+  attr_accessor :x, :target, :moving, :ks, :kd
+
+  def inspect
+    mov = @moving ? "��" : "��"
+    sprintf("[%s%.1f %.1f %.1f %.1f %.1f]", mov, @target, @x, @v, @ks, @kd)
+  end
+
+  def move
+    return if ! @moving
+    diff = @target - @x
+    if diff.abs < @e && @v.abs < @e
+      @moving = false
+      return
+    end
+    @v += (diff / @ks)
+    @v *= @kd
+    @x += @v
+  end
+
+  def rel_ks_notuse(r)
+    @ks += r
+    @ks = 1 if @ks <= 0
+  end
+end
+=end
+
+if $0 == __FILE__
+  require "test/unit"
+  $__test_sgl__ = true
+end
+
+if defined?($__test_sgl__) && $__test_sgl__
+  class TestSglSpring < Test::Unit::TestCase #:nodoc:
+    def test_all
+
+      s = SGL::NumSpring.new(0, 1, 0.1, 0.1)
+      assert_equal(1, s.x)
+      assert_equal(true, s.moving)
+
+      s.move
+      assert_equal(0.0, s.x)
+
+      s.move
+      assert_equal(-0.1, s.x)
+    end
+  end
+end