Changeset 397

Timestamp:

11/06/06 16:19:15 (2 years ago)

Author:

dshipton

Message:

Merge Dirks RenderTraversal? branch back into trunk.
This add's Occlusion Culling and a new node type called ScreenLOD
which is an automatic LOD node.

Files:

• trunk/SConstruct (modified) (view diffs)
• trunk/Source/Base/Base/OSGConfig.h (modified) (view diffs)
• trunk/Source/Base/Base/OSGContainerForwards.h (modified) (view diffs)
• trunk/Source/Base/Base/OSGMultiPool.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/Base/Base/OSGMultiPool.h) (view diffs)
• trunk/Source/Base/Base/OSGMultiPool.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/Base/Base/OSGMultiPool.inl) (view diffs)
• trunk/Source/Base/Base/OSGMultiPoolTest.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/Base/Base/OSGMultiPoolTest.cpp) (view diffs)
• trunk/Source/Base/Base/OSGVectorTest.cpp (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.cpp) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.h) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.inl) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderPartition.cpp (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderPartition.h (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderPartition.inl (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderTraversalAction.cpp (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderTraversalAction.h (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderTraversalActionInit.cpp (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderTraversalFwd.h (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderTreeNode.cpp (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderTreeNode.h (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGRenderTreeNode.inl (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScalarSortTreeBuilder.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScalarSortTreeBuilder.cpp) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScalarSortTreeBuilder.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScalarSortTreeBuilder.h) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScalarSortTreeBuilder.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScalarSortTreeBuilder.inl) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLOD.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLOD.cpp) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLOD.fcd (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLOD.fcd) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLOD.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLOD.h) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLOD.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLOD.inl) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLODBase.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLODBase.cpp) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLODBase.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLODBase.h) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLODBase.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLODBase.inl) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGScreenLODFields.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGScreenLODFields.h) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGStateSortTreeBuilder.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGStateSortTreeBuilder.cpp) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGStateSortTreeBuilder.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGStateSortTreeBuilder.h) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGStateSortTreeBuilder.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGStateSortTreeBuilder.inl) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGStateSorter.cpp (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGStateSorter.h (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGTreeBuilderBase.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGTreeBuilderBase.cpp) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGTreeBuilderBase.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGTreeBuilderBase.h) (view diffs)
• trunk/Source/System/Action/RenderTraversal/OSGTreeBuilderBase.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGTreeBuilderBase.inl) (view diffs)
• trunk/Source/System/Action/RenderTraversal/build.info (modified) (view diffs)
• trunk/Source/System/Action/RenderTraversal/testOcclusionCulling.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/testOcclusionCulling.cpp) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.cpp) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.fcd (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.fcd) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.h) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMap.inl) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMapBase.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMapBase.cpp) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMapBase.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMapBase.h) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMapBase.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMapBase.inl) (view diffs)
• trunk/Source/System/FieldContainer/Attachments/OSGStringAttributeMapFields.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/FieldContainer/Attachments/OSGStringAttributeMapFields.h) (view diffs)
• trunk/Source/System/FieldContainer/Base/OSGChangeList.cpp (modified) (view diffs)
• trunk/Source/System/FieldContainer/Base/OSGFieldContainer.inl (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Base/OSGGeoBuilder.cpp (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Base/OSGGeoBuilder.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoFunctions.cpp (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoFunctions.h (modified) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.cpp) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.fcd (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.fcd) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.h) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.inl) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentBase.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentBase.cpp) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentBase.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentBase.h) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentBase.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentBase.inl) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentFields.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentFields.h) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentTest.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentTest.cpp) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.cpp) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.fcd (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.fcd) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.h) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachment.inl) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentBase.cpp (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentBase.cpp) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentBase.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentBase.h) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentBase.inl (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentBase.inl) (view diffs)
• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentFields.h (copied) (copied from branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGStatsAttachmentFields.h) (view diffs)
• trunk/Source/System/RenderingBackend/OSGDrawEnv.h (modified) (view diffs)
• trunk/Source/System/RenderingBackend/OSGDrawEnv.inl (modified) (view diffs)
• trunk/Source/System/Statistics/Base/OSGStatRealElem.cpp (modified) (view diffs)
• trunk/Source/System/Statistics/Base/OSGStatRealElem.h (modified) (view diffs)
• trunk/Tools/osgBench/TestWindow.cpp (modified) (view diffs)
• trunk/Tools/osgBench/TestWindow.h (modified) (view diffs)
• trunk/Tools/osgBench/make_cubes.py (modified) (view diffs)
• trunk/Tools/osgBench/run_model.py (modified) (view diffs)
• trunk/Tools/osgBench/test_occ.py (copied) (copied from branches/Dirk_RenderTraversalWork/Tools/osgBench/test_occ.py) (view diffs)