FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,894 Commits 1 Branch 26 Tags 73 MiB
a345a04254
Commit Graph

174 Commits

Author SHA1 Message Date
Robert Osfield
fd9777101c *** empty log message *** 2003-12-20 14:20:48 +00:00
Robert Osfield
bbde1b2ae7 Fixes for optional compile of GL_LUMINANCE_ALPHA and GL_ALPHA texture usage 
in fonts.  Default to GL_ALPHA.
 2003-12-09 12:04:14 +00:00
Robert Osfield
4c3f6004df Moved osgText across to create GL_ALPHA textures instead of GL_LUMINANCE_ALPHA 2003-12-09 11:31:33 +00:00
Robert Osfield
8bbbd1fc70 Made getWidth and getHeight const. 2003-11-07 09:00:22 +00:00
Robert Osfield
bbc55c14fd Added osgText::Text::getTextureGlyphQuadMap(). 2003-11-04 13:40:24 +00:00
Robert Osfield
a2f9222753 Added support for handling of wordwrap in osgText::Text, so that whole words 
are cut in two, but rather moved completely to the next line.
 2003-09-15 21:43:54 +00:00
Robert Osfield
1b9d7d458a Added support for texture object manager, which provides an automatic mechansim 
for reusing deleted textures.
 2003-07-14 14:42:10 +00:00
Robert Osfield
8d4ab4668e From Tree, updates to osgText and freetype plugin to support are kerning paramter. 2003-06-26 16:21:49 +00:00
Don BURNS
15f88f35b2 *** empty log message *** 2003-06-24 15:40:09 +00:00
Robert Osfield
06054d9520 Added support for multibuffering of tex coordinates. 2003-05-06 13:13:31 +00:00
Robert Osfield
895a722842 Addd support for maximum screen text size into osgText when auto scale to 
screen is active.

Added osgautotransform demo.
 2003-05-01 21:06:18 +00:00
Robert Osfield
9468ab4979 Cleanup of the API. 2003-04-30 15:38:11 +00:00
Robert Osfield
0ab467483f Added support for automatic scaling of text to screen coords. Optimized 
the text implementation to provide better speed, especially by using the
alignement to screen option.

Deprecated the Text::setFontSize(,) method, which is now being replaced
by setFontResolution(,)

Fixed typos in Texture*.cpp.

Removed old deprecated methods from osg headers.
 2003-04-30 11:40:17 +00:00
Robert Osfield
c1b1a091fa From Tree, addition of ; after MACRO_'s to help with Java port. 
From Tree + Robert, Addition of LEFT_BASE_LINE,RIGHT_BASE_LINE,CENTER_BASE_LINE
Alignment options in Text.
 2003-04-27 10:58:39 +00:00
Robert Osfield
5e56e0eba8 Added osgkeyboard to the ./runexamples.bat. 
Made osgstereoimage exit when non files have been loaded.

Added non const getText() method.
 2003-03-25 13:57:16 +00:00
Robert Osfield
e87a08f1c3 Fixes to osgcluster demo as new Producer based example. 
Added extra pragrma remove a warning about float to int cast under VS.NET.
 2003-03-16 21:58:27 +00:00
Robert Osfield
5ae998dbc2 Added missing osg:: to StateAttribute. 2003-03-11 21:42:55 +00:00
Robert Osfield
78de76f17f Bug fixes to osgText to handle the osgUtil::Optimizer being used on a scene 
graph containing text.

Fixed warning in MD2 plugin.
 2003-03-11 13:30:03 +00:00
Robert Osfield
06fb808ad3 Improvements to the Text .osg support. 2003-03-10 16:40:26 +00:00
Robert Osfield
efea365412 Moved the remain inline osg::Font methods into Font.cpp to avoid problems with the 
impossibly stupid visual studio compilers.
 2003-03-10 09:15:59 +00:00
Robert Osfield
a78600af67 Removed the OSGTEXT_EXPORT symbol from FontImplementation to avoid problems under 
VisualStudio.
 2003-03-08 09:51:41 +00:00
Robert Osfield
47087585c0 Added maximum width and maximum height limits to the osgText::Text which 
automatically wraps text which goes beyond these limits.
 2003-03-06 21:35:33 +00:00
Robert Osfield
fab6f24f4e Changed the osgText::Font implementation so it used a facade us abstract away 
the actual implemention. This has been done so that when a freetype font is
created the implementation can unloaded when the freetype plugin is unloaded
without breaking the main font.

Also add image margin around founds to prevent any image boundaries appearing.
 2003-03-06 17:11:24 +00:00
Robert Osfield
63df52d408 Added osgText::String implementation to better handle decoding of encoded text. 2003-03-05 21:05:37 +00:00
Robert Osfield
7b6eaa72f2 Updates to Text for Sun Forte compilers. 2003-03-05 09:08:11 +00:00
Robert Osfield
ba9fbd371f Updates to the new osgtext example and fix to the friend usage. 2003-03-04 17:14:42 +00:00
Robert Osfield
1c34c0981e Further improvements to osgText and the freetype plugin, handling different 
font sizes better and plugin removal safely.
 2003-03-04 12:34:42 +00:00
Robert Osfield
e433b42bc0 Updates osghud demo. 
Compile fixes for VisualStudio6.0 because its a hideous pile of junk and can't
compile its way out of a paper bag.
 2003-03-03 22:18:33 +00:00
Robert Osfield
99e7c50d7a Typo fix. 2003-03-03 20:24:49 +00:00
Robert Osfield
5d84c10c8f Changed the ownership of Glyph's so that GlyphTexture's own a reference to 
Glyph's as well as Font's so keeping the Font valid even after the Font
itself has been desctructed.
 2003-03-03 16:12:00 +00:00
Robert Osfield
371d84683f Fixes to osgText for default parameter. 2003-03-03 15:36:52 +00:00
Robert Osfield
e2b95c50a4 Added support for computing bounds of text. 2003-03-03 09:37:02 +00:00
Robert Osfield
fbe674b321 First cut of new osgText implementation. 2003-03-02 21:05:05 +00:00
Robert Osfield
6184ecba3f Removed non implemented method convertWideString(const char* text) from header 2003-02-18 14:00:31 +00:00
Robert Osfield
8f1ba9d21b Removed include/osg/Types header defining osg::ubyte, osg::ushort etc. Changed 
any reference to these in the distribution across to using unsigned char,
unsigned short etc.  This has been done to keep the OSG code more opaque
to what types are.
 2003-02-12 19:20:47 +00:00
Robert Osfield
1b08b02df2 From Tree, added support for using wchar_t strings with osg::Text/EncodedText. 2003-02-10 15:01:27 +00:00
Robert Osfield
c2b4a05825 Minor fixes to ReaderWriter and Paragraph to help work with use of Doxygen. 
Fix to CullVisior to handle the new no referenced counted cull and draw traversal.
 2003-02-10 13:58:39 +00:00
Robert Osfield
48bda9cc79 Added new Copyright/License notice to header and source files. 2003-01-21 16:45:36 +00:00
Robert Osfield
4de63e72c6 Improvements to the handling of multiple graphics contexts. Still needs alot 
of work, but at least it isn't crashes in trivial cases right now.
 2003-01-20 20:28:28 +00:00
Robert Osfield
a86d519a89 Fixed a bug on the handling of empty EncodedText. 2003-01-17 15:01:27 +00:00
Robert Osfield
c3a7ce7352 Fixes to osgText to handle std::string correctly. 2003-01-13 14:05:08 +00:00
Robert Osfield
c5d3c860d8 From Tree, support for encoded text added into osgText. 2003-01-08 15:22:17 +00:00
Robert Osfield
baa7c11eb9 From Tree, added support for accept(PrimitiveFunctor) into osg::Text. Currently 
implemention is overly simple, but will do until rewrite.
 2002-12-06 19:03:34 +00:00
Robert Osfield
d7692f83d7 Added support for setting the axis which the text should be aligned along. 2002-12-05 12:01:38 +00:00
Robert Osfield
3bd400130c Name change and const change of Drawable::drawImmediateMode(State&) to 
Drawable::drawImplementation(State&) const.   Various updates to the
rest of the OSG to accomodate this.
 2002-11-06 15:43:11 +00:00
Robert Osfield
55b2a5ff30 From Gideon May, fixes to remain const base type instances in headers. 2002-10-25 12:29:03 +00:00
Robert Osfield
12226e4371 Converted the instances of const built in types being returned from methods 
and passed as paramters into straight forward non const built in types,
i.e. const bool foogbar(const int) becomes bool foobar(int).
 2002-09-02 12:31:35 +00:00
Robert Osfield
609a9ebf21 Updates to osgParticle form Macro. 2002-07-22 16:01:00 +00:00
Robert Osfield
3a964a6b93 Updated docs and added osgGA 2002-07-16 20:07:32 +00:00
Robert Osfield
336c47e5fe Fixed osgText::Text::DrawModeType::ALIGNEMENT spelling mistake, now 
is ALIGNMENT.
 2002-06-24 21:44:27 +00:00
Robert Osfield
247cb3ff7e Checked in Macro Jez's additions to osgText to support .osg IO make it 
a fully functioning NodeKit.

Also reimplement notify() to try an prevent a crash which has been caused by
to objects in notify.cpp being initiliazed twice, the second time the auto_ptr
holding the dev/null ofstream was being initilized to 0.
 2002-06-11 18:41:57 +00:00
Robert Osfield
99580f2212 Addd libraryName() method to osg::Object in preperation for the osgDB support 
for node kits plugins.
 2002-06-06 13:25:36 +00:00
Robert Osfield
a5a267d305 Added pragma to disable warning under VisualStudio.NET. 2002-05-28 16:11:49 +00:00
Robert Osfield
6ab93ff61d Adde osgText::Text::setColor/getColor so that osg::Material's need not be 
attached to set the text color.
 2002-05-28 14:33:13 +00:00
Robert Osfield
e73d4ca5b3 Changes for Cygwin build, sent in by Norman Vine. 2002-05-28 11:40:37 +00:00
Robert Osfield
8a5c6d5102 Clean up for VisualStudio build 2002-04-13 22:19:29 +00:00
Robert Osfield
c999dfb154 Updates to docs and fixes to a few warnings. 2002-02-09 14:29:58 +00:00
Robert Osfield
4c5fcd3f61 Fixes for IRIX and Boris Bralo's TerraPage loader. 2002-02-08 09:30:02 +00:00
Robert Osfield
c1283c23e8 Removed the trailing ; after namespace {...} declariations in headers 
which was being picked as a warning under Codewarrior.
 2002-02-03 12:33:41 +00:00
Robert Osfield
0c63a4b65d Added defined( __BCPLUSPLUS__) to windows export code segments. 2002-02-02 20:07:59 +00:00
Robert Osfield
02ef10fcfa Moved all references to osg::Cloner to osg::CopyOp. 2002-01-29 14:04:06 +00:00
Robert Osfield
f612924a45 Added support for shallow and deep copy of nodes, drawables and state, via a 
copy constructor which takes an optional Cloner object, and the old
osg::Object::clone() has changed so that it now requires a Cloner as paramter.
This is passed on to the copy constructor to help control the shallow vs
deep copying.  The old functionality of clone() which was clone of type has
been renamed to cloneType().

Updated all of the OSG to work with these new conventions, implemention all
the required copy constructors etc.  A couple of areas will do shallow
copies by design, a couple of other still need to be updated to do either
shallow or deep.

Neither of the shallow or deep copy operations have been tested yet, only
the old functionality of the OSG has been checked so far, such running the
viewer on various demo datasets.

Also fixed a problem in osg::Optimize::RemoveRendundentNodesVisitor which
was not checking that Group didn't have have any attached StateSet's, Callbacks
or UserData.  These checks have now been added, which fixes a bug which was
revealled by the new osgscribe demo, this related to removal of group acting
as state decorator.

method
 2002-01-28 21:17:01 +00:00
Robert Osfield
4fbf4db42e Added support for multiple graphics contexts, submission from Max Rhiener. 
Alas changed the indenting to use 4 spaces instead of tabs, this irons out
differences when working under Windows and Unix, keeping the identing
consistent.
 2002-01-18 22:25:51 +00:00
Robert Osfield
1fb8f9cb86 First batch of changes required for MacOS X build. Orignal submission from 
Phil Atkin, merged by Robert Osfield.
 2002-01-16 10:36:20 +00:00
Robert Osfield
e3ad8a87ee Updates for Cygwin port, from Norman Vine. 2002-01-03 21:34:57 +00:00
Robert Osfield
6070a9e1b1 Updatedwidley used includes to remove most of the float/double warnings 
generated when compiling under Windows with STLport.
 2001-12-14 18:06:34 +00:00
Robert Osfield
a434abafd7 Fixes for IRIX build. 
Updates to the osg::Transform, adding preMult and postMult methods and
deprecating the old preRotate,preTranslate,preScale.

Updated the rest of the OSG so that it nolonger uses the deprecated
osg::Transform nodes.

Renamed osgUtil::SceneView::setGlobalState() to
osgUtil::SceneView::setGlobalStateSet() so that the name reflects its
functionality better.  Updated osgGLUT::Viewer etc to cope with new
name change.
 2001-11-14 14:09:07 +00:00
Robert Osfield
34555f61d6 Added new files to cvs. 2001-11-12 10:04:57 +00:00
Robert Osfield
7290f793f1 Added osgText::Paragraph which is a subclass from Geode which composes a 
list of text drawables as a paragraph block, handles breaking of text into
individual lines automatically.

Changed the osg::Node::setUserData so that the data type has to be an
osg::Referenced, and removes the dependancy on osg::MemoryAdapter.  I have
done this since it simplifies the OSG side of the interface and makes it
less like that the user might abuse the memory managment of the data. It
does however mean that user data will have by subclassed from Referenced,
and therefor may require users to have their own adapter to do this.
However, this little nuasance is worth the extra cleaness and robustness
afforded by going the osg::Referenced route.
 2001-11-09 15:06:01 +00:00
Robert Osfield
06abf2266b Updates to Makefiles to include osgText. 
Also a couple of undefined methods in osgText::Text have been added.
 2001-11-02 20:11:37 +00:00
Robert Osfield
94ce36f9a3 Update to osgText to get things compiling under Windows. 2001-10-31 12:27:48 +00:00
Robert Osfield
6ddb40ba70 Updated the osgText implemention, now works under Linux. 2001-10-24 09:08:02 +00:00
Robert Osfield
36d206f40f Updates to the new osgText library to get it to compile under Linux. 2001-10-23 22:08:02 +00:00
Robert Osfield
8e1b1bcfc1 First past integrat of Max Rhiener work on wrapping FTGL to create osgText 
library and demo.
 2001-10-23 19:51:39 +00:00