FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,989 Commits 1 Branch 26 Tags 73 MiB
931e3277b9
Commit Graph

394 Commits

Author SHA1 Message Date
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
f70b6d0993 Improved the consistency of setting of rotation and auto rotate modes in setAxisAlingment method 2007-07-09 10:47:06 +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
eac3dc1963 From Paul Melis, "Here is a list of fixes to misspelled APIs. Unfortunately, more than one 
of these are public APIs and therefore will break linkage to existing
shared libraries."

Note from Robert Osfield, updated wrappers.
 2007-06-27 20:36:16 +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
198c3d3e5a Removed margin 2007-05-04 12:06:31 +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
3809d0dad0 Moved the OpenThreads link locally to each lib 2007-05-03 10:06:38 +00:00
Robert Osfield
f242570269 Unified the setup of version numbers so that they all are based on the version 
number setup in the include/osg/Version header file.
 2007-04-22 20:19:43 +00:00
Robert Osfield
68a6882d04 Bumbped the version number up to 1.9, in preperation for using odd release numbers 
for development releases, odd versions for stable releases.
 2007-04-16 06:03:22 +00:00
Robert Osfield
2e6ee4bb39 Removed old gmake and VisualStudio build files 2007-04-10 13:10:25 +00:00
Robert Osfield
6d7b5e7ebd From Eric Wing, pedantic warning fixes 2007-04-06 15:36:13 +00:00
Robert Osfield
b419fa93ef From Luigi Calori, "when we link against something that comes out from a Find... we ususally have a variable <LINK_VAR_NAME>available like OPENTHREADS_LIBRARY, 
so I' ve set up a macro that uses the variable name expanded for linking, and  test if a variable ${LINK_VAR_NAME}_DEBUG
like OPENTHREADS_LIBRARY_DEBUG exists and in case uses it for linking in debug mode.
I' ve also set up FindOpenThreads to set up these variables.
I had to edit the core libraries CMakeLists to add the calls to the macros used.
I' ve tested under MSVC"
 2007-03-26 13:02:38 +00:00
Robert Osfield
db6f07f1d6 Ran dos2unx of CMakeLists.txt files 2007-03-08 15:31:36 +00:00
Robert Osfield
b428aee852 Added missing files 2007-03-05 12:11:15 +00:00
Robert Osfield
f50ed9667a From Eric Wing and others, first cut of CMake build support 2007-03-04 13:05:33 +00:00
Robert Osfield
77b9a7ae19 From Eric Sokolwsky, "osgText is a useful node kit, but when longer paragraphs are displayed 
on the screen, it looks more aesthetically pleasing to have a larger
gap between lines than is given by default. I added a new parameter,
lineSpacing, in the Text class to allow the line spacing to be adjustable
by the application. The default value is 0 meaning there is no extra
spacing given. The value should be given as a percentage of the character
height. A good value for longer paragraphs is 0.25 (25%) or more."
 2007-01-30 14:32:12 +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
345810ef22 Added support for float or double osg::Plane, and the default osg::Plane to double. 
Performance tests on big models did not indicate any performance penalty in using doubles over floats,
so the move to doubles should mainly impact precision improvements for whole earth databases.

Also made improvements to osgUtil::PlaneIntersector and osgSim::ElevationSlice classes
 2006-11-28 16:00:52 +00:00
Robert Osfield
fd2ffeb310 Renamed osg::CameraNode to osg::Camera, cleaned up osg::View. 
Added beginnings of new osgViewer::Scene,View,Viewer,CompositeViewer and GraphicsWindowProxy files.
 2006-11-27 14:52:07 +00:00
Robert Osfield
85dc696c09 Added FadeText::setFadeSpeed and made internal data structures protected. 2006-10-24 09:06:28 +00:00
Robert Osfield
7c6b528588 Fixed bug related to clean up of text fonts. 2006-10-03 11:14:34 +00:00
Robert Osfield
cc202c1b6d Updates for fade text to work properly, but only in perspetive views at present. 2006-09-20 10:36:21 +00:00
Robert Osfield
5cab53941f Further work on fade text. 2006-09-19 22:57:23 +00:00
Robert Osfield
87aff3d92c Further work on osgText::FadeText implementation. 2006-09-19 20:19:29 +00:00
Robert Osfield
def74d3471 Introduced new osg::View, and osg::RenderInfo classes into the core OSG to help 
handle scenes with multiple views with elements that need coordinating on a per view basis.

Added beginings of new osgText::FadeText class (not functionality yet).
 2006-09-18 20:54:48 +00:00
Robert Osfield
96e1630cc7 Removed the String inhertiance from osg::Referenced. 2006-09-01 12:46:45 +00:00
Robert Osfield
87a221445e Updated version numbers of the up comming 1.2 release 2006-08-31 20:54:28 +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
26e3424195 Changed the default implementation of backdrop text to DEPTH_RANGE and 
tweaked the depth range values to minimize the depth rage witout causing z fighting
on osgtext example.
 2006-08-22 12:33:35 +00:00
Robert Osfield
98cdf9b3c7 From Eric Wing, fix for compute of the bounding box when handling outline/backdrop text. 2006-08-22 10:23:58 +00:00
Robert Osfield
132f9ead45 Updated version number for 1.1.1 release 2006-08-12 08:29:16 +00:00
Robert Osfield
f6d092957f Commented out the _textBB contribution of outline/backdrops to fix bounding box problem. 2006-08-10 06:20:28 +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
d728d8335e Fixed auto rotate bug. 2006-07-25 13:52:10 +00:00
Robert Osfield
97dde14dcf From Eric Wing, fix for VC6 support 2006-07-18 19:26:54 +00:00
Robert Osfield
f1c2694c17 Updated copyright years. 2006-07-18 15:21:48 +00:00
Robert Osfield
419e185895 From Eric Wing, add alternate backdrop implementations. 
From Robert Osfield, updated naming  and copy constructor methods.
 2006-07-18 12:24:04 +00:00
Robert Osfield
2ef59b73e9 Change Unit to Units to keep consistent with OpenGL naming. 2006-07-17 11:43:26 +00:00
Robert Osfield
f16a78ad97 Increased the unit multiplier to 3 to avoid z fighting. 2006-07-17 10:25:01 +00:00
Robert Osfield
4bae225d39 Added s/getFactorMultiplier(), s/getUnitMultiplier(), areUnitAndMultipliersSet() and 
setFactorAndUnitMultipliersUsingBestGuessForDriver() static methods to
osg::PolygonOffset to help implement workarounds for lack of portablity of
settings between different hardware.
 2006-07-14 14:08:33 +00:00
Robert Osfield
abe6260da4 Fixed management of Text's StateSet so that it works correctly when the DefaultFont is active. 2006-07-13 09:01:24 +00:00
Robert Osfield
88609a5eee Updated version numbers for 1.1 release 2006-07-06 10:28:12 +00:00
Robert Osfield
30d32133b8 Tweaked polygon offset 2006-07-06 10:27:40 +00:00
Robert Osfield
2c2083db72 From Vivek Rajan, "Rotated text in SCREEN_COORDS was looking a little squished especially 
in orthographic projection. Performing the rotation before the scaling
fixed the problem. I've attached Text.cpp with the fix."

From Robert Osfield, in keeping with Vivek's change moved the auto rotate to screen befor the scale as well.
 2006-07-06 08:36:12 +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
710adfd698 From Eric Wing, added support for outline/shadow and colour gradient effects. 2006-06-27 13:09:00 +00:00
Robert Osfield
4d35807a54 From Matt Green, fix to handling of centering of multi-line text entries. 2006-06-08 13:34:29 +00:00
Robert Osfield
2792c6c2fb From Colin MacDonald, fixed handling of an adding a graphics context after the creating of the osgText::Text. 2006-05-01 16:20:26 +00:00
Robert Osfield
3f2c419db6 From Paul Martz, changed Vec3 to Vec3d to ensure that the lazy evaluation of computeBound work properly. 2005-12-08 20:32:06 +00:00
Robert Osfield
0e16b64665 Coverted tabs to space in core libraries. 2005-11-17 13:35:53 +00:00
Robert Osfield
258425d649 Bumped the version numbers up to 1.0 in preparation for 1.0-rc1. 2005-11-09 10:49:56 +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
6c31d05172 Added a setSupportsDisplayList(false) to constructor to prevent end users 
enabling display lists, something that can break the osgText's managment
of state.
 2005-11-02 12:22:12 +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
a312b0451e From Farshid Laskari, changed the compute of the text bounding box to include the spaces. 2005-10-14 09:29:13 +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
1e9fb4ab03 From Marco Jez (with tweaks by Robert Osfield) : clean up of inheritance from std::vector<> classes 2005-07-20 19:42:59 +00:00
Robert Osfield
1c88914e5f From Yuri Vilmanis, improved multi-line justifaction support and new alignment modes 2005-07-15 16:22:53 +00:00
Robert Osfield
1dd553ed0e Bumped version numbers to 0.9.9 in rediness for 0.9.9 release. 2005-05-16 17:17:53 +00:00
Robert Osfield
e82a63ca81 Cross platform build fixes. 2005-05-13 11:11:52 +00:00
Robert Osfield
bf4d63f6ea Added new Node/Drawable::s/getInitialBound and Node/Drawable::s/getComputeBoundCallback 
methods and reimplement computeBound so that it passes back a bounding volume rather
than modifying the local one.
 2005-05-12 14:03:22 +00:00
Robert Osfield
d1a1b1d95c Added more comprehensive releaseGLObjects(State*=0) throughout Nodes, 
Drawables,StateSet, and osgDB::Registry.

Added cleanup_frame() from to osgProducer::OsgCamerGroup to help with proper
clean of OpenGL objects before exit, and modified osgviewer, osghangglider,
osgwindows examples to do the extra frame call to cleanup_frame() before exit.
 2005-05-07 20:47:09 +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
84aef32552 Removed old LUMINANCE_ALPHA code pathways since they are no longer used. 2005-04-28 19:08:44 +00:00
Robert Osfield
7f3d46e110 Added check to see if autoTransformCache had been initialized before 
using it in the computeBound.
 2005-04-28 05:58:20 +00:00
Robert Osfield
38bf740ef4 From Vivek Rajan, "osg::Text was getting stretched when the CharacterSizeMode was set to 
SCREEN_COORDS and the SceneView's projection matrix was set to an
Ortho2D matrix (sceneView->setProjectionMatrixAsOrtho2D(-1,1,-1,1)).

Computing the pixel size separately vertically and horizontally, and
setting the scaling factors appropriately based on that fixed the
problem."
 2005-04-26 07:49:18 +00:00
Robert Osfield
3ab9867264 Removed increment of the cursor position by the bearing value in the compute 
last character code as this should not be used when moving the cursor.
 2005-04-20 09:55:24 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
816df3a1d0 Fixes for VS6.0 build 2005-04-04 12:24:18 +00:00
Robert Osfield
c3f40e2e67 Added improved handling of center justificaion of multiline text 2005-03-03 12:33:07 +00:00
Robert Osfield
117c791a3b Added osg::BufferObject and a made a number associated to accomodate this 
new class. osg::BufferObject wraps up OpenGL pixel and array buffer objects.
Currently implementation is work in progress.
 2005-02-09 10:39:45 +00:00
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
Robert Osfield
80afddc08d Checked in Tino Schwarze's port to HP-UX. 2002-07-23 10:48:22 +00:00
Robert Osfield
3dd07ea354 Fixed more uninitialized variables and two potential memory leaks. 2002-07-22 12:41:55 +00:00
Robert Osfield
bfefb55a9f Fixed various uninitiliazed variables. 2002-07-21 20:34:38 +00:00
Robert Osfield
76d1775487 Bumped up the version numbers to 0.9.0 to reflect the upcomming release. 2002-07-16 15:43:20 +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
6767dd49d0 Rewrote the FileUtils support for data and library file paths, moving the 
storage of the path lists into osgDB::Registry, and changed the data
structor from a char* to a std::deque.  Changed a names of couple of the
convinience functions in osgDB/FileUtils to better reflect the two
public FilePathList's - DataFilePathList and the LibraryFilePathList.

Added support into the osgDB::Registry::readNode/Image/Object methods
for pushing and popping the path of the current file being loaded.
 2002-06-17 21:50:37 +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
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
dd3603c9db Fix for finding windows fonts. 2002-05-10 15:42:27 +00:00
Robert Osfield
3d3534dda9 Updated Versions, and NEWS file to reflect impending release of 0.8.45. 2002-04-21 10:11:03 +00:00
Robert Osfield
ab64566b61 Fixed memory leak in FTGL associated with the function of gluTesselate. 
Fixed a warnings in the DW plugin.
 2002-04-18 09:57:42 +00:00
Robert Osfield
2b4008bbbc Purge on warnings under Linux. 2002-04-16 14:09:46 +00:00