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

270 Commits

Author SHA1 Message Date
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
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
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
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
ac718b6abb Attempts to fix more of the *stupid* errors in the VisualStudio6.0 compiler. 2003-01-15 13:17:52 +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
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
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
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
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
adf5c91808 Renamed all instance of AppCallback/AppVisitor to UpdateCallback/UpdateVisitor 
inline with the decision to rename the "app phase" the "update phase".
 2002-12-19 15:55:40 +00:00
Robert Osfield
8f81cf2ac6 Moved TriangleFunctor from Drawable into its own header file. 2002-12-16 17:00:05 +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
Don BURNS
22ada7ee6b Uncommented fix for returning to non-stereo from stereo to get color mask 
back to normal.
 2002-12-16 00:33:48 +00:00
Don BURNS
b63827c5d9 Cleanin' up after Robert's spelling ...er ... challenges. 2002-12-07 06:59:08 +00:00
Robert Osfield
8b58a1df83 Added checking of parents against switch and sequence into the 
RemoveRendundentNodeVisitor to prevent breaking of the orinal order of the nodes.
 2002-12-06 11:16:45 +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
1f50138ec4 Added a getBound() to the SceneView::app() to make sure the bounding volume is 
updated well before the cull traversal which can be multithreaded.
 2002-11-11 09:01:54 +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
1dad443898 Michael Gronage fix for aspect ratio in split stereo. 2002-11-01 14:16:58 +00:00
Robert Osfield
432654bde8 Added handled of invlid drawable bounding boxes. 2002-11-01 12:11:23 +00:00
Robert Osfield
75fb39adbd Added a dirtyBound & diryDisplayList to the geometry merge operation in the 
Optimizer to fix a bug where the bouding volumes where being invildated.
 2002-10-31 15:24:17 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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