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

932 Commits

Author SHA1 Message Date
Don BURNS
5c111680f6 FIxed set_new_handler to std::set_new_handler 2002-10-24 15:24:39 +00:00
Robert Osfield
3be6ffd9c3 Changed the nameing of iterators to prevent clashes with VisualStudio's dumb 
compiler.
 2002-10-21 15:09:03 +00:00
Robert Osfield
761fc0574f Merged Pavel's updates to LWO2 for handle multiple texture layers. 2002-10-18 12:47:36 +00:00
Robert Osfield
31e8323f17 Added default colour and normal definition to the Geometry draw to prevent state 
inheritance of these attributes from causing problems of Geometry which arn't
fully defined.
 2002-10-18 12:26:23 +00:00
Robert Osfield
00fd58283c Added extension checking to the rgb and bmp write of images. 2002-10-18 12:23:42 +00:00
Robert Osfield
e1b084749e Renamed the RenderBin::sort_local to sortImplementation(), 
draw_local to drawImplementation() and added a new RenderBin::DrawCallback().

Added osgcubemap to the Make/ test scripts.
 2002-10-17 13:48:46 +00:00
Robert Osfield
ee8ded2a90 Fixed memory allocation. 2002-10-17 11:59:01 +00:00
Robert Osfield
88130dfa5a Checked in fix for std::hex for dumb arsed compilers. 2002-10-17 11:50:53 +00:00
Robert Osfield
ab59703e54 Fixed compile error under Windows. 2002-10-17 11:39:04 +00:00
Don BURNS
68427b98ae Changed std::malloc to new in src/osgUtil/CubeMapGenerator.cpp 2002-10-15 19:10:05 +00:00
Don BURNS
90d2c3054f Fixed cstdlib to stdlib.h for IRIX in src/osgUtil/CubeMapGeneragortor.cpp 2002-10-14 21:10:44 +00:00
Robert Osfield
4bb344719a Fixes from Macro. 2002-10-10 20:04:02 +00:00
Robert Osfield
bfd614f907 Fixed the names of the ControlPoint parameters so they weren't capitals, to avoid 
the clash with the parameter type itself.

Addd a PER_PRIMTIIVE_SET handling to the existing PER_PRIMTIIVE code, this code
is still flacky though and needs a rewrite as it doens't handle all attributes or
the full consequences of per primitive and per primitive set bindings.
 2002-10-10 14:58:44 +00:00
Robert Osfield
50652f389b Added Macro's new cube map generation classes and osgcubemap demo. 2002-10-10 12:44:38 +00:00
Robert Osfield
6c0861ef80 Maded the "flt::Registry::getPrototype: Unkown opcode:" message a INFO level 
notify message rather than a NOTICE.
 2002-10-10 09:42:41 +00:00
Robert Osfield
2e92e7d242 Made the warning about a mis-matching in the number of children in a switch 
a INFO level notify message rather than a WARN.
 2002-10-10 09:39:09 +00:00
Robert Osfield
50e8ea423c Added remapping of special keys to be handle like a convential key press. 2002-10-10 09:29:07 +00:00
Robert Osfield
41893927c1 From Gabor Dorka, Fixes to memory leaks. 2002-10-10 09:00:31 +00:00
Robert Osfield
16291da3b0 Fixes to smoothing visitor and tesselator to handle indexed Geometry. 2002-10-09 15:43:56 +00:00
Robert Osfield
88ecacfd7a Changed the default value of StandardOrientation to true, to fix orientation 
problems which commonly occur with png files.   Leaves the quesition of how to set
this value automatically.
 2002-10-09 15:41:22 +00:00
Robert Osfield
f210e13944 Fixed bug in osg::LOD::addChild() which was forcing all ranges to be identical 
values.
 2002-10-08 16:02:09 +00:00
Robert Osfield
c59fc9a2b7 Fixed a bug in the Optimizer where BIND_PER_PRIMITIVE_SET primitives where being eroneously merged. 
Added missing support for reading geometry indices from the .osg format.

Added handling of geometry indices into the primitive functor in osg::Geometry.

Moved the method implementions of AnimationPathManipulator into src/osgGA and added extra convinience
methods for setting the manipulator with an hand built AnimationPath.

FCVS: 	VisualStudio/osgPlugins/iv/iv.dsp
 2002-10-08 14:10:55 +00:00
Don BURNS
bfedea5636 osgdb_osg loader had more issues with const/non-const discrepancies on 
Solaris.  Modified Geoset.cpp and Point.cpp
 2002-10-08 08:39:42 +00:00
Don BURNS
16e3a3c182 Added AnimationPathManipulator to osgGA and modified sgv to use it. 2002-10-08 07:39:38 +00:00
Don BURNS
ab580f1e3b Fixed some inconsistencies between header files and function definitions 
where the header file declared a parameter non-const, but the function
definition expected a const.  The Solaris linker was coming up with
undefined symbols.
 2002-10-08 05:41:19 +00:00
Robert Osfield
04a9a09a8b Added extra convinience methods to LOD - addChild(child,min,max). 
Added osganimate to test scripts.
 2002-10-07 21:23:37 +00:00
Robert Osfield
41768f6824 Fixes to Switch so that it defaults to adding children switched on, and adds 
a flag to control whether children and added as true or false.
 2002-10-07 20:17:57 +00:00
Robert Osfield
b7372fb4cb Added new osganimate demo which demonstrate the osg::AnimationPath in action. 
Added extra parameters to the AnimationPath callbacks to allow finer control.
 2002-10-07 19:51:11 +00:00
Robert Osfield
5f1a5f0c41 Added code to Viewer::addViewport(..) to force the sharing of a single 
osg::State object between viewports.
 2002-10-07 10:02:47 +00:00
Robert Osfield
65934ef824 From Daneil Sjölie - modifications to the support of custom GUIEventHandlers in osgGLUT 2002-10-07 09:41:30 +00:00
Robert Osfield
70861ef70e Converted osg::LOD from used n+1 successive ranges to n min/max ranges, 
one min/max pair per child. Converted the rest of the OSG to use the new
osg::LOD node.
 2002-10-06 20:33:13 +00:00
Robert Osfield
84332f5b77 Fixes for Win32 build. 2002-10-04 16:40:45 +00:00
Robert Osfield
4a3cc5c182 Implemented OpenFlight style switches so that each child of a switch can now 
be individually turned on or off.  Moved the OpenFlight code across to use the
new scheme, removing the old hack of using node masks to achieve the same end
result.
 2002-10-04 14:50:33 +00:00
Robert Osfield
65ab5f7b62 Added osgteapot demo to show how to implement custom Drawables to 
wrap up OpenGL code.
 2002-10-02 15:28:17 +00:00
Robert Osfield
0a5ed26940 Moved the new osg::IndexedGeometry class over the top of the the existing 
osg::Geometry class, and removed the temporary IndexedGeometry.  Port the rest
of the OSG across to account for the change in method calls -
osg::Geometry::addPrimitive(..) becomes osg::addPrimitiveSet(..)
 2002-10-02 13:12:16 +00:00
Robert Osfield
6f6e237429 Added setActiveTextureUnit(0) to State::reset(). 2002-09-30 18:11:34 +00:00
Robert Osfield
af5f5e5a3f Added traverse the AnimationPath callbacks. 2002-09-30 16:50:16 +00:00
Robert Osfield
5fd86440b3 Added support for per primitive bindings in osg::IndexedGeometry. Added a 
convertToIndexedGeometry() method to GeoSet to allow datasets with per primitive
bindings to be be mapped to across to osg::IndexedGeometry for testing purposes.
 2002-09-30 13:30:46 +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
d176f752a5 From Daniel, Fixes for warnings under Win32. 2002-09-29 12:33:30 +00:00
Robert Osfield
da3739ebfc Fixes to IndexedGeometry.cpp to repair bugs introduced with Win32 build fixes.S 2002-09-28 19:09:42 +00:00
Robert Osfield
098e34ece0 Added a dirtyAllVertexArrays() to State::reset(). 2002-09-28 07:47:10 +00:00
Robert Osfield
b57b0b16b9 Fixes for Win32 build. 2002-09-28 07:43:04 +00:00
Robert Osfield
2a94879fcc Fix build after change in GLExtensions. 2002-09-27 19:04:46 +00:00
Robert Osfield
df027e1bab Fixes to IndexGeometry for Win32 build. 2002-09-27 19:01:59 +00:00
Robert Osfield
f8edf16c40 Improvements to IndexedGeometry. 2002-09-27 17:47:47 +00:00
Robert Osfield
2a28a4297f Futher work on the IndexedGeometry class. Indexed coordinates should now 
work.
 2002-09-26 15:26:22 +00:00
Robert Osfield
f7c7740327 Changed the linux linking of -lgif to -lungif. 
Fixed a typo in the Images name.
 2002-09-24 20:14:08 +00:00
Robert Osfield
9546c73e39 Changed the image file so that use the Images/ prefix to help locate the files 
within the OpenSceneGraph-Data directory.
 2002-09-24 20:04:20 +00:00
Robert Osfield
fb629ae87d From Gideon, support for tracking the number of objects constructed and deleted, 
only compiled in when unit tests are compiled in.
 2002-09-20 15:55:50 +00:00
Robert Osfield
444a6eaf97 From Ulrich Hertlien, supported add to textures in the .lwo format. 2002-09-20 15:54:17 +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
fd3bef5158 From Daniel, changed setEventHandler to addEventHandler. 2002-09-20 14:48:41 +00:00
Robert Osfield
ce51fb1841 Added PolygonStipple class from Mike, with mods from Robert to make data 
management local.
 2002-09-19 10:30:15 +00:00
Robert Osfield
68384e984b Made the calls to the drawing of the pre rendering stages exclit, using 
a seperate method in RenderStage and associated calls in sceneView.cpp.
This fixes problems when doing stereo and prerender at the same time.
 2002-09-19 09:52:50 +00:00
Robert Osfield
f6cb09c601 Fixed copy constructor so that the _stage member variable was set to this 
correctly.
 2002-09-19 09:05:50 +00:00
Robert Osfield
02d920c930 Fix the sceondary color code. 2002-09-18 16:10:42 +00:00
Robert Osfield
9a9e88b78a Added missing isCompressedInternalFormat() method. 2002-09-18 16:05:26 +00:00
Robert Osfield
f11410928f Simplified the depth calculation code in CullVisitor so that it always computes 
the depth of all drawables, so that it is always safe for RenderBin sort routines can use
these values directly.

Add an example of a RenderBin::SortCallback to sgv.cpp.
 2002-09-18 14:57:01 +00:00
Robert Osfield
4a54b7bdb1 From Daniel Sjölie - added support for multitexured flt files. 2002-09-18 11:11:10 +00:00
Robert Osfield
ed43d97ed3 Improved the sort callback support in osgUtil::RenderBin, and removed the 
now rendundent DepthSortedBin class.
 2002-09-17 15:47:23 +00:00
Robert Osfield
91df37b5c8 Further work on multiple context extensions. 2002-09-16 20:58:05 +00:00
Robert Osfield
f006d081e5 Commented out the call to combine LOD's in the optimizer as it was causing 
problems in some flt datasets.
 2002-09-16 10:55:09 +00:00
Robert Osfield
ce36cda0cc Updates the osg::Texture3D::Extensions interface to support the standardisation 
of extensions supported across multiple graphics contexts.
 2002-09-14 10:38:28 +00:00
Robert Osfield
6d21fbd6cf Added dirty methods for vertex arrays to better support external OpenGL 
code which modifies the OpenGL state and needs to tell the osg::State
about it to ensure that the OSG doesn't make any errors during lazy
state updating.
 2002-09-13 13:50:58 +00:00
Robert Osfield
f867dd81be Added asGroup() and asTransform() methods to osg::Node to downcast nodes 
to these types without requiring an expensive dynamic_cast<>.

Also added asGeometry() to osg::Drawable for the same reasons.
 2002-09-12 15:34:31 +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
Don BURNS
866af14f86 Added ability to accept '.tif' files (as well as '.tiff') and printed 
notify() on error
 2002-09-09 04:40:50 +00:00
Robert Osfield
e2603ff6c4 Improvements to osg::Texture3D::Extensions code. 2002-09-05 15:45:10 +00:00
Robert Osfield
bb0022175b Added new buffered_value template class which encapsulates a std::vector but 
initializes the array to the number of graphics contexts, and automatically
expands the array when indices outside the current size are required.

Added new osg::Texture::Extensions nested class to handle extensions on a per
context basis.
 2002-09-05 11:42:55 +00:00
Robert Osfield
9bab7a181f From Ulrich Hertlein, check for max 3d texture size into the osgtexture demo. 2002-09-04 10:51:33 +00:00
Robert Osfield
f574d0dd68 Added support for setting the fusion distance directly in SceneView, defaults 
to the original behavior of using the values from the Camera if attached.
 2002-09-04 10:49:17 +00:00
Robert Osfield
6ff24b338f Added support for multiple graphics contexts to osg::Texture and its 
subclasses.
 2002-09-04 08:14:04 +00:00
Don BURNS
d5f87e919d Added setting colormask to SceneView on every frame to allow toggling 
between stereo on and off in Anaglyphic mode.
 2002-09-04 01:15:07 +00:00
Robert Osfield
1ad924d0ca Fixes to the LWO to better handle 3 and 4 vertex polygons. 
Added an extra pass into the Optimizer's merging of geometry primitives so
it convertex 3 and 4 vertex polygons into triangles and quads respectively.
 2002-09-03 20:12:29 +00:00
Robert Osfield
2842346b5a Removed const from the evaluateLODChild(,,) callback method. 2002-09-03 19:25:00 +00:00
Robert Osfield
5c1787535c Removed the temporary commenting out of the Optimizer, which was done for 
debugging purposes.
 2002-09-03 14:42:19 +00:00
Robert Osfield
0cb75d42e0 Fixed LWO2 ReaderWriter problem which was down to an the compiler reodering 
the evaluation of a Vec3 paramter.
 2002-09-03 13:04:53 +00:00
Robert Osfield
46585242a1 Fixed and unmatched malloc/free pair, which was previously doing a mallco/delete. 2002-09-03 09:50:51 +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
52518673d1 From Yfei He, added in missing RoadConstruction handler. 2002-08-31 09:59:18 +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
c6965357e6 Renamed osg::Statistics::addOpaque to addDrawable to better reflect its current 
function.
 2002-08-30 19:45:56 +00:00
Robert Osfield
a68d95d2f6 Updates to windows build docs. 
Merge fixes for OSX from bob.

Added checking for impostor sprites into stats.
 2002-08-30 16:17:41 +00:00
Robert Osfield
b1f69a9b11 Fixed the flatten static transform visitor. 2002-08-30 15:07:10 +00:00
Robert Osfield
fc5f07acaa Fixed the numerical accuracy problems in the Drive and Flight Manipulators. 2002-08-29 20:41:19 +00:00
Robert Osfield
44beefa9a5 Fixed numerical accuracy problem in Trackball manipulator. 2002-08-29 16:38:51 +00:00
Robert Osfield
6c08183b45 Updated docs. 2002-08-29 14:29:49 +00:00
Robert Osfield
79aaac4e0c Renamed the ConvexPlaner* classes to ConvexPlanar* and changed all the various 
classes that reference it.

Added MUST_READ_ME.txt to the VisualStudio directory.
 2002-08-29 11:02:01 +00:00
Don BURNS
76959d5648 Blast it, Don... You should rebuild before you check things in! 2002-08-29 03:49:23 +00:00
Don BURNS
2b10b4c3df Fixed 69 occurance of 'Seperate' misspelling (should be 'Separate') 2002-08-29 03:22:27 +00:00
Robert Osfield
b546c63139 Changed instances of new across to use osgNew to help debugging, and fixed 
an unitialized variable in Sequence.
 2002-08-28 21:40:38 +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
fe93b91f73 Fixes to Win32 build. 2002-08-28 18:38:33 +00:00
Robert Osfield
4c762829f2 Added std:: infront of cout and endl. 2002-08-28 17:37:12 +00:00
Robert Osfield
ebb8a635d2 Fixes for Win32 build. 2002-08-28 16:59:22 +00:00
Robert Osfield
bd87e19068 Fixed unitialized variable in the MyTextureSubloadCallback. 2002-08-28 16:25:06 +00:00
Robert Osfield
e50552d6d2 Added fixes to UnitTestFramework to get it compiling under Windows. 2002-08-28 16:17:54 +00:00
Robert Osfield
3b53adc7e8 Warning fixes for Windwos 2002-08-28 15:44:03 +00:00
Robert Osfield
8353fc0ed6 Removed deprecated code from the distribution. 
Added .osg support for Texture1D and Texture3D.
 2002-08-28 15:28:11 +00:00