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

75 Commits

Author SHA1 Message Date
Robert Osfield
9780a7cbd6 Removed osg::Transform::ComputeTransformCallback from osg::Transform. 
Updated various dependant files to reimplemt callbacks as Transform subclasses.
 2003-12-09 14:07:44 +00:00
Robert Osfield
83bf813e58 Moved the responsibility for finding file to load on to the ReaderWriter plugins, 
instead of osgDB::Registry where it original lay.  This has been done to allow
fileName strings to be encode data rather than just file names, such as one
requires when using PagedLOD along with plugins for doing dynamic tesselation.
 2003-12-08 11:24:43 +00:00
Robert Osfield
3f14b9a653 Added code for combining adjacent static MatrixTransforms 2003-12-05 14:39:32 +00:00
Robert Osfield
db66abd6d6 Implemented duplicate removal code into TriStripVisitor and added an 
extra pass to doing tri stripping in the osgUtil::Optimzer.

Added validity checks into osg::TexEnvCombine to catch eronous enumarant values.

Improved the efficient of CullingSet's handling of new transforms.

Added a copy shared subgraphs and subdivision code into osgUtil::Optimizer.
 2003-12-03 21:45:32 +00:00
Robert Osfield
3c9d1e0603 Added a spatializer into osgUtil to create a balanced quad/oct tree. 2003-12-01 10:28:23 +00:00
Robert Osfield
2812c50329 Improved the Geometry::verifyBinding() and computeCorrectBindingsAndArraySizes() 
methods to check all atributes and to report warnigns when errors are detected.

Added a CheckGeomtryVisitor to osgUtil::Optimizer to detect eroneous Geometry
before rendering.
 2003-09-24 15:54:22 +00:00
Robert Osfield
b5442ac835 Added support for the ARB_vertex_buffer_object into osg::Geometry. 2003-06-29 21:41:57 +00:00
Robert Osfield
d70ab592ed Additions since the CVS back up was made. 2003-06-24 21:57:13 +00:00
Don BURNS
15f88f35b2 *** empty log message *** 2003-06-24 15:40:09 +00:00
Robert Osfield
efa16a34c5 Fixes to the Optimizer's handling of merging of osg::Geometry 2003-05-22 15:29:20 +00:00
Robert Osfield
4a6bdad3e1 Removed osg::GeoSet for core osg lib and osgPlugin. 
Commented out OpenDX plugin as its still based on GeoSet.

Added support for loading and converting GeoSet into the osgconv example.
 2003-05-21 12:15:45 +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
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
48bda9cc79 Added new Copyright/License notice to header and source files. 2003-01-21 16:45:36 +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
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
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
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
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
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
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
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
Robert Osfield
b1f69a9b11 Fixed the flatten static transform visitor. 2002-08-30 15:07:10 +00:00
Robert Osfield
4ddfd8668e Removed #ifdef hacks to remove optimization with VS6.0's STL. VS6.0 STL is 
now no longer supported!
 2002-08-26 19:35:43 +00:00
Robert Osfield
c45c3d3255 Added calling of the LightSource and ClipNode as Group by the NodeVisitor and 
fixed the CullVisitor and Optimizer to take account of this.
 2002-08-22 09:19:41 +00:00
Robert Osfield
19eaf17632 Temporarily commented out the flat staic transforms visitor since it 
was causing problems with the new DOFTransform class.
 2002-08-11 10:32:20 +00:00
Robert Osfield
b9b013e15b Changed the support for anisotropic filtering in osg::Texture so that it 
is now controlled via the setMaxAnisotropy(float) method, and is set up
independently for the mag filter mode, which it previously was done.
 2002-08-07 15:52:24 +00:00
Robert Osfield
e01f9eb891 Added shells for DOFTransform and PositionAttitudeTransform to the .osg 
loader, still need to fill in the saving and loading of paramters.

Went through the distribution remove old API usage.
 2002-08-06 17:07:05 +00:00
Robert Osfield
7a4c43c06e Changed > operator to < and swapped sides of expression, to enable compilation 
across compilers.
 2002-07-25 21:45:46 +00:00
Robert Osfield
cb1e1183c7 Fix to geometry combiner which wasn't check the overall color array values 
in the lessGeometry functor.
 2002-07-25 16:15:01 +00:00
Robert Osfield
1264bd5869 Removed debugging cout's. 2002-07-19 15:03:23 +00:00
Robert Osfield
d8d0ac60a7 Added primitve merging into the osg::Geometry optimizer. 2002-07-19 13:49:54 +00:00
Robert Osfield
ff8b4c001d Rewrote the osg::Drawable::AttributeFunctor and PrimtiveFunctor to make 
them more consistent with each other. This does mean an API change, so
dependanct code in the OSG has been updated accordingly.
 2002-07-18 15:36:14 +00:00
Robert Osfield
1a139efbbc Added const to LessGeometry functor to fix Win32 build. 2002-07-18 09:17:50 +00:00
Robert Osfield
09bdb10af5 Various fixes to the flt loader, and knock on changes to the osgUtil::Optimizer 
to better support removal of seperate osg::Geometry instances where they
share the same state and bindings.
 2002-07-18 00:53:03 +00:00
Robert Osfield
8c0d510571 Several items of work related to adding a manual creation of occluders 
option to the osgoccluder demo.

First the osgGA classes have been generalised a little to better support
new GUIEventHandler subclasses.

Second osgGLUT has a new option for registering a user defined event handler,
the allows the application to add externally extra options to the osgGLUT viewer.

Third, the osgoccluder demo now works in two modes. The original create
four occluder sides to wrap an loaded model, the second an interactive
mode which allows the users to add occluders to the model by pointing
to points and pressing 'a' to add a point, the 'e' to end the occluder
polygon, polygons must be convex, planer and be defined in an anitclockwise
order.  To start the osgoccluder in this mode one simple runs it with the
'-c' option.  Run osgoccluder with no parameter to get a list of options.
 2002-07-17 10:00:50 +00:00
Robert Osfield
6f392cdbfa Ported distribution across to use the new osg::MatrixTransform and osg::BlendFunc 
class instead of osg::Transform and osg::Transparancy respectively.
 2002-07-12 18:12:01 +00:00
Robert Osfield
0c943945f7 Implemented most of the changes required for supporting multitexturing in 
the osg::State/osg::StateSet/osg::StateAttribute and related classes.
 2002-07-09 09:35:42 +00:00
Robert Osfield
40fefcf335 Ported various demos and support classes over to use the new osg::Geometry class 
thus removing dependancy on osg::Geoset from most of the OSG, only loaders
left to port now.
 2002-06-26 10:28:17 +00:00
Robert Osfield
cbeeeefdab Added osg::Drawable::PrimitiveFunctor and TriangleFunctor subclass for 
querrying the primitive data inside Drawables.  Moved various support
classes over from being osg::GeoSet based to osg::Geometry based.
 2002-06-25 20:27:51 +00:00
Robert Osfield
cbb95d0445 Checked in .osg support for the new osg::Geometry class. 2002-06-24 21:37:34 +00:00
Robert Osfield
d174f60f8c Added required std:: to front of endl to fix Win32 build. 2002-06-24 12:53:27 +00:00
Robert Osfield
f2e215bf44 Added conversion to osg::GeoSet::converToGeometry() utility to help the 
migration to and testing of the new osg::Geometry class.
 2002-06-23 21:43:46 +00:00