rubysketch-solitaire 0.1.0 → 0.1.2

data/fastlane/metadata/ja/promotional_text.txt

@@ -0,0 +1 @@
+「宇宙ソリティア」で最高のソリティア体験をお楽しみください！鮮やかなグラフィック、シンプルな操作性、そして中毒性の高いゲームプレイがあなたを待っています。時間を忘れて、ストレスを解消しながらカードを並べましょう。ソリティア愛好家のための最適な選択です。

data/fastlane/metadata/ja/release_notes.txt

@@ -0,0 +1 @@
+- 軽微な不具合をいくつか修正

data/fastlane/metadata/ja/subtitle.txt

@@ -0,0 +1 @@
+選べるカードデザイン、選べるゲーム背景

data/fastlane/metadata/ja/support_url.txt

@@ -0,0 +1 @@
+https://xord.org/rubysolitaire/

data/fastlane/metadata/primary_category.txt

@@ -0,0 +1 @@
+GAMES

data/fastlane/metadata/primary_first_sub_category.txt

@@ -0,0 +1 @@
+

data/fastlane/metadata/primary_second_sub_category.txt

@@ -0,0 +1 @@
+

data/fastlane/metadata/review_information/demo_password.txt

@@ -0,0 +1 @@
+

data/fastlane/metadata/review_information/demo_user.txt

@@ -0,0 +1 @@
+

data/fastlane/metadata/review_information/email_address.txt

@@ -0,0 +1 @@
+xordog@gmail.com

data/fastlane/metadata/review_information/notes.txt

@@ -0,0 +1 @@
+

data/fastlane/metadata/secondary_category.txt

@@ -0,0 +1 @@
+GAMES_CARD

data/fastlane/metadata/secondary_first_sub_category.txt

@@ -0,0 +1 @@
+

data/fastlane/metadata/secondary_second_sub_category.txt

@@ -0,0 +1 @@
+

data/lib/rubysketch/solitaire/background.rb

@@ -1,34 +1,137 @@
+# -*- coding: utf-8 -*-
 using RubySketch
 
 
 class Background < Scene
 
-  def initialize()
+  TYPES = {
+    checker: {
+      name: 'Checker'
+    },
+    checker2: {
+      name: 'Checker (No Scroll)'
+    },
+    cosmic2: {
+      name:   'Cosmic 2',
+      author: 'huwb',
+      url:    'https://www.shadertoy.com/view/XllGzN'
+    },
+    classicPSPWave: {
+      name:   'Classic PSP Wave',
+      author: 'ParkingLotGames',
+      url:    'https://www.shadertoy.com/view/ddV3DK'
+    },
+    reflectiveHexes: {
+      name:   'Reflective hexes',
+      author: 'mrange',
+      url:    'https://www.shadertoy.com/view/ds2XRt'
+    },
+    colorfulUnderwaterBubbles2: {
+      name:   'Colorful underwater bubbles II',
+      author: 'mrange',
+      url:    'https://www.shadertoy.com/view/mlBSWc'
+    },
+  }
+
+  def initialize(type = nil)
     super
-    @start = now
+    @start  = now
+    @canvas = createGraphics width, height
+    set type || settings['background']&.intern|| types.first
+  end
+
+  attr_reader :type
+
+  def types()
+    TYPES.keys
+  end
+
+  def name()
+    TYPES[type][:name]
+  end
+
+  def author()
+    TYPES[type][:author]
+  end
+
+  def url()
+    TYPES[type][:url]
+  end
+
+  def nextType()
+    index = types.index(@type) || 0
+    types[(index + 1) % types.size]
+  end
+
+  def set(type)
+    type = types.first unless types.include?(type)
+    case type
+    when :checker, :checker2
+      @shader = createShader nil, checker
+    when :cosmic2
+      @shader = createShader nil, cosmic2
+    when :classicPSPWave
+      @shader = createShader nil, classicPSPWave
+    when :reflectiveHexes
+      @shader = createShader nil, reflectiveHexes
+    when :colorfulUnderwaterBubbles2
+      @shader = createShader nil, colorfulUnderwaterBubbles2
+    end
+    settings['background'] = @type = type
   end
 
   def draw()
-    pushStyle do
-      checker.set :time, now - @start
-      shader checker
-      rect 0, 0, width, height
+    @canvas.beginDraw do |g|
+      sh = @shader
+      case type
+      when :checker, :checker2
+        colors = skin.backgroundCheckerColors
+        sh.set :iTime, (type == :checker2 ? 0.0 : now - @start)
+        sh.set :color1, *colors[0].map {|n| n / 255.0}
+        sh.set :color2, *colors[1].map {|n| n / 255.0}
+      else
+        sh.set :iTime, now - @start
+        sh.set :iResolution, width, height
+      end
+      g.shader sh
+      g.translate 0, g.height
+      g.scale 1, -1
+      g.rect 0, 0, g.width, g.height
     end
+    copy @canvas, 0, 0, @canvas.width, @canvas.height, 0, 0, width, height
   end
 
   private
 
   def checker()
-    @checker ||= createShader nil, <<~END
+    <<~END
       varying vec4 vertTexCoord;
-      uniform float time;
+      uniform float iTime;
+      uniform vec4 color1;
+      uniform vec4 color2;
       void main() {
-        float t = mod(time, 32.0) * 16.0;
-        float x = mod(vertTexCoord.x + t, 32.0) < 16.0 ? 1.0 : 0.0;
-        float y = mod(vertTexCoord.y + t, 32.0) < 16.0 ? 1.0 : 0.0;
-        gl_FragColor = x != y ? vec4(0.6, 0.9, 0.7, 1) : vec4(0.7, 0.9, 0.6, 1);
+        float t = mod(iTime, 32.) * 8.;
+        float x = mod( vertTexCoord.x + t, 32.) < 16. ? 1. : 0.;
+        float y = mod(-vertTexCoord.y + t, 32.) < 16. ? 1. : 0.;
+        gl_FragColor = x != y ? color1 : color2;
       }
     END
   end
 
+  def cosmic2()
+    File.read(dataPath 'cosmic2.glsl').gsub('iMouse', 'vec2(0.)')
+  end
+
+  def classicPSPWave()
+    File.read(dataPath 'classicPSPWave.glsl')
+  end
+
+  def reflectiveHexes()
+    File.read(dataPath 'reflectiveHexes.glsl')
+  end
+
+  def colorfulUnderwaterBubbles2()
+    File.read(dataPath 'colorfulUnderwaterBubbles2.glsl')
+  end
+
 end# Background

data/lib/rubysketch/solitaire/card.rb

@@ -90,7 +90,7 @@ class Card
   end
 
   def color()
-    self.class.markColor mark
+    skin.markColor mark
   end
 
   def count()
@@ -111,11 +111,13 @@ class Card
   end
 
   def sprite()
-    @sprite ||= Sprite.new(0, 0, *spriteSize, image: closedImage).tap do |sp|
+    @sprite ||= Sprite.new(
+      0, 0, *skin.cardSpriteSize, image: skin.closedImage
+    ).tap do |sp|
       sp.pivot = [rand, rand]
       sp.angle = rand -5.0..5.0
       sp.update do
-        sp.image = @open > 90 ? openedImage : closedImage
+        sp.image = @open > 90 ? skin.openedImage(mark, number) : skin.closedImage
       end
       sp.draw do |&draw|
         push do
@@ -134,12 +136,17 @@ class Card
         image sp.image, 0, 0, w, h
       end
       sp.mousePressed do
+        next if $dragging
+        $dragging = self
         mousePressed sp.mouseX, sp.mouseY
       end
       sp.mouseReleased do
+        next unless $dragging.object_id == self.object_id
         mouseReleased sp.mouseX, sp.mouseY, sp.clickCount
+        $dragging = nil
       end
       sp.mouseDragged do
+        next unless $dragging.object_id == self.object_id
         x, y = sp.mouseX, sp.mouseY
         mouseDragged x, y, x - sp.pmouseX, y - sp.pmouseY
       end
@@ -169,88 +176,4 @@ class Card
     self.pos += createVector x - @startPos.x, y - @startPos.y if @startPos
   end
 
-  def openedImage()
-    @openedImage ||= createGraphics(*self.class.cardSize).tap do |g|
-      c, w, h, m     = self.class, g.width, g.height, 16# margin
-      image          = c.cardImage
-      nx, ny, nw, nh = c.numberRect number
-      mx, my, mw, mh = c.markRect mark
-      mnh            = m + nh
-      mxx, myy       = (w - mw) / 2, mnh + ((h - mnh) - mh) / 2
-      g.beginDraw
-      g.angleMode DEGREES
-      g.translate  w / 2,  h / 2
-      g.rotate 180
-      g.translate -w / 2, -h / 2
-      g.copy image, 896,  0, w,  h,  0,   0,   w,  h
-      g.tint *c.markColor(mark)
-      g.copy image, nx, ny,  nw, nh, m,   m,   nw, nh
-      g.copy image, mx, my,  mw, mh, mxx, myy, mw, mh
-      g.endDraw
-    end
-  end
-
-  def closedImage()
-    self.class.closedImages[3]
-  end
-
-  def spriteSize()
-    self.class.spriteSize
-  end
-
-  def self.closedImages()
-    @closedImages ||= (0..3).map {|n| n * 256}.map do |x|
-      createGraphics(*cardSize).tap do |g|
-        w, h = g.width, g.height
-        g.beginDraw
-        g.copy cardImage, x, 256, w, h, 0, 0, w, h
-        g.endDraw
-      end
-    end
-  end
-
-  def self.cardImage()
-    @cardImage ||= loadImage dataPath 'card.png'
-  end
-
-  def self.cardSize()
-    [164, 252]
-  end
-
-  def self.spriteSize()
-    @spriteSize ||= cardSize.then do |cw, ch|
-      ncolumns   = 7
-      size       = [width, height].min
-      cardWidth  = (size - margin * (ncolumns + 1)) / ncolumns
-      [cardWidth, cardWidth * (ch.to_f / cw.to_f)]
-    end
-  end
-
-  def self.margin()
-    @marin ||= [width, height].min * 0.02
-  end
-
-  def self.markRect(mark)
-    w = h = 128
-    [MARKS.index(mark) * w, 0, w, h]
-  end
-
-  def self.numberRect(number)
-    w = h = 64
-    [(number - 1) * w, 128, w, h]
-  end
-
-  def self.markColor(mark)
-    MARKS[0, 2].include?(mark) ? [255, 111, 61] : [62, 79, 60]
-  end
-
-  def __find_or_last_and_prev(card = nil)
-    prev, it = nil, self
-    while it.next
-      break if it == card
-      prev, it = it, it.next
-    end
-    return it, prev
-  end
-
 end# Card

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

@@ -2,40 +2,40 @@ using RubySketch
 
 
 EASINGS = {
-  linear:  lambda { |x| x },
-   sineIn: lambda { |x| 1.0 - Math.cos(x * Math::PI / 2) },
-  sineOut: lambda { |x|       Math.sin(x * Math::PI / 2) },
-
-     quadIn: lambda { |x|    quadIn x },
-    cubicIn: lambda { |x|   cubicIn x },
-    quartIn: lambda { |x|   quartIn x },
-    quintIn: lambda { |x|   quintIn x },
-     circIn: lambda { |x|    circIn x },
-     backIn: lambda { |x|    backIn x },
-     expoIn: lambda { |x|    expoIn x },
-  elasticIn: lambda { |x| elasticIn x },
-   bounceIn: lambda { |x| 1.0 - bounceOut(1.0 - x) },
-
-     quadOut: lambda { |x| 1.0 -    quadIn(1.0 - x) },
-    cubicOut: lambda { |x| 1.0 -   cubicIn(1.0 - x) },
-    quartOut: lambda { |x| 1.0 -   quartIn(1.0 - x) },
-    quintOut: lambda { |x| 1.0 -   quintIn(1.0 - x) },
-     circOut: lambda { |x| 1.0 -    curcIn(1.0 - x) },
-     backOut: lambda { |x| 1.0 -    backIn(1.0 - x) },
-     expoOut: lambda { |x| 1.0 -    expoIn(1.0 - x) },
-  elasticOut: lambda { |x| 1.0 - elasticIn(1.0 - x) },
-   bounceOut: lambda { |x| bounceOut x },
-
-     sineInOut: lambda { |x| x < 0.5 ?    sineIn(x) :    sineOut(x) },
-     quadInOut: lambda { |x| x < 0.5 ?    quadIn(x) :    quadOut(x) },
-    cubicInOut: lambda { |x| x < 0.5 ?   cubicIn(x) :   cubicOut(x) },
-    quartInOut: lambda { |x| x < 0.5 ?   quartIn(x) :   quartOut(x) },
-    quintInOut: lambda { |x| x < 0.5 ?   quintIn(x) :   quintOut(x) },
-     circInOut: lambda { |x| x < 0.5 ?    circIn(x) :    circOut(x) },
-     backInOut: lambda { |x| x < 0.5 ?    backIn(x) :    backOut(x) },
-     expoInOut: lambda { |x| x < 0.5 ?    expoIn(x) :    expoOut(x) },
-  elasticInOut: lambda { |x| x < 0.5 ? elasticIn(x) : elasticOut(x) },
-   bounceInOut: lambda { |x| x < 0.5 ?  bounceIn(x) :  bounceOut(x) }
+  linear:  lambda {|x| x},
+   sineIn: lambda {|x| 1.0 - Math.cos(x * Math::PI / 2)},
+  sineOut: lambda {|x|       Math.sin(x * Math::PI / 2)},
+
+     quadIn: lambda {|x|    quadIn x},
+    cubicIn: lambda {|x|   cubicIn x},
+    quartIn: lambda {|x|   quartIn x},
+    quintIn: lambda {|x|   quintIn x},
+     circIn: lambda {|x|    circIn x},
+     backIn: lambda {|x|    backIn x},
+     expoIn: lambda {|x|    expoIn x},
+  elasticIn: lambda {|x| elasticIn x},
+   bounceIn: lambda {|x| 1.0 - bounceOut(1.0 - x)},
+
+     quadOut: lambda {|x| 1.0 -    quadIn(1.0 - x)},
+    cubicOut: lambda {|x| 1.0 -   cubicIn(1.0 - x)},
+    quartOut: lambda {|x| 1.0 -   quartIn(1.0 - x)},
+    quintOut: lambda {|x| 1.0 -   quintIn(1.0 - x)},
+     circOut: lambda {|x| 1.0 -    curcIn(1.0 - x)},
+     backOut: lambda {|x| 1.0 -    backIn(1.0 - x)},
+     expoOut: lambda {|x| 1.0 -    expoIn(1.0 - x)},
+  elasticOut: lambda {|x| 1.0 - elasticIn(1.0 - x)},
+   bounceOut: lambda {|x| bounceOut x},
+
+     sineInOut: lambda {|x| x < 0.5 ?    sineIn(x) :    sineOut(x)},
+     quadInOut: lambda {|x| x < 0.5 ?    quadIn(x) :    quadOut(x)},
+    cubicInOut: lambda {|x| x < 0.5 ?   cubicIn(x) :   cubicOut(x)},
+    quartInOut: lambda {|x| x < 0.5 ?   quartIn(x) :   quartOut(x)},
+    quintInOut: lambda {|x| x < 0.5 ?   quintIn(x) :   quintOut(x)},
+     circInOut: lambda {|x| x < 0.5 ?    circIn(x) :    circOut(x)},
+     backInOut: lambda {|x| x < 0.5 ?    backIn(x) :    backOut(x)},
+     expoInOut: lambda {|x| x < 0.5 ?    expoIn(x) :    expoOut(x)},
+  elasticInOut: lambda {|x| x < 0.5 ? elasticIn(x) : elasticOut(x)},
+   bounceInOut: lambda {|x| x < 0.5 ?  bounceIn(x) :  bounceOut(x)}
 }
 
 def quadIn(x)

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

@@ -6,10 +6,14 @@ class Button < Sprite
   include CanDisable
 
   def initialize(
-    label, *args, rgb: 200, width: 1, fontSize: 24, round: 5, **kwargs, &block)
+    label = nil, *args,
+    icon: nil, rgb: nil, width: 1, fontSize: 24, round: 5, **kwargs,
+    &block)
+
+    raise if !label && !icon
 
     super 0, 0, 44 * width, 44, *args, **kwargs, &block
-    @label, @rgb, @fontSize, @round = label, [rgb].flatten, fontSize, round
+    @label, @icon, @rgb, @fontSize, @round = label, icon, rgb, fontSize, round
     @click = nil
     setup
   end
@@ -23,31 +27,53 @@ class Button < Sprite
 
   def setup()
     pressing = false
-    mousePressed  {pressing = true}
-    mouseReleased {pressing = false}
+
+    mousePressed do
+      next if $dragging
+      $dragging = self
+      pressing = true
+    end
+
+    mouseReleased do
+      next unless $dragging.object_id == self.object_id
+      pressing = false
+      if includeMouse?
+        if enabled?
+          @click&.call
+        else
+          shake
+        end
+        sound.play gain: 0.5
+      end
+      $dragging = nil
+    end
+
+    mouseDragged do
+      next unless $dragging.object_id == self.object_id
+      pressing = includeMouse?
+    end
 
     draw do
       offset  = 5
+      light   = [@rgb || skin.buttonColor].flatten
+      dark    = light.map {|n| n - 32}
       y       = pressing ? (offset - (enabled? ? 2 : 3.5)) : 0
       h       = self.h - y
       offset -= y
-      fill *@rgb.map {|n| n - 20}
+      fill *dark
       rect 0, y, w, h, *@round
-      fill *@rgb
-      rect 0, y, w, h - offset, *@round
-      fill enabled? ? 255 : 180
-      textAlign CENTER, CENTER
-      textSize @fontSize
-      text @label, 0, y, w, h - offset
-    end
-
-    mouseClicked do
-      if enabled?
-        @click.call if @click
-      else
-        shake
+      fill *light
+      h -= offset
+      rect 0, y, w, h, *@round
+      fill *(enabled? ? [255] : dark)
+      if @label
+        textAlign CENTER, CENTER
+        textSize @fontSize
+        text @label, 0, y, w, h
+      elsif @icon
+        imageMode CENTER
+        drawImage @icon, w / 2, y + h / 2, @icon.width / 2, @icon.height / 2
       end
-      sound.play gain: 0.5
     end
   end
 
@@ -64,4 +90,8 @@ class Button < Sprite
     @sound ||= loadSound dataPath 'button.mp3'
   end
 
+  def includeMouse?()
+    (0...width).include?(mouseX) && (0...height).include?(mouseY)
+  end
+
 end# Button

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

@@ -3,42 +3,66 @@ using RubySketch
 
 class Dialog < Scene
 
-  def initialize(background: 0, alpha: 100, z: 1000)
-    super
+  class Label < Sprite
+    attr_accessor :label
+  end
+
+  def initialize(background: 0, alpha: 100, z: 1000, &block)
     @background, @alpha = background, 0
+    @elements = []
+    super
     overlay.z = z
+    group :vertical, &block if block
     animate 0.2 do |t|
       @alpha = alpha * t
     end
   end
 
+  def group(flow = :horizontal, space: nil, &block)
+    old, @group = @group, []
+    block.call self
+  ensure
+    (old || @elements).push({
+      elements: @group,
+      flow:     flow,
+      space:    space || MARGIN
+    })
+    @group = old
+    updateLayout
+  end
+
   def addElement(sprite)
-    elements.push sprite
+    (@group || @elements).push sprite
+    sprite.z = overlay.z
     addSprite sprite if active?
     updateLayout
+    sprite
   end
 
-  def addLabel(label, rgb: [255], fontSize: 24, align: CENTER)
+  def addLabel(label, rgb: [255], alpha: nil, fontSize: 24, align: CENTER, &block)
     bounds = textFont.textBounds label, 0, 0, fontSize
-    addElement Sprite.new(0, 0, bounds.w, bounds.h).tap {|sp|
-      sp.z = overlay.z
+    addElement Label.new(0, 0, width - MARGIN * 2, bounds.h).tap {|sp|
+      sp.label = label
       sp.draw do
+        r, g, b, a = skin.translucentBackgroundColor
+        fill r, g, b, alpha || (a * 3)
+        rect 0, -MARGIN / 2, sp.w, sp.h + MARGIN
         textAlign align, CENTER
         textSize fontSize
         fill *rgb
-        text label, 0, 0, sp.w, sp.h
+        text sp.label, 0, 0, sp.w, sp.h
       end
+      sp.mouseClicked &block
     }
   end
 
-  def addButton(label, *args, **kwargs, &block)
-    addElement Button.new(label, *args, **kwargs).tap {|b|
-      b.z = overlay.z
+  def addButton(*args, **kwargs, &block)
+    addElement Button.new(*args, **kwargs).tap {|b|
       b.clicked &block
     }
   end
 
-  def addSpace(height)
+  def addSpace(height = 0)
     addElement Sprite.new(0, 0, 1, height).tap {|sp|
       sp.draw {}
     }
@@ -53,18 +77,30 @@ class Dialog < Scene
   end
 
   def elements()
-    @elements ||= []
+    f = -> es {es.map {|e| ((e in {elements:})) ? f[elements] : e}}
+    f.call(@elements).flatten
   end
 
   def draw()
-    sprite overlay, *elements
+    sprite overlay
     super
+    sprite *elements
   end
 
   def resized(w, h)
     updateLayout
   end
 
+  def activated()
+    super
+    parent.pause
+  end
+
+  def deactivated()
+    parent.resume
+    super
+  end
+
   private
 
   MARGIN = 10
@@ -84,19 +120,40 @@ class Dialog < Scene
 
   def cancelButton()
     @cancelButton ||= Button.new('CLOSE', width: 3, fontSize: 28).tap do |sp|
-      sp.z = overlay.z
       sp.clicked {close}
     end
   end
 
   def updateLayout()
-    w, h      = width, height
-    allHeight = elements.map(&:height).reduce {|a, b| a + MARGIN + b} || 0
-    y         = (h - allHeight) / 2
-    elements.each do |e|
-      e.x = (w - e.w) / 2
-      e.y = y
-      y  += e.h + MARGIN
+    element = {elements: @elements, flow: :vertical, space: MARGIN}
+    w, h    = getSize element
+    setPosition element, (width - w) / 2, (height - h) / 2, w, h
+  end
+
+  def getSize(element)
+    if element in {elements:, flow:, space:}
+      v     = flow == :vertical
+      sizes = elements.map {|e| getSize e}
+      sum   = sizes.map {|size| size[v ? 1 : 0]}.reduce {|a, b| a + space + b} || 0
+      max   = sizes.map {|size| size[v ? 0 : 1]}.max || 0
+      v ? [max, sum] : [sum, max]
+    else
+      [element.w, element.h]
+    end
+  end
+
+  def setPosition(element, x, y, w, h)
+    if element in {elements:, flow:, space:}
+      v = flow == :vertical
+      elements.each do |e|
+        ew, eh = getSize e
+        ex, ey = v ? [x + (w - ew) / 2, y] : [x, y + (h - eh) / 2]
+        setPosition e, ex, ey, ew, eh
+        x += ew + space if !v
+        y += eh + space if  v
+      end
+    else
+      element.x, element.y = x, y
     end
   end