From 2aa8e418289f620a3332078a14a9670c2d1ac33b Mon Sep 17 00:00:00 2001 From: mfranz Date: Wed, 13 Feb 2008 19:06:46 +0000 Subject: [PATCH] rename '.' glyph and arrow glyph names according to the new sign language spec --- Docs/README.scenery | 61 ++++++++++++++++++-------------------- materials.xml | 72 ++++++++++++++++++++++----------------------- 2 files changed, 65 insertions(+), 68 deletions(-) diff --git a/Docs/README.scenery b/Docs/README.scenery index 005bd7bf4..921e36837 100644 --- a/Docs/README.scenery +++ b/Docs/README.scenery @@ -261,58 +261,55 @@ In the simplest form it contains just 'normal' text, for example: This will create a black panel of 1m height with "EXIT" written on it in white versal letters. Actually, each of those characters are -single-letter-glyph-names that are looked up in the map of a +single-letter glyph names that are looked up in the map of a texture font entry in $FG_ROOT/materials.xml. It just happens that the entry for 'E' maps to a drawn 'E' in the font texture. This isn't true for all ASCII characters. Many aren't mapped at all (and thus not available), others are mapped to non-standard drawings. The '_', for example, is mapped to an empty black area and can therefore be used as a space. (The sign specification must not contain -real spaces.) But this is not hard-coded. +real spaces.) The '*' is mapped to a raised period. -Some glyph-names consist of more than one character, and can't, thus, be +Some glyph names consist of more than one character, and can't, thus, be used directly. They have to be put in a pair of curly braces: - {right-down} + {^rd} This creates an arrow that points to the right and down. Braces can really -contain a list of glyph-names, separated by commas (no space!). -Single-letter-glyph-names can be used that way, too, or in any mixture +contain a list of glyph names, separated by commas (no space!). +Single-letter glyph names can be used that way, too, or in any mixture of both methods: EXIT {E,X,I,T} {E}{X}{I}{T} EX{I,T} - E{X,I}T{left-up,right-down} - -Besides single- or multi-letter-glyph-names, there are also commands. -These always start with an '@'. - - {@rd}EXIT{@dr} - -Both @rd and @dr are abbreviations for the "right-down" arrow, and -the line is equivalent to - - {right-down}EXIT{right-down} + E{X,I}T{^lu,^rd} + {^u}EXIT{^u} - -The following abbreviations are available -- all expand to arrow symbols: - - abbrev. glyph-name - ----------------------------------------------------------------- - @u -> up (not really an abbreviation :-) - @d -> down - @l -> left - @r -> right - @ru @ur -> right-up - @rd @dr -> right-down - @lu @ul -> left-up - @ld @dl -> left-down +Multi-letter glyph names are usually used for symbols. Arrow symbol names +always start with a caret ("arrow head") and the left or right direction +always comes first (like the x in a Cartesian coordinate system). Here's +a list of some of the available names (see $FG_ROOT/materials.xml for +more): + ^l left arrow + ^r right arrow + ^u up arrow + ^d down arrow + ^lu left-up arrow + ^ld left-down arrow + ^ru right-up arrow + ^rd right-down arrow + no-entry "no entry" symbol + critical runway critical area + safety ils safety area + +In addition to multi-letter glyph names there are also commands, which +always start with an '@' symbol. The following commands are available -- for sign properties: @size=2.3 set sign height to 2.3m (width is derived from that @@ -350,8 +347,8 @@ Frames can be opened/closed using glyph names {start-frame} and {stop-frame}. Examples: {@R}10L-28R{@L}C - {@Y,@l}P|{@ul}N{@L}F{@Y}F{@ur} - {@Y,@dl}C ... same as any of {@Y}{@dl}C {@Y,@dl,C} {@Y,left-down,C} + {@Y,^l}P|{^lu}N{@L}F{@Y}F{^ru} + {@Y,^ld}C ... same as any of {@Y}{@ld}C {@Y,@ld,C} {@B}17 {@material=RedSign,@size=1.6,no-exit} diff --git a/materials.xml b/materials.xml index 41eef7d98..6419556e7 100644 --- a/materials.xml +++ b/materials.xml @@ -1502,7 +1502,7 @@ Shared parameters for various materials. 4096 128 - . 0.00439 0.01758 + * 0.00439 0.01758 _ 0.01392 0.02148 - 0.01758 0.03418 A 0.03418 0.05469 @@ -1551,14 +1551,14 @@ Shared parameters for various materials. t7 0.73120 0.74634 t8 0.74634 0.76001 t9 0.76001 0.77441 - up 0.77441 0.79200 - down 0.79200 0.81006 - left 0.81006 0.83276 - right 0.83276 0.85571 - left-up 0.85571 0.87573 - right-up 0.87573 0.89527 - left-down 0.89527 0.91529 - right-down 0.91529 0.93457 + ^u 0.77441 0.79200 + ^d 0.79200 0.81006 + ^l 0.81006 0.83276 + ^r 0.83276 0.85571 + ^lu 0.85571 0.87573 + ^ru 0.87573 0.89527 + ^ld 0.89527 0.91529 + ^rd 0.91529 0.93457 | 0.97974 0.98926 start-frame0.98462 0.98926 stop-frame 0.99390 0.99854 @@ -1586,7 +1586,7 @@ Shared parameters for various materials. 4096 128 | 0.00000 0.00244 - . 0.00439 0.01758 + * 0.00439 0.01758 _ 0.01392 0.02148 - 0.01758 0.03418 A 0.03418 0.05469 @@ -1635,14 +1635,14 @@ Shared parameters for various materials. t7 0.73120 0.74634 t8 0.74634 0.76001 t9 0.76001 0.77441 - up 0.77441 0.79200 - down 0.79200 0.81006 - left 0.81006 0.83276 - right 0.83276 0.85571 - left-up 0.85571 0.87573 - right-up 0.87573 0.89527 - left-down 0.89527 0.91529 - right-down 0.91529 0.93457 + ^u 0.77441 0.79200 + ^d 0.79200 0.81006 + ^l 0.81006 0.83276 + ^r 0.83276 0.85571 + ^lu 0.85571 0.87573 + ^ru 0.87573 0.89527 + ^ld 0.89527 0.91529 + ^rd 0.91529 0.93457 no-entry 0.93872 0.96997 start-frame0.98462 0.98926 stop-frame 0.99390 0.99854 @@ -1670,7 +1670,7 @@ Shared parameters for various materials. 4096 128 | 0.00000 0.00244 - . 0.00439 0.01758 + * 0.00439 0.01758 _ 0.01392 0.02148 - 0.01758 0.03418 A 0.03418 0.05469 @@ -1719,14 +1719,14 @@ Shared parameters for various materials. 7 0.73120 0.74634 8 0.74634 0.76001 9 0.76001 0.77441 - up 0.77441 0.79200 - down 0.79200 0.81006 - left 0.81006 0.83276 - right 0.83276 0.85571 - left-up 0.85571 0.87573 - right-up 0.87573 0.89527 - left-down 0.89527 0.91529 - right-down 0.91529 0.93457 + ^u 0.77441 0.79200 + ^d 0.79200 0.81006 + ^l 0.81006 0.83276 + ^r 0.83276 0.85571 + ^lu 0.85571 0.87573 + ^ru 0.87573 0.89527 + ^ld 0.89527 0.91529 + ^rd 0.91529 0.93457 start-frame0.98462 0.98926 stop-frame 0.99390 0.99854 @@ -1753,7 +1753,7 @@ Shared parameters for various materials. 4096 128 | 0.00000 0.00244 - . 0.00439 0.01758 + * 0.00439 0.01758 _ 0.01392 0.02148 - 0.01758 0.03418 A 0.03418 0.05469 @@ -1802,14 +1802,14 @@ Shared parameters for various materials. t7 0.73120 0.74634 t8 0.74634 0.76001 t9 0.76001 0.77441 - up 0.77441 0.79200 - down 0.79200 0.81006 - left 0.81006 0.83276 - right 0.83276 0.85571 - left-up 0.85571 0.87573 - right-up 0.87573 0.89527 - left-down 0.89527 0.91529 - right-down 0.91529 0.93457 + ^u 0.77441 0.79200 + ^d 0.79200 0.81006 + ^l 0.81006 0.83276 + ^r 0.83276 0.85571 + ^lu 0.85571 0.87573 + ^ru 0.87573 0.89527 + ^ld 0.89527 0.91529 + ^rd 0.91529 0.93457 start-frame0.98389 0.98926 stop-frame 0.99390 0.99976