geomotion 0.10.0 → 0.12.1

data/.travis.yml

@@ -0,0 +1,2 @@
+language: objective-c
+before_install: rvm use 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geomotion (0.9.0)
+    geomotion (0.11.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -257,6 +257,110 @@ point.angle_to(CGPoint.make(x: 20, y:110))
 => 0.785398163397  (pi/4)
 ```
 
+### CGAffineTransform
+
+These are assigned to the `UIView#transform` parameter.  See `CATransform3D` for
+the transforms that are designed for `CALayer` object.
+
+```ruby
+# you *can* create it manually
+transform = CGAffineTransform.make(a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0)
+
+# but don't!  the `make` method accepts `translate`, `scale`, and `rotate` args
+transform = CGAffineTransform.make(scale: 2, translate: [10, 10], rotate: Math::PI)
+
+# identity transform is easy
+CGAffineTransform.identity
+
+# just to be sure
+CGAffineTransform.identity.identity?  # => true
+
+# Operator Overloading
+transform1 = CGAffineTransform.make(scale: 2)
+transform2 = CGAffineTransform.make(translate: [10, 10])
+# concatenate transforms
+transform1 + transform2
+transform1 << transform2  # alias
+transform1 - transform2
+# => transform1 + -transform2
+# => transform1 + transform2.invert
+transform1 - transform1  # => CGAffineTransform.identity
+
+# create new transforms by calling `translate`, `scale`, or `rotate` as factory
+# methods
+CGAffineTransform.translate(10, 10)
+CGAffineTransform.scale(2)  # scale x and y by 2
+CGAffineTransform.scale(2, 4)  # scale x by 2 and y by 4
+CGAffineTransform.rotate(Math::PI / 4)
+
+# "shearing" turns a rectangle into a parallelogram
+# see sceenshot below or run geomotion app
+CGAffineTransform.shear(0.5, 0)  # in x direction
+CGAffineTransform.shear(0, 0.5)  # in y direction
+# you can combine these, but it looks kind of strange.  better to pick one
+# direction
+
+# or you can chain these methods
+CGAffineTransform.identity.translate(10, 10).scale(2).rotate(Math::PI / 4)
+```
+
+###### Shearing
+
+![Shearing](https://raw.github.com/colinta/geomotion/master/resources/shearing.png)
+
+### CATransform3D
+
+`CALayer`s can take on full 3D transforms.
+
+```ruby
+# these are really gnarly
+transform = CATransform3D.make(
+  m11: 1, m12: 0, m13: 0, m14: 0,
+  m21: 0, m22: 1, m23: 0, m24: 0,
+  m31: 0, m32: 0, m33: 1, m34: 0,
+  m41: 0, m42: 0, m43: 0, m44: 1,)
+
+# accepts transforms like CGAffineTransform, but many take 3 instead of 2 args
+transform = CATransform3D.make(scale: [2, 2, 1], translate: [10, 10, 10], rotate: Math::PI)
+
+# identity transform
+CATransform3D.identity
+CATransform3D.identity.identity?  # => true
+
+# Operator Overloading
+transform1 = CATransform3D.make(scale: 2)
+transform2 = CATransform3D.make(translate: [10, 10])
+# concatenate transforms
+transform1 + transform2
+transform1 << transform2  # alias
+transform1 - transform2
+# => transform1 + -transform2
+# => transform1 + transform2.invert
+transform1 - transform1  # => CATransform3D.identity
+
+# create new transforms by calling factory methods
+CATransform3D.translate(10, 10, 10)
+CATransform3D.scale(2)  # scale x and y by 2
+CATransform3D.scale(2, 4, 3)  # scale x by 2, y by 4, z by 3
+CATransform3D.rotate(Math::PI / 4)
+
+# "shearing" works the same as CGAffineTransform
+CATransform3D.shear(0.5, 0)  # in x direction
+CATransform3D.shear(0, 0.5)  # in y direction
+# "perspective" changes are better than rotation because they make one side
+# bigger and one side smaller
+# see sceenshot below or run geomotion app
+CATransform3D.perspective(0.002, 0)  # similar to rotating around x-axis
+CATransform3D.perspective(0, 0.002)  # "rotates" around the y-axis
+
+# or you can chain these methods
+CATransform3D.identity.translate(10, 10, 10).scale(2).rotate(Math::PI / 4)
+```
+
+###### Perspective
+
+![Perspective](https://raw.github.com/colinta/geomotion/master/resources/perspective.png)
+
 ## Install
 
 1. `gem install geomotion`

data/app/app_delegate.rb

@@ -1,5 +1,10 @@
 class AppDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    ctlr = ShearingController.new
+    first = UINavigationController.alloc.initWithRootViewController(ctlr)
+    @window.rootViewController = first
+    @window.makeKeyAndVisible
     true
   end
 end

data/app/next_controller.rb

@@ -0,0 +1,19 @@
+class ShowNextController < UIViewController
+
+  def init
+    super.tap do
+      if next_controller
+        navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('Next', style:UIBarButtonItemStylePlain, target:self, action: :show_next)
+      end
+    end
+  end
+
+  def show_next
+    navigationController.pushViewController(next_controller, animated:true)
+  end
+
+  def next_controller
+    nil
+  end
+
+end

data/app/perspective_controller.rb

@@ -0,0 +1,76 @@
+class PerspectiveController < UIViewController
+
+  def viewDidLoad
+    self.title = 'Perspective'
+
+    @restore = {
+      red: false, green: false, blue: false,
+    }
+    red = UIButton.buttonWithType(UIButtonTypeCustom)
+    red.setTitle('0.004, 0', forState: UIControlStateNormal)
+    red.backgroundColor = UIColor.redColor
+    red.frame = [[80, 16], [160, 100]]
+    red.addTarget(self, action: :transform_red, forControlEvents:UIControlEventTouchUpInside)
+
+    green = UIButton.buttonWithType(UIButtonTypeCustom)
+    green.setTitle('0, 0.004', forState: UIControlStateNormal)
+    green.backgroundColor = UIColor.greenColor
+    green.frame = red.frame.below(30)
+    green.addTarget(self, action: :transform_green, forControlEvents:UIControlEventTouchUpInside)
+
+    blue = UIButton.buttonWithType(UIButtonTypeCustom)
+    blue.setTitle("0.004, 0.004", forState: UIControlStateNormal)
+    blue.backgroundColor = UIColor.blueColor
+    blue.frame = green.frame.below(30)
+    blue.addTarget(self, action: :transform_blue, forControlEvents:UIControlEventTouchUpInside)
+
+    self.view.addSubview(@red = red)
+    self.view.addSubview(@green = green)
+    self.view.addSubview(@blue = blue)
+  end
+
+  def animate(&block)
+    UIView.animateWithDuration(0.3,
+      delay:0,
+      options:UIViewAnimationOptionCurveEaseInOut|UIViewAnimationOptionBeginFromCurrentState,
+      animations:block,
+      completion:nil)
+  end
+
+  def transform_red
+    animate do
+      if @restore[:red]
+        @red.layer.transform = CATransform3D.identity
+      else
+        @red.layer.transform = CATransform3D.perspective(0.004, 0)
+      end
+      @restore[:red] = ! @restore[:red]
+    end
+  end
+
+  def transform_green
+    animate do
+      if @restore[:green]
+        @green.layer.transform = CATransform3D.identity
+      else
+        @green.layer.transform = CATransform3D.perspective(0, 0.004)
+      end
+      @restore[:green] = ! @restore[:green]
+    end
+  end
+
+  def transform_blue
+    animate do
+      if @restore[:blue]
+        @blue.layer.transform = CATransform3D.identity
+      else
+        @blue.layer.transform = CATransform3D.perspective(0.004, 0.004)
+      end
+      @restore[:blue] = ! @restore[:blue]
+    end
+  end
+
+  def next_controller
+  end
+
+end

data/app/shearing_controller.rb

@@ -0,0 +1,77 @@
+class ShearingController < ShowNextController
+
+  def viewDidLoad
+    self.title = 'Shearing'
+
+    @restore = {
+      red: false, green: false, blue: false,
+    }
+    red = UIButton.buttonWithType(UIButtonTypeCustom)
+    red.setTitle('0.5, 0', forState: UIControlStateNormal)
+    red.backgroundColor = UIColor.redColor
+    red.frame = [[80, 16], [160, 100]]
+    red.addTarget(self, action: :transform_red, forControlEvents:UIControlEventTouchUpInside)
+
+    green = UIButton.buttonWithType(UIButtonTypeCustom)
+    green.setTitle('0, 0.5', forState: UIControlStateNormal)
+    green.backgroundColor = UIColor.greenColor
+    green.frame = red.frame.below(30)
+    green.addTarget(self, action: :transform_green, forControlEvents:UIControlEventTouchUpInside)
+
+    blue = UIButton.buttonWithType(UIButtonTypeCustom)
+    blue.setTitle('0.5, 0.5', forState: UIControlStateNormal)
+    blue.backgroundColor = UIColor.blueColor
+    blue.frame = green.frame.below(30)
+    blue.addTarget(self, action: :transform_blue, forControlEvents:UIControlEventTouchUpInside)
+
+    self.view.addSubview(@red = red)
+    self.view.addSubview(@green = green)
+    self.view.addSubview(@blue = blue)
+  end
+
+  def animate(&block)
+    UIView.animateWithDuration(0.3,
+      delay:0,
+      options:UIViewAnimationOptionCurveEaseInOut|UIViewAnimationOptionBeginFromCurrentState,
+      animations:block,
+      completion:nil)
+  end
+
+  def transform_red
+    animate do
+      if @restore[:red]
+        @red.transform = CGAffineTransform.identity
+      else
+        @red.transform = CGAffineTransform.shear(0.5, 0)
+      end
+      @restore[:red] = ! @restore[:red]
+    end
+  end
+
+  def transform_green
+    animate do
+      if @restore[:green]
+        @green.transform = CGAffineTransform.identity
+      else
+        @green.transform = CGAffineTransform.shear(0, 0.5)
+      end
+      @restore[:green] = ! @restore[:green]
+    end
+  end
+
+  def transform_blue
+    animate do
+      if @restore[:blue]
+        @blue.transform = CGAffineTransform.identity
+      else
+        @blue.transform = CGAffineTransform.shear(0.5, 0.5)
+      end
+      @restore[:blue] = ! @restore[:blue]
+    end
+  end
+
+  def next_controller
+    PerspectiveController.new
+  end
+
+end

data/lib/geomotion/ca_transform_3d.rb

@@ -0,0 +1,223 @@
+class CATransform3D
+  # CATransform3D.make  # default transform: identity matrix
+  # # make a transform from scratch. please don't ever do this ;-)
+  # CATransform3D.make(
+  #   m11: 1, m12: 0, m13: 0, m14: 0,
+  #   m21: 0, m22: 1, m23: 0, m24: 0,
+  #   m31: 0, m32: 0, m33: 1, m34: 0,
+  #   m41: 0, m42: 0, m43: 0, m44: 1,
+  # )
+  #
+  # # make a transform using primitives
+  # CATransform3D.make(scale: 2, translate: [10, 10, 0], rotate: Math::PI)
+  def self.make(options = {})
+    if options[:m11]
+      args = [
+        :m11, :m12, :m13, :m14,
+        :m21, :m22, :m23, :m24,
+        :m31, :m32, :m33, :m34,
+        :m41, :m42, :m43, :m44,
+      ].map do |key|
+        raise "#{key.inspect} is required" unless options.key? key
+        options[key]
+      end
+      return self.new(*args)
+    else
+      retval = self.identity
+      if options[:translate]
+        retval = retval.translate(options[:translate])
+      end
+      if options[:scale]
+        retval = retval.scale(options[:scale])
+      end
+      if options[:rotate]
+        retval = retval.rotate(options[:rotate])
+      end
+      return retval
+    end
+  end
+
+  # Returns a transform that is translated. Accepts one or three arguments. One
+  # argument can be an Array with three numbers, three arguments should be the
+  # x, y, z values.
+  # @return [CATransform3D]
+  def self.translate(point, ty=nil, tz=nil)
+    if ty
+      tx = point
+    else
+      tx = point[0]
+      ty = point[1]
+      tz = point[2]
+    end
+    CATransform3DMakeTranslation(tx, ty, tz)
+  end
+
+  # Returns a transform that is scaled. Accepts one or three arguments. One
+  # argument can be an Array with three items or a number that will be used to
+  # scale both x and y directions (z will be scale 1). Three arguments should be
+  # the x, y, z values.
+  def self.scale(scale, sy=nil, sz=nil)
+    if sy
+      sx = scale
+    elsif scale.is_a?(Numeric)
+      sx = sy = scale
+      sz = 1
+    else
+      sx = scale[0]
+      sy = scale[1]
+      sz = scale[2]
+    end
+    CATransform3DMakeScale(sx, sy, sz)
+  end
+
+  # Returns a transform that is rotated by `angle` (+ => counterclockwise, - => clockwise)
+  # @return [CATransform3D]
+  def self.rotate(angle, point=nil, y=nil, z=nil)
+    if point && y && z
+      x = point
+    elsif point
+      x = point[0]
+      y = point[1]
+      z = point[2]
+    else
+      # default: spins around z-axis
+      x = 0
+      y = 0
+      z = 1
+    end
+    CATransform3DMakeRotation(angle, x, y, z)
+  end
+
+  # A "shear" translation turns a rectangle into a parallelogram.  Delegates to
+  # the CGAffineTransform with the same name
+  # @param px [Numeric] how much to shear in x direction
+  # @param py [Numeric] how much to shear in x direction
+  # @return CATransform3D
+  def self.shear(px, py)
+    CGAffineTransform.shear(px, py).to_transform3d
+  end
+
+  # A perspective transform is a lot like a rotation... but different.  These
+  # numbers should be very small, like 0.002 is a decent perspective shift.
+  # @return CATransform3D
+  def self.perspective(x, y)
+    CATransform3D.new(1,0,0,x, 0,1,0,y, 0,0,1,0, 0,0,0,1)
+  end
+
+  # Returns the CATransform3D identity matrix
+  # @return [CATransform3D]
+  def self.identity
+    CATransform3DMakeTranslation(0, 0, 0)
+  end
+
+  # Return true if the receiver is the identity matrix, false otherwise
+  # @return [Boolean]
+  def identity?
+    CATransform3DIsIdentity(self)
+  end
+
+  # Return true if the receiver can be represented as an affine transform
+  # @return [Boolean]
+  def affine?
+    CATransform3DIsAffine(self)
+  end
+
+  # @return [CGAffineTransform]
+  def to_affine_transform
+    CATransform3DGetAffineTransform(self)
+  end
+
+  # @return [Boolean] true if the two matrices are equal
+  def ==(transform)
+    CATransform3DEqualToTransform(self, transform)
+  end
+
+  # Returns self
+  # @return [CATransform3D]
+  def +@
+    self
+  end
+
+  # Concatenates the two transforms
+  # @return [CATransform3D]
+  def concat(transform)
+    CATransform3DConcat(self, transform)
+  end
+  alias :+ :concat
+  alias :<< :concat
+
+  # Inverts the transform
+  # @return [CATransform3D]
+  def invert
+    CATransform3DInvert(self)
+  end
+  alias :-@ :invert
+
+  # Inverts the second transform and adds the result to `self`
+  # @return [CATransform3D]
+  def -(transform)
+    self.concat transform.invert
+  end
+
+  # Applies a translation transform to the receiver
+  # @return [CATransform3D]
+  def translate(point, ty=nil, tz=nil)
+    if ty
+      tx = point
+    else
+      tx = point[0]
+      ty = point[1]
+      tz = point[2]
+    end
+    CATransform3DTranslate(self, tx, ty, tz)
+  end
+
+  # Applies a scale transform to the receiver
+  # @return [CATransform3D]
+  def scale(scale, sy=nil, sz=nil)
+    if sy
+      sx = scale
+    elsif scale.is_a?(Numeric)
+      sx = sy = scale
+      sz = 1
+    else
+      sx = scale[0]
+      sy = scale[1]
+      sz = scale[2]
+    end
+    CATransform3DScale(self, sx, sy, sz)
+  end
+
+  # Applies a rotation transform to the receiver
+  # @return [CATransform3D]
+  def rotate(angle, point=nil, y=nil, z=nil)
+    if point && y && z
+      x = point
+    elsif point
+      x = point[0]
+      y = point[1]
+      z = point[2]
+    else
+      # default: spins around z-axis
+      x = 0
+      y = 0
+      z = 1
+    end
+    CATransform3DRotate(self, angle, x, y, z)
+  end
+
+  def shear(px, py)
+    self.concat CGAffineTransform.shear(px, py).to_transform3d
+  end
+
+  # Applies a perspective transform to the receiver
+  # @return CATransform3D
+  def perspective(x, y)
+    self.concat CATransform3D.perspective(x, y)
+  end
+
+  def to_a
+    [self.m11, self.m12, self.m13, self.m14, self.m21, self.m22, self.m23, self.m24, self.m31, self.m32, self.m33, self.m34, self.m41, self.m42, self.m43, self.m44]
+  end
+
+end