steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2009-07-23 15:55:54 -05:00
parent 78bbf96a6d 3759cd7efc
commit 15b609b15c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extra/gpu/render/render-docs.factor
View File

@ -72,7 +72,7 @@ $nl
"Rectangular matrix type names are column x row."
}
{ "Uniform slots can also be defined as other " { $snippet "uniform-tuple" } " types to bind uniform structures. The uniform structure will take its value from the slots of a tuple of the given type." }
{ "Array uniforms are passed as Factor sequences of the corresponding value types above." }
{ "Array uniforms are passed as Factor sequences of the corresponding value type above." }
}
$nl
"A value of a uniform tuple type is a standard Factor tuple. Uniform tuples are constructed with " { $link new } " or " { $link boa } ", and values are placed inside them using standard slot accessors."
@ -130,7 +130,7 @@ HELP: define-vertex-struct
{ $description "Defines a new struct C type from a " { $link vertex-format } ". The runtime equivalent of " { $link POSTPONE: VERTEX-STRUCT: } ". This word must be called inside a compilation unit." } ;
HELP: float-uniform
{ $class-description "This " { $link uniform-type } " value indicates a uniform parameter whose components are " { $snippet "float" } "s." } ;
{ $class-description "This " { $link uniform-type } " indicates that a slot of a " { $link uniform-tuple } " corresponds to a float uniform parameter." } ;
{ index-elements index-range multi-index-elements multi-index-range } related-words

4
extra/gpu/util/wasd/wasd.factor
View File

@ -8,8 +8,8 @@ specialized-arrays.float ui ui.gadgets.worlds ;
IN: gpu.util.wasd
UNIFORM-TUPLE: mvp-uniforms
{ "mv_matrix" float-uniform { 4 4 } }
{ "p_matrix" float-uniform { 4 4 } } ;
{ "mv_matrix" mat4-uniform f }
{ "p_matrix" mat4-uniform f } ;
CONSTANT: -pi/2 $[ pi -2.0 / ]
CONSTANT: pi/2 $[ pi 2.0 / ]