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

1314 Commits

Author SHA1 Message Date
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