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

97 Commits

Author SHA1 Message Date
Robert Osfield
f290b75bc9 Moved Font code across to using FontSizePair internally and on Font methods, but 
still using original implemetations.
 2007-12-23 13:45:37 +00:00
Robert Osfield
dea067050c Renamed osgText::Font::SizePair to osgText::FontSizePair in prep for use this more 
widely within osgText/freetype plugin.

Added support for inserting loading models into --mt multithreaded implementation.
 2007-12-23 13:18:40 +00:00
Robert Osfield
8733bb1799 From Mathias Froehlich, "Something to extend the texture subloading blacklist. 
... we have problems with that on solaris."
 2007-12-21 14:16:40 +00:00
Robert Osfield
0cdc3e9506 Added intializers. 2007-12-16 17:01:40 +00:00
Robert Osfield
256391c3b4 From Serge Lages, introduce readRef*File() methods which pass back ref_ptr<> rather than C pointers. 2007-12-12 17:04:48 +00:00
Robert Osfield
f4afa427a7 From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)." 2007-12-10 17:30:18 +00:00
Robert Osfield
f69a48e552 From David Callu, added support of 3D text to osgText and associated plugins. 2007-12-10 15:15:56 +00:00
Robert Osfield
e19f23021f Introduced the use of a ReentrantMutex to avoid problems with findFontFile. 2007-09-15 17:40:08 +00:00
Robert Osfield
c9f6a3f7ca Added mutex into osgText::Font::GlphTexture to marshel adding to and reading 
from glyph list
 2007-09-04 12:32:47 +00:00
Robert Osfield
3304646c4c Changed Font's mutex to become a static mutex shared between all instances of Font. 
This ensures single threaded access of the freetype plugin.
 2007-09-01 15:24:22 +00:00
Robert Osfield
1bc6d0bae4 Added mutex to protect the readFontFile calls 2007-08-31 18:56:22 +00:00
Robert Osfield
1273c814d1 Added better handling of OSG_TEXT_INCREMENTAL_SUBLOADING env var. 2007-08-24 16:12:22 +00:00
Robert Osfield
9489eef1cf Added default disabling of incremental subload for ATI cards. 2007-08-24 16:10:43 +00:00
Robert Osfield
4f97cdca96 Added thread safe ref/unref by default. 2007-08-22 12:14:15 +00:00
Robert Osfield
bdc8a72aae From Andre Garneau, minor warning fixes 2007-07-11 15:30:14 +00:00
Robert Osfield
19d1a563fe From Csaba Halasz and Robert Osfield, support for passing in ReaderWriter::Options object into readFontFile 2007-07-02 12:30:14 +00:00
Robert Osfield
1d5f76c55d Commented out debug messages 2007-05-09 13:05:19 +00:00
Robert Osfield
53777aee29 Set default texture size back to 1024x1204 2007-05-09 10:42:56 +00:00
Robert Osfield
2cd6a174d2 Added GL_MAX_TEXTURE_SIZE check and use of OSG_MAX_TEXTURE_SIZE env var to help 
hint to osgText that the native OpenGL implementation only supports textures up to
a given size.
 2007-05-09 10:41:56 +00:00
Robert Osfield
77b4ffcac2 Added use of OSG_MAX_TEXTURE_SIZE for clamping texture sizes. 2007-05-09 10:31:06 +00:00
Robert Osfield
681bf12333 Added imageData block initialized to 0 for first construction of GlyphTexture 2007-05-09 07:54:32 +00:00
Robert Osfield
dadb92ea64 Reorganised the managment of margins around glyphs so that is done entirely 
with src/osgText/Font.cpp rather than the font plugins or Text.cpp
 2007-05-04 12:05:29 +00:00
Robert Osfield
6d7b5e7ebd From Eric Wing, pedantic warning fixes 2007-04-06 15:36:13 +00:00
Robert Osfield
9454bafc8c Removed debug messages 2007-01-08 22:40:56 +00:00
Robert Osfield
7f5aaa8424 Improved resizeGLObjectBuffers support 2007-01-08 20:46:56 +00:00
Robert Osfield
709d2fa435 Improved the handling a releaseGLObjects() and add setThreadSafeRefUnref and resizeGLObjectsBuffers methods 2007-01-08 20:40:29 +00:00
Robert Osfield
7c6b528588 Fixed bug related to clean up of text fonts. 2006-10-03 11:14:34 +00:00
Robert Osfield
6be6bc2eaa Added TexEnv object into Font and apply this in Text::drawImplementation to make 
sure that a valid TexEnv is applied
 2006-08-28 19:37:40 +00:00
Robert Osfield
7b313eef34 Added OSG_TEXT_INCREMENTAL_SUBLOADING ON/OFF env var check to osgText::Font 
to optional disable the incremental subloading.
 2006-08-03 13:12:14 +00:00
Robert Osfield
9e7b07fbcf Reworked the state management within osgText::Text and osgText::Font so that it 
only applies textures locally rather than whole StateSet.
 2006-08-02 21:05:56 +00:00
Robert Osfield
f1c2694c17 Updated copyright years. 2006-07-18 15:21:48 +00:00
Robert Osfield
3ad5140942 Change osgText so that the Text drawable now can have its own StateSet 
that users can assign to it without it being overriden.  If none is
assigned externally it now uses a StateSet associated wit the Font assigned
to the Text.
 2006-07-04 13:56:29 +00:00
Robert Osfield
2773d45f2a From Wang Lam,"The changes allow users of OpenSceneGraph to call a new function 
readFontStream() to load fonts from a std::istream, rather than from the
local filesystem by name.  Such a call may be used, for example, if the
user has a font fetched over a network, or a font available in memory
without a correspondng filename.

The changes implement the new function by following the corresponding code
for readFontFile().  readFontStream() reads a stream into memory, and
holds that memory for FreeType.

As a basic test, I mangled the osgtext example to use
readFontStream(std::ifstream("font")) in lieu of a readFontFile call, and
the modified example ran completely."
 2005-11-07 11:05:16 +00:00
Robert Osfield
b0d19b0b66 From Farshid Lashkari, "I need the ability to check for a font file without actually loading 
the font object.  I've modified font.h/cpp of osgText so that it
exports the findFontFile function."
 2005-11-02 10:57:42 +00:00
Robert Osfield
b5c4605d1c From Joran Jessurun, added font search fallbck that strips the leading path from the font file and then looks again. 2005-09-28 13:39:26 +00:00
Robert Osfield
141f8a70d7 From Farshid Lashkari, append "\fonts" to end of windows font search path. 2005-09-11 19:08:41 +00:00
Robert Osfield
08d5f9f85a From Tim Daoust/Robert Osfield, added Font::releaseGLobjects(State*state=0) to 
facilate clean up of scene when a graphics context is deleted/reused.
 2005-05-07 09:17:55 +00:00
Robert Osfield
178a0b5c7e Reduced the verboseness of the notifaction messages 2005-04-28 19:50:07 +00:00
Robert Osfield
bf13c8ca14 Changed the default texture size to 512x512 to reduce the number of textures 
required when rendering text.
 2005-04-28 19:24:09 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
a086a6d01b Changed Font::setSize to Font::setFontResolution 2005-01-27 11:10:50 +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
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
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
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
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