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

301 Commits

Author SHA1 Message Date
Robert Osfield
809168d5f8 Further updates to the DatabasePager. 2003-07-09 19:48:04 +00:00
Robert Osfield
5aa47a77c2 Improvements to the DatabasePager and PagedLOD class adding support for 
deleting expuired children in the database thread.
 2003-07-09 14:55:39 +00:00
Robert Osfield
dcbaf59753 Added #include <unistd.h> to DatabasePager.cpp. 2003-07-09 07:41:53 +00:00
Robert Osfield
c2eabe1d4b Added osg::PagedLOD and osgProducer::DatabasePager class, and linked up osgProducer::Viewer 
to manage the pager.
 2003-07-08 14:44:00 +00:00
Don BURNS
15f88f35b2 *** empty log message *** 2003-06-24 15:40:09 +00:00
Robert Osfield
72b86dee82 Removed the _state.reset() call as it was doing OpenGL calls outside of the 
thread with the graphics context.
 2003-05-21 16:33:53 +00:00
Robert Osfield
fcbbf12b75 Added usage of the InputRectangle into setting up of the EventAdapter. 2003-05-20 20:45:10 +00:00
Robert Osfield
094e0f2e48 Fixes to the handling of mouse coords after changes in the default behavior 
of Producer.
 2003-05-20 13:21:05 +00:00
Robert Osfield
e2ec462fab Changed the fusion distance update code to use OsgCameraGroup::setDistanceDistance() 
rather than going through the SceneView's by hand. This should ensure that values
are kept consistent betwen OsgCameraGroup and SceneView's.
 2003-05-20 08:47:21 +00:00
Robert Osfield
940ce67133 Removed remaining dependancies on osg::Camera. 2003-05-19 15:15:17 +00:00
Robert Osfield
ba8bf1e94c From Eric Sokolowsky, support for mouse scroll wheel in osgGA/osgProducer. 2003-05-07 11:13:49 +00:00
Robert Osfield
0ab467483f Added support for automatic scaling of text to screen coords. Optimized 
the text implementation to provide better speed, especially by using the
alignement to screen option.

Deprecated the Text::setFontSize(,) method, which is now being replaced
by setFontResolution(,)

Fixed typos in Texture*.cpp.

Removed old deprecated methods from osg headers.
 2003-04-30 11:40:17 +00:00
Robert Osfield
89b1365b2b Added support for gather information on which vertices have been intersected with. 2003-04-25 13:47:33 +00:00
Robert Osfield
341fa340ce Added check for camera's sharing the same RenderSurface, if so switches off 
multi-threading of cull and draw.
 2003-04-23 09:59:08 +00:00
Robert Osfield
b6ee5445b7 Changed the ordering of the picking intersections. 2003-04-18 21:44:48 +00:00
Robert Osfield
bc8bd29646 Updated NEWS for the release. 
Fixed warnings.
 2003-04-18 15:59:34 +00:00
Robert Osfield
ba575396a4 Added setting of the RenderSurface name to the application name. 2003-04-17 15:57:05 +00:00
Robert Osfield
d0aac6e6f0 Added an alternate compile path for Windows in the toggle of fullscreen 
for the first time.
 2003-04-17 13:57:15 +00:00
Robert Osfield
fd262554ac Moved the managing of frame stamp from osgProducer::Viewer into 
osgProducer::OsgCamaraGroup.

Added setting of trackball in osgcameragroup so its starts in the
correct place for different models.
 2003-04-17 11:14:25 +00:00
Don BURNS
6fc19084ac Changed Rect('s to Rectangle('s 2003-04-16 21:16:23 +00:00
Robert Osfield
d9ddd0bb06 Changed near and far instances into near_point, far_point to avoid 
problems with Win32 build.
 2003-04-16 19:20:15 +00:00
Robert Osfield
3bd03476f4 Moved the PickVisitor from osgUtil into the implementation of 
osgProducer::Viewer.  Removed methods in PickVisitor which wern't being
used by osgProducer::Viewer.  This has been done because the PickVisitor
interface and implementation weren't ready for general usage.
 2003-04-16 15:14:25 +00:00
Robert Osfield
2e659c9ebf Renamed computeNearFar to computeNearFarPoints. 2003-04-16 14:22:36 +00:00
Robert Osfield
904aceec22 Added convinence methods to osgProducer::Viewer: 
/** compute, from normalized mouse coords, for sepecified Camera, the pixel coords relative to that Camera's RenderSurface.*/
        bool computePixelCoords(float x,float y,unsigned int cameraNum,float& pixel_x,float& pixel_y);

        /** compute, from normalized mouse coords, for sepecified Camera, the near and far points in worlds coords.*/
        bool computeNearFar(float x,float y,unsigned int cameraNum,osg::Vec3& near, osg::Vec3& far);

        /** compute, from normalized mouse coords, for sepecified Camera, intersections with the scene.*/
        bool computeIntersections(float x,float y,unsigned int cameraNum,osgUtil::IntersectVisitor::HitList& hits);

        /** compute, from normalized mouse coords, for all Cameras, intersections with the scene.*/
        bool computeIntersections(float x,float y,osgUtil::IntersectVisitor::HitList& hits);
 2003-04-16 14:17:49 +00:00
Robert Osfield
f9eb43083a Changed OsgSceneHandler so it re-uses osgUtil::SceneView project and modelview 
matrices.

Changed the osgpick demo so that it uses the OsgSceneHandler's projection and
modelview matrices where possible.
 2003-04-16 09:22:33 +00:00
Robert Osfield
0036018507 Added -I/usr/X11R6/include to osgProducer and all the examples GNUMakefiles. 
From Bob, mods to GNUMakefile and Make/makedefs for the extra includes for
freetype.
 2003-04-14 19:39:22 +00:00
Robert Osfield
95636af81c Added using namespace Producer to get round namespace issue with CameraGroup 
call.
 2003-04-14 18:53:50 +00:00
Robert Osfield
deac5b8d4a Updated osgstereoimage and osgimpostor to handle the new default 
orientation of normalized mouse coords.
 2003-04-14 18:49:41 +00:00
Robert Osfield
5df7118d6d Updates to the osgpick code. 
Updates to osgGA::CameraManipulors.
 2003-04-14 15:44:30 +00:00
Robert Osfield
f543d69881 Improved the handling of Producer's no dimensional mouse coords. 2003-04-14 13:23:12 +00:00
Robert Osfield
c2a9234cc5 Updated the version numbers to 0.9.4 2003-04-11 10:04:53 +00:00
Robert Osfield
52d2d8eaff Moved the osgcameragroup example across to being just based on 
osgProducer::OsgCameraGroup with no usage of osgGA manipulators.

Removed redundent files from osgProducer.
 2003-04-10 15:23:49 +00:00
Robert Osfield
bc4fd5b051 Added usage of Producer::CameraGroup::isValidForRendering() to the Viewer::done() 
implemention so apps automatically close if one of the windows is killed.
 2003-04-10 12:55:48 +00:00
Robert Osfield
5c88b5ff8b Fix to the CameraGroup::setViewByMarix usage. 2003-04-10 10:16:39 +00:00
Robert Osfield
e1e54570cb Fixed Viewer and OsgCameraGroup classes so that work properly with the 
Prodicer::setViewByMatrix calls.
 2003-04-10 10:02:24 +00:00
Robert Osfield
38cccb696b Added environmental variable usage to OsgCameraGroup. 2003-04-09 10:51:13 +00:00
Robert Osfield
2c030170ff Added a setting of OsgCameraGroup::_applicateUsage to 
ApplicationUsage::instance() by default.
 2003-04-09 10:13:07 +00:00
Robert Osfield
b02917e7a2 Fixed type of osg::ApplicationUsage::set/getApplictionName(), updated 
demos accordingly.

Made OsgCameraGroup set the _applicationUsage to the
osg::ApplicationUsage::instance() when no ArgumentParser is supplied.

Added export to osgProducer::ViewerEventAdapter.
 2003-04-09 08:20:08 +00:00
Robert Osfield
1e689ae57a Added support for key modifiers to osgProducer::EventAdapter. 2003-04-08 20:39:47 +00:00
Robert Osfield
8a3d731739 Added support for Viewer::setViewer::setView so that the internal old 
style osg::Camera and camera manipulators are updated correctly.
 2003-04-08 15:47:45 +00:00
Robert Osfield
e928bca4c9 Changed the Viewer::realize() calls across to not using the threading paramter 
leaving it up to the Viewer to specify the mode (which by default is MultiThreaded).
Added a check for the presence of osgParticle systems so that threading is
disabled in this case.
 2003-04-08 15:18:45 +00:00
Robert Osfield
afef5ad2fa Set the static mouse position values in osgProducer::EventAdater to the same 
value as warp pointer to ensure that the now roll is encountered on warping
of the pointer.
 2003-04-08 13:53:28 +00:00
Robert Osfield
5f8411ac5c Changed the KeySwichCameraManipulator::setNode() so it set all camera's 
attached to it.
 2003-04-08 13:10:47 +00:00
Robert Osfield
18ab95a294 Added support for snaping screen images from osgProducer::Viewer apps. 2003-04-07 19:19:01 +00:00
Robert Osfield
0df1b28672 Added osgwindows example which sets up and Producer::CameraConfig up 
and uses that to create multiple windows.
 2003-04-07 10:20:34 +00:00
Robert Osfield
98f691f693 Added if (!_kbmcb) to handle the case where the keyboard mouse callback 
is pre set.
 2003-04-06 21:46:48 +00:00
Robert Osfield
c7a7bd03cb Added support for recording animation paths in the osgProducer::Viewer. 2003-04-05 22:24:48 +00:00
Robert Osfield
cac6642de5 Improvements to the handling of warp pointer call on start up. 2003-04-05 07:19:40 +00:00
Robert Osfield
169bf25f77 Implemented support for float x and y mouse positions, and normalization of 
mouse coords in osgGA::GUIEventAdapter, and ported osgGA camera manaipulators
to use the new normalized values.

Moved osgProducer across to tracking the window dimensions and ensure that the
internals values in osgProducer::EventAdapter are kept consistent.  Moved
the warp pointer in Viewer across to using KeyboardMouse::positionPointer().
 2003-04-04 19:10:37 +00:00
Robert Osfield
e9e0b4304d Improved support for toggle between full screen and non fullscreen in 
the osgProducer::Viewer.
 2003-04-04 11:06:09 +00:00
Robert Osfield
a47a6f0310 Fixes to the multipipe initialization. 2003-04-03 14:12:09 +00:00
Robert Osfield
5a974ab091 Fixes to osg::Texture's handling of anisotropy updating and 
hardware generate mip mapping.

Added switching off generate mip map from osgText::Font.cpp.

Changed savedmodel.osg to saved_model.osg in ViewerEventHandler.
 2003-04-01 20:32:57 +00:00
Robert Osfield
fee0debfde Added timer code to the init in OsgCameraGroup. 
Made the stats view 20 frames rather than 6.
 2003-04-01 11:55:29 +00:00
Robert Osfield
60e16ea044 Added Escape to the help list. 
Changed the help key from '?' to 'h'
 2003-03-28 10:04:58 +00:00
Robert Osfield
6b7102d16e Improved stats. 2003-03-27 14:39:19 +00:00
Robert Osfield
fc4fe9c625 Updates to utilise the new Producer keyboard bindings. 2003-03-27 10:54:01 +00:00
Robert Osfield
e93c812021 Improved the stats reporting. 2003-03-26 16:48:29 +00:00
Robert Osfield
8779fe20a7 Added help support for display help on screen to osgProducer::Viewer. 2003-03-26 12:50:30 +00:00
Robert Osfield
0c60d14c00 Added a ViewerEventHandler which manages full screen, file write, and help 
output to osgProducer.  Removed FullSreenEventHandler as it is now superseeded
by ViewerEventHandler.
 2003-03-25 15:13:20 +00:00
Robert Osfield
f2772debf4 Added back into the win32 build of KeyboardMouseCallback the check against VK_ESCAPE. 2003-03-25 12:42:06 +00:00
Robert Osfield
35e0ba12bc Added a viewer.sync to the end of all the demos. 
Removed the Win32 remapping of keycodes from the osgProducer::EventAdapter.
 2003-03-25 10:05:09 +00:00
Robert Osfield
a03675495a Added new osgkeyboad example. 2003-03-24 21:17:51 +00:00
Robert Osfield
09acadb560 Added support for remapping of Win32 key symbols to 
osgGA::GUIEventAdpater::KeySymbols.
 2003-03-24 15:13:00 +00:00
Robert Osfield
19e2368991 Added osgGA::GUIEventAdapter::KeySymbol enumate list, which is a remapping 
of the X settings.

Added a pass through of X11 sybmbols from Producer to osgGA::GUIEventAdapter::KeySymbol
in the osgProducer::EventAdapter.
 2003-03-24 13:43:22 +00:00
Robert Osfield
6dbc770347 Made the osgGA::GUIEventHandler sublassed from osg::Object as a virtual 
inheritence to allow handler to also be used as node callbacks.

Fix to UpdateVisitor to make the visitation of Drawable more consistent
with the way that nodes are traversed.
 2003-03-24 08:42:35 +00:00
Robert Osfield
f0eae16828 Added overide of the SceneHandler::clear() making it a no-op. Will revisit 
this implemention later.
 2003-03-20 17:24:25 +00:00
Robert Osfield
fe49a97baa Updates to osgProducer and osgstereoimage for stereo support. 
Changed the default distance from the scene of the home position of the
trackball and flight manipulators.
 2003-03-20 17:00:32 +00:00
Robert Osfield
0476348a0c Added support for setting up VisualChoose with destination alpha, stencil and 
quad buffers attributes from DisplaySettings values.
 2003-03-20 14:07:03 +00:00
Robert Osfield
ca0ff266e2 First pass fix at implementing requestWarpPointer. 2003-03-19 15:49:21 +00:00
Robert Osfield
426e301c48 Addd a full screen toggle event handler to osgProducer & its viewer base 
class.
 2003-03-19 14:27:05 +00:00
Robert Osfield
74f8f18ad6 Added a realize callback to the OsgCameraGroup. 
Move osgtexture3D across to using the new realize callback for creating its textures.
 2003-03-19 12:06:29 +00:00
Robert Osfield
a7bb0126f5 Fixed crash in osgoccluder which was calling setUpViewer and the 
osgProducer/Viewer was assuming that the update was always set.
 2003-03-19 10:28:19 +00:00
Don BURNS
d241ca763b Fixed a globalState setting order in OsgCameraGroup::realize() 2003-03-19 02:31:22 +00:00
Robert Osfield
8ed643ca24 Chaned the OsgCameraGroup so that its scene handler list used ref_ptr<> for 
robustly managing memory.
 2003-03-18 20:27:09 +00:00
Robert Osfield
7083773b64 Ported osgGLUT based src/Demos across to being osgProducer based, and placed 
them in the new examples/ directory.
 2003-03-14 20:35:45 +00:00
Don BURNS
ec3e1dc611 Fixes for Mac OS X 2003-03-13 06:22:31 +00:00
Don BURNS
fa33244f92 1) Replaced all Makefile* with GNUmakefile*. 
2) Changed Makedepend system to make individual dependency files, which
   should save time rebuilding dependencies by limiting the regeneration
   of dependency file for only modified source files.
 2003-03-12 10:39:43 +00:00
Robert Osfield
e51c7f1587 Added support for AbortRendering flag pointer in osg::State which is used 
by osgUtil::RenderLeaf to test if any abort state has been set, if so it
doesn't do any further drawing.

The osgProducer::Viewer has been set up to set the osg::State's it manages
with their AbortRendering flag pointers set to the osgProducer::Viewer::_done
memeber varaible.  Now when escape is pressed the rendering is aborted early.
 2003-03-11 15:25:49 +00:00
Robert Osfield
6a87495c80 Fixes for IRIX build. 2003-03-07 21:05:35 +00:00
Robert Osfield
5d84c10c8f Changed the ownership of Glyph's so that GlyphTexture's own a reference to 
Glyph's as well as Font's so keeping the Font valid even after the Font
itself has been desctructed.
 2003-03-03 16:12:00 +00:00
Robert Osfield
57e73682ce Added using namespace Producer to get round scoping issues associated with 
trying to support VS6 and the rest of the compiler world.
 2003-02-25 21:00:26 +00:00
Robert Osfield
2f74b2cf7c Renamed osgProducer::CameraGroup and SceneHandler to OsgCameraGroup and 
OsgSceneHandler to avoid the namespace bug under VS6.

Removed the osgproducer demo (its now been replaced by examples/osgviewer.)
 2003-02-25 12:28:16 +00:00
Robert Osfield
0d3f78350a Added keyboard mouse binding usage to the osg::ApplicationUsage and 
osgGA::GUIEventHandler and its subclasses.
 2003-02-19 10:43:02 +00:00
Robert Osfield
73f741d16f Completed first pass at providing commandline option usage via the new 
osg::ArgumentPareser and osg::ApplicationUsage classes. The osgproducer
demo has been implemented using these new mechansims.
 2003-02-18 21:58:40 +00:00
Robert Osfield
c10d5f2d6f Added new osg::ApplicationUsage and osg::ArgumentParser to help streamline 
application/example developement.
 2003-02-18 16:36:42 +00:00
Don BURNS
1ab232b113 Used INC instead of CXXFLAGS 
GVS: ----------------------------------------------------------------------
 2003-02-10 22:15:04 +00:00
Robert Osfield
9cc9b0000b Fixed infinite loop in osgProducer::CameraGroup::advance(). 2003-01-31 23:46:15 +00:00
Robert Osfield
4c4735a586 Added FrameStats support into osgProducer lib, and removed them from the 
osgproducer demo.

Removed the producer config files osgproducer demo.

Added a search the osgDB::DataFilePath for the producer config file.
 2003-01-30 23:02:32 +00:00
Robert Osfield
03eee3b700 Fixed warning in osgText 
Added getBound() to begining of osgProducer::CameraGroup::frame() to ensure
that the parallel cull traversals don't all do a getBound().

Added osgProducer::CameraGroup::getTopMostSceneData() convinience method.
 2003-01-30 16:11:39 +00:00
Robert Osfield
6c4f2f5207 Fixes for multipipe support. 
Addition of FrameStatsHandler to osgproducer demo to add frame stats.
 2003-01-29 17:16:26 +00:00
Don BURNS
cf1ff34d38 Fixes to osgProducer for IRIX build. 2003-01-27 20:40:08 +00:00
Robert Osfield
1ce53fcfba Changed the setUpViewer so it takes unisigned int to make it easier to 
do OR'ing of the various enumerates when passing in paramters (avoids a
warning).
 2003-01-24 09:37:11 +00:00
Robert Osfield
6afedcc6d1 Updated version numbers to 0.9.3 2003-01-22 19:17:39 +00:00
Robert Osfield
6fd27a4b59 Clean up to the osgProducer lib and demo. 2003-01-22 15:30:17 +00:00
Robert Osfield
128be070ba Added new osgProducer::Viewer class for putting together simple producer 
based viewers very quickly.
 2003-01-21 13:14:29 +00:00
Robert Osfield
dc83e399a9 Improvements to osgProducer lib, in particular adding a mutex lock to the init() call in 
SceneView to prevent init running multi-threaded.
 2003-01-20 20:33:50 +00:00
Robert Osfield
c325de6865 Updates to osgProducer, moving the implementation of CameraGroup and 
SceneHandler into the source directory.
 2003-01-20 08:58:32 +00:00
Robert Osfield
762db56a40 Improvements to the osgProducer lib to better handle Producer's normalized 
coord system.

Addition of ReadCameraConfigFile and WriteCameraConfigFile as a tempory
measure for implementing local a C++ read/write of the Producer::CameraConfig, this
will be removed once these implementations or similar have been moved to Producer.
 2003-01-18 22:07:59 +00:00
Robert Osfield
13aa469628 Updated the KeyboardMouseCallback so this it takes into account the the new 
passiveMouseMotion support in Producer.
 2003-01-18 10:17:28 +00:00
Robert Osfield
eaaf758910 Added KeyboardMouse::allowContinousMouseMotionUpdate(), but commented out right 
now as Producer crashes when you use it..
 2003-01-17 20:05:41 +00:00
Robert Osfield
619862f8d6 Added osgProducer library to the distribution. 
Cleaned up the osgproducer demo, and made it work with the new osgProducer lib.
 2003-01-17 18:34:35 +00:00