ruby-miyako 2.1.0 → 2.1.1

data/sample/Room3/title.rb

@@ -19,7 +19,7 @@ class Title
     @visible = false
 
     @title = Sprite.new(:file=>"image/mittsu_no_oheya.png", :type=>:ck)
-    
+
     @exec = self.method(:view_in)
   end
 
@@ -52,7 +52,7 @@ class Title
     end
     return TitleCall
   end
-  
+
   def update
     return nil if (Input.pushed_any?(:esc) || Input.quit?)
     return @exec.call
@@ -79,7 +79,7 @@ class TitleCall
     @man.center!.bottom!
     @alpha = 0.0
     @wait = WaitCounter.new(0.2)
-    @exec = self.method(:view_in)
+    @exec = :view_in
   end
 
   def setup
@@ -92,19 +92,24 @@ class TitleCall
 
   def update
     return nil if (Input.pushed_any?(:esc) || Input.quit?)
-    return @exec.call
+    case @exec
+      when :view_in
+        return view_in
+      when :exec_yuki
+        return exec_yuki
+    end
   end
-  
+
   def final
     message_box.stop
   end
-  
+
   def view_in
     if @wait.finish?
       if @alpha == 1.0
-        @yuki.start_plot
-        @exec = self.method(:exec_yuki)
+        @exec = :exec_yuki
         message_box.start
+        @yuki.start_plot
         return @now
       end
       @alpha += 0.15
@@ -119,7 +124,7 @@ class TitleCall
     @yuki.update
     return @yuki.result ? @yuki.result : @now
   end
-  
+
   def plot
     yuki_plot do
       text("「レディ〜ス　エ〜ン　ジェントルメ〜ン！」").pause.cr
@@ -179,6 +184,6 @@ class TitleCall
 
   def render
     Bitmap.dec_alpha(@man, Screen, @alpha)
-    message_box.render if @exec == self.method(:exec_yuki)
+    message_box.render if @exec == :exec_yuki
   end
 end

data/sample/collision_test2.rb

@@ -48,6 +48,7 @@ sprites = Array.new(Sprites){|n|
 
   # :collisioned => 当たり判定した？
   {
+   :name => "sprite_#{n}",
    :sprite => sprite,
    :collision => collision,
    :amount => get_amount_one
@@ -66,7 +67,7 @@ cautions = {
 collision_type = collision_list.next
 
 # 一気にレンダリング
-Screen.pre_render_array << sprites.map{|m| m[:sprite]}
+sprites.each{|m| Screen.pre_render_array << [m[:name], m[:sprite]] }
 
 # 判定を切り替えるタイミングを決めるタイマー
 wait = WaitCounter.new(1.0)

data/sample/fixed_map_test/fixed_map_sample.rb

@@ -30,7 +30,7 @@ class Monster
   def start
     @anim.start
   end
-  
+
   def update(map, events, param)
     @anim.update_animation
   end
@@ -41,7 +41,7 @@ class Monster
 
   def finish
   end
-  
+
   def dispose
     @anim.dispose
     @spr.dispose
@@ -103,11 +103,11 @@ class SlimeEvent
   def init(map, x, y)
     @slime = Slime.new(map, x, y)
   end
-  
+
   def update(map, events, param)
     @slime.update(map, events, param)
   end
-  
+
   def final
     @slime.finish
   end
@@ -115,7 +115,7 @@ class SlimeEvent
   def dispose
     @slime.dispose
   end
-  
+
   def render
     @slime.render
   end
@@ -126,7 +126,8 @@ em.add(1, SlimeEvent)
 
 # main
 mp = MapChipFactory.load("./mapchip.csv")
-@fmap = FixedMap.new(mp, "./map.csv", em)
+ms = MapStructFactory.load("./map.csv")
+@fmap = FixedMap.new(mp, ms, em)
 
 Miyako.main_loop do
   break if Input.quit_or_escape?

data/sample/map_test/main_scene.rb

@@ -20,14 +20,19 @@ class MainScene
     @map.move!(*@chr.margin)
     # マップの実座標を設定する
     @map.move!(*@chr.position)
-    
+
     @parts = CommonParts.instance
     #Yukiの初期化
     @yuki = Yuki.new
     @yuki.select_textbox(@parts.box[:box])
     @yuki.select_commandbox(@parts.cbox[:box])
+    @yuki.vars[:command] = [
+      Yuki::Command.new("話す", "話す", "話す", true, nil, talk),
+      Yuki::Command.new("調べる", "調べる", "調べる", true, nil, check),
+      Yuki::Command.new("その他", "その他", "その他", false, nil, check)
+    ]
   end
-  
+
   def setup
     @map.start
     @chr.start
@@ -56,8 +61,6 @@ class MainScene
         if event_flags.none?
           #標準のコマンドを表示
           @yuki.vars[:now] = @now
-          @yuki.vars[:talk] = talk
-          @yuki.vars[:check] = check
           @yuki.start_plot(command_plot)
         else
           #キャラの立ち位置が重なっているイベントを起動
@@ -93,7 +96,7 @@ class MainScene
       end
     }
     @executing_flags = @map.events[0].map{|e| e.executing? }
-   
+
     #コマンド選択の結果、イベントが実行されたときは、結果として@nowを返す
     return @now unless @yuki.is_scene?(@yuki.result)
     return @yuki.result || @now
@@ -112,8 +115,7 @@ class MainScene
 
   def command_plot
     yuki_plot do
-      command([Yuki::Command.new("話す", "話す", nil, vars[:talk]),
-               Yuki::Command.new("調べる", "調べる", nil, vars[:check])], vars[:now])
+      command(vars[:command], vars[:now])
       call_plot(select_result) if is_scenario?(select_result)
       vars[:now]
     end
@@ -128,7 +130,7 @@ class MainScene
       clear
     end
   end
-  
+
   #コマンドウィンドウの「話す」を選んだときの処理
   def talk
     yuki_plot do
@@ -139,13 +141,13 @@ class MainScene
       clear
     end
   end
-  
+
   def final
     @parts.stop
     @map.stop
     @chr.stop
   end
-  
+
   def dispose
     @map.dispose
     @chr.dispose

data/sample/map_test/map_manager.rb

@@ -1,27 +1,28 @@
 # -*- encoding: utf-8 -*-
-#�}�b�v�Ǘ��N���X
+#マップ管理クラス
 class MapManager
   extend Forwardable
 
   attr_reader :mapchip
-  
+
   def initialize
     @moving = false
 
-    #�}�b�v�`�b�v�C���X�^���X�̍쐬
+    #マップチップインスタンスの作成
     @mapchip = MapChipFactory.load("./mapchip.csv")
 
-    #�C�x���g��o�^
+    #イベントを登録
     em = MapEventManager.new
     em.add(3, EventRouteMarker).
        add(7, EventRouteMarker2).
        add(8, EventTown).
        add(16, EventOasis)
 
-    #�}�b�v�̍쐬
-    @map = Map.new(@mapchip, "./map_layer.csv", em)
+    #マップの作成
+    @map_struct = MapStructFactory.load("./map_layer.csv")
+    @map = Map.new(@mapchip, @map_struct, em)
 
-    #�C�̃}�b�v�`�b�v��g���A�j���[�V��������摜�ɒu������
+    #海のマップチップを波がアニメーションする画像に置き換え
     @sp = Sprite.new(:file=>"sea.png", :type=>:as)
     @sp.oh = @sp.w
     @ar = SpriteAnimation.new(:sprite=>@sp, :wait=>0.4)
@@ -32,21 +33,21 @@ class MapManager
     @map.move!(dx, dy)
     @map.events[0].each{|e| e.move!(dx, dy) }
   end
-  
+
   def move_to!(x, y)
     @map.events[0].each{|e| e.move!(x-@map.pos.x, y-@map.pos.y) }
     @map.move_to!(x, y)
   end
-  
+
   def start
     @ar.start
   end
-  
+
   def update
     @ar.update_animation
     @map.events[0].each{|e| e.update(@map, @map.events, nil) }
   end
-  
+
   def render
     @map.render
   end
@@ -62,13 +63,13 @@ class MapManager
   def stop
     @ar.stop
   end
-  
+
   def dispose
     @map.dispose
     @ar.dispose
     @sp.dispose
   end
-    
+
   def_delegators(:@map, :w, :h, :get_code, :get_code_real, :margin, :mapchips, :[])
   def_delegators(:@map, :collision?, :meet?, :cover?, :events)
   def_delegators(:@mapchip, :collision_table, :access_table)

data/sample/rasterscroll.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# ���X�^�X�N���[���T���v��
+# ラスタスクロールサンプル
 # 2009.4.12 Cyross Makoto
 
 require 'Miyako/miyako'
@@ -7,9 +7,9 @@ require 'Miyako/EXT/raster_scroll'
 
 include Miyako
 
-#1�b��Ƀ��X�^�X�N���[���̃t�F�[�h�A�E�g��ݒ肷��
+#1秒後にラスタスクロールのフェードアウトを設定する
 wait = WaitCounter.new(1.0).start
-# 0.05�b���ƂɁA2���C�����A8�s�N�Z���P�ʂ̃��X�^�X�N���[�����s��
+# 0.05秒ごとに、2ラインずつ、8ピクセル単位のラスタスクロールを行う
 sprite = Sprite.new(:file => "Animation2/lex_body.png", :type => :ck).centering!
 rs = RasterScroll.new(sprite).start({:lines => 2, :size => 8, :wait=>WaitCounter.new(0.05)})
 fade = false
@@ -18,8 +18,8 @@ Miyako.main_loop do
   break if Input.quit_or_escape?
   rs.effecting? ? rs.update.render : sprite.render
   if fade == false && wait.finish?
-    #1�b�ゲ�ƂɁA���X�^�X�N���[���̕����k�߂�
+    #1秒後ごとに、ラスタスクロールの幅を縮める
     rs.fade_out(1, WaitCounter.new(1.0))
     fade = true
   end
-end
+end

data/sample/takahashi.rb

@@ -32,9 +32,9 @@ shape2 = Shape.text(:font=>Font.serif, :align=>:right){|v|
 					text("DEFG")
         }
 
-# 自動描画配列にshape1、shape2を組み込み
-Screen.auto_render_array << shape1
-Screen.auto_render_array << shape2
+# オートレンダー(SpriteList)にshape1、shape2を組み込み
+Screen.auto_render_array << [:shape1, shape1]
+Screen.auto_render_array << [:shape2, shape2]
 
 Miyako.main_loop do
 	break if Input.quit_or_escape?

data/sample/textbox_sample.rb

@@ -38,15 +38,16 @@ box_bg.fill([128,0,64,128])
 @parts[:box].centering!
 @parts.centering!
 
-p @parts.broad_rect
-
 # 選択肢の作成
 list = [
-        [Shape.text(:font=>font, :text=>"選択肢１"), nil, 1],
-        [Shape.text(:font=>font, :text=>"選択肢２"), nil, 2],
-        [Shape.text(:font=>font, :text=>"選択肢３"), nil, 3]
+        ["選択肢１", "選択肢１", "選択肢１", true,  1],
+        ["選択肢２", "選択肢２", "選択肢２", true,  2],
+        ["選択肢３", "選択肢３", "選択肢３", true,  3],
+        ["選択肢４", "選択肢４", "選択肢４", false, 4]
        ]
 @choices = @parts[:box].create_choices_chain(list)
+#@choices[0][1].visible = false
+#@choices[0][2].enable = false
 
 # カーソルのアニメーションの開始
 @parts[:box].start
@@ -183,7 +184,7 @@ Miyako.main_loop do
     # カーソルの移動
     @parts[:box].move_cursor(*Input.pushed_amount)
     # １ボタンを押したとき、選択状態を解除する
-    @parts[:box].finish_command if Input.pushed_any?(:btn1)
+    @parts[:box].finish_command if (Input.pushed_any?(:btn1) && @parts[:box].enable_choice?)
     process_textbox
     next
   end

data/sample/transform.rb

@@ -29,7 +29,8 @@ yscale = 4.0 # 初期拡大率(y座標)4倍
 angle = 0.0  # 初期回転角度0度
 
 # 画面の中心に画像を表示指定(pre_render)
-Screen.pre_render_array << [Sprite.new(:file=>"Animation1/m1ku_back.jpg", :type=>:ac).centering!, @sprite]
+Screen.pre_render_array << [:s1, Sprite.new(:file=>"Animation1/m1ku_back.jpg", :type=>:ac).centering!]
+Screen.pre_render_array << [:s2, @sprite]
 
 # 画面の変形中心を設定
 Screen.center_x = Screen.w/2

data/uninstall_miyako.rb

@@ -12,8 +12,11 @@ require 'fileutils'
 puts "Are you sure?(Y/else)"
 exit unless $stdin.gets.split(//)[0].upcase == 'Y'
 
-sitelibdir = Config::CONFIG["sitelibdir"] + "/Miyako"
+baselibdir = Config::CONFIG["sitelibdir"]
+sitelibdir = baselibdir + "/Miyako"
 
+FileUtils.remove(baselibdir+"/miyako.rb")
+FileUtils.remove(baselibdir+"/miyako_require_only.rb")
 FileUtils.remove_dir(sitelibdir, true)
 
 puts "uninstall completed."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-miyako
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Cyross Makoto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-09 00:00:00 +09:00
+date: 2009-10-16 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -37,13 +37,16 @@ files:
 - ./lib/Miyako/API/bitmap.rb
 - ./lib/Miyako/API/choices.rb
 - ./lib/Miyako/API/collision.rb
+- ./lib/Miyako/API/color.rb
 - ./lib/Miyako/API/diagram.rb
 - ./lib/Miyako/API/drawing.rb
 - ./lib/Miyako/API/exceptions.rb
 - ./lib/Miyako/API/fixedmap.rb
 - ./lib/Miyako/API/font.rb
+- ./lib/Miyako/API/i_yuki.rb
 - ./lib/Miyako/API/input.rb
 - ./lib/Miyako/API/layout.rb
+- ./lib/Miyako/API/map_struct.rb
 - ./lib/Miyako/API/map.rb
 - ./lib/Miyako/API/map_event.rb
 - ./lib/Miyako/API/modules.rb
@@ -57,15 +60,22 @@ files:
 - ./lib/Miyako/API/sprite_animation.rb
 - ./lib/Miyako/API/sprite_list.rb
 - ./lib/Miyako/API/story.rb
+- ./lib/Miyako/API/struct_point.rb
+- ./lib/Miyako/API/struct_size.rb
+- ./lib/Miyako/API/struct_rect.rb
+- ./lib/Miyako/API/struct_square.rb
+- ./lib/Miyako/API/struct_segment.rb
 - ./lib/Miyako/API/textbox.rb
 - ./lib/Miyako/API/utility.rb
 - ./lib/Miyako/API/viewport.rb
+- ./lib/Miyako/API/wait_counter.rb
 - ./lib/Miyako/API/yuki.rb
-- ./lib/Miyako/EXT/miyako_cairo.rb
 - ./lib/Miyako/EXT/raster_scroll.rb
 - ./lib/Miyako/EXT/slides.rb
 - ./lib/Miyako/miyako.rb
 - ./lib/Miyako/miyako_require_only.rb
+- ./lib/miyako.rb
+- ./lib/miyako_require_only.rb
 - ./logo/EGSR_logo.png
 - ./logo/EGSR_logo_bg.png
 - ./logo/EGSR_logo_fg.png
@@ -86,6 +96,8 @@ files:
 - ./miyako_sprite2.c
 - ./miyako_transform.c
 - ./miyako_utility.c
+- ./miyako_yuki.c
+- ./miyako_diagram.c
 - ./Rakefile
 - ./README
 - ./sample/Animation1/m1ku.rb
@@ -113,7 +125,6 @@ files:
 - ./sample/Animation2/song_title.png
 - ./sample/ball_action_sample.rb
 - ./sample/blit_rop.rb
-- ./sample/cairo_sample.rb
 - ./sample/circle_collision_test.rb
 - ./sample/collision_test.rb
 - ./sample/collision_test2.rb

data/lib/Miyako/EXT/miyako_cairo.rb

@@ -1,62 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Miyako Extension Cairo-Miyako interface
-=begin
-Miyako Extention Library v2.1
-Copyright (C) 2007-2009  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
-
-begin
-  loaded = false
-  require 'cairo'
-rescue LoadError
-  begin
-    require 'rubygems'
-    require 'cairo'
-    loaded = true
-  rescue LoadError
-    raise Miyako::MiyakoError, "Sorry, Cairo-Miyako Interface has rcairo." unless loaded
-  end
-end
-
-module Miyako
-  #==MiyakoのSpriteクラスのインスタンスとCairoのImageSurfaceクラスのインスタンスとの相互変換モジュール
-  #要rcairo1.8以降
-  module MiyakoCairo
-    #===SpriteインスタンスをCairoのImageSurfaceに変換
-    #変換したCairo::ImageSurfaceインスタンスは、32ビット(Cairo::Format::ARGB32)の画像を持つ
-    #_sprite_:: 変換元Spriteインスタンス
-    #返却値:: 変換したCairo::ImageSurfaceインスタンス
-    def MiyakoCairo.to_cairo_surface(sprite)
-      return Cairo::ImageSurface.new(sprite.bitmap.pixels, Cairo::Format::ARGB32, sprite.w, sprite.h, sprite.w * 4)
-    end
-    
-    #===CairoのImageSurfaceをSpriteインスタンスに変換
-    #変換したSpriteインスタンスは、:acタイプ(但し元画像がCairo::Format::RGB24の時は:asタイプ)の画像を持つ
-    #_surface_:: 変換元Cairo::ImageSurfaceインスタンス
-    #返却値:: 変換したSpriteインスタンス
-    def MiyakoCairo.to_sprite(surface)
-      # エンディアン判別
-      if [1].pack("V*") == [1].pack("L*") # リトルエンディアン？
-        bitmap = SDL::Surface.new_from(surface.data, surface.width, surface.height, 32, surface.stride, 0xff0000, 0xff00, 0xff, 0xff000000)
-      else # ビッグエンディアン
-        bitmap = SDL::Surface.new_from(surface.data, surface.width, surface.height, 32, surface.stride, 0xff00, 0xff0000, 0xff000000, 0xff)
-      end
-      return Sprite.new(:bitmap => bitmap, :type => :as) if surface.format == Cairo::Format::RGB24
-      return Sprite.new(:bitmap => bitmap, :type => :ac)
-    end
-  end
-end

data/sample/cairo_sample.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-# MiyakoCairoサンプル
-# 2009.4.12 Cyross Makoto
-
-require 'Miyako/miyako'
-require 'Miyako/EXT/miyako_cairo'
-
-sprite = Miyako::Sprite.new(:file=>"Animation2/lex_body.png", :type=>:ck)
-sprite.bitmap.saveBMP("./sample.bmp")
-
-surface = Miyako::MiyakoCairo.to_cairo_surface(sprite)
-surface.write_to_png("./sample.png")
-
-surface = Cairo::ImageSurface.new(Cairo::Format::ARGB32, 320, 240)
-context = Cairo::Context.new(surface)
-
-context.set_source_rgb(1.0, 0.5, 0.8)
-context.fill{
-  context.rectangle(50, 50, 150, 100)
-}
-
-surface.write_to_png("./sample2.png")
-
-sprite = Miyako::MiyakoCairo.to_sprite(surface)
-sprite.bitmap.saveBMP("./sample2.bmp")