Sfoglia il codice sorgente

reword <Transform> paragraphs

David Rose 23 anni fa
parent
commit
ef7fdd9a50
1 ha cambiato i file con 10 aggiunte e 17 eliminazioni
  1. 10 17
      panda/src/doc/eggSyntax.txt

+ 10 - 17
panda/src/doc/eggSyntax.txt

@@ -197,11 +197,14 @@ appear before they are referenced.
     defines a 2-d 3x3 matrix.  The definition may be any sequence of
     defines a 2-d 3x3 matrix.  The definition may be any sequence of
     zero or more of the following.  Transformations are post
     zero or more of the following.  Transformations are post
     multiplied in the order they are encountered to produce a net
     multiplied in the order they are encountered to produce a net
-    transformation matrix.
+    transformation matrix.  Rotations are counterclockwise about the
+    origin in degrees.  Matrices, when specified explicitly, are
+    row-major.
 
 
     <Translate> { x y }
     <Translate> { x y }
     <Rotate> { degrees }
     <Rotate> { degrees }
     <Scale> { x y }
     <Scale> { x y }
+    <Scale> { s }
 
 
     <Matrix3> {
     <Matrix3> {
       00 01 02
       00 01 02
@@ -1078,7 +1081,6 @@ GROUPING ENTRIES
       other modelling tools.
       other modelling tools.
 
 
 
 
-
   <Transform> { transform-definition }
   <Transform> { transform-definition }
 
 
     This specifies a matrix transform at this group level.  This
     This specifies a matrix transform at this group level.  This
@@ -1091,8 +1093,8 @@ GROUPING ENTRIES
     the following.  Transformations are post multiplied in the order
     the following.  Transformations are post multiplied in the order
     they are encountered to produce a net transformation matrix.
     they are encountered to produce a net transformation matrix.
     Rotations are defined as a counterclockwise angle in degrees about
     Rotations are defined as a counterclockwise angle in degrees about
-    a particular axis, either implicit (x, y, or z axis), or
-    arbitrary.
+    a particular axis, either implicit (about the x, y, or z axis), or
+    arbitrary.  Matrices, when specified explicitly, are row-major.
 
 
     <Translate> { x y z }
     <Translate> { x y z }
     <RotX> { degrees }
     <RotX> { degrees }
@@ -1109,20 +1111,11 @@ GROUPING ENTRIES
       30 31 32 33
       30 31 32 33
     }
     }
 
 
-    In the context of texture coordinates, the transform is defined in
-    2-d space, and the allowable components correspondingly reflect
-    two-dimensional transforms:
+    Note that the <Transform> block defines a 3-d transform when it
+    appears within the context of a node, while it defines a 2-d
+    transform (and has correspondingly different entries) when it
+    appears within the context of a texture.
 
 
-    <Translate> { x y }
-    <Rotate> { degrees }
-    <Scale> { x y }
-    <Scale> { s }
-
-    <Matrix3> {
-      00 01 02
-      10 11 12
-      20 21 22
-    }    
 
 
   <VertexRef> { indices <Ref> { pool-name } }
   <VertexRef> { indices <Ref> { pool-name } }