FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,312 Commits 1 Branch 26 Tags 73 MiB
616097e465
Commit Graph

208 Commits

Author SHA1 Message Date
Robert Osfield
a086a6d01b Changed Font::setSize to Font::setFontResolution 2005-01-27 11:10:50 +00:00
Don BURNS
1771cdbcc7 Update version numbers in files 2004-12-04 23:38:24 +00:00
Robert Osfield
d9b9a6f1f8 Made read/write methods in ReaderWriter all const to facilate multi-threading 2004-11-23 15:29:52 +00:00
Robert Osfield
a6369da4f4 Moved Registry::CacheHintOptions into ReaderWriter::Options 2004-11-22 14:10:12 +00:00
Robert Osfield
2718058173 Removed the font cache from the FreeType plugin, moving the support across to 
osgDB::Registry.
 2004-11-02 11:10:44 +00:00
Robert Osfield
7e5c87de6a Changed the version strings to use OpenSceneGaph rather than "Open Scene Graph" 2004-09-27 12:07:34 +00:00
Robert Osfield
54b45ce3bc Updated to DatabasePager support 2004-09-21 21:33:52 +00:00
Robert Osfield
255c27d552 Added a new osgDB::appendPlatformSpecificLibraryFilePaths() method to FileUtils.cpp 
Includes a new OSX code from Eric Wing
 2004-08-27 16:14:21 +00:00
Robert Osfield
ddb7423e46 Set version numbers for 0.9.7 release 2004-08-05 08:02:48 +00:00
Robert Osfield
7eb3f2646e From Norman Vine (with small tweaks by Robert Osfield), build fixes for Cygwin 2004-08-04 08:27:43 +00:00
Robert Osfield
1ae521981e From David Fries, divide by zero fix on text with a pixel size of 0.0 2004-07-28 07:24:13 +00:00
Robert Osfield
422aab8e3f Added handling of the case when texture objects are released from underneath 
the osgText::Font::GlyphTexture - something which requires a full rebuild
of the texture object.
 2004-07-19 14:34:12 +00:00
Robert Osfield
4ee909d217 Added better handling of number of graphic context size changes. 2004-03-16 21:03:37 +00:00
Robert Osfield
4aa7afedf3 Removed include <iostream> where possible, replacing with istream or ostream and changing 
std::cout/cerr to osg::notify().
 2004-03-03 13:27:21 +00:00
Robert Osfield
8cf1cc0dad From Brad Christaiansen, added check for projection matrix changing in 
screen coord character size mode.
 2004-02-04 09:30:06 +00:00
Robert Osfield
d226e3ec68 From Nick, added VectorUInt in osgText/String hack to get around VS's stoopid compiler bugs. 
From Robert, removed an #if #else #endif block, for code clarity.
 2004-01-27 11:50:32 +00:00
Robert Osfield
a7a96e710c Added support for REVERESED_XY_PLANE, REVERESED_XZ_PLANE and 
REVERESED_YZ_PLANE's for the axis alignement to allow the text to be
reversed.
 2003-12-20 14:23:04 +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
58c872c662 From Tree, tweaks to the coord generation to improve text alignment. 2003-12-09 10:42:30 +00:00
Robert Osfield
eed6b77ca4 Suggestion from Tree, changed tex coord scaling against textureWidth/Height rather 
than textureWidth-1 etc.
 2003-12-02 21:38:52 +00:00
Robert Osfield
7136a00b9a Changed the freetype plugin so it keeps its own ref_ptr<Font> to fonts 
that it creates, rather than have osgText::Font::readFontFile() use the
osgDB::Registry object cache.

This has been done to prevent problems when users flush the object cache,
which was causing a dangling pointer.
 2003-11-20 11:07:19 +00:00
Robert Osfield
8bbbd1fc70 Made getWidth and getHeight const. 2003-11-07 09:00:22 +00:00
Robert Osfield
c91a2d3d3e Updated version numbers and ChangeLog for the release. 2003-09-16 21:25:25 +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
cc529aebe0 Bumped up version numbers in preperation for the 0.9.5 release. 2003-07-23 08:54:29 +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
fa8b8c6a52 From Tree, fixes for text bounding box initialization. 2003-07-10 13:18:13 +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
Don BURNS
b6d6759337 Small operation precedence bug fixed in Text.cpp 2003-05-14 16:07:39 +00:00
Robert Osfield
06054d9520 Added support for multibuffering of tex coordinates. 2003-05-06 13:13:31 +00:00
Robert Osfield
6c60fa233e Fixed accept(PrimitiveFunctor&) so it uses the transform coords correctly. 2003-05-05 14:30:12 +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
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
b66f464a1b Tweak to the debug output. 2003-04-14 15:03:55 +00:00
Robert Osfield
39a5cf3ad9 Added extra debugging details to help track down IRIX64 & Solaris64 problems. 2003-04-14 15:02:13 +00:00
Robert Osfield
c2a9234cc5 Updated the version numbers to 0.9.4 2003-04-11 10:04:53 +00:00
Robert Osfield
5a974ab091 Fixes to osg::Texture's handling of anisotropy updating and 
hardware generate mip mapping.

Added switching off generate mip map from osgText::Font.cpp.

Changed savedmodel.osg to saved_model.osg in ViewerEventHandler.
 2003-04-01 20:32:57 +00:00
Robert Osfield
c784f8a669 Changed the background pixel colour to white, but kept the alpha value zero. 
This has been done to improve the quality of the mip mapping of text.
 2003-03-27 10:58:20 +00:00
Robert Osfield
e00b8f2868 Tweak the tex coords of fonts slightly to avoid cut off of text. 2003-03-25 15:48:17 +00:00
Robert Osfield
cad1d8162b Fixed axis alignment bug in text, which occured what text was placed on the XZ 
or YZ planes.
 2003-03-25 15:45:08 +00:00
Robert Osfield
96b72af169 Implemented a object cache in osgDB::Registry. 2003-03-17 22:53:46 +00:00
Robert Osfield
34fc7dd289 The wrong file name was being used readFontFile. 2003-03-14 09:28:34 +00:00
Robert Osfield
3343c3a970 Fix from Gabor for proper casting of char's to unsigned ints be setting up the 
osgText::String.
 2003-03-12 15:36:26 +00:00
Don BURNS
fa33244f92 1) Replaced all Makefile* with GNUmakefile*. 
2) Changed Makedepend system to make individual dependency files, which
   should save time rebuilding dependencies by limiting the regeneration
   of dependency file for only modified source files.
 2003-03-12 10:39:43 +00:00
Robert Osfield
88b686faca Added (unsigned int) cast to the call to osg::minimum. 2003-03-12 09:45:12 +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
6a87495c80 Fixes for IRIX build. 2003-03-07 21:05:35 +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
d1c0d74bb7 Fix for non standard compiliant Forte compilers. 2003-03-05 20:18:12 +00:00
Robert Osfield
8e6a1d38e4 Updates to the GLUT and Producer text demo. 
Fix to text to better handle unsetting of vertex arrays.
 2003-03-05 12:28:42 +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
55c25a551b Added support for using the generate mip map extension within osgText. 2003-03-04 15:47:28 +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
fe978ac122 Compile fixes to osgText. 2003-03-03 20:12:18 +00:00
Robert Osfield
b871020222 Added search path to osgText::readFontFile. 2003-03-03 16:42:48 +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
1b08b02df2 From Tree, added support for using wchar_t strings with osg::Text/EncodedText. 2003-02-10 15:01:27 +00:00
Robert Osfield
03eee3b700 Fixed warning in osgText 
Added getBound() to begining of osgProducer::CameraGroup::frame() to ensure
that the parallel cull traversals don't all do a getBound().

Added osgProducer::CameraGroup::getTopMostSceneData() convinience method.
 2003-01-30 16:11:39 +00:00
Robert Osfield
787bbef714 From Max, fixes to UniCode support for bitmap fonts. 2003-01-30 01:31:22 +00:00
Robert Osfield
6afedcc6d1 Updated version numbers to 0.9.3 2003-01-22 19:17:39 +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
359e0d9c70 Removed the addition of 0 to the add of the encoded text vector as it is now 
redundent having added support for the begin,end range into FTFont.
 2003-01-17 16:00:09 +00:00
Robert Osfield
a86d519a89 Fixed a bug on the handling of empty EncodedText. 2003-01-17 15:01:27 +00:00
Robert Osfield
c3c346e647 Added handling of the case when length is -1, allowing the code to just test 
against characters being zero, rather than against length, which is now only
done when a valid value of length (i.e >=0) is passed in.
 2003-01-13 14:56:04 +00:00
Robert Osfield
c3a7ce7352 Fixes to osgText to handle std::string correctly. 2003-01-13 14:05:08 +00:00
Robert Osfield
f91e141e7a Fix to case statement from Tree. 2003-01-08 16:37:09 +00:00
Robert Osfield
c5d3c860d8 From Tree, support for encoded text added into osgText. 2003-01-08 15:22:17 +00:00
Robert Osfield
7bcef50e3b Removed reference to osg/MemoryManager. 2002-12-16 14:12:48 +00:00
Robert Osfield
00cc3a1833 Converted the instance of osgNew and osgDelete back to new and delete as part 
of depecating the include/osg/MemoryManager
 2002-12-16 13:40:58 +00:00
Robert Osfield
ffb200e4f4 Added the axis alignment into the Outline and Texture fonts drawing. 2002-12-12 11:36:08 +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
Don BURNS
89b2575ffe Forced GLPixmapGlyph color to white rather than using glGetCurrentColor 2002-11-24 00:23:47 +00:00
Don BURNS
1098a7ded1 Freetype 2.1 and later align bitmap pitch on boundaries of 2 bytes. It is 
therefore necessary to use glPixelStorei(..,UNPACK_..., 2).  There is an
#if() statement that allows the continued use of freetype 2.0 (Rh 7.x), as
well as accomodating newer releases.
 2002-11-23 05:16:47 +00:00
Robert Osfield
f42205a3ef Updates version numbers to 0.9.2 2002-11-08 12:58:34 +00:00
Robert Osfield
9816a51bc7 Added GL_LIBS to the osgText/Makefile for OSX build. 
Fixed typo in IntersectVisitor.

Fixed warnings in osgimpsotor demo.
 2002-11-08 11:00:16 +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
41893927c1 From Gabor Dorka, Fixes to memory leaks. 2002-10-10 09:00:31 +00:00
Robert Osfield
3fc5b0fdc9 From Macro, added a setActiveTextureUnit(0) to osg::Text::drawImmediateMode() to 
prevent the wrong OpenGL mode being used.
 2002-09-29 17:55:46 +00:00
Robert Osfield
55215651d7 Renamed osg::Primitive to osg::PrimitiveSet which better reflect what it 
encapsulates.

Added new osg::IndexGeometry implemention, *not* complete yet.

Changed the rest of the OSG to handle the renaming og Primitive to PrimitiveSet.
 2002-09-20 14:51:59 +00:00
Robert Osfield
5733cc1470 From Brede Johansen - Fixes to osg::Plane::valid and added a new set method. 
From Stephan Huber - Compilation fix to Texture.cpp for OSX.

From Don Tidrow - added dirtyBound() to osgText::Text::setPosition
 2002-09-12 13:23:15 +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
11bc1b2a77 Bug fix from Tom Jolly, which adds a check aginst a delete of gl textures 
in FTGLTextureFont destructor to prevent a NULL be passed to glDeleteTextures.
This solves the crash on exit of osghud/osgtext.
 2002-08-31 09:51:52 +00:00
Robert Osfield
df5c8f789a Updated the version numbers to reflect the upcomming release 0.9.1. 2002-08-28 18:49:27 +00:00
Robert Osfield
df9a899d9e Moved the IO support for the osgText and osgParticle libraries into seperate 
plugin libraries.
 2002-08-20 11:27:08 +00:00
Robert Osfield
5d61488476 Submission for Gideon May, fixes for spacing in various osgText files. 2002-08-09 19:51:12 +00:00