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

1479 Commits

Author SHA1 Message Date
Robert Osfield
b728b1dd99 Implemented load and subload methods in osg::Texture/Texture2D. 2003-03-31 21:41:17 +00:00
Robert Osfield
11a38e12f2 Made the default transparent bin be bin number 10 rather than 1 to allow 
more bins between it and the default opaque bin of 0.

Added a check for compressed image format in osg::Texture.
 2003-03-31 12:48:33 +00:00
Robert Osfield
60e16ea044 Added Escape to the help list. 
Changed the help key from '?' to 'h'
 2003-03-28 10:04:58 +00:00
Robert Osfield
6b7102d16e Improved stats. 2003-03-27 14:39:19 +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
fc4fe9c625 Updates to utilise the new Producer keyboard bindings. 2003-03-27 10:54:01 +00:00
Robert Osfield
e93c812021 Improved the stats reporting. 2003-03-26 16:48:29 +00:00
Robert Osfield
8779fe20a7 Added help support for display help on screen to osgProducer::Viewer. 2003-03-26 12:50:30 +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
0c60d14c00 Added a ViewerEventHandler which manages full screen, file write, and help 
output to osgProducer.  Removed FullSreenEventHandler as it is now superseeded
by ViewerEventHandler.
 2003-03-25 15:13:20 +00:00
Robert Osfield
ce46db87b0 Spotted by Brede - missing ! 2003-03-25 13:01:34 +00:00
Robert Osfield
f2772debf4 Added back into the win32 build of KeyboardMouseCallback the check against VK_ESCAPE. 2003-03-25 12:42:06 +00:00
Robert Osfield
35e0ba12bc Added a viewer.sync to the end of all the demos. 
Removed the Win32 remapping of keycodes from the osgProducer::EventAdapter.
 2003-03-25 10:05:09 +00:00
Robert Osfield
a03675495a Added new osgkeyboad example. 2003-03-24 21:17:51 +00:00
Robert Osfield
09acadb560 Added support for remapping of Win32 key symbols to 
osgGA::GUIEventAdpater::KeySymbols.
 2003-03-24 15:13:00 +00:00
Robert Osfield
19e2368991 Added osgGA::GUIEventAdapter::KeySymbol enumate list, which is a remapping 
of the X settings.

Added a pass through of X11 sybmbols from Producer to osgGA::GUIEventAdapter::KeySymbol
in the osgProducer::EventAdapter.
 2003-03-24 13:43:22 +00:00
Robert Osfield
6dbc770347 Made the osgGA::GUIEventHandler sublassed from osg::Object as a virtual 
inheritence to allow handler to also be used as node callbacks.

Fix to UpdateVisitor to make the visitation of Drawable more consistent
with the way that nodes are traversed.
 2003-03-24 08:42:35 +00:00
Robert Osfield
f0eae16828 Added overide of the SceneHandler::clear() making it a no-op. Will revisit 
this implemention later.
 2003-03-20 17:24:25 +00:00
Robert Osfield
fe49a97baa Updates to osgProducer and osgstereoimage for stereo support. 
Changed the default distance from the scene of the home position of the
trackball and flight manipulators.
 2003-03-20 17:00:32 +00:00
Robert Osfield
0476348a0c Added support for setting up VisualChoose with destination alpha, stencil and 
quad buffers attributes from DisplaySettings values.
 2003-03-20 14:07:03 +00:00
Robert Osfield
65485370f6 Added missing 
setInterleavedArray( InterleaveArrayType format, float *ia, GLuint *iai )
method.
 2003-03-20 08:43:38 +00:00
Robert Osfield
a3bb1da618 Added Endian test header to the core osg, and add use of the new 
getCpuByteOrder test in LightPointDrawable.
 2003-03-19 21:46:44 +00:00
Robert Osfield
21a74223e6 Added getCameraManipulator(unsigned int) method. 2003-03-19 21:14:50 +00:00
Robert Osfield
ca0ff266e2 First pass fix at implementing requestWarpPointer. 2003-03-19 15:49:21 +00:00
Robert Osfield
426e301c48 Addd a full screen toggle event handler to osgProducer & its viewer base 
class.
 2003-03-19 14:27:05 +00:00
Robert Osfield
74f8f18ad6 Added a realize callback to the OsgCameraGroup. 
Move osgtexture3D across to using the new realize callback for creating its textures.
 2003-03-19 12:06:29 +00:00
Robert Osfield
a7bb0126f5 Fixed crash in osgoccluder which was calling setUpViewer and the 
osgProducer/Viewer was assuming that the update was always set.
 2003-03-19 10:28:19 +00:00
Don BURNS
d241ca763b Fixed a globalState setting order in OsgCameraGroup::realize() 2003-03-19 02:31:22 +00:00
Robert Osfield
8ed643ca24 Chaned the OsgCameraGroup so that its scene handler list used ref_ptr<> for 
robustly managing memory.
 2003-03-18 20:27:09 +00:00
Robert Osfield
b04edb70aa Added a clear of allocated Records and the cache's in flt::Registry to 
prevent memory leaks and unneccesary references to model models remaining
beyond the scope of the loader.
 2003-03-18 20:10:51 +00:00
Robert Osfield
96b72af169 Implemented a object cache in osgDB::Registry. 2003-03-17 22:53:46 +00:00
Robert Osfield
d01d155ff9 Fixes for new beta release of VS.NET 2003-03-16 22:00:42 +00:00
Robert Osfield
787fe46e4f Removed the GNUMakefile for the old Demos directory. 2003-03-15 20:41:05 +00:00
Robert Osfield
f811b2580e Removed osgGLUT and Demos/*. 
Integrated Marco's updated examples/*/*.dsp's.
 2003-03-15 20:20:46 +00:00
Robert Osfield
59995dde90 Moved code across to use the new ArgumentParser. 2003-03-14 21:01:35 +00:00
Robert Osfield
7083773b64 Ported osgGLUT based src/Demos across to being osgProducer based, and placed 
them in the new examples/ directory.
 2003-03-14 20:35:45 +00:00
Robert Osfield
2ca505b3d8 Ported all glut based demos across to using the new osg::ArgumentParser. 2003-03-14 10:49:06 +00:00
Robert Osfield
34fc7dd289 The wrong file name was being used readFontFile. 2003-03-14 09:28:34 +00:00
Don BURNS
3786683636 Removed the building of the osgTXP library so the build system builds only 
the plugin.  Building both the plugin and the library causes a race condition
during parallel makes.
 2003-03-14 02:29:34 +00:00
Don BURNS
ec3e1dc611 Fixes for Mac OS X 2003-03-13 06:22:31 +00:00
Don BURNS
693a889ece Various changes to the BUILD system: 
o Object files now go in subdirectories named $(OS)$(ARCH).Opt and
       $(OS)$(ARCH).Debug for OS's that support both architectures.
          eg.  Linux32.Opt and Linux32.Debug

     o Libraries links are now placed in lib/$(OS)$(ARCH)
          eg.  lib/Linux32/

     o Binaries are now placed in bin/$(OS)$(ARCH)
          eg. bin/Linux32

     o 'make install' and 'make instlinks' now place files/links in
       /usr/local/{include,lib,share/OpenSceneGraph} by default on
       most systems (Solaris still goes in /opt/OpenSceneGraph).
       Rather than having the somwehat confusing INST_SYS_PREFIX and
       INST_SHARE_PREFX, you can override these with just
            INST_LOCATION
       For example,
             make INST_LOCATION=/usr
       will place files at /usr/include, /usr/lib,
       /usr/share/OpenSceneGraph.
 2003-03-13 02:53:40 +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
Robert Osfield
edaed5996a Added 'w' toggle to StateSetManipulator to toggle between filled, line and 
point polygon drawing modes.
 2003-03-12 13:54:59 +00:00
Robert Osfield
6021ffecac Changed std::min to osg::minimum. 2003-03-12 12:17:57 +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
b0dce04063 Added setBound() method to Drawable. 2003-03-11 21:53:28 +00:00
Robert Osfield
5ae998dbc2 Added missing osg:: to StateAttribute. 2003-03-11 21:42:55 +00:00
Robert Osfield
e51c7f1587 Added support for AbortRendering flag pointer in osg::State which is used 
by osgUtil::RenderLeaf to test if any abort state has been set, if so it
doesn't do any further drawing.

The osgProducer::Viewer has been set up to set the osg::State's it manages
with their AbortRendering flag pointers set to the osgProducer::Viewer::_done
memeber varaible.  Now when escape is pressed the rendering is aborted early.
 2003-03-11 15:25:49 +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
4cdbbf1b4a Added missing osgDB:: to writeArray() usage. 2003-03-11 13:24:28 +00:00
Robert Osfield
06fb808ad3 Improvements to the Text .osg support. 2003-03-10 16:40:26 +00:00
Robert Osfield
5c4bcd4aac Moved the RenderLeaf implementatation across to always applying matrices 
before state, which fixes problem that can occur with state that needs
the current model view or projection matrices.

Changes osgreflect so that it uses ClipNode rather than clip plane, thereby
fixing the problems which occur when the above is applied.

Create a new osgProducer version of the original GLUT based version.
 2003-03-10 11:59:41 +00:00
Robert Osfield
ebbd03c114 Marged new getLibaryMethod added by Daniel. 2003-03-10 11:57:17 +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
397edcd579 Fixed examples/osghud and osgtext Makefile's to include osgText. 2003-03-08 21:39:40 +00:00
Robert Osfield
6a87495c80 Fixes for IRIX build. 2003-03-07 21:05:35 +00:00
Robert Osfield
ef3b957cb9 From Daniel Sjolie, support for light source. 2003-03-07 09:04:04 +00:00
Robert Osfield
08cdf05b3e Fix to comment record and longID length using both inbedded null's and 
rec length to determine the length of a string.
 2003-03-07 08:52:51 +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
352204f358 Renamed Text::TextString String. 2003-03-06 11:18:38 +00:00
Robert Osfield
d3e9fea28b Fixed the setInterleavedArray call. 2003-03-06 10:38:56 +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
5e396d40e1 Made the State::setInterleavedArrays method use a const GLvoid*. 2003-03-05 21:02:37 +00:00
Robert Osfield
d1c0d74bb7 Fix for non standard compiliant Forte compilers. 2003-03-05 20:18:12 +00:00
Robert Osfield
6bfc06dc0e Fixes for Win32 build. 2003-03-05 14:02:48 +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
7cc69d4d66 Added md2 plugin from Vladimir Vukicevic. 2003-03-05 09:56:56 +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
fcbf1e200a Fix for warning under Windows. 2003-03-03 20:28:07 +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
878c545785 Fixes for the new osg::Image::setImage() parameter, from Ulrich Hertlein. 2003-03-03 11:04:15 +00:00
Robert Osfield
5b7718ea45 Updates to the quicktime plugin from Bob Kuehne. 2003-03-03 11:02:35 +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
a826f5ee31 Changed incorrect instance "TRUE" to "FALSE" to match DepthMask state. 2003-02-27 08:43:02 +00:00
Robert Osfield
4275a96d40 Changed the title of the ReaderWriter, removing the "Default" word as its no 
longer appropriate.
 2003-02-27 08:38:53 +00:00
Robert Osfield
57e73682ce Added using namespace Producer to get round scoping issues associated with 
trying to support VS6 and the rest of the compiler world.
 2003-02-25 21:00:26 +00:00
Robert Osfield
2f74b2cf7c Renamed osgProducer::CameraGroup and SceneHandler to OsgCameraGroup and 
OsgSceneHandler to avoid the namespace bug under VS6.

Removed the osgproducer demo (its now been replaced by examples/osgviewer.)
 2003-02-25 12:28:16 +00:00
Robert Osfield
b32c8c65f3 Added osg::Image::AllocationMode enum and associated set/get methods. 
osg::Image::setImage has also been modified to require the AllocationMode
mode to be passed to it so that it knows how to delete the data once the
image goes out of scope.

Port the image plugins across to specify the new AllocationMode, and converted
them across to using new/delete in place of malloc/free.
 2003-02-25 11:56:18 +00:00
Robert Osfield
7877c55770 Implemented an osg::minimum and osg::maximum template functions to replace 
the std::min/max functions previously used in parts of the osg, since the
std::min/max methods do not seem implemented under IRIX.
 2003-02-24 12:02:00 +00:00
Robert Osfield
5471ada6da Fixes to try and keep OSX and Win32 compiling with the new usage of std::max. 2003-02-23 15:50:57 +00:00
Robert Osfield
696c89e2c5 Added #include<algorithm> to keep OSX build compiling. 
Reverted the mymax implementation to std::max, hopefully this should be ok now
that we have standardised on non native STL under VisualStudio.
 2003-02-21 20:22:32 +00:00
Robert Osfield
0d56658191 Added std:: infront of cout. 2003-02-20 21:58:47 +00:00
Robert Osfield
0b3f300642 Changed the license details across to OSGPL instead of GPL. 2003-02-20 21:52:50 +00:00
Robert Osfield
9d711d80e9 Added missing std:: infront of string usage. 2003-02-19 21:37:12 +00:00
Robert Osfield
7c6cdcde1e Added check into the application usage list of command line args for 
unrecognized options to prevent unprocessed, but valid options being
classed as unrecognized.
 2003-02-19 11:32:15 +00:00
Robert Osfield
0d3f78350a Added keyboard mouse binding usage to the osg::ApplicationUsage and 
osgGA::GUIEventHandler and its subclasses.
 2003-02-19 10:43:02 +00:00
Robert Osfield
73f741d16f Completed first pass at providing commandline option usage via the new 
osg::ArgumentPareser and osg::ApplicationUsage classes. The osgproducer
demo has been implemented using these new mechansims.
 2003-02-18 21:58:40 +00:00
Robert Osfield
cabc0025cb Made the osg::ApplicationUsage forward declared. 
Added include of ostream to ArgumentParser header.
 2003-02-18 21:10:42 +00:00
Don BURNS
4f0972f3c3 std::cout replaced cout 2003-02-18 19:45:53 +00:00
Robert Osfield
c10d5f2d6f Added new osg::ApplicationUsage and osg::ArgumentParser to help streamline 
application/example developement.
 2003-02-18 16:36:42 +00:00
Robert Osfield
73dd9eb59b Added reference to Group in the RegisterDotOsgWrapperProxy. 2003-02-18 11:33:55 +00:00
Robert Osfield
20489dbd4c Added missing ; 2003-02-18 10:50:57 +00:00
Robert Osfield
cbad9b7610 Removed linking to osgGLUT/GLUT in the osgconv program. 2003-02-18 09:12:27 +00:00
Robert Osfield
9208e24bd4 Fixes to RenderToTextureStage to account for the cull/draw traversal no longer using 
reference counting of statesets.

Moved last uint reference over to unsigned int.
 2003-02-15 19:51:53 +00:00
Robert Osfield
a07cbb969d Moved osghanglide back to pure osgGLUT based, removing osgProducer pathways. 2003-02-14 22:32:29 +00:00
Robert Osfield
b4293fe93a More work on uint -> unsigned int. 2003-02-14 20:27:23 +00:00
Robert Osfield
77fee92d71 Renamed futher uint/ushort instances. 2003-02-14 16:52:47 +00:00
Robert Osfield
bd506b53da Removed last of the uint references. 2003-02-14 11:41:52 +00:00
Robert Osfield
319e84ceed Added support for ClipNode in the .osg plugin. 2003-02-13 15:37:32 +00:00
Robert Osfield
43d304c24e From Geoff Michel, updates to the Geo plugin. 
Removed osg::uint reference form the pfb plugin.
 2003-02-13 15:16:04 +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
28732e3451 Merged linkage changes from Duncan Cavens to help the OSG osgtext and osghud 
demo's build cleanly even when a previous version of the OSG is installed.
 2003-02-12 14:39:51 +00:00
Robert Osfield
0e8154d3d3 From Norman Vine, updates to TXP plugin so that the Cygwin build uses pthreads. 2003-02-12 12:02:25 +00:00
Robert Osfield
042af2be03 Add if (!textureStateSet) return check to replace assert() to prevent crashes 
when multi-texture layers don't exist.
 2003-02-12 10:10:03 +00:00
Robert Osfield
636c5e3d98 Added if (!null) guard around description strings. 2003-02-12 09:52:27 +00:00
Robert Osfield
cdf63f2ca7 Made the Professional services subscript optional - use "osglogo ps" to enable 
it.
 2003-02-11 15:54:31 +00:00
Robert Osfield
2eea610703 Clean up of the logo demo. 2003-02-11 12:37:48 +00:00
Don BURNS
1ab232b113 Used INC instead of CXXFLAGS 
GVS: ----------------------------------------------------------------------
 2003-02-10 22:15:04 +00:00
Robert Osfield
07f96583f5 Removed the osg::notify() calls from the RenderBin prototype construction to 
avoid problems under OSX with construction/deletion of std::cout/cerr.
 2003-02-10 16:48:53 +00:00
Robert Osfield
fa643c8795 From Geoff Michel, updates to the Geo loader including handling of 
.geo files from the rc1 of the GEO modeller.
 2003-02-10 15:16:51 +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
ebb31fb339 Updates from Ulrich for sharing of textures. 2003-02-10 14:47:20 +00:00
Robert Osfield
c3c70c9415 Changed int to GLint for OSX build. 2003-02-10 14:23:31 +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
Don BURNS
d4f7da7bb8 Right, em.... fixed eh.. problem with destruction of RenderBin prototype list 2003-02-05 23:13:27 +00:00
Robert Osfield
9cc9b0000b Fixed infinite loop in osgProducer::CameraGroup::advance(). 2003-01-31 23:46:15 +00:00
Robert Osfield
fa70860427 Port of osghangglide to use osg producer. Default build still uses GLUT. 2003-01-31 00:44:56 +00:00
Robert Osfield
4c4735a586 Added FrameStats support into osgProducer lib, and removed them from the 
osgproducer demo.

Removed the producer config files osgproducer demo.

Added a search the osgDB::DataFilePath for the producer config file.
 2003-01-30 23:02:32 +00:00
Robert Osfield
f485304665 Fix for endianess of colour set up of RGBA values. 2003-01-30 21:46:57 +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
8422040e97 Fixes to osgprerender and osgshadow scene for new cull and draw implemention 
without use of ref counting.

New StatsEventHandler for osgprerender demo to add keyboard control of stats
output.
 2003-01-30 00:34:35 +00:00
Robert Osfield
6439a719aa Fixed CullVisitor::getDistanceFromEyePoint so that withLODScale is handled 
correctly.
 2003-01-29 17:24:54 +00:00
Robert Osfield
6c4f2f5207 Fixes for multipipe support. 
Addition of FrameStatsHandler to osgproducer demo to add frame stats.
 2003-01-29 17:16:26 +00:00
Don BURNS
cf1ff34d38 Fixes to osgProducer for IRIX build. 2003-01-27 20:40:08 +00:00
Robert Osfield
6d02ccfc58 Removed the inline declarations of several method implementations. 2003-01-24 16:57:28 +00:00
Robert Osfield
31e4185aa6 Added an #ifdef to osgGLUT/Window.cpp to handle the case of compiling against 
older versions of GLUT.
 2003-01-24 15:12:54 +00:00
Robert Osfield
63303787fc Changes to try and placate the Sun Forte compiler. 2003-01-24 12:39:18 +00:00
Robert Osfield
1ce53fcfba Changed the setUpViewer so it takes unisigned int to make it easier to 
do OR'ing of the various enumerates when passing in paramters (avoids a
warning).
 2003-01-24 09:37:11 +00:00
Robert Osfield
df21d69666 Fixed the formating of the Matrix output. 2003-01-24 09:35:05 +00:00
Robert Osfield
6eb62b1e30 Added an #ifdef check around the glutSpecialUpFunc to help compile unde old 
version of GLUT.
 2003-01-24 09:34:33 +00:00
Robert Osfield
20ba1a4033 Fix for impostors bug where image insert were visible, this was down to a double 
call to RenderStage::drawPreRenderStage().  The call to it in RenderStage inside
the draw() method has been removed, leaving on the call in SceneView.
 2003-01-24 09:11:05 +00:00
Robert Osfield
f74f50161c Changed the template insert(,,) method for a std::copy() implemention as it 
seems that the Sun Forte compiler can't handle member templates!
 2003-01-23 22:12:04 +00:00
Robert Osfield
f43d02f496 Added extra checks in the removal of rendundent nodes code so that description 
fields etc are checked.
 2003-01-23 15:12:58 +00:00
Robert Osfield
5a05e14e50 Fix to handling of comment records and longid's. 2003-01-23 14:46:10 +00:00
Robert Osfield
bf41106ce8 Changed the image directory refered to in billboard demo. 
Updates NEWS.

Changed the line endings in TextureCubeMap to unix endings.
 2003-01-23 12:18:22 +00:00
Robert Osfield
a32a392d8d Tweaking of the osgvertexprogram tex matrix settings. 2003-01-23 12:07:01 +00:00
Robert Osfield
3cdf42e599 Fixed Win32 compile problem. 2003-01-23 10:11:11 +00:00
Robert Osfield
79eaabd961 Fixed typo of APPLY_MATICES_BEFORE_STATE. 2003-01-23 08:39:48 +00:00
Robert Osfield
ecc2f02f0d Removed eroneous std:: from the from of DisplayListVector. 2003-01-23 08:37:15 +00:00
Robert Osfield
fce55a22ad Added a couple more #defines for the texture cube maps that one can use. 2003-01-22 23:35:19 +00:00
Robert Osfield
f7439363ea Added support for a -c option. 2003-01-22 23:34:43 +00:00
Robert Osfield
9aaf5a560b Changed the implementation of the texture objects and display list to delete 
caches so that they use a std::vector<> swap on the internal data structures
when ready to delete to minimize the amount of time that a race condition
condition can happen.
 2003-01-22 23:34:18 +00:00
Robert Osfield
d6f25a112d Vertex program update from Brede. 2003-01-22 20:48:10 +00:00
Robert Osfield
6afedcc6d1 Updated version numbers to 0.9.3 2003-01-22 19:17:39 +00:00
Robert Osfield
ec8afe0392 Fixed compute bound code which was applying offset first then rotating, rather 
than rotating first then offset.
 2003-01-22 16:49:05 +00:00
Robert Osfield
fbeae00fa2 Fixed handling of rotations reading from .osg of osg::Shapes. 2003-01-22 16:17:56 +00:00
Robert Osfield
ea35796526 From Daniel Sjölie, support for controlling which viewports are focusable i.e. 
recive mouse/keyboard events.
 2003-01-22 15:44:22 +00:00
Robert Osfield
6fd27a4b59 Clean up to the osgProducer lib and demo. 2003-01-22 15:30:17 +00:00
Robert Osfield
4b671e5023 Fixed remove transform code to work with the new extra paramter require by osgUtil::Optimizer. 2003-01-22 12:50:52 +00:00
Robert Osfield
d2b7340fb5 Changed the decal=true setting to decal=false to make sure that textured models 
come out lit ok.  The makes the assumption that colour values on the objects
and realistic, if they arn't then decal texture can produce better results..
 2003-01-22 12:25:04 +00:00
Robert Osfield
329a8a1656 Fixed an Optimizer crash where if the top most node of a model was 
a static transform it would crash when this root was deleted.  Have fixed
by recognising this node as one not to remove and set it to identity instead.
 2003-01-22 12:06:22 +00:00
Robert Osfield
1c56ee52a2 Changed the local header includes from <> to "" to help the OSG compile. 2003-01-21 21:02:17 +00:00
Robert Osfield
926394dcb8 Removed debugging messages. 2003-01-21 19:37:45 +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
6cd43acb5a Made the pre rendering texture using glCopySubImage rather than copy to image 
and then copy to texture, as the later was no longer working due to
texture->apply ordering.
 2003-01-21 16:40:18 +00:00
Robert Osfield
87973523ad Added gaurds around alpha function value to catch erroneous values before they 
are passed on to the OSG.
 2003-01-21 16:02:29 +00:00
Robert Osfield
ac5c9a6847 Made a new osgproducer demo based on the new osgProducer::Viewer class. 
Kept the old camera group version around for future reference.
 2003-01-21 13:22:13 +00:00
Robert Osfield
128be070ba Added new osgProducer::Viewer class for putting together simple producer 
based viewers very quickly.
 2003-01-21 13:14:29 +00:00
Robert Osfield
2261b1cc86 From Joseph Steel, addition of texture filter modes to txp plugin. 2003-01-21 09:09:48 +00:00
Robert Osfield
0f69a4c3ae Made the drawable::compile(State&) method const and the DisplayListVisitor to 
compile even when dislay list is off.  This has been done to allow subclasses
of Drawable handle their own compile implementation, such as used by text.
 2003-01-20 20:40:06 +00:00
Robert Osfield
dc83e399a9 Improvements to osgProducer lib, in particular adding a mutex lock to the init() call in 
SceneView to prevent init running multi-threaded.
 2003-01-20 20:33:50 +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
7633ffce3c Removed the ReaderWriterFLY demo since it was causing OSX builds to crash when 
running the osghangglide demo.
 2003-01-20 14:07:27 +00:00
Robert Osfield
5cb765ff25 Clean up to the osgproducer demo. 2003-01-20 11:54:34 +00:00
Robert Osfield
a889cb8f88 Fixed bug in the flight and drive manipulators where they would uncontrollably 
shrink down to a tiny window size when one rezized the window.
 2003-01-20 11:52:34 +00:00
Robert Osfield
f034ca6d74 Fixed osglogo demo so that is correctly set up the colour of the background. 2003-01-20 11:07:41 +00:00
Robert Osfield
c1831b21f7 Made the setting of default glNormal and glColor values an compile 
option via #ifdef USE_DEFAULT_NORMAL and USE_DEFAULT_COLOR defines respectively.
 2003-01-20 11:02:27 +00:00
Robert Osfield
2ac175484a Updates from Pavel. 
1. Storing color of geometry in ColorArray e.g. its don't work when
    lighting off.

  2.  Detecting of alpha channel and automatically enabling blending.
 2003-01-20 10:41:21 +00:00
Robert Osfield
ec30f7d8a6 Update the ReaderWriterATTR file so that it used the definitions that Joseph 
Steel obtained from MPI.

Removed the unique child check from the flt::PrimRecord and osg::Group, this
allows more flexibility when specifing nodes, and is faster..
 2003-01-20 09:56:09 +00:00
Robert Osfield
3723dcda1d From Ruben, updates to the IV/VRML1 loader to handler large datasets. 2003-01-20 09:09:46 +00:00
Robert Osfield
c325de6865 Updates to osgProducer, moving the implementation of CameraGroup and 
SceneHandler into the source directory.
 2003-01-20 08:58:32 +00:00
Robert Osfield
08456ecf70 Added osg::State::dirtyAllModes() and dirtyAllAttributes() methods. 2003-01-19 15:28:08 +00:00
Robert Osfield
762db56a40 Improvements to the osgProducer lib to better handle Producer's normalized 
coord system.

Addition of ReadCameraConfigFile and WriteCameraConfigFile as a tempory
measure for implementing local a C++ read/write of the Producer::CameraConfig, this
will be removed once these implementations or similar have been moved to Producer.
 2003-01-18 22:07:59 +00:00
Robert Osfield
13aa469628 Updated the KeyboardMouseCallback so this it takes into account the the new 
passiveMouseMotion support in Producer.
 2003-01-18 10:17:28 +00:00
Robert Osfield
0bc11fcbf1 From Eric Sokolowsky, Fix for IRIX build, adding typename into the graph_array 
to allow the compiler to leave instation of typedefs until required.
 2003-01-18 09:44:12 +00:00
Robert Osfield
eaaf758910 Added KeyboardMouse::allowContinousMouseMotionUpdate(), but commented out right 
now as Producer crashes when you use it..
 2003-01-17 20:05:41 +00:00
Robert Osfield
619862f8d6 Added osgProducer library to the distribution. 
Cleaned up the osgproducer demo, and made it work with the new osgProducer lib.
 2003-01-17 18:34:35 +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
f87dc60ddd Further improvements to the osgproducer demo. 2003-01-17 14:12:46 +00:00
Robert Osfield
c2c38955c6 Added new getCurrentCamaeraManipulator(), and removed and debugging message. 2003-01-17 14:12:25 +00:00
Robert Osfield
c406d2476f Removed the osg::Referenced::createCount() and deleteCount() methods and 
associated variables which were only compiled in on debug build.  These optional
methods/static vars were causingproblems when mixing debug and release builds.
 2003-01-17 14:11:34 +00:00
Robert Osfield
63fe1433bb Integated the trackball manipulator with the osgproducer demo. 2003-01-17 13:34:03 +00:00
Robert Osfield
097030766d Added ProducerEventCallback class to manager the conversion of producer events 
into GUIEventAdapter versions.
 2003-01-17 11:26:16 +00:00
Robert Osfield
4dd273de70 Added support for ReferenceFrame into osg::LightSource, modified the .osg 
plugin and cull visitor to account for this change.
 2003-01-16 16:37:24 +00:00
Robert Osfield
a0e5b9b007 Added support for frame stamping each frame. 2003-01-16 12:39:15 +00:00
Robert Osfield
cab41ec32d Updates to clean up the demo. 2003-01-16 12:18:45 +00:00
Robert Osfield
d6480b0425 Warning fix for Win32. 2003-01-15 20:57:48 +00:00
Robert Osfield
0e6b3b68bd Added #include <osg/Export> simply to include the #pragma's for disabling the 
daft VisualStudio warnings.
 2003-01-15 20:53:27 +00:00
Robert Osfield
e0074d7c44 Made the osgDB::ParamterOutput class so that it is purely defined in terms 
of the header, and therefore not requiring to be exported.

Updated the MUSE_READ_ME.txt to include mention of syntax highlighting.
 2003-01-15 20:50:12 +00:00
Robert Osfield
5ad9602673 Updates to the osgproducer demo. 2003-01-15 19:23:16 +00:00
Robert Osfield
7bf60026f7 Removed the -> methods from the arc class to prevent stupid warnings under 
VisualStudio6.0.
 2003-01-15 15:44:49 +00:00
Robert Osfield
afb0ff775d First cut and a demo which uses Open Producer for windowing. 2003-01-15 15:24:35 +00:00
Robert Osfield
ac718b6abb Attempts to fix more of the *stupid* errors in the VisualStudio6.0 compiler. 2003-01-15 13:17:52 +00:00
Robert Osfield
5960307703 Patch from Joseph Steel, added missing check for the mipmap usage. 2003-01-15 11:33:33 +00:00
Robert Osfield
d542a2165d Removed the template versions of the PrimitiveSet constructors as this was 
causing problem under VisualStudio6.0.
 2003-01-15 11:29:30 +00:00
Robert Osfield
64efc8ecbb Fix for win32. 2003-01-14 19:12:22 +00:00
Robert Osfield
af6a6ff9f0 Fixes for Win32 build. 2003-01-14 16:39:41 +00:00
Robert Osfield
59969be08d From Daniel Sjölie, updates to the GUIEventAdapter and GLUTEventAdapter to handle 
key and key down, modifiers and funcion keys.
 2003-01-14 14:25:56 +00:00
Robert Osfield
a03fff8c57 Added an compile in option of applying the matrices before state in the RenderLeaf 
apply method.  This order is intended to help support of vertex programming, but
unfortunately breaks the osgreflect demo so the original ordering is kept by default.
 2003-01-14 14:21:06 +00:00
Robert Osfield
3365634a01 Submission from Joseph Stell, added LoadModels to TerrapageNode. 2003-01-14 14:00:09 +00:00
Robert Osfield
edd04fd5a0 Fixed typo. 2003-01-14 12:36:14 +00:00
Robert Osfield
36857d6b2f Replaced the NVTriStrip code with tri_stripper written by Tanguy Fautré. 2003-01-14 10:54:01 +00:00
Robert Osfield
c882283b5d Typo fix if USE_HOME_POSITION. 2003-01-13 20:14:23 +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
7ee6d4f3f4 Clean up to the cross platform support in DirectX plugin. 2003-01-13 14:11:06 +00:00
Robert Osfield
c3a7ce7352 Fixes to osgText to handle std::string correctly. 2003-01-13 14:05:08 +00:00
Robert Osfield
29f4fa713f Added missing _bbox.init() to ShapeDrawable.cpp. 2003-01-13 10:39:14 +00:00
Don BURNS
0adc037d20 ReaderWriterDirectX.cpp needed some std::'s 2003-01-11 20:56:29 +00:00
Robert Osfield
9bd4145405 From Ulrich, fixes to double to float conversion warnings under Windows. 2003-01-11 20:43:47 +00:00
Robert Osfield
ef7d7fce2e Moved some in inline methods in ParamterOutput into the new ParamterOutput.cpp 
file to clean up the interface.
 2003-01-11 12:50:39 +00:00
Robert Osfield
e8ddbdd195 Updates from Ulrich. 2003-01-10 17:06:20 +00:00
Robert Osfield
f790d1ff15 Added missing header for new matric reading and writing methods. 2003-01-10 16:56:39 +00:00
Robert Osfield
f36bc69c58 Made the more of the OSG's referenced object desctructors protected to ensure 
that they arn't created on the stack inappropriately.

Split the implemention of Matrix up so that it is a simple no referenced counted
class and can be safefly created on the stack.  To support referenced counting a
seperate subclass now exists, this is RefMatrix which inherits from both Matrix and
Object.
 2003-01-10 09:25:42 +00:00
Robert Osfield
f948a3de7c Fixed typo. 2003-01-09 18:41:01 +00:00
Robert Osfield
043839f40b Added #ifndef GL_TEXTURE_WRAP_S #define block to keep things compiling 
on old drivers.
 2003-01-09 16:13:30 +00:00
Robert Osfield
97da5d7f92 Fixed typo. 2003-01-09 11:48:49 +00:00
Robert Osfield
e8c2226e38 Added setting of the R wrap paramter to applyTexParamters(). 2003-01-09 10:06:44 +00:00
Robert Osfield
ba2c3a187d From Ulrich Hertlein, DirectX .x model loader plugin. 2003-01-08 22:52:27 +00:00
Robert Osfield
f91e141e7a Fix to case statement from Tree. 2003-01-08 16:37:09 +00:00
Robert Osfield
a1f6b8730b Added Shape.cpp to cvs resposity. Shape.cpp adds support for the various 
osg::Shape in the .osg file format.
 2003-01-08 16:33:02 +00:00
Robert Osfield
6727b8d5f7 Cleaned up the code for the animation flags of the group record. 2003-01-08 16:30:48 +00:00
Robert Osfield
c5d3c860d8 From Tree, support for encoded text added into osgText. 2003-01-08 15:22:17 +00:00
Robert Osfield
ba34880464 Added support for reading and writing Sphere, Box, Cone, Cylinder and Grid shapes. 2003-01-08 14:32:13 +00:00
Robert Osfield
e6b64a5550 Added support for sharing arrays in the .osg format for osg::Geometry. 
Fixed the osgUtil::Optimizater so it takes into account sharing of arrays when
deciding whether an geometry can be merged or not.
 2003-01-07 16:29:07 +00:00
Robert Osfield
53204898f3 Fixes for Irix64 build. 2003-01-06 23:19:42 +00:00
Robert Osfield
0161dacc15 Removed the osg::LightPoint::OPAQUE option, and implemented the ADDTIVE blending option. 2003-01-06 16:42:02 +00:00
Robert Osfield
3ef3666d0f Added new ARB vertex program state attribute and demo program, 
sent in my Brede Johansen.
 2003-01-04 20:45:53 +00:00
Robert Osfield
060975a05c Fixed small typo. 2003-01-04 20:44:17 +00:00
Robert Osfield
1317f6feaf Added usage info in -O option. 2003-01-04 20:43:53 +00:00
Robert Osfield
7b6d802131 Fixed options code. 2003-01-04 20:43:27 +00:00
Robert Osfield
141f065b17 Removed the dual inheritance from the AnimationPathCallback, moving the 
NodeVisitor implemention into the .cpp.

Small tweak to the lighpoint drawable implmenentation to improve the additive
blending and state resotoration.
 2003-01-03 21:42:02 +00:00
Robert Osfield
fe64942c54 Added a AnimationPathCallback which can update both a MatrixTransform and a 
PositionAttitudeTransform, removed the equivialnt callbacks once found in these
transform classes.

Changed the NodeCallback class so its derived from osg::Object instead of
osg::Referenced to allow it to be saved out in the .osg format.

Added support for Update and Cull callbacks into the .osg file format.

Added support for AnimationPathCallback into the .osg file format.
 2003-01-02 20:10:04 +00:00
Robert Osfield
6ee563ad55 Updates the terrapage to try and make it thread "safer" when used with the OSG. 2002-12-21 19:41:27 +00:00
Robert Osfield
e9287afd5e Turned display lists off in the osg::Geomety created by the terrapage loader, 
this is done because terrapage will dynamic page in and out geometry so we
don't want to keep creating and deleting display lists.
 2002-12-21 11:30:54 +00:00
Robert Osfield
3113fe360b Tweaked the colours in the logo. 2002-12-20 10:48:22 +00:00
Robert Osfield
20a0cc5445 Renamed the app method update. 2002-12-20 09:43:15 +00:00