From 3759cd7efcbd9594532c80d371e6f3a08e44c85e Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Thu, 23 Jul 2009 14:58:45 -0500
Subject: [PATCH] update gpu.util.wasd to match uniform tuple changes

---
 extra/gpu/render/render-docs.factor | 4 ++--
 extra/gpu/util/wasd/wasd.factor     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extra/gpu/render/render-docs.factor b/extra/gpu/render/render-docs.factor
index 8e761be13c..f198558b06 100755
--- a/extra/gpu/render/render-docs.factor
+++ b/extra/gpu/render/render-docs.factor
@@ -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
 
diff --git a/extra/gpu/util/wasd/wasd.factor b/extra/gpu/util/wasd/wasd.factor
index 34051730fb..b0a3d8179a 100644
--- a/extra/gpu/util/wasd/wasd.factor
+++ b/extra/gpu/util/wasd/wasd.factor
@@ -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 / ]