FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,364 Commits 1 Branch 26 Tags 73 MiB
5e161ff0e0
Commit Graph

2093 Commits

Author SHA1 Message Date
Robert Osfield
5ba0e5b930 Fixed missing initializer in Options constrctor 2007-03-29 19:39:20 +00:00
Robert Osfield
0f507e317d Removed the using to avoid VS 7.1 build problem 2007-03-29 15:41:59 +00:00
Robert Osfield
cb811aa7cd Added support for compute the extents on local NDC coordiantes of the 
elevation and colour layers
 2007-03-28 16:28:20 +00:00
Robert Osfield
b7967b7007 From Mike Wittman, "Here is a change to the .cpp file to fix it by disambiguating the cull invocation." 2007-03-28 15:05:49 +00:00
Robert Osfield
7fc714ada1 Removed deprecated drawImplementation(State&) method from Drawable and Drawable::DrawCallback 2007-03-28 11:30:38 +00:00
Robert Osfield
d30a33247d Replaced the X11 Window by Carbon WindowRef in the WindowData structure. 2007-03-28 08:52:44 +00:00
Robert Osfield
78ed8f9219 Add computeBound support to TerrainNode and Layer. 2007-03-27 19:27:36 +00:00
Robert Osfield
4688d5ae8e Rearranged the traversal and initialization of TerrainTechnique 2007-03-27 16:01:01 +00:00
Robert Osfield
e76e4e82db Added EllipsoidLocator. 2007-03-27 11:23:57 +00:00
Robert Osfield
404d583b3e Added return false; to default implementations of convert functions 2007-03-26 19:24:18 +00:00
Robert Osfield
8dc2a28945 Removed WindowData parameter from init(). 2007-03-26 16:28:26 +00:00
Robert Osfield
1cdda0654f Added Locator and layer setting to osgterrain example 2007-03-26 15:52:22 +00:00
Robert Osfield
7013c12a0d From Mike Wittman, "This is another weirdo change to support code generation. It brings all the Drawable::supports and Drawable::accepts overloads into the ShapeDrawable scope to avoid errors invoking the ones that are not defined in ShapeDrawable. Currently you'll get compilation errors if you pass a Drawable::AttributeFunctor or PrimitiveIndexFunctor to the "accept" function invoked on a ShapeDrawable pointer or reference, since those overloads are only defined in the base class. You'll also get the same error passing a PrimitiveIndexFunctor to the "supports" function. These errors occur because C++ function overload resolution does not cross inheritance boundaries." 2007-03-26 13:00:29 +00:00
Robert Osfield
37f4740c45 From Mike Wittman, remove redundent const from in front of unsigned int. 
From Robert Osfield, updated wrappers
 2007-03-23 17:27:53 +00:00
Robert Osfield
56a1808794 Added ImageLayer, ArrayLayer and HeightFieldLayer classes 2007-03-21 17:18:53 +00:00
Robert Osfield
541c3f13e9 Added GeometryTechinque to osgTerrain. Added usage of GeometryTechnique into osgterrain example 
Added --width and --height command line options to osgdistortion to allow users
to control the window size.
 2007-03-21 16:34:04 +00:00
Robert Osfield
32166ca631 Build fixes 2007-03-19 10:54:39 +00:00
Robert Osfield
ed9aa1c6bf Removed now redundent method 2007-03-18 11:04:12 +00:00
Robert Osfield
069adcf555 From David Callu, " bug: 
Lost the functionality to find the real type pointed by a pointer.
   Ex: a osg::Node pointer point on a osg::Group, if I look for information
       on the pointer type, the introspection say it is a "osg::Node*".
       But if I want information on the pointed type,
       the introspection must return the "osg::Group".
   

   This bug come from the osgIntrospection::Value::Ptr_instance_box::ptype() function.
   In the original version, this function use the member "Instance_base *inst_"
   like this :
      typeof(*static_cast<Instance<T> *>(inst_)->_data)

   But in the new version, this function use the template argument "T":
      typeof(typename remove_pointer<T>::type)

   This is a good meta-programming use, but here we need a dynamic request.

   Moreover the "typeof" macro define in "Reflection" header accept only a type in parameter with the new version.
   


 fix:
   Add the macro "typeofvalue" in "Reflection" header which accept a value or a type in parameter.
   Restore original code in osgIntrospection::Value::Ptr_instance_box::ptype() function.
"
 2007-03-16 14:28:27 +00:00
Robert Osfield
aa28f60357 Added WindowData structures to GraphicsWindowX11,Win32 and Carbon to help support 
GraphicsWindow inheriting their window handles from an external toolkit
 2007-03-16 13:22:05 +00:00
Robert Osfield
2fae221f2d Added class shells for osgTerrain::Locator and osgTerrain::Layer classes 2007-03-14 12:00:54 +00:00
Robert Osfield
c489b0af2c Renamed HeightFieldNode and HeightFieldRenderer to TerrainNode and TerrainTechnique respectively 2007-03-14 11:24:04 +00:00
Robert Osfield
083618cc65 Added inheritedWindowData member variable to Traits. 2007-03-11 11:48:03 +00:00
Robert Osfield
bff1b51361 Added preliminary work on osg::TransferFunction 2007-03-10 11:53:31 +00:00
Robert Osfield
ebb571473f Changed _pixel_x and _pixel_y to be floats 2007-03-06 12:01:55 +00:00
Robert Osfield
579700bedf From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses. 
These changes add the necessary superclass type qualification so that Doxygen now recognizes the references."
 2007-03-05 17:34:36 +00:00
Robert Osfield
6c56383ba9 From Mike Wittman, added protected function support 2007-03-01 11:54:30 +00:00
Robert Osfield
96b30c3509 Added mention of LODScale in docs 2007-02-28 10:10:21 +00:00
Robert Osfield
459696fdb2 From Paul Martz, updated the LOD documentation 2007-02-28 10:08:45 +00:00
Robert Osfield
b00cbe5a17 Moved include/osgTerrain/DataSet/.cpp, gdal plugin and osgdem out into the VirtualPlaneBuilder project. 
Updated examples to remove DataSet/GDAL dependency.

Updated wrappers
 2007-02-27 21:12:48 +00:00
Robert Osfield
eb4ad4229f Moved osgProducer and osgproducerviewer out into their own repository. 
Clean up the source for remaining references to osgProducer/Producer.
 2007-02-27 13:16:18 +00:00
Robert Osfield
7f8f4e331a Completed changes to osgManipulator to make it more flexible w.r.t viewer usage, and 
ported osgmanipulator example across of osgViewer
 2007-02-26 13:01:17 +00:00
Robert Osfield
f43cd7332c Further work on add serialization support for osgViewer configurations 2007-02-25 20:05:23 +00:00
Robert Osfield
ad3cac84e9 Moved Block, ReentrantMutex and ReadWriteMutex into OpenThreads. 2007-02-23 16:31:34 +00:00
Robert Osfield
96f567eff3 Added bool View::Slave::_useMastersSceneData to help manage HUD's and RTT 
cameras that are embedded in the Viewer's View
 2007-02-23 11:53:45 +00:00
Robert Osfield
ee9440d155 Added Camera::s/getAllowsEventFocus() method to allow osgViewer to have non interfactive cameras such as RTT ones 2007-02-21 19:06:43 +00:00
Robert Osfield
228fd04a19 Removed the exclusion of CullSettings from the genwrapper.conf, and then changed the CullStack RefMatrix& methods to RefMatrix* 
as the RefMatrix& versions caused the wrappers to fail.
 2007-02-21 13:48:01 +00:00
Robert Osfield
57c2939174 Added g/setUpdateVistor method 2007-02-19 20:57:08 +00:00
Robert Osfield
37526e3bea Implemented basic ShadowMap technique 2007-02-19 14:20:18 +00:00
Robert Osfield
d5c68cfa02 Moved CameraCullCallback into ShadowTechnique scope to make it more resusable between various Techniques 2007-02-19 12:13:30 +00:00
Robert Osfield
a3594bc653 Added new osg::ComputeBoundsVisitor 2007-02-16 17:34:34 +00:00
Robert Osfield
3817dbf1a2 From Roland Smeenk, "ClipNode contains a method getClipPlaneList that should actually be called setClipPlaneList." 2007-02-16 15:17:43 +00:00
Robert Osfield
526ba8c506 From Stephan Huber, "I added a bool to GraphicsContext::Traits to indicate wether to use the 
multithreaded-opengl-engine on os x or not. I set its default to false,
perhaps other os x users can test this setting with their data/apps, to
see if we can enable it by default.

I changed also the borderless-window-type, so expos?works correctly."
 2007-02-16 13:33:29 +00:00
Robert Osfield
fd3a0c25ba Fleshed out a bit more of the ShadowTexture implementation 2007-02-16 10:20:10 +00:00
Robert Osfield
dbb7c3c74c Added support for using the new osgShadow plugin as a psuedo loader such that: 
osgviewer cow.osg.shadow

Or to ShadowVolume rechnique specifically:

  osgviewer cow.osg.sv.shadow
 2007-02-15 22:28:32 +00:00
Robert Osfield
3e6a91c079 From Mike Wittman, "The template-argument-list errors look to be due to a lack of spaces in the typeof macro. Here's a new Reflection header which should fix those problems. For consistency I think that's the best solution." 2007-02-15 15:03:30 +00:00
Robert Osfield
272ab99767 Reorganised the text comments so that they are shorter length, and hopefully will 
avoid VS2003's silly text string limits when compiling osgIntrospection wrappers
 2007-02-15 14:53:54 +00:00
Robert Osfield
ed01ae9387 From André Garneau, Win32 build fixes 2007-02-15 14:04:22 +00:00
Robert Osfield
3fe4be6e70 Added context sharing support. 2007-02-15 12:24:04 +00:00
Robert Osfield
b717790dcb Removed inappropriate Stats:: prefix 2007-02-15 10:25:11 +00:00
Robert Osfield
f60330df31 Added extra spaces between <> template declarations 2007-02-15 09:17:03 +00:00
Robert Osfield
acf10c827e Removed setFrameStamp 2007-02-15 08:29:09 +00:00
Robert Osfield
b7b8e7ed98 Removed extrandous Stats:: prefix 2007-02-15 00:53:52 +00:00
Robert Osfield
87ff8e2b55 Added support for sharing context to GraphicsWindowX11 2007-02-14 20:14:45 +00:00
Robert Osfield
f82c34ff11 Added getState()->setGraphicsContext(this); to the various GrpahicsWindow implementations 2007-02-14 17:28:33 +00:00
Robert Osfield
810e7291fc Added use of Mutex into osg::Stats to better handle multi-threaded usage 2007-02-14 16:24:49 +00:00
Robert Osfield
07411f3246 Introduced new osg::Object::DataVariance type of UNSPECIFIED, and changed the deafult 
values of DataVariance to UNSPECIFIED to all types.
 2007-02-14 13:18:58 +00:00
Robert Osfield
89c99a88fa Added computeDataVariance method into osg::Object and implementations in Drawable and StateSet, 
and calling of osgUtil::StaticObjectDetectionVisitor in osgViewer::Viewer
 2007-02-14 11:24:42 +00:00
Robert Osfield
5dcb7af6a4 From Mike Wittman, added spaces into < > macros 2007-02-14 11:21:41 +00:00
Robert Osfield
264d69e0c9 From Mike Wittman, support for reference parameters 2007-02-13 09:33:35 +00:00
Robert Osfield
d28a6011f1 From Mike Wittman, "Here is the next in the series of changes I'm making to OSG introspection to support the attributes needed for C# bindings. This change adds virtual/pure virtual attributes to MethodInfo and an explicit attribute to ConstructorInfo using the implementation strategy that David Callu recommended a few months back (thanks David!). This change updates both genwrapper and osgIntrospection, and assumes the osgIntrospection reference support that's still pending in your submission queue." 2007-02-12 17:59:18 +00:00
Robert Osfield
a725e0af7d From Mike Wittman, "These changes add support for reflection of reference and const reference type representations via osgIntrospection::Type. This covers just the static type information; the dynamic behavior via Type::createInstance/Type::InvokeMethod should not be affected." 2007-02-12 17:14:46 +00:00
Robert Osfield
fe177e42d5 Added osgViewer::HelpHandler 2007-02-12 13:39:18 +00:00
Robert Osfield
3006bb14f4 Changed osgManipulator::Dragger::handle(..) method to use a nested PointerInfo 
class to encapsulate the pixel coords, SceneView and picking operations in prep for
making the code more general purpose, and less reliant on classes like osgUtil::SceneView and osgUtil::IntersectVisitor.
 2007-02-11 21:12:34 +00:00
Robert Osfield
1484ab515e Changed the osg::Shape related projectors so that they used pointers rather 
than references.
 2007-02-11 12:22:58 +00:00
Robert Osfield
19db0c1674 From Vivek Rajan, new osgManipulator library, with a few minor tweaks and rename for osgDragger to osgManipulator for build by Robert Osfield. 
Vivek's email to osg-submissions:

"I'm happy to release the osgdragger nodekit to the OSG community. I
implemented the nodekit for my company, Fugro-Jason Inc., and they
have kindly agreed to open source it.

The nodekit contains a few draggers but it should be easy to build new
draggers on top of it. The design of the nodekit is based on a
SIGGRAPH 2002 course - "Design and Implementation of Direct
Manipulation in 3D". You can find the course notes at
http://www.pauliface.com/Sigg02/index.html. Reading pages 20 - 29 of
the course notes should give you a fair understanding of how the
nodekit works.

The source code also contains an example of how to use the draggers."
 2007-02-11 10:33:59 +00:00
Robert Osfield
f1a82f35b2 From Vivek Rajan, MatrixDecomposition implementaion, adapted by Robert Osfield 
to be part of osg::Matrixf and osg::Matrixd classes.
 2007-02-10 18:01:37 +00:00
Robert Osfield
760cfeaadb Cleaned up osgshadow example so that it now relies upon osgShadow for its 
shadow implementation
 2007-02-09 21:31:29 +00:00
Robert Osfield
9aae37e357 Moved the basic ShadowVolume code into osgShadow 2007-02-09 16:03:29 +00:00
Robert Osfield
2a9d2bb25a Changed GraphicsWindowX11 so that it creates two Display* connextions to the Xserver, 
one for the graphics thread, one for the main thread that querries events
 2007-02-09 13:51:28 +00:00
Robert Osfield
c2665963bb Further work on osgShadow::ShadowTechnique API 2007-02-08 19:34:38 +00:00
Robert Osfield
95befaf1ed Flesh out more of basic ShadowTechnique and ShadowedScene API. 2007-02-08 17:23:40 +00:00
Robert Osfield
47622e6134 Fixed the FlattenStaticTransform visitor so that it excludes subgraphs that 
contain PagedLOD nodes
 2007-02-08 15:47:05 +00:00
Robert Osfield
19608966d0 Added the threading model to stats 2007-02-08 12:47:35 +00:00
Robert Osfield
b3b420de5d Updated the handling of closing of windows 2007-02-08 12:14:26 +00:00
Robert Osfield
958b8d74dd Changed the setting of need to traverse during the update traverse so it is only enabled when animation is switched on. 2007-02-07 21:48:53 +00:00
Robert Osfield
c52207b637 Added new Transform::ReferenceType enum ABSOLUTE_RF_INHERIT_VIEWPOINT to support 
internal RTT cameras that wish to use the main cameras view/eye point for LOD and other
distance based tests.
 2007-02-07 16:32:14 +00:00
Robert Osfield
3de205ec45 Added new Viewer threading model options 2007-02-06 14:38:08 +00:00
Robert Osfield
424bc9b997 Clean up getDrawable() method 2007-02-06 14:20:04 +00:00
Robert Osfield
bad2a4cc7c Further work on support for ThreadPerCamera, and improved the efficiency of SingleThraeded 2007-02-06 11:03:13 +00:00
Robert Osfield
cfe737c552 Tweak API and updated wrappers to get wrappers to build 2007-02-05 14:56:41 +00:00
Robert Osfield
ebd68ba063 Added Camera's s/getCameraThread() and updated wrappers 2007-02-05 13:44:16 +00:00
Robert Osfield
98b0eb889a From Brede Johansen, added OSG_EXPORT to DeleteHandler for windows build 2007-02-05 10:48:20 +00:00
Robert Osfield
4914d3974a From Paul Martz, "Here's my changes to Registry to allow extension alias mapping via a config file. I also attached a sample file that tests the parsing, but this is just FYI and not for inclusion in CVS. 
To set up extension aliases using a config file, an app calls:
osgDB::Registry::instance()->readPluginAliasConfigurationFile(), passing in the file name as the parameter. (Of course this should be done before loading any files whose names depend on the mapping.) osgDB will search for the file using OSG_FILE_PATH.

The file should contain a line for each mapping, with the "map" extension first, followed by a space or tab, then the plugin identifier. For example, a file containing this line:

flt OpenFlight

would map the ".flt" extension to the OpenFlight plugin."
 2007-02-05 10:44:10 +00:00
Robert Osfield
69da91620f Convert GraphicsThread/GraphicsOperation to more generic OperationsThread/Operation. 
This paves the way to running cull traversals in seperate threads.

Updated wrappers
 2007-02-02 22:30:36 +00:00
Robert Osfield
6d9641a78b Added a concrete osg::DeleteHandler implementation which provides support for 
retain objects for several frames before deleting them.  Also added RenderStageCache
into CullVistor.cpp that is used for handling RTT osg::Camera's that are being
used in double buffered SceneView usage.
 2007-02-02 12:41:13 +00:00
Robert Osfield
158921574c Improved the toggling on/off of thrading modes 2007-02-01 11:07:53 +00:00
Robert Osfield
8dfc5155f4 Further work on new threading model. 2007-01-31 22:24:20 +00:00
Robert Osfield
f8213d1c53 Updated wrappers 2007-01-30 14:47:13 +00:00
Robert Osfield
77b9a7ae19 From Eric Sokolwsky, "osgText is a useful node kit, but when longer paragraphs are displayed 
on the screen, it looks more aesthetically pleasing to have a larger
gap between lines than is given by default. I added a new parameter,
lineSpacing, in the Text class to allow the line spacing to be adjustable
by the application. The default value is 0 meaning there is no extra
spacing given. The value should be given as a percentage of the character
height. A good value for longer paragraphs is 0.25 (25%) or more."
 2007-01-30 14:32:12 +00:00
Robert Osfield
35c720420e From Bryan Thrall, "The osgDB::ReaderWriter and osgDB::ReaderWriter::Options classes have 
copy constructors that take a const osg::CopyOp rather than a
osg::CopyOp&, forcing an unnecessary copy. The attached header fixes
this, based off OSG 1.2.

Also fixed duplicate "or" openArchive()'s comment."
 2007-01-30 14:18:39 +00:00
Robert Osfield
b8d98a2cfe Added support for compute average stats attributes in inverse space to improve 
the quality of frame rate reporting.
 2007-01-30 13:48:04 +00:00
Robert Osfield
ecedc8d86a Added Stats::collectStats(string,bool) controls, getAveragedAttribute methods into osg::Stats class, and 
related support into osgViewer::Viewer and osgViewer::StatsHandler.

Added lazy updating of text in StatsHandler HUD to minimize the impact of
slow text updating on observed frame rates.
 2007-01-30 11:40:23 +00:00
Robert Osfield
fd0ea388c2 Began work on providing support for threading camera cull traversals in parallel with 
the previous frames draw traversal.  Changes range from osg::State, through osgUtil::RenderBin, through to osgViewer
 2007-01-29 22:44:29 +00:00
Robert Osfield
af6de09ab4 Added set/getRealizeOperation() to Viewer and CompositeViewer 2007-01-28 17:11:21 +00:00
Robert Osfield
60b5c68221 From Vlad Danciu, fixed leaf depth sort functor 2007-01-28 09:30:11 +00:00
Robert Osfield
9168d1130e From Mike Wittman, "This file removes the virtual destructor of osgText::String. It seemed wrong that osgText::String should have a vtable since it is treated like a value type, and any subclasses containing additional data would effectively be subject to slicing during standard usage. This stuck out as an anomaly when classifying the OSG types for C# bindings." 2007-01-28 09:17:10 +00:00
Robert Osfield
27f6f7c790 Added access methods to PositionStateContainer 2007-01-27 14:27:54 +00:00
Robert Osfield
5bf2dfe3b1 Added _sorted flag into RenderBin to prevent a bin being sorted twice in one frame 2007-01-27 12:54:33 +00:00
Robert Osfield
36330f7e40 Changed osgUtil::RenderBin and osg::State to allow nesting of StateSet's associated with RenderBin's. 2007-01-27 11:13:01 +00:00