Commit Graph

585 Commits

Author SHA1 Message Date
Robert Osfield
db7cc1c559 Disabled the MemoryManager in all builds since it isn't yet thread safe. 2002-12-14 07:55:29 +00:00
Don BURNS
63c0a33926 Moved TrpageViewer.h to Demos/src/osgtxp 2002-12-13 20:29:26 +00:00
Robert Osfield
97a4775b7e Updates to the light points support to improve the control of the blending of
light points with their background.
2002-12-10 19:56:14 +00:00
Robert Osfield
8d0718e8da Added setting of the current texture unit into the applyTextureAttribute() method. 2002-12-09 21:03:02 +00:00
Robert Osfield
109f6f22fe Updated the Switch, Sequence and Group classes so that they all used a
similar style removeChild() mechansim.

Made the old style osg::Switch::setValue() method deprecated.
2002-12-07 21:18:12 +00:00
Don BURNS
b63827c5d9 Cleanin' up after Robert's spelling ...er ... challenges. 2002-12-07 06:59: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
1be82ec697 From Tree, mods to help support the creation of Java bindings. 2002-12-06 09:44:11 +00:00
Robert Osfield
b0c4256e90 Norman Vine's changes for gcc 3.2 under Cygwin, moving of SG_EXPORT to after
the extern declaration.
2002-12-05 12:43:08 +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
Robert Osfield
a4404a388d Fixes for Cywin gcc3.x build in GL and Math headers.
Fix for VS build in osgshadowtexture.
2002-12-04 17:34:52 +00:00
Robert Osfield
f6934e25ab Made the callback class uses virtual inheritance of osg::Referenced to ensure
that a single class can be used for two different types of callbacks whithout
incurring issues of multiple ref counts and ref()/unref() methods existing.
2002-12-03 17:20:31 +00:00
Don BURNS
bf0cbf6b10 Modified Files:
include/osgTXP/trPagePageManager.h src/Demos/osgtxp/osgtxp.cpp
 Added Files:
    VisualStudio/Demos/osgtxp/osgtxp.dsp
2002-11-29 22:10:12 +00:00
Robert Osfield
26ba223880 Added isImageTransulacent() method. 2002-11-25 16:38:33 +00:00
Don BURNS
12e922bc3c Added Paging TerraPage loader and osgTXP library. 2002-11-24 21:36:05 +00:00
Robert Osfield
bcf9d08c2b Adjusted tabbing. 2002-11-22 08:23:54 +00:00
Robert Osfield
a545f3b48c Moved the shadow creation code into a seperate CreateShadowedScene header and source,
and exposed just the basic createShadowedScene function in the header.
2002-11-21 15:35:51 +00:00
Robert Osfield
5ddcd5d878 Added osg::Geometry::setPrimtiveSet,removePrimtiiveSet, insertPrimitiveSet
and getPrimitiveSetIndex().

Renamed osg::Group::findChildNum(..) to getChildIndex().

Renamed osg::Geode::findDrawableNum(..) to getDrawableIndex().
2002-11-21 09:07:11 +00:00
Robert Osfield
2b957675d5 Added visual workspace files for osgSim nodekit and osglightpoint demo. 2002-11-19 12:23:45 +00:00
Robert Osfield
e02ae73edc Added osgSim library which encapulsulates light points.
Added osglightpoint demo.
2002-11-19 10:57:40 +00:00
Robert Osfield
5fca8ea229 Moved Drawable across to using osg::buffered_value.
Added new osg::State::setInterleavedArray() method.

Added new osg::Group::setNode(uint,Node*) method.

Cleaned up and fixed the osg::Texture's handling of dirtyTextureParamters().
2002-11-19 10:56:59 +00:00
Robert Osfield
42fb3c5987 Added setDrawable(uint,Drawable*) method. 2002-11-18 16:14:00 +00:00
Robert Osfield
bd7762a73e Added State::computeSecondaryColorSupported() & computeFogCoordSupported().
Updated NEWS.
2002-11-13 11:09:55 +00:00
Robert Osfield
8e84722f90 Added LEFT_EYE and RIGHT_EYE stereo to osg::DisplaySettings/osgUtil::SceneView
Renamed LODBias to LODScale.
2002-11-12 10:22:38 +00:00
Robert Osfield
35b9317baf Fixes to typo of *Dirty() 2002-11-11 16:11:48 +00:00
Robert Osfield
6f3e2b681c Fixed bug in osg::Node::isCullingActive().
Rnabled the automatic selection of the animation path if one is specified
on the commandline in sgv.
2002-11-11 08:52:24 +00:00
Robert Osfield
661240d1ca Fixes to const paramter types. 2002-11-11 08:04:40 +00:00
Robert Osfield
feeadcdec0 Removed deprecated API 2002-11-08 14:03:44 +00:00
Robert Osfield
aca6c3c4f9 Added #define DARWIN_OSX_PRE_10_2 and related #ifdef checks to cope with backwards compatiblity
with versions of OSX before 10.2.
2002-11-08 12:26:41 +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
5db3229b5f Updates to Math for OSX build.
Added 3dmodelworld.com to the data source directory.

Fixed compile problem under VC6.0 in osgimpostor.
2002-11-08 10:25:08 +00:00
Robert Osfield
b6988affe6 Commented out the USE_DEPRECATED_API define. 2002-11-07 14:29:33 +00:00
Robert Osfield
6d09a50c6d Added shape drawable into dot osg plugin. 2002-11-07 08:49:12 +00:00
Don BURNS
7669b96c28 Changed a couple of const/non-const discrpancies between header and source
for TexGen.  Removed external library dependencies in plugin makefiles
2002-11-06 18:39:32 +00:00
Robert Osfield
f6cbfc20bd Fix for backwards compatibility. 2002-11-06 16:04:51 +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
26875c965d Renamed ProceduralGeometry to ShapeDrawable to better reflect its current
purpose.
2002-11-06 10:46:34 +00:00
Robert Osfield
5eb65f65cc Added support for recording camera animation paths in osgGLUT::Viewer, and fixed
the osgGA::AnimationPathManipulator to handle it.

Added a new Drawable::ConstAttributeFunctor and make the accept(PrimitiveFunctor)
be a const method so can disallows modification.  Added Drawable::supports(...) methods
for each of the AttributeFunctor, ConstAttributeFunctor and PrimitiveFunctor so
that programs can querry whether it is possible to use functors with that object type.
2002-11-06 10:24:33 +00:00
Robert Osfield
a6eafa79e2 From Ulrich Hertlien, added ReaderWriter::Options to the osgconv and pfb plugin
so that all the pfi files can be converted to rgb be the plugin.
2002-11-04 09:08:50 +00:00
Robert Osfield
bba03297a7 Added support for primitive functor into the new osg::ProceduralGeometry class 2002-11-01 15:12:51 +00:00
Robert Osfield
d9af228892 Added export to the height field class. 2002-11-01 10:39:35 +00:00
Robert Osfield
94105025a0 Updates to Shape support. 2002-11-01 10:25:27 +00:00
Robert Osfield
21ee9e4cb7 Added osg::Grid shape class, and added an example of its use into the
hang glide demo.
2002-10-31 10:36:11 +00:00
Robert Osfield
da84f9b4aa Added first cut of new primtive shapes support. 2002-10-30 13:27:15 +00:00
Robert Osfield
2e99fdacfc Removal of more redundent const base types. 2002-10-30 12:58:26 +00:00
Robert Osfield
32c6a7809a Updated the handling of string in the .osg reading and writing so that it
handles the use of " quotes inside the string.
2002-10-28 12:55:19 +00:00
Robert Osfield
55b2a5ff30 From Gideon May, fixes to remain const base type instances in headers. 2002-10-25 12:29:03 +00:00
Robert Osfield
f5f20e4ac1 Fix from Don Tidrow for bug when moving between RenderGraph when popping back
up to common parents.
2002-10-23 07:46:11 +00:00
Robert Osfield
054fd3877c Fixed spelling mistake in comment. 2002-10-21 13:03:02 +00:00
Robert Osfield
ac0de068d9 Changed the private: to protected: to allow easier extension. 2002-10-21 13:02:30 +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
f284f158f3 Fixed error in #ifdef GL_SECONDARY_COLOR...
CV: ----------------------------------------------------------------------
2002-10-17 10:04:11 +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
6ba195efea Added a little more info into the State contextID docs. 2002-10-10 13:06:24 +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
16291da3b0 Fixes to smoothing visitor and tesselator to handle indexed Geometry. 2002-10-09 15:43:56 +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
588bc1da3c Solaris didn't like filebuf. Using old FILE 2002-10-08 08:36:48 +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
525fc2f746 Set the default values for scale to 1,1,1. This fixes the bug obsevered when
using AnimationPath with MatrixTransform without setting the scale value of
the osg::AnimationPath::ControlPoint's.
2002-10-07 20:01:28 +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
478f736f63 Added missing osg::TextureCubeMap::getAssociatedMode(). 2002-10-07 11:06:37 +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
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
14e9be42c2 Changed the include of MatrixTransform to Transform. 2002-10-04 13:53:41 +00:00
Robert Osfield
06022febff Added back in the old osg::Geometry::addPrimitive(..) methods for backwards
compatibility and have placed them within a #ifdef USE_DEPREACATED_API block.
2002-10-02 13:16:39 +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
29e998c1f8 Removed inappropriate inline keyword from getOrCreateStateSet(). 2002-09-30 18:12:54 +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
b57b0b16b9 Fixes for Win32 build. 2002-09-28 07:43:04 +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
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
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
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
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
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
ee93b70033 From Pavel Moloshtan, fixes for Mingw32 build. 2002-09-12 20:30:41 +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
Don BURNS
b5870857c4 Fixed setFusionDistance 2002-09-12 14:29: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
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
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
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
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
c6965357e6 Renamed osg::Statistics::addOpaque to addDrawable to better reflect its current
function.
2002-08-30 19:45:56 +00:00
Robert Osfield
cf9e9e2b5b Fixes to Math for MacOSX build.
Converted TextureCubeMap to unix file endings.
2002-08-30 15:32:59 +00:00
Robert Osfield
b1f69a9b11 Fixed the flatten static transform visitor. 2002-08-30 15:07:10 +00:00