dxruby_sdl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGIxYTRjODcxNGNiZjU5MDlkNDY5ZjMxZmZhOTA3MTBjYzk1NmE0ZA==
+    ZjNjNDE4NTRhMjM3MjQ3YjZmNDQ3YjBhZTNlNGNmNzUyMDNlMzM0ZQ==
   data.tar.gz: !binary |-
-    ODQ2MTgzODg3YWY5YWJkNzNkZDI2NjRhYzczMDAxNTUzNmU1MGVjOA==
+    ODkyNjFjMjgwMGQwOTU0NmNiOTljOTFmYTAxOTI0NmVjMGY1MDUzZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmQ0YTVjNzFjZjlkZTQ4OGM3MmIwNzgyZjRiZTdkMmUzZTQ1ZDY0OWUyNzA5
-    ZjEyZjhlNzM3NGM5N2UwNTBmNDQwYjdmMjE5MzM5NGM0NDUzODMyZjAzZTI0
-    OWEzMWFmOTA2ODY1NDkyN2Q2ZTZlYzAyZjQxN2FiNGY3NGZlZjE=
+    NTY5MjMyYWI3YTRiNDVmMTdkZjZkMzI0YjljYmY5NWUxNTQ3M2JiNDEyNWQ3
+    ZDE1MGEzNzQzOGNhODFhNjQ5MTk0MTE4NTIzYzkzZDQ0NWFjMDlkNWU3Njdl
+    M2VkZmVlOGUyZWEwMTgyYzA2MDZlODFlMjlhMzAxZDc2N2E0ZmQ=
   data.tar.gz: !binary |-
-    MzQ5NTBmNjJhMTljMTQyOGM2OWU0NmY0NTQzNjEzODVkZmMwODcxODg1M2U4
-    Mzc5M2Q1MjNlZTkzNzg2MGU4MzAzMDJmYzc1MTg0YTViNmU2MmJhY2M5NjQz
-    MzlkZDkzZjU5NzFlMDg4ZjVlNWVjOTEzY2ZmNDI2Y2Y5Njc0YTQ=
+    ZWM3ZWQ1MWM4ZTE2MjM1ZGFjMzJmOThkMmRjZDMyODRhMTlmZDhlOTk0ZmNm
+    MTYxZmQ2Y2UxMjY3OWQ2YjFiOGNmYTEyZDUwMmI4YWNjNDZkYmEyMGJjZjk1
+    M2Q2NDI0NmY2NjdkMDQ5MGMxYmY2YmE4YzkwYzY3YTUxNWIxZGY=

data/lib/dxruby_sdl/image.rb

@@ -70,13 +70,32 @@ module DXRubySDL
       end
     end
 
+    def circle_fill(x, y, r, color)
+      lock do
+        @_surface.draw_circle(x, y, r, to_sdl_color(color), true, false,
+                              to_sdl_alpha(color))
+      end
+    end
+
     def box(x1, y1, x2, y2, color)
       x = x1 < x2 ? x1 : x2
       w = (x2 - x1).abs
       y = y1 < y2 ? y1 : y2
       h = (y2 - y1).abs
       lock do
-        @_surface.draw_rect(x, y, w, h, to_sdl_color(color))
+        @_surface.draw_rect(x, y, w, h, to_sdl_color(color), false,
+                            to_sdl_alpha(color))
+      end
+    end
+
+    def box_fill(x1, y1, x2, y2, color)
+      x = x1 < x2 ? x1 : x2
+      w = (x2 - x1).abs
+      y = y1 < y2 ? y1 : y2
+      h = (y2 - y1).abs
+      lock do
+        @_surface.draw_rect(x, y, w, h, to_sdl_color(color), true,
+                            to_sdl_alpha(color))
       end
     end
 
@@ -86,6 +105,8 @@ module DXRubySDL
       alias_method :load_to_array, :load_tiles
       alias_method :loadToArray, :load_to_array
     end
+    alias_method :circleFill, :circle_fill
+    alias_method :boxFill, :box_fill
     # rubocop:enable SymbolName
 
     private

data/lib/dxruby_sdl/input.rb

@@ -48,12 +48,39 @@ module DXRubySDL
       return key_press?(to_sdl_key(key_code))
     end
 
+    def mouse_down?(button)
+      case button
+      when M_LBUTTON
+        index = 2
+      when M_MBUTTON
+        index = 3
+      when M_RBUTTON
+        index = 4
+      end
+      return SDL::Mouse.state[index]
+    end
+
+    def mouse_push?(button)
+      case button
+      when M_LBUTTON
+        index = 2
+      when M_MBUTTON
+        index = 3
+      when M_RBUTTON
+        index = 4
+      end
+      return SDL::Mouse.state[index] &&
+        !Window.instance_variable_get('@last_mouse_state')[index]
+    end
+
     # rubocop:disable SymbolName
     class << self
       alias_method :padDown?, :pad_down?
       alias_method :mousePosX, :mouse_pos_x
       alias_method :mousePosY, :mouse_pos_y
       alias_method :keyPush?, :key_push?
+      alias_method :mouseDown?, :mouse_down?
+      alias_method :mousePush?, :mouse_push?
     end
     # rubocop:enable SymbolName
 

data/lib/dxruby_sdl/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module DXRubySDL
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/dxruby_sdl/window.rb

@@ -4,6 +4,8 @@ require 'dxruby_sdl/window/fpstimer'
 
 module DXRubySDL
   module Window
+    @last_mouse_state = [false, false, false]
+
     module_function
 
     def _screen
@@ -13,6 +15,10 @@ module DXRubySDL
                               SDL::SWSURFACE)
     end
 
+    def fps=(val)
+      FPSTimer.instance.fps = val
+    end
+
     def loop(&block)
       timer = FPSTimer.instance
       timer.reset
@@ -32,6 +38,8 @@ module DXRubySDL
           yield
 
           _screen.update_rect(0, 0, 0, 0)
+
+          @last_mouse_state = SDL::Mouse.state
         end
       end
     end

data/samples/kadai1.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+require 'dxruby'
+
+i = Image.new(640, 480)
+i.boxFill(50, 50, 350, 200, [255, 0, 0])
+i.circle(50, 50, 10, [0, 255, 0])
+i.circle(350, 50, 10, [0, 255, 0])
+i.circle(50, 200, 10, [0, 255, 0])
+i.circle(350, 200, 10, [0, 255, 0])
+
+font = Font.new(50, 'MS Gothic')
+
+Window.loop do
+  Window.draw(0, 0, i)
+
+  t = Time.now
+  if t.sec.even?
+    s = t.strftime('%H:%M:%S')
+  else
+    s = t.strftime('%H %M %S')
+  end
+  Window.drawFont(100, 100, s, font)
+end

data/samples/kadai2.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require 'dxruby'
+
+c = 255
+r = 1
+
+font = Font.new(32)
+i = Image.new(640, 480)
+
+Window.loop do
+  c -= Input.x
+  if c > 255
+    c = 255
+  end
+  if c < 0
+    c = 0
+  end
+
+  r -= Input.y
+  if r > 20
+    r = 20
+  end
+  if r < 1
+    r = 1
+  end
+
+  Window.drawFont(0, 0, "C:#{c} R:#{r}", font)
+
+  if  Input.mouseDown?(M_LBUTTON)
+    x = Input.mousePosX
+    y = Input.mousePosY
+    i.circleFill(x, y, r, [c, c, c])
+  end
+  Window.draw(0, 0, i)
+end

data/samples/kadai3.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+require 'dxruby'
+
+f = ['7', '@', 'G', '!', '*']
+no1_f = f.sort_by { rand }
+no2_f = f.sort_by { rand }
+no3_f = f.sort_by { rand }
+
+i = 0
+no1 = no1_f[i]
+no2 = no2_f[i]
+no3 = no3_f[i]
+
+no1_s = false
+no2_s = false
+no3_s = false
+font = Font.new(64, 'MS Gothic')
+Window.fps = 15
+Window.loop do
+  Window.drawFont(20, 10, "#{no1} #{no2} #{no3}", font)
+  if  Input.mousePush?(M_LBUTTON)
+    if  !no1_s
+      no1_s = true
+    elsif  !no2_s
+      no2_s = true
+    elsif  !no3_s
+      no3_s = true
+    end
+  end
+  i += 1
+  if  i >= f.length
+    i = 0
+  end
+  if  !no1_s
+    no1 = no1_f[i]
+  end
+  if  !no2_s
+    no2 = no2_f[i]
+  end
+  if  no3_s
+    if  no1 == no2 && no1 == no3
+      Window.drawFont(120, 100, 'Good!!', font)
+    else
+      Window.drawFont(120, 100, 'Bad.', font)
+    end
+  else
+    no3 = no3_f[i]
+  end
+end

data/spec/dxruby_sdl/image_spec.rb

@@ -149,9 +149,45 @@ describe DXRubySDL::Image, '画像を表すクラス' do
     include_context 'draw methods'
   end
 
+  shared_context '#circle_fill' do
+    include_context 'draw methods'
+  end
+
+  describe '#circle_fill' do
+    subject { image.circle_fill(50, 50, 25, [255, 255, 255]) }
+
+    include_context '#circle_fill'
+
+    describe 'alias' do
+      describe '#circleFill' do
+        it_behaves_like '#circle_fill' do
+          subject { image.circleFill(50, 50, 25, [255, 255, 255]) }
+        end
+      end
+    end
+  end
+
   describe '#box' do
     subject { image.box(0, 0, 100, 100, [255, 255, 255]) }
 
     include_context 'draw methods'
   end
+
+  shared_context '#box_fill' do
+    include_context 'draw methods'
+  end
+
+  describe '#box_fill' do
+    subject { image.box_fill(0, 0, 100, 100, [255, 255, 255]) }
+
+    include_context '#box_fill'
+
+    describe 'alias' do
+      describe '#boxFill' do
+        it_behaves_like '#box_fill' do
+          subject { image.boxFill(0, 0, 100, 100, [255, 255, 255]) }
+        end
+      end
+    end
+  end
 end

data/spec/dxruby_sdl/input_spec.rb

@@ -227,4 +227,275 @@ describe DXRubySDL::Input,
       end
     end
   end
+
+  shared_context '.mouse_down?' do
+    context 'マウスの左ボタンを押している場合' do
+      before do
+        allow(SDL::Mouse)
+          .to receive(:state).and_return([0, 0, true, false, false])
+      end
+
+      describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_LBUTTON }
+
+        it { should be_true }
+      end
+
+      describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_MBUTTON }
+
+        it { should be_false }
+      end
+
+      describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_RBUTTON }
+
+        it { should be_false }
+      end
+    end
+
+    context 'マウスの中ボタンを押している場合' do
+      before do
+        allow(SDL::Mouse)
+          .to receive(:state).and_return([0, 0, false, true, false])
+      end
+
+      describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_LBUTTON }
+
+        it { should be_false }
+      end
+
+      describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_MBUTTON }
+
+        it { should be_true }
+      end
+
+      describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_RBUTTON }
+
+        it { should be_false }
+      end
+    end
+
+    context 'マウスの右ボタンを押している場合' do
+      before do
+        allow(SDL::Mouse)
+          .to receive(:state).and_return([0, 0, false, false, true])
+      end
+
+      describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_LBUTTON }
+
+        it { should be_false }
+      end
+
+      describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_MBUTTON }
+
+        it { should be_false }
+      end
+
+      describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+        let(:button) { DXRubySDL::M_RBUTTON }
+
+        it { should be_true }
+      end
+    end
+  end
+
+  describe '.mouse_down?' do
+    subject { described_class.mouse_down?(button) }
+
+    include_context '.mouse_down?'
+
+    describe 'alias' do
+      describe '.mouseDown?' do
+        it_behaves_like '.mouse_down?' do
+          subject { described_class.mouseDown?(button) }
+        end
+      end
+    end
+  end
+
+  shared_context '.mouse_push?' do
+    context '直前にマウスのボタンを押していない場合' do
+      before do
+        DXRubySDL::Window.instance_variable_set('@last_mouse_state',
+                                                [0, 0, false, false, false])
+      end
+
+      context 'マウスの左ボタンを押している場合' do
+        before do
+          allow(SDL::Mouse)
+            .to receive(:state).and_return([0, 0, true, false, false])
+        end
+
+        describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_LBUTTON }
+
+          it { should be_true }
+        end
+
+        describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_MBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_RBUTTON }
+
+          it { should be_false }
+        end
+      end
+
+      context 'マウスの中ボタンを押している場合' do
+        before do
+          allow(SDL::Mouse)
+            .to receive(:state).and_return([0, 0, false, true, false])
+        end
+
+        describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_LBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_MBUTTON }
+
+          it { should be_true }
+        end
+
+        describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_RBUTTON }
+
+          it { should be_false }
+        end
+      end
+
+      context 'マウスの右ボタンを押している場合' do
+        before do
+          allow(SDL::Mouse)
+            .to receive(:state).and_return([0, 0, false, false, true])
+        end
+
+        describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_LBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_MBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_RBUTTON }
+
+          it { should be_true }
+        end
+      end
+    end
+
+    context '直前にマウスのボタンを全て押していた場合' do
+      before do
+        DXRubySDL::Window.instance_variable_set('@last_mouse_state',
+                                                [0, 0, true, true, true])
+      end
+
+      context 'マウスの左ボタンを押している場合' do
+        before do
+          allow(SDL::Mouse)
+            .to receive(:state).and_return([0, 0, true, false, false])
+        end
+
+        describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_LBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_MBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_RBUTTON }
+
+          it { should be_false }
+        end
+      end
+
+      context 'マウスの中ボタンを押している場合' do
+        before do
+          allow(SDL::Mouse)
+            .to receive(:state).and_return([0, 0, false, true, false])
+        end
+
+        describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_LBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_MBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_RBUTTON }
+
+          it { should be_false }
+        end
+      end
+
+      context 'マウスの右ボタンを押している場合' do
+        before do
+          allow(SDL::Mouse)
+            .to receive(:state).and_return([0, 0, false, false, true])
+        end
+
+        describe 'マウスの左ボタン(M_LBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_LBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの中ボタン(M_MBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_MBUTTON }
+
+          it { should be_false }
+        end
+
+        describe 'マウスの右ボタン(M_RBUTTON)を指定する' do
+          let(:button) { DXRubySDL::M_RBUTTON }
+
+          it { should be_false }
+        end
+      end
+    end
+  end
+
+  describe '.mouse_push?' do
+    subject { described_class.mouse_push?(button) }
+
+    include_context '.mouse_push?'
+
+    describe 'alias' do
+      describe '.mousePush?' do
+        it_behaves_like '.mouse_push?' do
+          subject { described_class.mousePush?(button) }
+        end
+      end
+    end
+  end
 end

data/spec/dxruby_sdl/window_spec.rb

@@ -26,6 +26,22 @@ describe DXRubySDL::Window do
     end
   end
 
+  describe '.fps=', 'FPSを設定する' do
+    context '15に設定した場合' do
+      let(:fps) { 15 }
+
+      before do
+        DXRubySDL::Window.fps = fps
+      end
+
+      describe 'DXRubySDL::Window::FPSTimer.instance' do
+        subject { DXRubySDL::Window::FPSTimer.instance }
+
+        its(:fps) { should eq(fps) }
+      end
+    end
+  end
+
   shared_context '.draw_font' do
     context 'サイズのみを設定したフォントを指定した場合' do
       let!(:font) { DXRubySDL::Font.new(32) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxruby_sdl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kouji Takao
@@ -153,6 +153,9 @@ files:
 - lib/dxruby_sdl/window/fpstimer.rb
 - samples/bgm.mid
 - samples/data.png
+- samples/kadai1.rb
+- samples/kadai2.rb
+- samples/kadai3.rb
 - samples/sound.wav
 - samples/tutorial-2-01.rb
 - samples/tutorial-2-02.rb