|
d6a2d851
|
2008-04-13T21:14:44
|
|
* Merged trunk commits [664], [665], [666], [667], [669], [670], [671],
[672] and [684], by patrick and henry:
+ Added FTLayout.h, FTSimpleLayout.h and FTSimpleLayout.cpp to implement
a framework for layout managers and an implementation of a simple layout
manager.
+ Updated FTGLDemo to use the new FTSimpleLayout. Changes include:
- Added a font origin to specify the location to render the font.
- The default text is now blatantly plagarized from the back cover of
the OGL red book.
- The font size is much smaller.
- Font metrics are rendered differently depending on the current layout
manager.
- The FTSimpleLayout alignment mode is now output with other font
information.
- The space bar no longer cycles through the fonts. The cursor up/down
keys do.
- The cursor left/right keys increment/decrement the size of the current
font.
- The page up/page down keys cycle through the layout managers.
- The home/end keys increment and decrement the line length of a simple
layout
- The tab key cycles through the alignment modes of a simple layout.
+ Fixed a bug where the trackball rotation was applied after translation.
+ Minor reformatting and enabled texture fonts to be selected
+ Un-inlined private methods...because they are called by other private
inlined methods
+ Minor formatting changes
+ Adding FTLayout
|
