Merge branch 'for-slava' of git://git.rfc1149.net/factor
commit
4cc48dcb12
|
@ -1,6 +1,16 @@
|
|||
USING: help.markup help.syntax math math.vectors vectors ;
|
||||
IN: math.quaternions
|
||||
|
||||
HELP: q+
|
||||
{ $values { "u" "a quaternion" } { "v" "a quaternion" } { "u+v" "a quaternion" } }
|
||||
{ $description "Add quaternions." }
|
||||
{ $examples { $example "USING: math.quaternions prettyprint ;" "{ C{ 0 1 } 0 } { 0 1 } q+ ." "{ C{ 0 1 } 1 }" } } ;
|
||||
|
||||
HELP: q-
|
||||
{ $values { "u" "a quaternion" } { "v" "a quaternion" } { "u-v" "a quaternion" } }
|
||||
{ $description "Subtract quaternions." }
|
||||
{ $examples { $example "USING: math.quaternions prettyprint ;" "{ C{ 0 1 } 0 } { 0 1 } q- ." "{ C{ 0 1 } -1 }" } } ;
|
||||
|
||||
HELP: q*
|
||||
{ $values { "u" "a quaternion" } { "v" "a quaternion" } { "u*v" "a quaternion" } }
|
||||
{ $description "Multiply quaternions." }
|
||||
|
|
|
@ -24,3 +24,7 @@ math.constants ;
|
|||
[ t ] [ qk q>v v>q qk = ] unit-test
|
||||
[ t ] [ 1 c>q q1 = ] unit-test
|
||||
[ t ] [ C{ 0 1 } c>q qi = ] unit-test
|
||||
[ t ] [ qi qi q+ qi 2 q*n = ] unit-test
|
||||
[ t ] [ qi qi q- q0 = ] unit-test
|
||||
[ t ] [ qi qj q+ qj qi q+ = ] unit-test
|
||||
[ t ] [ qi qj q- qj qi q- -1 q*n = ] unit-test
|
||||
|
|
|
@ -20,6 +20,12 @@ IN: math.quaternions
|
|||
|
||||
PRIVATE>
|
||||
|
||||
: q+ ( u v -- u+v )
|
||||
v+ ;
|
||||
|
||||
: q- ( u v -- u-v )
|
||||
v- ;
|
||||
|
||||
: q* ( u v -- u*v )
|
||||
[ q*a ] [ q*b ] 2bi 2array ;
|
||||
|
||||
|
|
Loading…
Reference in New Issue