Merge branch 'master' of git@github.com:prunedtree/factor

Conflicts:
	basis/math/matrices/matrices.factor

diff --combined basis/math/matrices/matrices.factor
index 3203355bb935f801e6725f4a048c4b4fefb47192,21d9a97adf04e98959538b135a10266d50f3b1e2..4ba8e1d3d904b99df5cbaa99344bd9462e1bc073
--- 1/basis/math/matrices/matrices.factor
--- 2/basis/math/matrices/matrices.factor
+++ b/basis/math/matrices/matrices.factor
@@@ -1,92 -1,17 +1,92 @@@
  ! Copyright (C) 2005, 2009 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
 -USING: accessors arrays columns kernel math math.bits
 -math.order math.vectors sequences sequences.private ;
 +USING: accessors arrays columns kernel locals math math.bits
 +math.functions math.order math.vectors sequences
 +sequences.private fry ;
  IN: math.matrices
  
  ! Matrices
  : zero-matrix ( m n -- matrix )
 -    [ nip 0 <array> ] curry map ;
 +    '[ _ 0 <array> ] replicate ;
  
  : identity-matrix ( n -- matrix )
      #! Make a nxn identity matrix.
      dup [ [ = 1 0 ? ] with map ] curry map ;
  
 +:: rotation-matrix3 ( axis theta -- matrix )
 +    theta cos :> c
 +    theta sin :> s
 +    axis first3 :> z :> y :> x
 +    x sq 1.0 x sq - c * +     x y * 1.0 c - * z s * -   x z * 1.0 c - * y s * + 3array
 +    x y * 1.0 c - * z s * +   y sq 1.0 y sq - c * +     y z * 1.0 c - * x s * - 3array
 +    x z * 1.0 c - * y s * -   y z * 1.0 c - * x s * +   z sq 1.0 z sq - c * +   3array
 +    3array ;
 +
 +:: rotation-matrix4 ( axis theta -- matrix )
 +    theta cos :> c
 +    theta sin :> s
 +    axis first3 :> z :> y :> x
 +    x sq 1.0 x sq - c * +     x y * 1.0 c - * z s * -   x z * 1.0 c - * y s * +   0 4array
 +    x y * 1.0 c - * z s * +   y sq 1.0 y sq - c * +     y z * 1.0 c - * x s * -   0 4array
 +    x z * 1.0 c - * y s * -   y z * 1.0 c - * x s * +   z sq 1.0 z sq - c * +     0 4array
 +    { 0.0 0.0 0.0 1.0 } 4array ;
 +
 +:: translation-matrix4 ( offset -- matrix )
 +    offset first3 :> z :> y :> x
 +    {
 +        { 1.0 0.0 0.0 x   }
 +        { 0.0 1.0 0.0 y   }
 +        { 0.0 0.0 1.0 z   }
 +        { 0.0 0.0 0.0 1.0 }
 +    } ;
 +
 +: >scale-factors ( number/sequence -- x y z )
 +    dup number? [ dup dup ] [ first3 ] if ;
 +
 +:: scale-matrix3 ( factors -- matrix )
 +    factors >scale-factors :> z :> y :> x
 +    {
 +        { x   0.0 0.0 }
 +        { 0.0 y   0.0 }
 +        { 0.0 0.0 z   }
 +    } ;
 +
 +:: scale-matrix4 ( factors -- matrix )
 +    factors >scale-factors :> z :> y :> x
 +    {
 +        { x   0.0 0.0 0.0 }
 +        { 0.0 y   0.0 0.0 }
 +        { 0.0 0.0 z   0.0 }
 +        { 0.0 0.0 0.0 1.0 }
 +    } ;
 +
 +: ortho-matrix4 ( dim -- matrix )
 +    [ recip ] map scale-matrix4 ;
 +
 +:: frustum-matrix4 ( xy-dim near far -- matrix )
 +    xy-dim first2 :> y :> x
 +    near x /f :> xf
 +    near y /f :> yf
 +    near far + near far - /f :> zf
 +    2 near far * * near far - /f :> wf
 +
 +    {
 +        { xf  0.0  0.0 0.0 }
 +        { 0.0 yf   0.0 0.0 }
 +        { 0.0 0.0  zf  wf  }
 +        { 0.0 0.0 -1.0 0.0 }
 +    } ;
 +
 +:: skew-matrix4 ( theta -- matrix )
 +    theta tan :> zf
 +
 +    {
 +        { 1.0 0.0 0.0 0.0 }
 +        { 0.0 1.0 0.0 0.0 }
 +        { 0.0 zf  1.0 0.0 }
 +        { 0.0 0.0 0.0 1.0 }
 +    } ;
 +
  ! Matrix operations
  : mneg ( m -- m ) [ vneg ] map ;
  
@@@ -120,7 -45,7 +120,7 @@@
  
  PRIVATE>
  
 -: cross ( vec1 vec2 -- vec3 ) [ i ] [ j ] [ k ] 2tri 3array ;
 +: cross ( vec1 vec2 -- vec3 ) [ [ i ] [ j ] [ k ] 2tri ] keep 3sequence ;
  
  : proj ( v u -- w )
      [ [ v. ] [ norm-sq ] bi / ] keep n*v ;
@@@ -136,7 -61,11 +136,7 @@@
  
  : cross-zip ( seq1 seq2 -- seq1xseq2 )
      [ [ 2array ] with map ] curry map ;
 -
 -<PRIVATE
      
 -: m^n ( m n -- m ) 
 +: m^n ( m n -- n ) 
      make-bits over first length identity-matrix
--    [ [ dupd m. ] when [ dup m. ] dip ] reduce nip ;
 -
 -PRIVATE>
++    [ [ dupd m. ] when [ dup m. ] dip ] reduce nip ;