ruby-miyako-mswin32 2.1.0 → 2.1.1

data/lib/Miyako/miyako.rb

@@ -3,7 +3,7 @@
 #=コンテンツ作成ライブラリMiyako2.1
 #
 #Authors:: サイロス誠
-#Version:: 2.1.0
+#Version:: 2.1.1
 #Copyright:: 2007-2009 Cyross Makoto
 #License:: LGPL2.1
 #
@@ -60,7 +60,7 @@ Thread.abort_on_exception = true
 
 #==Miyako基幹モジュール
 module Miyako
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 
   #===アプリケーション実行中に演奏する音楽のサンプリングレートを指定する
   #単位はHz(周波数)
@@ -77,7 +77,7 @@ module Miyako
   def Miyako::version
     return VERSION
   end
-  
+
   osn = Config::CONFIG["target_os"].downcase
   @@osName = "other"
   case osn
@@ -88,7 +88,7 @@ module Miyako
   when /darwin/
     @@osName = "mac_osx"
   end
-  
+
   #===実行しているOSの名前を取得する
   #(Windows 9x/Me/Xp/Vista, Cygwin/MinGW) : "win"
   #(Linux) : "linux"
@@ -98,7 +98,7 @@ module Miyako
   def Miyako::getOSName
     return @@osName
   end
-  
+
   #===ウィンドウのタイトルを設定する
   #_title_:: 設定する文字列
   def Miyako::setTitle(title)
@@ -117,18 +117,26 @@ end
 
 require 'Miyako/API/exceptions'
 require 'Miyako/API/utility'
+require 'Miyako/API/struct_point'
+require 'Miyako/API/struct_size'
+require 'Miyako/API/struct_rect'
+require 'Miyako/API/struct_square'
+require 'Miyako/API/struct_segment'
+require 'Miyako/API/color'
+require 'Miyako/API/wait_counter'
 require 'Miyako/API/basic_data'
 require 'Miyako/API/modules'
+require 'Miyako/API/layout'
 require 'Miyako/API/yuki'
+require 'Miyako/API/i_yuki'
 require 'Miyako/API/font'
 require 'Miyako/API/viewport'
-require 'Miyako/API/layout'
 require 'Miyako/API/bitmap'
 require 'Miyako/API/drawing'
 require 'Miyako/API/spriteunit'
 require 'Miyako/API/sprite_animation'
-require 'Miyako/API/sprite'
 require 'Miyako/API/sprite_list'
+require 'Miyako/API/sprite'
 require 'Miyako/API/collision'
 require 'Miyako/API/screen'
 require 'Miyako/API/shape'
@@ -139,6 +147,7 @@ require 'Miyako/API/movie'
 require 'Miyako/API/parts'
 require 'Miyako/API/choices'
 require 'Miyako/API/textbox'
+require 'Miyako/API/map_struct'
 require 'Miyako/API/map'
 require 'Miyako/API/fixedmap'
 require 'Miyako/API/map_event'
@@ -150,16 +159,21 @@ module Miyako
 
   #===Miyakoのメインループ
   #ブロックを受け取り、そのブロックを評価する
-  #ブロック評価前に<i>Audio::update</i>と<i>Input::update</i>、<i>Screen::clear</i>、評価後に<i>Screen::render</i>を呼び出す
+  #ブロック評価前に<i>Audio::update</i>と<i>Input::update</i>、<i>WaitCounter::update</i>、
+  #<i>Screen::clear</i>、評価後に<i>WaitCounter::post_update</i>、<i>Animation::update</i>、
+  #<i>Screen::render</i>を呼び出す
   #
   #ブロックを渡さないと例外が発生する
-  def Miyako.main_loop
+  def Miyako.main_loop(is_clear = true)
     raise MiyakoError, "Miyako.main_loop needs brock!" unless block_given?
     loop do
       Audio.update
       Input.update
-      Screen.clear
+      WaitCounter.update
+      Screen.clear if is_clear
       yield
+      WaitCounter.post_update
+      Animation.update
       Screen.render
     end
   end
@@ -179,7 +193,7 @@ module Miyako
   def Miyako.initialized?
     @@initialized
   end
-  
+
   #===Miyakoの初期化
   #画面初期化や音声初期化などのメソッドを呼び出す。
   #グローバル変数$miyako_auto_openがtrueのときは最初に自動的に呼び出される。

data/lib/miyako.rb

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+#
+#=コンテンツ作成ライブラリMiyako2.1
+#
+#Authors:: サイロス誠
+#Version:: 2.1.0
+#Copyright:: 2007-2009 Cyross Makoto
+#License:: LGPL2.1
+#
+=begin
+Miyako v2.1
+Copyright (C) 2007-2008  Cyross Makoto
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+=end
+require 'Miyako/miyako'

data/lib/miyako_require_only.rb

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+#
+#=コンテンツ作成ライブラリMiyako2.1
+#
+#Authors:: サイロス誠
+#Version:: 2.1.0
+#Copyright:: 2007-2009 Cyross Makoto
+#License:: LGPL2.1
+#
+=begin
+Miyako v2.1
+Copyright (C) 2007-2008  Cyross Makoto
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+=end
+
+# 初期化を行わずにrequire 'Miyako/miyako'のみ行う
+
+$miyako_auto_open = false
+
+require 'Miyako/miyako'
+
+$miyako_auto_open = nil

data/sample/Diagram_sample/diagram_sample_yuki2.rb

@@ -3,19 +3,19 @@
 # Diagram sample for Miyako v2.0
 # 2009.1.16 Cyross Makoto
 
-require 'Miyako/miyako'
+require 'miyako'
 
 include Miyako
 
 # 移動が遅いスクロール
 class MoveSlower
   include Diagram::NodeBase
-  
+
   def initialize(spr)
     @spr = spr
     @finish = false # 終了フラグ
   end
-  
+
   def start
     @spr.move_to!(640, @spr.y) # 画面を出たところまで移動
   end
@@ -29,7 +29,7 @@ class MoveSlower
   def render
     @spr.render
   end
-  
+
   def finish?
     return @finish
   end
@@ -38,12 +38,12 @@ end
 # 移動が速いスクロール
 class MoveFaster
   include Diagram::NodeBase
-  
+
   def initialize(spr)
     @spr = spr
     @finish = false # 終了フラグ
   end
-  
+
   def start
     @spr.move_to!(640, @spr.y) # 画面を出たところまで移動
   end
@@ -57,7 +57,7 @@ class MoveFaster
   def render
     @spr.render
   end
-  
+
   def finish?
     return @finish
   end
@@ -69,19 +69,19 @@ class WaitTrigger
   def initialize(wait=0.1)
     @timer = WaitCounter.new(wait)
   end
-  
+
   def pre_process
     @timer.start
   end
-  
+
   def update?
     @timer.finish?
   end
-  
+
   def post_update
     @timer.start
   end
-  
+
   def post_process
     @timer.stop
   end
@@ -90,7 +90,7 @@ end
 # 移動アニメーションノード
 class Moving
   include Diagram::NodeBase
-  
+
   def initialize(parts, wait)
     @parts = parts
     @pr = {}
@@ -98,7 +98,7 @@ class Moving
       dia.add :scroll, MoveFaster.new(@parts[:c1]), WaitTrigger.new(wait)
       dia.add_arrow(:scroll, nil)
     }
-    
+
     @pr[:slow] = Diagram::Processor.new{|dia|
       dia.add :scroll, MoveSlower.new(@parts[:c2]), WaitTrigger.new(wait)
       dia.add_arrow(:scroll, nil)
@@ -115,13 +115,13 @@ class Moving
     @finished = @pr.keys.inject(true){|r, k|
       @pr[k].update
       r &= @pr[k].finish?
-    } # アニメーション処理が終了するまで繰り返し    
+    } # アニメーション処理が終了するまで繰り返し
   end
 
   def stop
     @pr.keys.each{|k| @pr[k].stop }
   end
-  
+
   def render
     @parts[:bk].render
     # 通常なら。@pr[:fast].render,@pr[:slow].renderが筋だが、
@@ -129,7 +129,7 @@ class Moving
     @parts[:c1].render
     @parts[:c2].render
   end
-  
+
   def finish?
     return @finished
   end
@@ -138,7 +138,7 @@ end
 # Yukiプロット開始
 class StartPlot
   include Diagram::NodeBase
-  
+
   def initialize(manager, parts, imgs)
     @manager = manager
     @parts = parts
@@ -157,13 +157,13 @@ class StartPlot
 
   def stop
   end
-  
+
   def render
     @imgs[:bk].render
     @imgs[:c1].render
     @imgs[:c2].render
   end
-  
+
   def finish?
     return @finished
   end
@@ -172,7 +172,7 @@ end
 # Yukiプロット実行
 class Plotting
   include Diagram::NodeBase
-  
+
   def initialize(manager, parts, imgs, set_wait)
     @manager = manager
     @parts = parts
@@ -202,10 +202,10 @@ class Plotting
     @manager.render
     @parts.render
   end
-  
+
   def stop
   end
-  
+
   def finish?
     return @finished
   end
@@ -240,13 +240,13 @@ class MainScene
 
     @yuki = Yuki.new
     @yuki.update_text = self.method(:update_text)
-    
+
     @imgs = {}
     @imgs[:c1] = Sprite.new(:file=>"chr01.png", :type=>:ac).bottom!
     @imgs[:c2] = Sprite.new(:file=>"chr02.png", :type=>:ac).bottom!
     @imgs[:bk] = Sprite.new(:file=>"back.png", :type=>:as).centering!
 
-    
+
     @pr = Diagram::Processor.new{|dia|
       dia.add :move,  Moving.new(@imgs, 0.01)
       dia.add :start, StartPlot.new(@yuki, @parts, @imgs)
@@ -268,7 +268,7 @@ class MainScene
       select_first_page nil # nil, :page1, :page2が選択可能
     }
   end
-  
+
   def update
     return nil if Input.quit_or_escape?
     @pr.update_input
@@ -276,11 +276,11 @@ class MainScene
     return nil if @pr.finish?
     return @now
   end
-  
+
   def render
     @pr.render
   end
-  
+
   def plot
     yuki_plot{
       text_method :string do
@@ -307,7 +307,7 @@ class MainScene
       end
     }
   end
-  
+
   def update_text(yuki, ch)
     yuki.wait @wait # １文字ずつ表示させる
   end
@@ -319,11 +319,11 @@ class MainScene
   def reset_wait
     @wait = @base_wait
   end
-  
+
   def final
     @pr.stop
   end
 end
 
 ds = Story.new
-ds.run(MainScene)
+ds.run(MainScene)

data/sample/Room3/blue.rb

@@ -48,34 +48,34 @@ class Blue
     end
     return r
   end
-  
+
   def render
     @room.render
     @yuki.render
     message_box.render
     command_box.render if @yuki.selecting?
   end
-  
+
   def get_command
-    return [Yuki::Command.new("挨拶する", nil, lambda{var[:aoyama_aisatsu]==false}, blue2),
-             Yuki::Command.new("辺りを見る", nil, lambda{var[:aoyama_aisatsu]==true}, look_blue),
-             Yuki::Command.new("話す", nil, lambda{var[:aoyama_aisatsu]==true}, talk),
-             Yuki::Command.new("渡す", nil, lambda{var[:aoyama_aisatsu]==true && var[:release_aoyama_book]==true && var[:release_akamatsu_book]==false}, send1),
-             Yuki::Command.new("探す", nil, lambda{var[:search_bookmark]==true && var[:get_bookmark]==false}, search),
-             Yuki::Command.new("戻る", nil, lambda{var[:aoyama_aisatsu]==true}, MainScene)]
+    return [Yuki::Command.new("挨拶する",   nil, nil, true, lambda{var[:aoyama_aisatsu]==false}, blue2),
+            Yuki::Command.new("辺りを見る", nil, nil, true, lambda{var[:aoyama_aisatsu]==true}, look_blue),
+            Yuki::Command.new("話す",       nil, nil, true, lambda{var[:aoyama_aisatsu]==true}, talk),
+            Yuki::Command.new("渡す",       nil, nil, true, lambda{var[:aoyama_aisatsu]==true && var[:release_aoyama_book]==true && var[:release_akamatsu_book]==false}, send1),
+            Yuki::Command.new("探す",       nil, nil, true, lambda{var[:search_bookmark]==true && var[:get_bookmark]==false}, search),
+            Yuki::Command.new("戻る",       nil, nil, true, lambda{var[:aoyama_aisatsu]==true}, MainScene)]
   end
-  
+
   def get_search
-    return [Yuki::Command.new("壁", nil, nil, wall),
-             Yuki::Command.new("テレビ", nil, nil, tv),
-             Yuki::Command.new("テレビ台", nil, nil, tv_base),
-             Yuki::Command.new("ビデオデッキ", nil, lambda{var[:look_video_base] == true}, video),
-             Yuki::Command.new("テレビゲーム機", nil, lambda{var[:look_video_base] == true}, tv_game),
-             Yuki::Command.new("ソファー", nil, nil, sofar),
-             Yuki::Command.new("ベッド", nil, nil, bed),
-             Yuki::Command.new("戻る", nil, nil, "ret")]
+    return [Yuki::Command.new("壁",             nil, nil, true, nil, wall),
+            Yuki::Command.new("テレビ",         nil, nil, true, nil, tv),
+            Yuki::Command.new("テレビ台",       nil, nil, true, nil, tv_base),
+            Yuki::Command.new("ビデオデッキ",   nil, nil, true, lambda{var[:look_video_base] == true}, video),
+            Yuki::Command.new("テレビゲーム機", nil, nil, true, lambda{var[:look_video_base] == true}, tv_game),
+            Yuki::Command.new("ソファー",       nil, nil, true, nil, sofar),
+            Yuki::Command.new("ベッド",         nil, nil, true, nil, bed),
+            Yuki::Command.new("戻る",           nil, nil, true, nil, "ret")]
   end
-  
+
   def plot
     yuki_plot do
       text "青の扉から中に入った。"
@@ -88,7 +88,7 @@ class Blue
       vars[:main_command]
     end
   end
-  
+
   def main_command
     yuki_plot do
       loop do

data/sample/Room3/green.rb

@@ -19,7 +19,7 @@ class Green
     var[:midori_talk]         = 0     if var[:midori_talk]         == nil
 
     @talks = Array.new(6){|i| self.method("talk#{i}".to_sym).call}
-    
+
     @yuki.vars[:var] = var
     @yuki.vars[:main_command] = main_command
     @yuki.vars[:command] = get_command
@@ -45,21 +45,21 @@ class Green
     end
     return r
   end
-  
+
   def render
     @room.render
     @yuki.render
     message_box.render
     command_box.render if @yuki.selecting?
   end
-  
+
   def get_command
-    return [Yuki::Command.new("挨拶する",   nil, lambda{var[:midori_aisatsu]==false}, green2),
-            Yuki::Command.new("辺りを見る", nil, lambda{var[:midori_aisatsu]==true}, look_green),
-            Yuki::Command.new("話す",       nil, lambda{var[:midori_aisatsu]==true}, talk),
-            Yuki::Command.new("戻る",       nil, lambda{var[:midori_aisatsu]==true}, MainScene)]
+    return [Yuki::Command.new("挨拶する",   nil, nil, true, lambda{var[:midori_aisatsu]==false}, green2),
+            Yuki::Command.new("辺りを見る", nil, nil, true, lambda{var[:midori_aisatsu]==true}, look_green),
+            Yuki::Command.new("話す",       nil, nil, true, lambda{var[:midori_aisatsu]==true}, talk),
+            Yuki::Command.new("戻る",       nil, nil, true, lambda{var[:midori_aisatsu]==true}, MainScene)]
   end
-  
+
   def plot
     yuki_plot do
       text "緑の扉から中に入った。"
@@ -72,7 +72,7 @@ class Green
       vars[:main_command]
     end
   end
-  
+
   def main_command
     yuki_plot do
     loop do

data/sample/Room3/main.rb

@@ -2,7 +2,7 @@
 class MainScene
   include Story::Scene
   include MainComponent
-    
+
   def init
     @yuki = Yuki.new(message_box[:box], command_box[:box]){|box, cbox|
       select_textbox(box)
@@ -31,7 +31,7 @@ class MainScene
     command_box.start
     @yuki.start_plot(plot)
   end
-  
+
   def update
     return nil if Input.quit_or_escape?
     message_box.update_animation
@@ -41,15 +41,15 @@ class MainScene
     @yuki.start_plot(plot) if (@yuki.executing? == false && r == @now)
     return r
   end
-  
+
   def get_command
-    return [Yuki::Command.new("緑の扉から入る", nil, nil, Green),
-             Yuki::Command.new("赤の扉から入る", nil, lambda{var[:sekkaku] == true }, red_sekkaku),
-             Yuki::Command.new("赤の扉から入る", nil, lambda{var[:sekkaku] == false}, Red),
-             Yuki::Command.new("青の扉から入る", nil, nil, Blue),
-             Yuki::Command.new("合い言葉を言う", nil, lambda{var[:aikotoba] == true}, tell_aikotoba)]
+    return [Yuki::Command.new("緑の扉から入る", nil, nil, true, nil, Green),
+            Yuki::Command.new("赤の扉から入る", nil, nil, true, lambda{var[:sekkaku] == true }, red_sekkaku),
+            Yuki::Command.new("赤の扉から入る", nil, nil, true, lambda{var[:sekkaku] == false}, Red),
+            Yuki::Command.new("青の扉から入る", nil, nil, true, nil, Blue),
+            Yuki::Command.new("合い言葉を言う", nil, nil, true, lambda{var[:aikotoba] == true}, tell_aikotoba)]
   end
-  
+
   def plot
     yuki_plot{
       ret = vars[:now]
@@ -68,7 +68,7 @@ class MainScene
 
   def main_command
   end
-  
+
   def red_sekkaku
     yuki_plot{
       text "せっかくだから、赤の扉に入ってみよう"
@@ -76,7 +76,7 @@ class MainScene
       vars[:red]
     }
   end
-  
+
   def tell_aikotoba
     yuki_plot{
       text "「こんなゲーム、"
@@ -88,7 +88,7 @@ class MainScene
       vars[:ending]
     }
   end
-  
+
   def render
     @doors.render
     message_box.render

data/sample/Room3/red.rb

@@ -24,7 +24,7 @@ class Red
     var[:release_akamatsu_book] = false if var[:release_akamatsu_book] == nil
     var[:search_bookmark]       = false if var[:search_bookmark]       == nil
     var[:get_bookmark]          = false if var[:get_bookmark]          == nil
-    
+
     @yuki.vars[:var] = var
     @yuki.vars[:command] = get_command
     @yuki.vars[:main_loop] = main_loop
@@ -36,16 +36,16 @@ class Red
     command_box.start
     @yuki.start_plot(plot)
   end
-  
+
   def get_command
-    return [Yuki::Command.new("挨拶する",   nil, lambda{var[:akamatsu_aisatsu] == false}, red2),
-             Yuki::Command.new("辺りを見る", nil, lambda{var[:akamatsu_aisatsu]==true }, look),
-             Yuki::Command.new("話す",       nil, lambda{var[:akamatsu_aisatsu]==true }, talk),
-             Yuki::Command.new("渡す",       nil, lambda{var[:akamatsu_aisatsu] && var[:release_akamatsu_book] && var[:search_bookmark]==false}, send1),
-             Yuki::Command.new("渡す",       nil, lambda{var[:search_bookmark] && var[:get_bookmark] && var[:aikotoba]==false}, send2),
-             Yuki::Command.new("戻る",       nil, lambda{var[:akamatsu_aisatsu]==true}, MainScene)]
+    return [Yuki::Command.new("挨拶する",   nil, nil, true, lambda{var[:akamatsu_aisatsu] == false}, red2),
+            Yuki::Command.new("辺りを見る", nil, nil, true, lambda{var[:akamatsu_aisatsu]==true }, look),
+            Yuki::Command.new("話す",       nil, nil, true, lambda{var[:akamatsu_aisatsu]==true }, talk),
+            Yuki::Command.new("渡す",       nil, nil, true, lambda{var[:akamatsu_aisatsu] && var[:release_akamatsu_book] && var[:search_bookmark]==false}, send1),
+            Yuki::Command.new("渡す",       nil, nil, true, lambda{var[:search_bookmark] && var[:get_bookmark] && var[:aikotoba]==false}, send2),
+            Yuki::Command.new("戻る",       nil, nil, true, lambda{var[:akamatsu_aisatsu]==true}, MainScene)]
   end
-  
+
   def update
     return nil if Input.quit_or_escape?
     message_box.update_animation
@@ -65,7 +65,7 @@ class Red
     message_box.render
     command_box.render if @yuki.selecting?
   end
-  
+
   def plot
     yuki_plot do
       text "赤の扉から中に入った。"
@@ -78,7 +78,7 @@ class Red
       vars[:main_loop]
     end
   end
-  
+
   def main_loop
     yuki_plot do
       loop do
@@ -219,7 +219,7 @@ class Red
     message_box.stop
     command_box.stop
   end
-    
+
   def dispose
     @akamatsu.dispose
     @room.dispose