ruby-miyako 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/miyako_basicdata.c

@@ -83,7 +83,8 @@ static void get_min_max(VALUE segment, VALUE *min, VALUE *max)
 */
 static VALUE counter_start(VALUE self)
 {
-  rb_iv_set(self, "@st", rb_funcall(mSDL, rb_intern("getTicks"), 0));
+  rb_iv_set(self, "@st", INT2NUM(SDL_GetTicks()));
+  rb_iv_set(self, "@stop_tick", Qnil);
   rb_iv_set(self, "@counting", Qtrue);
   return self;
 }
@@ -93,7 +94,7 @@ static VALUE counter_start(VALUE self)
 */
 static VALUE counter_stop(VALUE self)
 {
-  rb_iv_set(self, "@st", INT2NUM(0));
+  rb_iv_set(self, "@stop_tick", INT2NUM(SDL_GetTicks()));
   rb_iv_set(self, "@counting", Qfalse);
   return self;
 }
@@ -101,19 +102,118 @@ static VALUE counter_stop(VALUE self)
 /*
 :nodoc:
 */
-static VALUE counter_wait_inner(VALUE self, VALUE f)
+static VALUE counter_now(VALUE self)
 {
-  VALUE counting = rb_iv_set(self, "@counting", Qtrue);
-  if(counting == Qfalse){ return f == Qtrue ? Qfalse : Qtrue; }
+  VALUE stop_tick = rb_iv_get(self, "@stop_tick");
+  Uint32 cnt = 0;
+  Uint32 wait = NUM2INT(rb_iv_get(self, "@wait"));
+  if(stop_tick != Qnil)
+  {
+    cnt = NUM2INT(stop_tick) - NUM2INT(rb_iv_get(self, "@st"));
+    if(wait < cnt)
+    {
+      return INT2NUM(wait+1);
+    }
+    else
+    {
+      return INT2NUM(cnt);
+    }
+  }
+  if(rb_iv_get(self, "@counting") == Qfalse){ return NUM2INT(-1); }
+  cnt = SDL_GetTicks() - NUM2INT(rb_iv_get(self, "@st"));
+  if(wait < cnt)
+  {
+    return INT2NUM(wait+1);
+  }
+  else
+  {
+    return INT2NUM(cnt);
+  }
+  return self;
+}
 
-  int t = NUM2INT(rb_funcall(mSDL, rb_intern("getTicks"), 0));
-  int st = NUM2INT(rb_iv_get(self, "@st"));
-  int wait = NUM2INT(rb_iv_get(self, "@wait"));
-  if((t - st) < wait){ return f; }
+/*
+:nodoc:
+*/
+static VALUE counter_remain(VALUE self)
+{
+  VALUE stop_tick = rb_iv_get(self, "@stop_tick");
+  Uint32 cnt = 0;
+  Uint32 wait = NUM2INT(rb_iv_get(self, "@wait"));
+  if(stop_tick != Qnil)
+  {
+    cnt = NUM2INT(stop_tick) - NUM2INT(rb_iv_get(self, "@st"));
+    if(wait < cnt)
+    {
+      return NUM2INT(-1);
+    }
+    else
+    {
+      return INT2NUM(wait-cnt);
+    }
+  }
+  if(rb_iv_get(self, "@counting") == Qfalse){ return INT2NUM(wait+1); }
+  cnt = SDL_GetTicks() - NUM2INT(rb_iv_get(self, "@st"));
+  if(wait < cnt)
+  {
+    return INT2NUM(-1);
+  }
+  else
+  {
+    return INT2NUM(wait-cnt);
+  }
+  return self;
+}
+
+/*
+:nodoc:
+*/
+static VALUE counter_reset(VALUE self)
+{
+  if(rb_iv_get(self, "@counting") == Qtrue){ return self; }
+  rb_iv_set(self, "@st", INT2NUM(0));
+  rb_iv_set(self, "@stop_tick", Qnil);
+  rb_iv_set(self, "@counting", Qfalse);
+  return self;
+}
+
+/*
+:nodoc:
+*/
+static VALUE counter_resume(VALUE self)
+{
+  VALUE stop_tick = rb_iv_get(self, "@stop_tick");
+  if(stop_tick == Qnil) return self;
+  Uint32 st = NUM2INT(rb_iv_get(self, "@st")) + SDL_GetTicks() - NUM2INT(stop_tick);
+  rb_iv_set(self, "@st", INT2NUM(st));
+  rb_iv_set(self, "@stop_tick", Qnil);
+  rb_iv_set(self, "@counting", Qtrue);
+  return self;
+}
 
-  rb_iv_set(cWaitCounter, "@counting", Qfalse);
+/*
+:nodoc:
+*/
+static VALUE counter_wait_inner(VALUE self, VALUE f)
+{
+  Uint32 st = NUM2INT(rb_iv_get(self, "@st"));
+  Uint32 wait = NUM2INT(rb_iv_get(self, "@wait"));
+  Uint32 cnt = 0;
 
-  return f == Qtrue ? Qfalse : Qtrue;
+  VALUE stop_tick = rb_iv_get(self, "@stop_tick");
+  if(stop_tick != Qnil)
+  {
+    cnt = NUM2INT(stop_tick) - st;
+  }
+  else
+  {
+    cnt = SDL_GetTicks() - st;
+  }
+  if(cnt >= wait)
+  {
+    return f == Qtrue ? Qfalse : Qtrue;
+  }
+  return f;
 }
 
 /*
@@ -137,15 +237,91 @@ static VALUE counter_finish(VALUE self)
 */
 static VALUE counter_wait(VALUE self)
 {
-  int t = NUM2INT(rb_funcall(mSDL, rb_intern("getTicks"), 0));
-  int st = NUM2INT(rb_funcall(mSDL, rb_intern("getTicks"), 0));
-  int wait = NUM2INT(rb_iv_get(self, "@wait"));
+  Uint32 t = SDL_GetTicks();
+  Uint32 st = NUM2INT(rb_iv_get(self, "@st"));
+  Uint32 wait = NUM2INT(rb_iv_get(self, "@wait"));
   while((t - st) < wait){
     t = NUM2INT(rb_funcall(mSDL, rb_intern("getTicks"), 0));
   }
   return self;
 }
 
+/*
+:nodoc:
+*/
+static int counter_update_inner(VALUE key, VALUE val)
+{
+  if(rb_iv_get(key, "@counting") == Qfalse){ return 0; }
+  if(counter_finish(key) == Qtrue)
+  {
+    VALUE call_arg = rb_ary_new();
+
+    VALUE *array_ptr = RARRAY_PTR(val);
+
+    rb_ary_push(call_arg, key);
+    rb_ary_push(call_arg, *(array_ptr+1));
+    rb_ary_push(call_arg, *(array_ptr+2));
+    rb_proc_call(*array_ptr, call_arg);
+
+    int count = NUM2INT(*(array_ptr+1));
+    int ncount = NUM2INT(*(array_ptr+2));
+
+    if(ncount > count)
+    {
+      counter_start(key);
+    }
+    else if(count == ncount)
+    {
+      counter_stop(key);
+    }
+    else
+    {
+      *(array_ptr+2) = INT2NUM(ncount + 1);
+      counter_start(key);
+    }
+  }
+
+  return 0;
+}
+
+/*
+:nodoc:
+*/
+static VALUE counter_update(VALUE self)
+{
+  VALUE callbacks = rb_iv_get(self, "@@callbacks");
+  rb_hash_foreach(callbacks, counter_update_inner, Qnil);
+
+  return Qnil;
+}
+
+/*
+:nodoc:
+*/
+void _miyako_counter_update()
+{
+  counter_update(cWaitCounter);
+}
+
+/*
+:nodoc:
+*/
+static VALUE counter_post_update(VALUE self)
+{
+  VALUE callbacks = rb_iv_get(self, "@@post_callbacks");
+  rb_hash_foreach(callbacks, counter_update_inner, Qnil);
+
+  return Qnil;
+}
+
+/*
+:nodoc:
+*/
+void _miyako_counter_post_update()
+{
+  counter_post_update(cWaitCounter);
+}
+
 static VALUE su_move(VALUE self, VALUE dx, VALUE dy)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -315,7 +491,7 @@ static VALUE rect_in_range(VALUE self, VALUE vx, VALUE vy)
   int h = NUM2INT(*(st+3));
   int x = NUM2INT(vx);
   int y = NUM2INT(vy);
-  
+
   if(x >= l && y >= t && x < (l+w) && y < (t+h)){ return Qtrue; }
   return Qfalse;
 }
@@ -429,7 +605,7 @@ static VALUE square_in_range(VALUE self, VALUE vx, VALUE vy)
   int b = NUM2INT(*(st+3));
   int x = NUM2INT(vx);
   int y = NUM2INT(vy);
-  
+
   if(x >= l && y >= t && x <= r && y <= b){ return Qtrue; }
   return Qfalse;
 }
@@ -457,13 +633,21 @@ void Init_miyako_basicdata()
   one = 1;
   nOne = INT2NUM(one);
 
+  rb_define_singleton_method(cWaitCounter, "update", counter_update, 0);
+  rb_define_singleton_method(cWaitCounter, "post_update", counter_post_update, 0);
   rb_define_method(cWaitCounter, "start", counter_start, 0);
   rb_define_method(cWaitCounter, "stop",  counter_stop,  0);
+  rb_define_method(cWaitCounter, "reset", counter_reset, 0);
+  rb_define_method(cWaitCounter, "resume",  counter_resume,  0);
+  rb_define_method(cWaitCounter, "now", counter_now, 0);
+  rb_define_method(cWaitCounter, "remain",  counter_remain,  0);
+  rb_define_method(cWaitCounter, "remind",  counter_remain,  0);
   rb_define_method(cWaitCounter, "wait_inner", counter_wait_inner, 1);
   rb_define_method(cWaitCounter, "waiting?", counter_waiting, 0);
   rb_define_method(cWaitCounter, "finish?", counter_finish, 0);
+  rb_define_method(cWaitCounter, "finished?", counter_finish, 0);
   rb_define_method(cWaitCounter, "wait", counter_wait, 0);
-  
+
   rb_define_method(sSpriteUnit, "move!", su_move, 2);
   rb_define_method(sSpriteUnit, "move_to!", su_move_to, 2);