Commit Graph

2283 Commits

Author SHA1 Message Date
Robert Osfield
dfaed29d6b From Geoff Michel, fixes. 2004-07-20 18:50:30 +00:00
Robert Osfield
3bca9ec9cf Added SceneView::Options for SceneView::setDefaults(options) and
OsgCameraGroup::setRealizeSceneViewOptions(options) to allow better control
of what functionality is compiled in by default.
2004-07-20 10:17:22 +00:00
Robert Osfield
aed65903db From Bob Kuehne, add usage of version number to differentiate between
rev's of the LOD.
2004-07-20 07:46:05 +00:00
Robert Osfield
aa833acfd3 Added support for releasing GLObjects, and renamed DisplayListVisitor the
GLObjectVisitor to better fit its function, and added support for releasing
objects as well as compiling them.
2004-07-20 05:37:59 +00:00
Robert Osfield
12a315ec1d From Eric Sokolosky, added INVENTOR_INCLUDE and INVENTOR_LIB vars. 2004-07-20 05:36:44 +00:00
Robert Osfield
d5aea35895 From Geoff Michel, fix for handling of texture filenames enclosed in quotes. 2004-07-19 18:35:01 +00:00
Robert Osfield
422aab8e3f Added handling of the case when texture objects are released from underneath
the osgText::Font::GlyphTexture - something which requires a full rebuild
of the texture object.
2004-07-19 14:34:12 +00:00
Robert Osfield
4a8c090bf8 Lowered level of debugging message 2004-07-19 09:39:58 +00:00
Robert Osfield
0fb5733f13 Added support for --tile-image-size <size>, --tile-terrain-size <size> and --comment <string>
command line options into osgTerrain::DataSet + osgdem.
2004-07-19 09:03:50 +00:00
Robert Osfield
9885d15ff6 From Mike Weiblen, switched of alpha test on anisotropic effect, due to missing
write of colour.
2004-07-17 10:38:09 +00:00
Robert Osfield
f9ea73fbe2 From Mike Weiblen, updates to the psuedo loaders to add documentation. 2004-07-17 10:33:26 +00:00
Robert Osfield
d57697fefa Fixed the computePosition so it find intersections more easily. 2004-07-12 21:32:33 +00:00
Robert Osfield
0acbe077fa Added support for matix manipulator setHomePosition(,,) 2004-07-12 19:54:54 +00:00
Robert Osfield
47910f2c2e Removed enabling of use client stage storage hint. 2004-07-12 17:30:36 +00:00
Robert Osfield
6fd4677868 Added OPTIMIZER_TEXTURE_SETTINGS pass to Optimizer, which enables
unref image data after apply, client storage hint.
2004-07-12 13:20:18 +00:00
Robert Osfield
3e5c491f54 Added debugging message, currently commented out. 2004-07-12 13:13:58 +00:00
Robert Osfield
ed08f7a5a9 Added unref image data on apply automatically to all textures being loaded. 2004-07-12 10:23:15 +00:00
Robert Osfield
69caf104d8 Reduced the pan sensitive on the trackball 2004-07-12 09:43:45 +00:00
Robert Osfield
7fdf18a768 Reduced the sensitivity of the pan. 2004-07-12 09:17:21 +00:00
Robert Osfield
ba295ccab7 Added a more flexible variable on the textured quad generation function 2004-07-12 01:01:00 +00:00
Robert Osfield
788a19d3b5 Made debugging message write to osg::INFO instead of osg::NOTICE 2004-07-11 23:07:47 +00:00
Robert Osfield
363d13d7ce Added CLUSTER_CULLING mask to CullSettings, and modified the ClusterCullingCallback
to use the mask to see if cluster culling is enabled or disabled.
2004-07-11 21:46:23 +00:00
Robert Osfield
3f4b8e9034 Fixed cluster culling. 2004-07-09 20:58:43 +00:00
Robert Osfield
504dd515d3 Improvements to the handling of coordinate system nodes 2004-07-09 15:21:33 +00:00
Robert Osfield
9cb7bb0f4a Clean up of debugging information. 2004-07-09 12:14:25 +00:00
Robert Osfield
0869da6e67 From Mike Weiblen, "mods based on those Bob Kuehne posted.
- updated to the latest ARB-approved GLSL version query mechanism.
- updated enums to the latest official glext.h
- fixed some TODOs"
2004-07-09 08:22:24 +00:00
Robert Osfield
8d325c24ff Added new coputeActiveCooridnateSystemNodePath method 2004-07-08 22:28:15 +00:00
Robert Osfield
8a44435e4d Made the local storage of a StateAttribute* be a ref_ptr<> 2004-07-08 22:11:42 +00:00
Robert Osfield
e81d3ea000 Made the constructor's default value for _lightingMode be NO_SCENEVIEW_LIGHT 2004-07-08 22:10:44 +00:00
Robert Osfield
787792077c From Vasily Radostev, fixed Billboard compute near/far bug due to typo of bbCornerFar. 2004-07-07 13:19:07 +00:00
Robert Osfield
c6ca80f2c5 Added automatic scaling of the minimum distance to cope with models of
small dimensions.
2004-07-07 11:29:58 +00:00
Robert Osfield
1634cc47c6 Added automatic setting of the verical scale when the destination coordinate
system is geographic (i.e. lats and longs.).
2004-07-07 11:28:21 +00:00
Robert Osfield
a3f7547cf7 Added support for automatically computing the local skirt orientation 2004-07-07 09:04:21 +00:00
Robert Osfield
3c7dfa389d Added mutex to image stream thread to serialize calls to Quicktime. 2004-07-06 15:10:33 +00:00
Robert Osfield
105c3568f8 From Geoff Michel, replaced used C style FILE with iostream. 2004-07-06 13:00:14 +00:00
Robert Osfield
ba20259794 Removed debugging message 2004-07-06 12:32:09 +00:00
Robert Osfield
b8aa8bfc40 Fixed warning. 2004-07-06 12:15:03 +00:00
Robert Osfield
d0aa593292 Changed the default mipmapping mode to record the mipmaps in the
images in the generated databases.
2004-07-06 12:14:52 +00:00
Robert Osfield
518cedf6c7 Added dealloc or previous image data into readImageFromTexture 2004-07-05 21:46:02 +00:00
Robert Osfield
cce00c475b Added suppor for copying mipmaps of compressed textures 2004-07-05 21:09:30 +00:00
Don BURNS
4c5f33d397 Changed internal formatt on jpeg loader to be GL_RGB, GL_RGBA, etc. rather
than numComponents.
2004-07-05 16:21:43 +00:00
Robert Osfield
1c2c5c4f43 From Ulrich Hertlein, added check for detailRatio<=0.0 2004-07-05 09:04:53 +00:00
Robert Osfield
c58891d168 Fixed missing member variable initialized varaibles 2004-07-05 07:42:46 +00:00
Robert Osfield
2ce192f0ae Change the light in LightSource from a generic osg::StateAttribute to
a osg::Light.
2004-07-02 14:46:24 +00:00
Robert Osfield
2598b02243 Changed the generation of primtive set to use DrawElementsUShort for even
index sets that can be represented by UBytes, thisis to try to keep to
fast paths more likely to be supported by graphics drivers.
2004-07-01 14:27:22 +00:00
Robert Osfield
a0eead991f Fixed indenting 2004-07-01 14:22:11 +00:00
Robert Osfield
0c38189018 Moved the radius parameter from PageLOD into LOD. 2004-07-01 13:53:30 +00:00
Robert Osfield
a8ee967f14 Added support for using pixel size control of LOD levels. 2004-06-30 19:07:05 +00:00
Robert Osfield
b22de2eba0 Maded the image filename handling more consistent. 2004-06-30 14:43:40 +00:00
Robert Osfield
ae3b1454e8 Completed support for "--levels min max" option where the levels that a
source imager or DEM contributes to.
2004-06-30 14:37:06 +00:00
Robert Osfield
c45138f977 Fixed handling of PROCTED/OVERRIDE 2004-06-30 09:02:41 +00:00
Robert Osfield
888d9e2a25 From Pavel Moloshtan, added support for storing primitive sets in VBO's 2004-06-29 15:04:38 +00:00
Robert Osfield
d4c46df7ce Fixed parsing of internalTextureFormat. 2004-06-29 08:03:28 +00:00
Robert Osfield
fdbb1fe021 Re-organised Texture::computeInternalFormatWithImage() to avoid testing
for extensions when not required.
2004-06-28 22:09:52 +00:00
Robert Osfield
9b03d8c67e Fixed warnings. 2004-06-28 21:39:31 +00:00
Robert Osfield
0887e22c3f Added .osg support for new TexGenNode 2004-06-28 15:09:49 +00:00
Robert Osfield
124f64c55f Fixed warning 2004-06-28 14:18:48 +00:00
Robert Osfield
ca96c9e731 From Michael Logan, build fix for Performer plugin 2004-06-28 13:18:31 +00:00
Robert Osfield
db43e34bce From Michael Gronager, added support for alpha channel in writing of BMP images 2004-06-28 13:18:10 +00:00
Robert Osfield
6de63f097b From Eric Sokolowsky. Added missing blend modes into .osg reading and writing
and fixed typo.
2004-06-28 12:52:13 +00:00
Robert Osfield
20de9666dd From Terry Welsh, added support for reading and writing osg::FragmentProgram
local parameters.
2004-06-28 10:00:21 +00:00
Robert Osfield
4c0aa24526 Added handling of GL_INTENSITY in osg::Image::computeNumComponents() 2004-06-17 15:07:50 +00:00
Robert Osfield
63aa9b857d Added first stage of support for "--levels min max" in osgdem/osgTerrain where
this option controls which levels that an associated imager or DEM contributes
to the final model.
2004-06-17 14:39:16 +00:00
Robert Osfield
06aa06d686 Added support for setting texture units in the new TexGenNode. 2004-06-17 14:02:15 +00:00
Robert Osfield
840d5d4930 From Loic Dachary, added missing copy contructor operations. 2004-06-16 15:05:01 +00:00
Robert Osfield
ad6bf73037 From David Fries, small treak to debugging output. 2004-06-16 06:02:12 +00:00
Robert Osfield
8b0a98f03c Added Marco's AutoTransform.cpp 2004-06-15 12:26:39 +00:00
Robert Osfield
616ee0928a From Marco Jez, implemented I/O support for the AutoTransform node. 2004-06-14 20:12:04 +00:00
Robert Osfield
ade10ccebc Improved precision of AnimationPath IO. 2004-06-14 20:10:08 +00:00
Robert Osfield
2d35b3cc27 Changed Billboard::g/setPos(..) to g/setPosition(..). 2004-06-14 19:34:43 +00:00
Robert Osfield
78d075eb24 Added new TexGenNode class for positioning tex gens. 2004-06-14 19:11:04 +00:00
Robert Osfield
0153764aa9 Fixed handling of skylight and headlight options in osgProducer::Viewer. 2004-06-11 21:27:36 +00:00
Robert Osfield
773ffc0c05 Added better debugging messages for verify bindings. 2004-06-11 21:05:50 +00:00
Robert Osfield
6f03f991b3 Changed the color binding to better reflect the settings in the OpenFlight file. 2004-06-11 21:05:07 +00:00
Robert Osfield
eda1bf544d Added further checks for _node validity. 2004-06-11 21:00:06 +00:00
Robert Osfield
c63f0e2fce Added checks against null to prevent crashes when the terrain manipulator is set up before
a node has been attached.
2004-06-11 20:57:36 +00:00
Robert Osfield
09d585561a Added missing setColorBinding() into ConvertFromFLT::setMeshColors(). 2004-06-11 14:49:22 +00:00
Robert Osfield
343fa27fcd From Troy Yee, fixes to handling meshes.
From Robert Osfield, replaced assert(0)'s with error messages.
2004-06-10 15:43:56 +00:00
Robert Osfield
3adacbdeb7 Changed the *(itr++) instances with *(itr), *(itr+1) with a seperate itr+=n etc. This
has been done to avoid VC6.0 optimization ordering problems.
2004-06-09 16:28:51 +00:00
Robert Osfield
f75a7c6294 Added CoordinateSystemNode::set(const CoordinateSystemNode&) method to conviniently
set up a coordindate system.
2004-06-09 15:11:27 +00:00
Robert Osfield
84c66b7c2e Added proper mapping of format and coordinate system. 2004-06-09 15:06:19 +00:00
Robert Osfield
a8ce6b01d6 Added CoordinateSystem::s/getFormat(). 2004-06-09 15:00:03 +00:00
Robert Osfield
6f82b37dd0 Improved the precision of animation paths. 2004-06-08 14:30:48 +00:00
Robert Osfield
65d0293778 Added options for controlling mipmapping and aniso-tropic filtering. 2004-06-08 13:58:36 +00:00
Robert Osfield
dbba29e35c From Boris Bralo, reimplementation of dereference_less functor to use
two input types, to attempt to avoid VC compile problems and redundent
copies of ref_ptr<>.
2004-06-08 09:29:56 +00:00
Robert Osfield
22ec86114d Updates to the terrain manipulator. 2004-06-08 07:32:08 +00:00
Robert Osfield
eec378a885 Moved the osg::ClusterCullingCallback into into own header and source file. 2004-06-07 15:05:22 +00:00
Robert Osfield
48d671352d Changed the terrain manipulator so the intersection ray is only
computed near to the current center point during panning.
2004-06-07 14:49:39 +00:00
Robert Osfield
4bb147aed4 Added haveAppliedAttribute to allow draw callbacks to get access to the
current active lights.
2004-06-04 12:27:04 +00:00
Robert Osfield
bfd1286b25 Add clamping to 0..1 bounds for each of the r,g,b,a components in
the CubeMapGenerator::set_pixel() method.
2004-06-04 11:35:13 +00:00
Robert Osfield
c69a8a5b80 Added check to Quat::makeRotate(,,,) to catch zero lengh axis. 2004-06-04 10:05:18 +00:00
Robert Osfield
2cf45b50c9 From Terry Welsh, added checks to incoming Geometry for existance of normals,
and if they are present use these to compute the tanget and binormals
vectors perpendicular to existing normals.
2004-06-04 08:24:13 +00:00
Robert Osfield
0fac56f56a From Max Behensky, fixes to the computation of the number of primitives 2004-06-04 08:13:36 +00:00
Robert Osfield
e8a3ba8a9f Fixed spelling of Equivalent. 2004-06-03 20:06:17 +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
b5366cbda6 Added DataSet::s/getSkirtRatio() method to allow control of how deep to
make the skirts around tiles.
2004-06-02 14:15:08 +00:00
Robert Osfield
344beecede Added derived reqiestRedraw() and requestContinueUpdate() methods for
debugging purposes.
2004-06-02 14:13:11 +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
673244a60c Fixed setCoordinateFrame method 2004-05-26 00:27:00 +00:00
Robert Osfield
205a6a105e Made the drive and flight manipulators more sensitive to de/acceleration 2004-05-26 00:26:43 +00:00
Robert Osfield
9236f6daa8 From George Tarantilils, add missing handling of alpha channel. 2004-05-25 20:40:26 +00:00
Robert Osfield
9990650cc9 Changed screen grab filename back to a saved_image.jpg 2004-05-25 20:39:49 +00:00
Robert Osfield
eb3917060f From George Tarantilis, fixes to DDS size computations.
From Robert Osfield, addition of constructors for internal DDS structures.
2004-05-25 16:10:28 +00:00
Robert Osfield
5312bcc54a Updates the movie support 2004-05-25 14:32:20 +00:00
Robert Osfield
6303b87e9a Added better handling of clamping of projection matrix 2004-05-25 07:40:18 +00:00
Robert Osfield
eac7fdff76 From Alberto Farre, fixes to the computation of sizes 2004-05-24 19:50:13 +00:00
Robert Osfield
ab2b817e61 Made improvements to the handling of small rotations in Quat and
TerrainManipulator
2004-05-20 23:25:26 +00:00
Robert Osfield
f8daf206ab Improved support for new double Vec* classes 2004-05-20 12:57:06 +00:00
Robert Osfield
f02c75f5ea Added Vec2d, Vec3d and Vec4d classes, and remapped Vec2, Vec3 and Vec4 to
Vec2f, Vec3f an Vec4f respectively, with typedef's to the from Vec* to Vec*f.
2004-05-20 10:15:48 +00:00
Robert Osfield
2cd4bd513a Changed how the rotation and panning are managed, therby improving the
handling of the center point going over a pole.
2004-05-17 22:22:24 +00:00
Robert Osfield
a62699b015 Improved the panning support, and added s/getRotationMode(..) to allow
users flip between a trackball rotation style and an azim,elevation style.
2004-05-17 15:50:44 +00:00
Robert Osfield
867a1ae105 From Bob Kuehne, more general checks for existance of extensions. 2004-05-17 13:20:41 +00:00
Robert Osfield
01b504bc2f Improved the pan controls on the terrain manipulator 2004-05-17 12:08:52 +00:00
Robert Osfield
ae5aefac0e Added the beginings of new osgParticle Explosion, Fire and SmokeEffects.
Added support for generation explosion, fire and smoke effects in osgsimulation
2004-05-13 22:09:23 +00:00
Robert Osfield
45998cfdf7 Revert the computeNearFar mode to using bounding volumes as default. 2004-05-13 22:06:20 +00:00
Robert Osfield
642253b731 From Bruce Clay, cross platform implemention of fileType(..) 2004-05-13 13:37:55 +00:00
Robert Osfield
f4a290cdff From Donny Cipperly, completed Windows support for fileType() 2004-05-13 08:11:31 +00:00
Robert Osfield
90579a0e17 Fixes for FreeBSD 2004-05-12 20:31:58 +00:00
Robert Osfield
5eafee1b83 From Frank Lindeman, compile fix for VS to get round limitation is VS when
handling templated methods.
2004-05-12 14:22:01 +00:00
Robert Osfield
82562e5bdd From Eric Sokolowsky, fixed problems in PNG plugin for handling
paletted images which contain alpha values.
2004-05-12 10:45:36 +00:00
Robert Osfield
f66599e00c From Eric Sokolosky, with further additions from Robert, added support
for RGBA TIFF files
2004-05-11 20:44:31 +00:00
Robert Osfield
7742794eec From Bruce Clay, modify template copy method to avoid VS6.0 compile errors. 2004-05-10 20:01:13 +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
4ab330de96 Removed eroneous return statement. 2004-05-10 13:56:05 +00:00
Robert Osfield
6f34ef29f8 From Joran Jessurun, "I needed to be able to set the quality of the saved jpeg images. I could
not find a way to do this in OSG. Therefore I implemented this by adding
an option called: JPEG_QUALITY <quality> to the JPEG reader/writer.

To parse the options string I use the same method as used in the LWO
reader/writer. "
2004-05-09 07:06:32 +00:00
Robert Osfield
35c6632cfd From Mike Weiblen, Fixes for Win32 build 2004-05-09 06:29:54 +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
b6c1c44bd0 From Paul Martz,
"Changes to provide rudimentary support for OF 15.8 light point
animation palettes. This change also includes light point palette override
support for external references. This is the last of my code changes to
support OF 15.8 in the flt loader. Barring bugs, of course, knock on wood.

The gist of the animation palette code is to create ref_ptr'd
osgSim::BlinkSequence objects for each palette entry, and then pass them on
to osgSim::LightPoint for any OpenFlight light points that reference that
palette entry. This should be conservative of memory (not that I expect the
animation palette to be extremely large)."
2004-05-08 21:33:25 +00:00
Robert Osfield
3d3199017e From Ken Sewel, added osgDB::fileType(filename) method and usage of this
new function in osgdem to automatcally handle directories as part of the
regular -d and -t options.
2004-05-08 06:35:32 +00:00
Robert Osfield
3a8e5fc6b4 From Yefei Hi, replaced windows specific function with sprintf to afford
better cross platform portability.
2004-05-07 19:58:56 +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
a196ea1d5d From Yefei Hi,fix to MultiSwitch set up, and adding of parsing of description
fields (which is presently #if 0'd out while a compile problem is resolved.)
2004-05-07 14:51:33 +00:00
Robert Osfield
bc3c6c2edf Fixed tabbing to be all four spaced tabs 2004-05-07 14:44:58 +00:00
Robert Osfield
9978c02b7f From Julian, fix to handling of multi-textures 2004-05-07 14:33:15 +00:00
Robert Osfield
aec98259a8 Added support for osgDB::ReaderWriter::ReadResult::FILE_LOADED_FROM_CACHE 2004-05-07 13:43:41 +00:00
Robert Osfield
1c46e8c4f2 From Bob Kuehne, addition of support for toggling on and off GL_TEXTURE_1D, 3D, CUBE_MAP
and GL_TEXTURE_RECTANGLE (small addition from R.O)
2004-05-07 12:41:49 +00:00
Robert Osfield
0307463746 Added GL_TEXTURE_RECTANGLE define 2004-05-07 12:40:21 +00:00
Robert Osfield
48dad727b1 From Bob Kuehne, added getting of the max number of texture units in
the Texture::Extension object
2004-05-07 11:28:55 +00:00
Robert Osfield
2c352ceb7c Changed debug info level 2004-05-07 11:18:18 +00:00
Robert Osfield
1666037f42 Changed notify level of debuggin message from NOTICE to INFO 2004-05-07 11:10:05 +00:00
Robert Osfield
324437d1e5 From Don Tidrow, changed cerr usage to osg::notify() 2004-05-07 11:09:05 +00:00
Robert Osfield
db78d55ef2 *** empty log message *** 2004-05-06 12:30:53 +00:00
Robert Osfield
47dd0ece28 Added new TerrainManipulator to osgGA, and new callback for getting the
CoordinateFrame for a given X,Y,Z location.
2004-05-06 11:01:16 +00:00
Robert Osfield
1a09763515 Removed Terrain.cpp and header from CVS repository.
Added support for setting the maximum visiable distance of top level
to osgTerrain::DataSet, and debugging code which insert a axes.osg
above each tile.
2004-05-06 10:59:08 +00:00
Robert Osfield
eedfe44a1c Fixed computeLocalTransform to generate correct orientation of local coordinate
frame.
2004-05-06 10:54:58 +00:00
Robert Osfield
fe0fd07f36 Moved isCulled check inside the CullVisitor::apply(Projection&) to just
before traverse rather than at the begining of the method.
2004-05-05 19:56:18 +00:00
Robert Osfield
b88b9b83ea Compile fixes for that pitful excuse for a C++ compiler that is VS6.0 2004-05-05 14:54:16 +00:00
Robert Osfield
8bdb68ef97 Added support for reading environmental varables in CullSettings. 2004-05-05 09:16:12 +00:00