rubysketch-solitaire 0.1.0 → 0.9.0

data/lib/rubysketch/solitaire/common/scene.rb

@@ -14,6 +14,12 @@ class Scene
 
   attr_reader :name, :parent
 
+  def pause()
+  end
+
+  def resume()
+  end
+
   def add(scene)
     @scenes.push scene
     scene.parent = self
@@ -28,12 +34,13 @@ class Scene
     scene
   end
 
-  def transition(to, effect = nil, *args, **kwargs)
+  def transition(to, effect = nil, *args, **kwargs, &block)
     if effect
-      add effect.new(to, *args, **kwargs)
+      add effect.new(to, *args, **kwargs, &block)
     else
       parent.add to
       parent.remove self
+      block.call if block
     end
     to
   end
@@ -61,6 +68,10 @@ class Scene
     @particle ||= Particle.new
   end
 
+  def active?()
+    @active
+  end
+
   def update()
     size = [width, height]
     if size != @prevSize
@@ -95,8 +106,8 @@ class Scene
     @active = false
   end
 
-  def active?()
-    @active
+  def focusChanged(focus)
+    @scenes.each {|scene| scene.focusChanged focus}
   end
 
   def mousePressed(x, y, button)

data/lib/rubysketch/solitaire/common/settings.rb

@@ -5,15 +5,27 @@ class Settings
     @hash = load path
   end
 
-  def []=(key, value)
-    hash[key] = value
+  def clear()
+    hash.clear
     save @path
   end
 
+  def []=(key, value)
+    if value != hash[key]
+      hash[key] = value
+      save @path
+    end
+    value
+  end
+
   def [](key)
     hash[key]
   end
 
+  def to_json()
+    hash.to_json
+  end
+
   private
 
   def hash()
@@ -21,7 +33,7 @@ class Settings
   end
 
   def save(path)
-    File.write path, hash.to_json
+    File.write path, to_json
   end
 
   def load(path)

data/lib/rubysketch/solitaire/common/timer.rb

@@ -29,7 +29,7 @@ def fireTimers()
   now_ = now
   blocks = []
   $timers.delete_if do |_, (time, block)|
-    (now_ >= time).tap { blocks.push block if _1 }
+    (now_ >= time).tap {|t| blocks.push block if t}
   end
-  blocks.each { _1.call }
+  blocks.each &:call
 end

data/lib/rubysketch/solitaire/common/transitions.rb

@@ -7,10 +7,12 @@ class TransitionEffect < Scene
     nextScene, sec: 1,
      secOut: nil,       secIn: nil,
     easeOut: :expoOut, easeIn: :expoIn,
+    showAd: false,
     &block)
 
     super()
-    @nextScene, @easeOut, @easeIn = nextScene, easeOut, easeIn
+    @nextScene, @easeOut, @easeIn, @showAd, @block =
+      nextScene, easeOut, easeIn, showAd, block
     @secOut = secOut || sec / 2.0
     @secIn  = secIn  || sec / 2.0
     @phase  = :out
@@ -26,11 +28,15 @@ class TransitionEffect < Scene
     start do
       case @phase
       when :out
-        pa = parent
-        pa.remove self
-        @phase = :in
-        @nextScene.add self
-        pa.transition @nextScene
+        sendCommand :showInterstitialAd if @showAd
+        delay do
+          pa = parent
+          pa.remove self
+          @phase = :in
+          @nextScene.add self
+          pa.transition @nextScene
+          @block.call if @block
+        end
       when :in
         parent.remove self
       end

data/lib/rubysketch/solitaire/common/utils.rb

@@ -1,3 +1,10 @@
+using RubySketch
+
+
+def ios?()
+  RbConfig::CONFIG['CFLAGS'] =~ %r{/Platforms/iPhone(OS|Simulator).platform/}
+end
+
 def now()
   Time.now.to_f
 end
@@ -10,6 +17,14 @@ def dataPath(path)
   File.expand_path "../../../../data/#{path}", __dir__
 end
 
+def resizeImage(image, w, h)
+  createGraphics(w, h).tap do |g|
+    g.beginDraw do
+      g.copy image, 0, 0, image.width, image.height, 0, 0, w, h
+    end
+  end
+end
+
 
 module Processing
   class Vector