FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,282 Commits 1 Branch 26 Tags 73 MiB
46c830cc12
Commit Graph

332 Commits

Author SHA1 Message Date
Robert Osfield
46680be5eb Added control of auto option into slideshow3D 2003-07-23 15:12:52 +00:00
Robert Osfield
b925dcabaa Fixed typo's slideshow3D 2003-07-23 15:00:07 +00:00
Robert Osfield
871da625ba Made the keyboard mouse callback a ref_ptr<> managed object to fix ref count problem. 2003-07-23 08:48:23 +00:00
Robert Osfield
00e7e10a26 Updates to the slideshow3D app. 2003-07-22 15:35:51 +00:00
Robert Osfield
f7ad937020 Added XML support and slideshow constructor to slideshow3D example, now 
renamed from the previous osgslideshow.
 2003-07-22 12:39:40 +00:00
Robert Osfield
eed6ab7d85 Added Images/ infront of lz.rgb path. 2003-07-22 08:42:14 +00:00
Robert Osfield
a4b29996fd Added osg::Matrix::getOtho,getFrustum and getLookAt() methods. 
Added test for new matrix methods into unit tests example, but these really
should go in their own lib...
 2003-07-16 20:14:48 +00:00
Robert Osfield
77c0366cb2 From Mike Weiblen's osgGL2 node kit which support the latest OpenGL 2.0 extensions. 2003-07-15 10:45:46 +00:00
Robert Osfield
fc4b990a7a Compile fixes. 2003-07-15 07:53:25 +00:00
Robert Osfield
ae2712c84b Attempt to fix compile error caused by recent change in osg::Texture. 2003-07-14 19:12:22 +00:00
Robert Osfield
1b9d7d458a Added support for texture object manager, which provides an automatic mechansim 
for reusing deleted textures.
 2003-07-14 14:42:10 +00:00
Robert Osfield
7432eee381 Fix to accomodate function name change in osgDB::Registry. 2003-07-10 13:48:56 +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
Robert Osfield
5bf9be4473 Addition of text to default presentation. 2003-06-25 22:11:12 +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
Don BURNS
5a939f5420 Updating 5/27/03 backup with 6/20/03 tarball 2003-06-24 15:39:59 +00:00
Robert Osfield
5bfaf54292 Added missing std:: 2003-05-24 14:26:20 +00:00
Robert Osfield
5408077c3b Added ive reader/writer - from Rune Schmidt Jensen/Michael Gronager 2003-05-23 19:51:12 +00:00
Robert Osfield
23569ac5db Removed occurances of SG_EXPORT. 2003-05-22 14:02:10 +00:00
Robert Osfield
80baa19ff3 Added GeoSet to osgconv. 2003-05-21 14:34:12 +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
709dafe15b Added osgtexturerectangle example from Ulrich Hertlein. 2003-05-20 14:05:19 +00:00
Robert Osfield
601c8d72f2 Removed redundent write_usage function. 2003-05-20 08:57:02 +00:00
Robert Osfield
d156e259ef Fixed manipulator. 2003-05-20 08:43:09 +00:00
Robert Osfield
940ce67133 Removed remaining dependancies on osg::Camera. 2003-05-19 15:15:17 +00:00
Robert Osfield
57af40ee95 Updates to the handling of vertex attributes. 2003-05-09 13:07:06 +00:00
Robert Osfield
aa0d5fc52e Changed the CullVisitor::popProjection() so that it doesn't adjust orthorgraphic 
projection matrices.
 2003-05-07 09:35:43 +00:00
Robert Osfield
fa0333b6fe Aded extra constructors to BlendFunc and Depth to help set them up convieniently. 
Added a background quad to osghud.
 2003-05-06 18:04:27 +00:00
Robert Osfield
06054d9520 Added support for multibuffering of tex coordinates. 2003-05-06 13:13:31 +00:00
Robert Osfield
895a722842 Addd support for maximum screen text size into osgText when auto scale to 
screen is active.

Added osgautotransform demo.
 2003-05-01 21:06:18 +00:00
Robert Osfield
d29c57a2ba Reverted the test of setAutoScaleToScreen. 2003-04-30 11:41:24 +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
490647f5f4 Updates to the introduction.html. 
Added support for new alignment modes in osgtext.
 2003-04-28 11:37:53 +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
4f92ba3245 Updated NEWS for the release date. 
Tweaked the text sizes in osglogo.
 2003-04-19 09:09:46 +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
dac86dabb5 Added a realize callback for setting up the pbuffer so that it definately 
has a valid graphics context.
 2003-04-18 08:17:18 +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
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
55cd95f542 InputRectangle converted to RenderSurface->get()... 2003-04-16 23:09:31 +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
48cb15015f Add a check for the result to writeNodeFile(). 2003-04-16 12:46:06 +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
fc4a2ab191 Added support for multiple cameras into osgpick. 2003-04-15 20:54:10 +00:00
Robert Osfield
6998229639 From Brede, Fixed the ordering of the znear and zfar. 2003-04-15 09:33:56 +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
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
026dc2cbb7 Added Geoff Michel's osgpick and osgUtil::PickVisitor code. 2003-04-13 13:26:41 +00:00
Robert Osfield
8350eda616 Added std:: infront of cout instances. 2003-04-11 06:50:15 +00:00
Robert Osfield
aaa761e333 Added tests for presense of extensions to osgcubemap, osgvertexproram and 
osgmultitexture examples.

Added osg::VertexProgram::Extensions class to better handle multiple graphics
context vertex program extensions.
 2003-04-10 19:32:32 +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
8b03d59be3 Added support for modifying the osg::Texture*:Extensions stuctures. 
Added an example modifying osg::Texture::Extensions to osgtext.  Optionally
compiled out by default.
 2003-04-10 13:41:45 +00:00
Robert Osfield
0dd724e8b7 Changed the '-c' commandline option to '-m' to avoid overlapp with -c 
used for config files.
 2003-04-10 10:21:20 +00:00
Robert Osfield
2e87dcd804 Added desciptions to all the demos. 2003-04-09 11:44:32 +00:00
Robert Osfield
2061b1bdd3 Fixed warning. 2003-04-09 10:11:56 +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
06e773cefb Fixed warning. 2003-04-08 20:05:00 +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
5f8411ac5c Changed the KeySwichCameraManipulator::setNode() so it set all camera's 
attached to it.
 2003-04-08 13:10:47 +00:00
Robert Osfield
0d45181aff Removed the output of command line usage when no arguments are passed since 
this example doens't need paramters.
 2003-04-08 09:48:02 +00:00
Robert Osfield
564077643f Set the fusion distance ratio to 1/300.0f to compensate for the coords 
of the hang gliding database being so small, this allow the scene to be
viewed in stereo and still look a convincing size.
 2003-04-07 14:57:18 +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
49a28660dc Added the usage report to the examples for when no arguments are passed 
to the examples.
 2003-04-06 21:32:44 +00:00
Robert Osfield
908164d58a Fixed for new implemention osg OsgCameraGroup::setView(). 2003-04-06 18:18:52 +00:00
Robert Osfield
e60ddd4916 Fixed setView to work with new OsgCameraGroup::setView 2003-04-06 13:29:02 +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
79fd5786d8 Fixed manipulator to work correctly with new osgGA::GUIEventAdapter 
code.
 2003-04-05 20:02:42 +00:00
Robert Osfield
5dbe1f0d0b Added Images/ infront of dog_left and dog_right images. 2003-04-05 19:54:51 +00:00
Robert Osfield
75b591e70b Added a couple ability of offset the images relative to each other 
horizontally and vertically to allow better comenstation for mismatched
imagery.
 2003-04-05 19:40:18 +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
e0d7709d50 Added code to set the colour of each geometry to white to prevent 
colours from the text being inherited.
 2003-04-04 08:39:58 +00:00
Don BURNS
03a0b4f5de Changes to fix compiles on Mac OS X 2003-04-03 08:14:49 +00:00
Robert Osfield
fea6ad3101 Changed colour of anisotropic text in osgtexture2D example. 
Removed the save test.osg call in osgkeyboard.
 2003-04-02 11:57:23 +00:00
Robert Osfield
7aab621405 Added support for min pixel size, max pixel size and max visable distance to 
osgSim::LightPointNode, the max pixel size from was originally in osg::LightPoint.

Added additional get/set methods to osg::LightPointNode.

Increased the compute pixel size by a ratio 1.41 (sqrtf(2)) to correlate the
computed size with the actual size seen on screen.
 2003-04-02 10:50:15 +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
d820449931 Used notify for reporting the keypressing to the commandline. 2003-04-01 18:35:31 +00:00
Robert Osfield
b63a49ca3f New osgtexture2D example code. 2003-04-01 16:00:33 +00:00
Robert Osfield
e8f7290ead Updated NEWS. 
Removed writing of test.osg from osgstereoimage.
 2003-04-01 12:00:13 +00:00
Robert Osfield
2af64da81c Removed closeLibrary reference for osgtext as this was causing problems with the 
osgtext help.
 2003-03-30 11:10:56 +00:00
Don BURNS
5b1969563b Fixed installation of demo source from src/Demos to examples 2003-03-27 18:42:31 +00:00
Robert Osfield
ee7975c76a Added -losgGA to keep things compiling across platforms. 2003-03-27 17:16:53 +00:00
Robert Osfield
a3d676c10b Added -osgText to GNUMakefiles. 2003-03-27 13:51:40 +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
5e56e0eba8 Added osgkeyboard to the ./runexamples.bat. 
Made osgstereoimage exit when non files have been loaded.

Added non const getText() method.
 2003-03-25 13:57:16 +00:00
Robert Osfield
6b5d17a6d4 Added text input field to the osgkeyboard demo. 2003-03-25 12:44:50 +00:00
Robert Osfield
65e0ebf29d Added futher keys to complete the keyboard. 2003-03-25 11:28:52 +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
500c8fee92 Revamp of the osgstereoimage demo to provide a presentation tool for up comming 
"In Your Face" shows held at the Glasgow Science Center.
 2003-03-22 20:35:11 +00:00
Robert Osfield
aa78092885 Added using namespace osg and removed osg:: from CopyOp's as this was 
causing problems with VisualStudio's scoping bug.
 2003-03-21 22:32:01 +00:00
Robert Osfield
4a3e04e1c2 Add osg:: infront of CopyOp instances. 2003-03-20 20:38:38 +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
38a2408847 Changed the shadow texture implemention to use CLAMP_TO_BORDER for the 
WRAP_S and _T modes.  Also set the border colour to 1,1,1,1 to ensure
problem blending.
 2003-03-20 08:58:51 +00:00
Robert Osfield
6fc7f82a31 Added sync at the end of the main loop to prevent seg fault on exit. 2003-03-19 15:57:31 +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
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
f37c3db2af Added inc and links for local Producer. 2003-03-17 20:08:36 +00:00
Robert Osfield
db54d1f6f8 break from osgcluster main loop added for when the master send a killed 
messsage to slaves.
 2003-03-17 09:51:19 +00:00
Robert Osfield
e87a08f1c3 Fixes to osgcluster demo as new Producer based example. 
Added extra pragrma remove a warning about float to int cast under VS.NET.
 2003-03-16 21:58:27 +00:00
Robert Osfield
e791014d5c Added osgpbuffer example source. 2003-03-15 16:41:27 +00:00
Don BURNS
ced920030a Added -losgGA to all GNUmakefiles in examples. 
Added one std:: in front of an endl in osgunittests.cpp
 2003-03-15 08:01:41 +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
693a889ece Various changes to the BUILD system: 
o Object files now go in subdirectories named $(OS)$(ARCH).Opt and
       $(OS)$(ARCH).Debug for OS's that support both architectures.
          eg.  Linux32.Opt and Linux32.Debug

     o Libraries links are now placed in lib/$(OS)$(ARCH)
          eg.  lib/Linux32/

     o Binaries are now placed in bin/$(OS)$(ARCH)
          eg. bin/Linux32

     o 'make install' and 'make instlinks' now place files/links in
       /usr/local/{include,lib,share/OpenSceneGraph} by default on
       most systems (Solaris still goes in /opt/OpenSceneGraph).
       Rather than having the somwehat confusing INST_SYS_PREFIX and
       INST_SHARE_PREFX, you can override these with just
            INST_LOCATION
       For example,
             make INST_LOCATION=/usr
       will place files at /usr/include, /usr/lib,
       /usr/share/OpenSceneGraph.
 2003-03-13 02:53:40 +00:00
Robert Osfield
7439d7bb58 Changed the GNUMakefile for the osgproducer demo to use INC += instead of CXXFLAGS. 2003-03-12 21:02:04 +00:00
Robert Osfield
40271ef1c8 Added -losgText 2003-03-12 11:50:02 +00:00
Robert Osfield
d998b2acfa Added missing osghud Makefile. 2003-03-12 11:36:55 +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
78de76f17f Bug fixes to osgText to handle the osgUtil::Optimizer being used on a scene 
graph containing text.

Fixed warning in MD2 plugin.
 2003-03-11 13:30:03 +00:00
Robert Osfield
bc35d8d33b Addded new osgProducer based osgreflect demo. 2003-03-10 12:06:17 +00:00
Robert Osfield
5c4bcd4aac Moved the RenderLeaf implementatation across to always applying matrices 
before state, which fixes problem that can occur with state that needs
the current model view or projection matrices.

Changes osgreflect so that it uses ClipNode rather than clip plane, thereby
fixing the problems which occur when the above is applied.

Create a new osgProducer version of the original GLUT based version.
 2003-03-10 11:59:41 +00:00
Robert Osfield
397edcd579 Fixed examples/osghud and osgtext Makefile's to include osgText. 2003-03-08 21:39:40 +00:00
Robert Osfield
6a87495c80 Fixes for IRIX build. 2003-03-07 21:05:35 +00:00
Robert Osfield
fab6f24f4e Changed the osgText::Font implementation so it used a facade us abstract away 
the actual implemention. This has been done so that when a freetype font is
created the implementation can unloaded when the freetype plugin is unloaded
without breaking the main font.

Also add image margin around founds to prevent any image boundaries appearing.
 2003-03-06 17:11:24 +00:00
Robert Osfield
8e6a1d38e4 Updates to the GLUT and Producer text demo. 
Fix to text to better handle unsetting of vertex arrays.
 2003-03-05 12:28:42 +00:00
Robert Osfield
7b6eaa72f2 Updates to Text for Sun Forte compilers. 2003-03-05 09:08:11 +00:00
Robert Osfield
424fad7234 Added std:: infront of cout references. 2003-03-04 19:52:32 +00:00
Robert Osfield
ba9fbd371f Updates to the new osgtext example and fix to the friend usage. 2003-03-04 17:14:42 +00:00
Robert Osfield
1c34c0981e Further improvements to osgText and the freetype plugin, handling different 
font sizes better and plugin removal safely.
 2003-03-04 12:34:42 +00:00
Robert Osfield
c08a24d89a Added examples/osghud - a osgProducer port of the old osghud demo. 2003-03-03 22:47:50 +00:00
Robert Osfield
e433b42bc0 Updates osghud demo. 
Compile fixes for VisualStudio6.0 because its a hideous pile of junk and can't
compile its way out of a paper bag.
 2003-03-03 22:18:33 +00:00
Robert Osfield
fbe674b321 First cut of new osgText implementation. 2003-03-02 21:05:05 +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
b32c8c65f3 Added osg::Image::AllocationMode enum and associated set/get methods. 
osg::Image::setImage has also been modified to require the AllocationMode
mode to be passed to it so that it knows how to delete the data once the
image goes out of scope.

Port the image plugins across to specify the new AllocationMode, and converted
them across to using new/delete in place of malloc/free.
 2003-02-25 11:56:18 +00:00
Robert Osfield
372ca1d227 Ported osgstereoimage to use osgProducer, added it to the examples directory. 
Added a osgProducer::CameraGroup::getSceneHanderList() methods.
 2003-02-23 17:01:05 +00:00
Robert Osfield
3b429134cb Added examples directory, a place for all new OSG demo code. 
Added osgcameragroup, osgviewer, osgtext, osgconv to the new examples directory.
 2003-02-21 14:05:39 +00:00