Commit Graph

293 Commits

Author SHA1 Message Date
Robert Osfield
7b31aeca43 Added set up of overlay stateset 2007-05-30 16:36:47 +00:00
Robert Osfield
a510ecf5bd Added trapezodial fitting code 2007-05-30 14:18:33 +00:00
Robert Osfield
adf95c8261 Fixed handle on non ellipsoid models 2007-05-28 15:27:21 +00:00
Robert Osfield
4abacc9d3d Added project down to base implementation. 2007-05-28 13:56:26 +00:00
Robert Osfield
a8cae09c30 Added s/getOverlayBaseHeight methods 2007-05-25 16:00:38 +00:00
Robert Osfield
74d19eed34 Implemnet clampping of ovleray polytope to base plane 2007-05-25 10:14:05 +00:00
Robert Osfield
a22a7f867e Improved the polytope cutting and project calculation 2007-05-24 14:20:02 +00:00
Robert Osfield
6918cc69e9 Fixed brackets 2007-05-23 19:30:16 +00:00
Robert Osfield
7673184d01 Added insertion of center point into object polytope 2007-05-23 14:55:59 +00:00
Robert Osfield
6a6f57ad56 Added angular sorting of the points on the plane intersecting the cut plane. 2007-05-23 13:26:21 +00:00
Robert Osfield
732685d125 Fixed build error under float matrix build 2007-05-20 11:13:18 +00:00
Robert Osfield
e37ec98748 Various additions to better support view dependent overlay node, and updated wrappers 2007-05-19 13:43:38 +00:00
Robert Osfield
851df77673 Improved view dependent camera positioning 2007-05-17 15:39:33 +00:00
Robert Osfield
d80cf6b5ee Futher work on view dependent OverlayNode 2007-05-16 19:19:43 +00:00
Robert Osfield
78800829ed Refactored the internals of OverlayNode 2007-05-16 14:22:10 +00:00
Robert Osfield
310d6d2fc8 Added code for computing the frustum dimensions in local coords to the overlay node 2007-05-16 11:32:29 +00:00
Robert Osfield
1e0af35900 Added code to better compute the view frustum that is appropriate for a traversed
subgraph.
2007-05-15 17:04:57 +00:00
Robert Osfield
dd1f6982dd Futher work on new view dependent overlay node 2007-05-15 11:22:25 +00:00
Robert Osfield
e41cd46da8 Set up new view dependent overlay technique control methods 2007-05-14 20:23:10 +00:00
Robert Osfield
3809d0dad0 Moved the OpenThreads link locally to each lib 2007-05-03 10:06:38 +00:00
Robert Osfield
f242570269 Unified the setup of version numbers so that they all are based on the version
number setup in the include/osg/Version header file.
2007-04-22 20:19:43 +00:00
Robert Osfield
68a6882d04 Bumbped the version number up to 1.9, in preperation for using odd release numbers
for development releases, odd versions for stable releases.
2007-04-16 06:03:22 +00:00
Robert Osfield
2e6ee4bb39 Removed old gmake and VisualStudio build files 2007-04-10 13:10:25 +00:00
Robert Osfield
6d7b5e7ebd From Eric Wing, pedantic warning fixes 2007-04-06 15:36:13 +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
b419fa93ef From Luigi Calori, "when we link against something that comes out from a Find... we ususally have a variable <LINK_VAR_NAME>available like OPENTHREADS_LIBRARY,
so I' ve set up a macro that uses the variable name expanded for linking, and  test if a variable ${LINK_VAR_NAME}_DEBUG
like OPENTHREADS_LIBRARY_DEBUG exists and in case uses it for linking in debug mode.
I' ve also set up FindOpenThreads to set up these variables.
I had to edit the core libraries CMakeLists to add the calls to the macros used.
I' ve tested under MSVC"
2007-03-26 13:02:38 +00:00
Robert Osfield
bd1d9e33d5 Changed typeid(CullVisitor) check to dynamic_cast 2007-03-14 10:02:45 +00:00
Robert Osfield
db6f07f1d6 Ran dos2unx of CMakeLists.txt files 2007-03-08 15:31:36 +00:00
Robert Osfield
ac1106372b Added missing files 2007-03-05 12:09:42 +00:00
Robert Osfield
f50ed9667a From Eric Wing and others, first cut of CMake build support 2007-03-04 13:05:33 +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
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
7232a831da Added osg::FrameStamp::set/getSimulationTime().
Added setting of osg_SimulationTime and osg_DeltaSimulationTime to the uniforms set by SceneView

Added frame(double simulationTime) and advance(double simulationTime) parameters to
osgViewer::SimpleViewer, Vewer and CompositeViewer.

Updated various examples and Nodes to use SimulationTime where appropriate.
2007-01-25 12:02:51 +00:00
Robert Osfield
dd958be8a4 Added setThreadSafeRefUnref, resizeGLObjectBuffers and releaseGLObjects to OverlayNode 2007-01-11 10:21:11 +00:00
Robert Osfield
462803fd57 From Paul Martz, speeling fixes for Tessellator/Tessellation. 2007-01-08 21:29:49 +00:00
Robert Osfield
02bda82b55 From Paul Martz and Robert Osfield, renamed include/osgUtil/Tesselator and associated classes/references to Tessellator etc. 2007-01-08 11:23:52 +00:00
Robert Osfield
e9a7225db1 Added support for traversal mask into ElevationSlice, HeightAboveTerrain and LineOfSight classes 2006-12-19 16:45:09 +00:00
Robert Osfield
21bf3e8762 Removed debug output files 2006-12-13 21:15:22 +00:00
Robert Osfield
0d399adf46 Commented out debug messages 2006-12-13 17:39:30 +00:00
Robert Osfield
97a5ca8a54 Further improvements to handling of multiple z values 2006-12-13 16:41:06 +00:00
Robert Osfield
71bf5371a7 Improvements to handling of multiple z value regions 2006-12-12 21:48:59 +00:00
Robert Osfield
e2481bf1ba Improved the filtering of overlapping and vertical line segments 2006-12-07 22:20:48 +00:00
Robert Osfield
cb77bbf7f6 Fixed copyright notice 2006-12-07 15:48:17 +00:00
Robert Osfield
eb4a5ffe25 Improved the handling of overlapping line segments. 2006-12-06 21:29:10 +00:00
Robert Osfield
afa96fff0e Added more accurate computation of local height above sea level in the plane intersections routines 2006-12-05 12:58:29 +00:00
Robert Osfield
ba3fe2844f Improved the calculation of distance around the globe within the ElevationSlice routine. 2006-12-04 17:31:20 +00:00
Robert Osfield
0f5aeb5fa3 Added preliminary support for generating distance, height lists for ElevationSlice. 2006-12-04 12:36:13 +00:00
Robert Osfield
fd8d6b7f3b Cleaned up debugging info. 2006-12-03 12:52:38 +00:00
Robert Osfield
ab7d1ecc42 Further work on PlaneIntersector 2006-11-29 14:21:59 +00:00
Robert Osfield
a2e79f6a38 Moved osgUtil::PolytopeIntersector, osgUtil::PlaneIntersector and osgUtil::LineSegmentIntersector out from include/osgUtil/IntersecionVisitor into their own seperate files. 2006-11-28 16:30:38 +00:00
Robert Osfield
345810ef22 Added support for float or double osg::Plane, and the default osg::Plane to double.
Performance tests on big models did not indicate any performance penalty in using doubles over floats,
so the move to doubles should mainly impact precision improvements for whole earth databases.

Also made improvements to osgUtil::PlaneIntersector and osgSim::ElevationSlice classes
2006-11-28 16:00:52 +00:00
Robert Osfield
05bffbe9c4 Added beginnings of osgUtil::PlaneIntersector and osgSim::ElevationSlice 2006-11-27 20:25:36 +00:00
Robert Osfield
fd2ffeb310 Renamed osg::CameraNode to osg::Camera, cleaned up osg::View.
Added beginnings of new osgViewer::Scene,View,Viewer,CompositeViewer and GraphicsWindowProxy files.
2006-11-27 14:52:07 +00:00
Robert Osfield
a253e17d3e Implemented HeightAboveTerrain and added usage into osgintersection 2006-10-31 12:59:51 +00:00
Robert Osfield
e9b501002c Added LineOfSight and HeightAboveTerrain classes 2006-10-31 08:41:24 +00:00
Robert Osfield
16c238fc60 Added osgSim::LineOfSight and osgSim::HeightAboveTerrain classes 2006-10-30 20:29:06 +00:00
Robert Osfield
baeb41a416 From Michael Henheffer, "There's a problem with OverlayNodes where the texture will not display
if continuous updating is set to false.

The problem was being caused by the camera update call never being made
if continuous updating was not set to true.  This fix adds a flag that
is set when dirtyOverlayTexture() is called and checked in the update
visitor section of the traversal to determine if the camera should be
updated.

I tested the fix by making some changes to the osgAnimate example
program so it has continuous updating off and calls dirtyOverlayTexture
for each frame.  The overlay texture now displays properly."
2006-10-30 12:19:41 +00:00
Robert Osfield
87a221445e Updated version numbers of the up comming 1.2 release 2006-08-31 20:54:28 +00:00
Robert Osfield
25a91d97f0 From Chuck Sembroski, fixes for IRIX 2006-08-13 07:37:55 +00:00
Robert Osfield
132f9ead45 Updated version number for 1.1.1 release 2006-08-12 08:29:16 +00:00
Robert Osfield
cdaca0ebdf Fixed crash due on multipipe systems due by moving the local camera update code from the cull into the update traversal. 2006-08-02 11:36:13 +00:00
Robert Osfield
f1c2694c17 Updated copyright years. 2006-07-18 15:21:48 +00:00
Robert Osfield
df2d0e1ceb Removed explict definition of osgUtil::Optimizer::StateVisitor to attempt
to get round VS 6.0 cruddiness.
2006-07-06 14:50:38 +00:00
Robert Osfield
88609a5eee Updated version numbers for 1.1 release 2006-07-06 10:28:12 +00:00
Robert Osfield
e8a3444b88 From Brede Johansen,
"The attached file corrects two small typos in MultiSwitch.cpp.  The
local "values" reference and the "_values" member attribute are of
different types but both are vectors so the size() operator happily
compiles.  A renaming of _values to _masks or similar may be a more
future proof solution but the submission only removes the underscore
in two places.

The switch_1701.flt model part of the Creator gallery revealed this bug."
2006-07-04 13:33:19 +00:00
Robert Osfield
2e2684c05a From Paul Martz, added support to textured light points into osgSim and OpenFlight loader, as part of the OpenFlight v16.0 spec. 2006-06-08 14:32:02 +00:00
Robert Osfield
732ca180d1 Added missing clip against maximum azimuth. 2006-06-05 16:25:29 +00:00
Robert Osfield
34cdf22794 Fixed popping of state frustum. 2006-05-02 09:18:36 +00:00
Robert Osfield
3246dde716 From Brede Johansen, new OpenFlight plugin!!!!!
By default the original flt plugin is still used, to select at runtime
the new plugin set the env OSG_OPEN_FLIGHT_PLUGIN=new
2006-03-08 21:38:37 +00:00
Robert Osfield
7d5c81bf5e From Ulrich Hertlein, spelling corrections and a few Doxgen comments. 2006-02-20 21:05:23 +00:00
Robert Osfield
22d5390784 From Louis Hamilton, fix to LightPoint's under 64 bit build, changing longs to ints in
colour conversion code.
2005-12-06 10:16:21 +00:00
Robert Osfield
e1454d22a7 Attempt at build fixes for IRIX. 2005-12-05 10:24:02 +00:00
Robert Osfield
0e16b64665 Coverted tabs to space in core libraries. 2005-11-17 13:35:53 +00:00
Robert Osfield
6268001c66 Warning fix. 2005-11-15 08:43:24 +00:00
Robert Osfield
258425d649 Bumped the version numbers up to 1.0 in preparation for 1.0-rc1. 2005-11-09 10:49:56 +00:00
Robert Osfield
a742cb682e Added RenderTargetFallback option into osg::CameraNode. 2005-11-01 10:42:54 +00:00
Robert Osfield
b61a8a6603 From Brede Johansen, "some tweaks to the osgSim lightpoints.
- The first change is to start fadeing a lightpoint just before the
maximum distance of a light is reached.
- The second change is to start fading a lightpoint when pixelSize is
less than _minPixelSize instead of 1.0."
2005-10-31 11:43:54 +00:00
Robert Osfield
89f6753492 From Farshid Lashkari, compile fix for VS 2002. 2005-10-14 21:40:03 +00:00
Robert Osfield
fb524952b6 Renamed osgUtil::RenderGraph to osgUtil::StateGraph 2005-10-13 12:51:00 +00:00
Robert Osfield
436521e205 Added a couple of (double) casts for VS7 build. 2005-10-03 19:24:12 +00:00
Robert Osfield
ef093bd5e5 Added closing of loops. 2005-10-03 19:18:53 +00:00
Robert Osfield
ba5c7cdc91 Added fusing of ends of lines 2005-10-03 16:13:26 +00:00
Robert Osfield
550bb4b74e Improved handling of convex azim ranges. 2005-10-03 13:19:03 +00:00
Robert Osfield
024b43b017 Adding handling of case of convex azimuth side ways of sphere segment. 2005-10-01 12:23:10 +00:00
Robert Osfield
06401ba129 Changed the line intersection algorithm to computer full line intersections then
trim down to size by intersecting with the sphere segmenet sufaces
2005-09-30 19:36:22 +00:00
Robert Osfield
913dccc14c Fix to intersection code. 2005-09-29 15:55:55 +00:00
Robert Osfield
7ac71b939f Added setOverlayClearColor and setTexEnvMode and automatic set up of TexEnv. 2005-09-29 10:22:06 +00:00
Robert Osfield
d82d598115 Fixed typo of CameraNode::setRenderTargetImplementation(..) 2005-09-29 09:36:51 +00:00
Robert Osfield
600349dce8 Various improvements to the sphere segment intersection code. 2005-09-27 12:15:40 +00:00
Robert Osfield
5731ea2352 Set the defaul clear colour to 0,0,0,0. 2005-09-26 11:24:37 +00:00
Robert Osfield
0fb2e7adc0 From Mike Weiblen, fixes from VS 7.1 build. 2005-09-25 20:41:56 +00:00
Robert Osfield
f1125f7b4d Improvements to the clipping of polygons at boundary edges. 2005-09-24 14:53:22 +00:00
Robert Osfield
e77ec7f96b Further work on intersection code. 2005-09-21 14:38:36 +00:00
Robert Osfield
d13306e885 Added multiple intersect triangle visualization for testing purposes. 2005-09-19 19:49:23 +00:00
Robert Osfield
ea1ea88a17 Added countMultipleIntersections to help with debugging. 2005-09-19 13:15:59 +00:00
Robert Osfield
3a1ce55de6 Improved the region classifaction of the intersection code. 2005-09-17 18:50:26 +00:00
Robert Osfield
68d22f8de7 Improved accuracy of spheresegment to mesh intersections uses mathematical
models of surface geometry.
2005-09-16 14:52:56 +00:00
Robert Osfield
a154348d9a Added Azimuth and Elevation intersector functors. 2005-09-16 09:28:22 +00:00
Robert Osfield
d2f98ef56e Added line connectivity code. 2005-09-15 20:03:37 +00:00
Robert Osfield
4a47a79c23 Added more intersection testing code. 2005-09-10 12:51:03 +00:00
Robert Osfield
745834c329 Added triangle index functor to src/osgUtil/SphereSegment.cpp for computing
the intersection between an indivual geometry and the sphere segment.

Converted the terrain in osgspheresegment to be an osg::Geometry based
drawable rather than a osg::ShapeDrawable/osg::HeightField one to make it
more practicle to use as a test for the new SphereSegment intersection code.
2005-09-09 11:13:40 +00:00
Robert Osfield
67e8e0b287 Added PolytopeVisitor to SphereSegment.cpp to help cull down to only drawables
that intersect with the frustum of the SphereSegment. PolytopeVisitor may
eventually be pulled out to be more generally used along the lines of osgUtil::IntersectVisitor.
2005-09-08 18:56:37 +00:00
Robert Osfield
559219f519 Added initial interface for computing intersections between sphere segments
and terrain.
2005-09-08 13:10:04 +00:00
Robert Osfield
765db1998c Added support for cullable state, that uses a polytope to define the extents
of objects that will be influenced by it.
2005-09-07 16:18:43 +00:00
Robert Osfield
4e6a8cfcd5 Added s/getContinousUpdate(bool) method to OverlayNode. 2005-09-06 19:54:29 +00:00
Robert Osfield
5283c11f8a Added osgSim::OverlayNode to osganimate and osgspheresegment examples, and
added support for setting texture size hint and coping with scene graphs
with CoordinateSystemNode in them.
2005-09-06 15:48:18 +00:00
Robert Osfield
ce3bfff46a Removed redundent code. 2005-09-01 19:55:41 +00:00
Robert Osfield
a420782199 Added osgSim::OverlayNode setup in osgsimulation, and added preliminary test
code to the osgSim::OverlayNode to test osgsimulation/the architecture.
2005-08-31 15:04:27 +00:00
Robert Osfield
f3be713d66 Added OveralyNode into VS project file, and fleshed out more code in the OveralyNode implementation. 2005-08-26 20:01:21 +00:00
Robert Osfield
42752347aa Added beginings of new OverlayNode, for managing a render to texture which is
then used to overaly other parts of the scene such as terrain.
2005-08-26 14:00:02 +00:00
Robert Osfield
ee4d2128da Added --num-components <num> option. 2005-08-26 13:26:02 +00:00
Robert Osfield
f07b24e56b From Joseph Winston, removed #include <osgUtil/RenderToTexture> 2005-08-20 08:20:26 +00:00
Robert Osfield
42e4488454 Port Impostor across to use the new osg::CameraNode. 2005-07-24 11:06:39 +00:00
Robert Osfield
06d3d869f3 Attached ImpostorSpriteManager to the CullVisitor. 2005-07-23 15:21:18 +00:00
Robert Osfield
69efae505b Renabled impostor support using old style RenderToTextureStage setup. 2005-07-22 16:25:38 +00:00
Robert Osfield
1dd553ed0e Bumped version numbers to 0.9.9 in rediness for 0.9.9 release. 2005-05-16 17:17:53 +00:00
Robert Osfield
428608e781 Warning fixes for IRIX 2005-05-16 15:51:57 +00:00
Robert Osfield
4f71be21d4 Yet another using namespace osg to try and work out the spat betwen MipsPro and VS.6.0. 2005-05-13 21:39:34 +00:00
Robert Osfield
e82a63ca81 Cross platform build fixes. 2005-05-13 11:11:52 +00:00
Robert Osfield
bf4d63f6ea Added new Node/Drawable::s/getInitialBound and Node/Drawable::s/getComputeBoundCallback
methods and reimplement computeBound so that it passes back a bounding volume rather
than modifying the local one.
2005-05-12 14:03:22 +00:00
Robert Osfield
03232ec667 Moved osg::Impostor to osgSim::Impostor, as Impostor isn't a core feature. 2005-05-01 19:48:49 +00:00
Robert Osfield
000e5f8d10 Changed the animation on default to false, so things only move if you ask them to. 2005-04-17 11:35:26 +00:00
Robert Osfield
066c829768 Added setValue and setSwitchSet methods 2005-04-15 20:05:30 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
7d24d9fdd5 Added #include <algorithm> 2005-04-08 12:22:03 +00:00
Don BURNS
1771cdbcc7 Update version numbers in files 2004-12-04 23:38:24 +00:00
Robert Osfield
b70ff91eaf Changed ABSOLUTE and RELATIVE to ABSOLUTE_RF and RELATIVE_RF to avoid stooppid Win32 #define 2004-10-24 20:04:00 +00:00
Robert Osfield
6821a80e14 Changed the ReferenceFrame enums to be RELEATIVE and ABSOLUTE, and
deprecated the RELATIVE_TO_ABSOLUTE and RELATIVE_TO_PARENTS.
2004-10-22 19:26:45 +00:00
Robert Osfield
7e5c87de6a Changed the version strings to use OpenSceneGaph rather than "Open Scene Graph" 2004-09-27 12:07:34 +00:00
Robert Osfield
4571238459 From Joakim Simonsson, add s/getHPROrder method 2004-09-06 14:59:11 +00:00
Robert Osfield
d64aa24449 Changed the length multiple to be 2x the bounding sphere radius 2004-08-16 08:32:16 +00:00
Robert Osfield
f62d0e4dd2 From Michael Gronager, fix to an orientation bug. 2004-08-16 07:29:07 +00:00
Robert Osfield
ddb7423e46 Set version numbers for 0.9.7 release 2004-08-05 08:02:48 +00:00
Robert Osfield
6524fe1293 From Norman Vine, fixes for Mingw 2004-08-02 09:11:31 +00:00
Robert Osfield
a92a9d0f22 Added handling of case when only one colour is used. 2004-06-03 10:16:19 +00:00
Robert Osfield
5d97f7ec92 Added support for a single color in a ColorRange 2004-06-03 10:10:41 +00:00
Robert Osfield
1526281793 Added room for tail of text. 2004-06-03 09:36:49 +00:00
Robert Osfield
7f94839e94 Added setPosition and setWidth methods into ScalarBar and changed the
implementation to use these values to position and set the size of the
scalar bar.  Also made the characterSize value a float rather than
the previous int.
2004-06-02 12:37:14 +00:00
Robert Osfield
3fc447af89 Changed &D to use define to keep things compiling under VS6.0 2004-05-10 16:17:46 +00:00
Robert Osfield
86d323752d From Corbin Holtz, "I have completed my mods to the OpenFlight loader (modified files are
attached):
   * Light point strings using the REPLICATE opcode should now be supported
(>=15.6?)

   * Directional lights should now work as in Performer using a viewing
frustrum defined by a direction vector, horizontal angular width, vertical
angular width, and roll angle about the direction vector.  The current
directional light implementation had some bad assumptions which caused
problems with direction vectors not on the XY plane.

   * IVE and OSG reader/writers were updated as appropriate"
2004-05-08 22:18:38 +00:00
Robert Osfield
bdeb391a00 From Mike Weiblen, added new rot, scale and trans pseudo loaders. 2004-05-07 15:18:59 +00:00
Robert Osfield
ae7ceae631 From Paul Martz, added support for OpenFlight15.8 LightPointSystems 2004-04-10 11:30:16 +00:00
Robert Osfield
316c646a8f From David Fries, add init() call to SphereSegment constructor, and
new get methods for draw mask and color.
2004-03-31 08:52:47 +00:00
Robert Osfield
20252db7ff From Brede Johansen, added support for incrementing animation of DOFTransform
w.r.t. time rather than frame number.
2004-03-02 16:53:21 +00:00
Robert Osfield
1f80e1e6c4 From Shane Arnott, added drawing of "split" 2004-02-12 01:42:00 +00:00
Robert Osfield
eca2fc2837 Improved osgSim::SphereSegmenet's handling of transparancy. 2004-02-12 01:15:37 +00:00
Robert Osfield
22b2e7343e From Tom Jolly, Fixes to osgSim::BlinkSequence to enable proper saving and
loading.
2004-02-05 10:50:29 +00:00
Robert Osfield
77840e62e7 Added virtual destructor to LightPointDrawable 2004-02-04 11:03:52 +00:00
Robert Osfield
dea75f5510 Attempts to fix compile problems under IRIX due to namespace problems. 2004-01-29 15:47:51 +00:00
Robert Osfield
b604d22982 Added _activeSwitchSet(sw._activeSwitchSet) into the copy constructor. 2004-01-21 20:38:03 +00:00