Commit Graph

1979 Commits

Author SHA1 Message Date
Robert Osfield
884e046abb From Geoff Michel, added tesselate pass to Optimizer and added handling of per
primitve color to osgUtil::Tesselator.
2003-12-27 13:46:33 +00:00
Robert Osfield
2cb360dd38 From Rommano Silva, admendments to Texture::computeRequiredTextureDimensions
so that it takes into account the current mip map settings.
2003-12-27 11:30:41 +00:00
Robert Osfield
177eb76244 Fixed osgFX::Scribe so that is handled setting of colour and line width correctly,
by setting up the Materiail and LineWidth attributes within the Scribe constructor.
2003-12-26 16:45:06 +00:00
Robert Osfield
96a8fa1f21 Fixes for VS6.0 2003-12-24 19:28:39 +00:00
Robert Osfield
477739f6fc Fixed typos in error reporting 2003-12-24 00:14:45 +00:00
Robert Osfield
5c199e01c0 Build fixes for VS6.0 2003-12-24 00:14:12 +00:00
Robert Osfield
5cc98a420d Updates from Nick.
Added support for OSG_TXP_DEFAULT_MAX_ANISOTROPY to override the default make
anistropy in textures.
2003-12-23 13:02:13 +00:00
Robert Osfield
2747c0aa41 removed osg:: 2003-12-23 12:10:06 +00:00
Robert Osfield
453902001c Removed osg:: from NodeVisitor and Group base class calls 2003-12-23 09:18:29 +00:00
Robert Osfield
679b2e44b8 Added max texture anisotropy of 4. 2003-12-22 14:48:14 +00:00
Robert Osfield
26ef2ca0d2 Updates from Nick. 2003-12-22 14:05:04 +00:00
Robert Osfield
503568a303 Moved TileMapper code out into its own file and made it a signleton 2003-12-22 07:26:45 +00:00
Robert Osfield
7a5053f81f From Trajce Nikolov, port of TXP plugin across to a pure PagedLOD based
pager, with a little assistance from Robert Osfield.
2003-12-22 06:27:17 +00:00
Robert Osfield
f1d8a584d8 Fixed memory leak and utilised DrawArrayLengths in place of multiple
DrawArray calls.
2003-12-21 23:02:32 +00:00
Robert Osfield
fdd5a72115 Added extra clampProjectionMatrix methods to handle both Matrixd and Matrixf
pathways.
2003-12-21 13:11:36 +00:00
Robert Osfield
315065df24 Fixed PagedLOD's handling of distances beyond the furthest range. 2003-12-20 23:25:05 +00:00
Robert Osfield
a7a96e710c Added support for REVERESED_XY_PLANE, REVERESED_XZ_PLANE and
REVERESED_YZ_PLANE's for the axis alignement to allow the text to be
reversed.
2003-12-20 14:23:04 +00:00
Robert Osfield
30bafd8867 Added Mode parameter to constructor. 2003-12-20 14:19:09 +00:00
Robert Osfield
6553284ed9 Added support for reading and writing UserData from objects. 2003-12-19 23:14:54 +00:00
Robert Osfield
ca86461446 From Corbin Holtz, support for endian testing and bytes swapping. With mods
from Robert to use include/osg/Endian
2003-12-19 22:21:57 +00:00
Robert Osfield
3ee8ed15a6 Added _ARB to GL_COMPARE_R_TO_TEXTURE 2003-12-19 10:52:17 +00:00
Robert Osfield
ca06afbc79 Changed the ArrayData constructor to use copyop for copying arrays, instead
of by default doing cloning.
2003-12-18 12:20:38 +00:00
Robert Osfield
aac16a17e7 Fixed typo in comments. 2003-12-18 09:56:48 +00:00
Robert Osfield
0edb480129 From Bob Kuehne, build fixes for OSX. 2003-12-17 23:19:11 +00:00
Robert Osfield
8fefec9f47 From Pavel Moloshtan, added GL_ARB_shadow_support to osg::Texture. 2003-12-17 19:26:16 +00:00
Robert Osfield
6bdbe942b1 From Marco Jez, fixes to osgFX so that effects are compiled correctly.
Fixed title name of osgkeyboardmouse example.
2003-12-16 23:43:37 +00:00
Robert Osfield
2e9676f2cb Put the ordering of the callbacks so that the update callback is first,
then cull then draw.  Added missing copy of update callback into copy
constructor.
2003-12-16 08:56:49 +00:00
Robert Osfield
1158e4605d Added support for updating the SceneView projection matrix from the values
of near and far computed during the cull traversal.
2003-12-15 23:23:45 +00:00
Robert Osfield
de0253aac7 Changed the default wrap modes from REPEAT to CLAMP since CLAMP is the OpenGL
default value.
2003-12-15 23:22:35 +00:00
Robert Osfield
caaed0d8b8 Added test against MultiSwitch in Optimizer to prevent switch children
being removed.
2003-12-15 08:54:38 +00:00
Robert Osfield
0c22a6550f Fixed paramter name from being fileName to file. 2003-12-13 22:15:47 +00:00
Robert Osfield
3702947ef9 From Jeremy Bell, add -losgText to fix OSX compile. 2003-12-13 22:07:55 +00:00
Robert Osfield
70572a3930 Added TriStripVisitor usage. 2003-12-13 16:41:46 +00:00
Robert Osfield
0cbe10d399 From Michael Gronager, with updates from Robert Osfield, to add support
for Registry::closeAllLibrary and forced Registry destruction via
Registry::instance(true).
2003-12-13 16:36:29 +00:00
Robert Osfield
1025643170 From Eric Sokolosky, fixed broken handling of palatted textures. 2003-12-13 15:33:48 +00:00
Robert Osfield
9f0dc42efe Fixed flatten static transform 2003-12-12 17:23:03 +00:00
Robert Osfield
3fefc3cc7e Removed comments, and move the tri stipper slightly later in the code to
apply it on all geometries.
2003-12-12 16:34:46 +00:00
Robert Osfield
f4b5c075be Updates from Geof Michel. 2003-12-12 15:22:39 +00:00
Robert Osfield
4bf9347fae Made progress reports use osg::notify(osg::INFO) instread of std::cout 2003-12-12 13:53:04 +00:00
Robert Osfield
995af47ab9 Fixed merging of geometry code. 2003-12-12 13:24:23 +00:00
Robert Osfield
7e012ccfc4 Renamed PermissableOptions to setPermissableOptimizations. 2003-12-11 23:33:27 +00:00
Robert Osfield
1881610a35 Added support for controlling what optimization operations can be applied
to specific nodes in the scene graph.  Typical use would be tagging a
node so that it can't be optimized away in say a flatten static transform
pass.  Added methods to Optimizer are:

        inline void setPermissableOptionsForObject(const osg::Object* object, unsigned int options)
        {
            _permissableOptionsMap[object] = options;
        }

        inline unsigned int getPermissableOptionsForObject(const osg::Object* object) const
        {
            PermissableOptionsMap::const_iterator itr = _permissableOptionsMap.find(object);
            if (itr!=_permissableOptionsMap.end()) return itr->second;
            else return 0xffffffff;
        }

        inline bool isOperationPermissableForObject(const osg::Object* object,unsigned int option) const
        {
            return (option & getPermissableOptionsForObject(object))!=0;
        }
2003-12-11 23:26:22 +00:00
Robert Osfield
5295d68fd3 Added _maximumNumberOfActiveOccluders variable to CollectOccludersVisitor(), to
limit the maximum number of occluders used in the cull traversal, default is
now 10.

Added set/getCollectOccluderVisitor() method into SceneView to allow control
of the the settings of the CollectOccluderVisitor.
2003-12-11 16:46:45 +00:00
Robert Osfield
8f41f8a149 Added environmental variable for setting the height of the drive manipulator. 2003-12-10 16:50:26 +00:00
Robert Osfield
5011d994e8 Added a special AvailablerReaderWriterIterator class to handle the task
of iterating through the list of available reader writer, whilst handling
cases where the list itself changes size during iteration through the list.
Previous size changes during iteration was cause invalid iterators, which
in turn was causing a crash.
2003-12-10 15:24:14 +00:00
Robert Osfield
af482998b9 Improved the management of errors reported from ReaderWriters, and cleaned
up the reporting of errors in DynamicLibrary.
2003-12-10 11:40:58 +00:00
Robert Osfield
eb57ab5cda Added support for using DrawArrays when indices are in ascending order, and
increment 1 at a time.
2003-12-10 10:49:16 +00:00
Robert Osfield
a25e14b42f Improvements to the TriStripVisitor such that it now groups 4 point tri strips
together as quads.
2003-12-09 22:29:56 +00:00
Robert Osfield
9780a7cbd6 Removed osg::Transform::ComputeTransformCallback from osg::Transform.
Updated various dependant files to reimplemt callbacks as Transform subclasses.
2003-12-09 14:07:44 +00:00
Robert Osfield
d76cef6f8e Added support for new PagedLOD Radius and NumChildrenThatCannorBeExpired variables
to .osg and .ive support.
2003-12-09 14:06:48 +00:00
Robert Osfield
5ad968b049 Reverted back to non exception based JPEG plugin. 2003-12-09 12:09:36 +00:00
Robert Osfield
1baffa3a77 Addition of the following methods:
/** Set the object-space reference radius of the volume enclosed by the PagedLOD.
          * Used to detmine the bounding sphere of the PagedLOD in the absense of any children.*/
        inline void setRadius(float radius) { _radius = radius; }

        /** Get the object-space radius of the volume enclosed by the PagedLOD.*/
        inline float getRadius() const { return _radius; }


        /** Set the number of children that the PagedLOD must keep around, even if thay are older than their expiry time.*/
        inline void setNumChildrenThatCannotBeExpired(unsigned int num) { _numChildrenThatCannotBeExpired = num; }

        /** Get the number of children that the PagedLOD must keep around, even if thay are older than their expiry time.*/
        unsigned int getNumChildrenThatCannotBeExpired() const { return _numChildrenThatCannotBeExpired; }
2003-12-09 12:08:27 +00:00
Robert Osfield
6d5eb79804 Addition of Mode mode=MODULATE constructor. 2003-12-09 12:05:50 +00:00
Robert Osfield
bbde1b2ae7 Fixes for optional compile of GL_LUMINANCE_ALPHA and GL_ALPHA texture usage
in fonts.  Default to GL_ALPHA.
2003-12-09 12:04:14 +00:00
Robert Osfield
4c3f6004df Moved osgText across to create GL_ALPHA textures instead of GL_LUMINANCE_ALPHA 2003-12-09 11:31:33 +00:00
Robert Osfield
393f1580c8 From Pavel Moloshtan, extension support for ARB_occlusion_querry 2003-12-09 11:20:44 +00:00
Robert Osfield
77fce7f6f6 From Mike Wieblen, tweak to GL2 shader 2003-12-09 11:19:52 +00:00
Robert Osfield
58c872c662 From Tree, tweaks to the coord generation to improve text alignment. 2003-12-09 10:42:30 +00:00
Robert Osfield
1f219f5a7e From Johan Nouvel, support for AnimationPathCallback values in .osg file.
Includes a small modication to ensure that code works shared animation paths, by RO.
2003-12-09 10:38:59 +00:00
Robert Osfield
e6d3af7a46 From Eric Sokolosky, OSX uses DYLD_LIBRARY_PATH for initial library search path
instead of LD_LIBRARY_PATH.
2003-12-09 09:25:53 +00:00
Robert Osfield
b0a4e917c8 Aded FileUtils include. 2003-12-09 09:03:14 +00:00
Robert Osfield
0034d026d2 Added commented out lines for setting orange blue anaglyphic stereo. The
analgyphic block really needs to have the color mask set up optionally, this
is something to configure in the future.
2003-12-08 19:25:08 +00:00
Robert Osfield
83bf813e58 Moved the responsibility for finding file to load on to the ReaderWriter plugins,
instead of osgDB::Registry where it original lay.  This has been done to allow
fileName strings to be encode data rather than just file names, such as one
requires when using PagedLOD along with plugins for doing dynamic tesselation.
2003-12-08 11:24:43 +00:00
Robert Osfield
3e7fadb2ec Added check against null being passed into std::string constructor. 2003-12-07 20:58:46 +00:00
Robert Osfield
3f14b9a653 Added code for combining adjacent static MatrixTransforms 2003-12-05 14:39:32 +00:00
Robert Osfield
8794f1bb76 Fixes for Windows build. 2003-12-05 13:58:27 +00:00
Robert Osfield
73c5896432 Removed DOFTransform. 2003-12-05 13:26:47 +00:00
Robert Osfield
4b63fde145 Added a cast (Array*) to get round VS.NET compiler error. 2003-12-05 09:22:03 +00:00
Robert Osfield
9c2f01fd61 Added support for expanding index'd attributes from within
osgUtil:TriStripVisitor.
2003-12-04 17:14:06 +00:00
Robert Osfield
f9fcffd9cd Added optional TraversalMask paramter to computeIntersections() methods. 2003-12-04 09:43:34 +00:00
Robert Osfield
db66abd6d6 Implemented duplicate removal code into TriStripVisitor and added an
extra pass to doing tri stripping in the osgUtil::Optimzer.

Added validity checks into osg::TexEnvCombine to catch eronous enumarant values.

Improved the efficient of CullingSet's handling of new transforms.

Added a copy shared subgraphs and subdivision code into osgUtil::Optimizer.
2003-12-03 21:45:32 +00:00
Robert Osfield
eed6b77ca4 Suggestion from Tree, changed tex coord scaling against textureWidth/Height rather
than textureWidth-1 etc.
2003-12-02 21:38:52 +00:00
Robert Osfield
a66d6becfa From Rune, Added catch for erroneous size specification in .dds file. 2003-12-02 21:38:01 +00:00
Robert Osfield
bd4a1cd601 From Pavel Moloshton, addition of AlphaFunc support to .ive. 2003-12-01 14:31:56 +00:00
Robert Osfield
3c9d1e0603 Added a spatializer into osgUtil to create a balanced quad/oct tree. 2003-12-01 10:28:23 +00:00
Robert Osfield
532d9a38bf From Ruben,
>Fixed: The iv loader that uses Inventor library has a little bug, if used with
>osgconv, it doesn't write the images to the converted file because it's
>not setting the osg::Image->setFilename()
2003-11-28 22:39:15 +00:00
Robert Osfield
848e21fb98 From Geoff Michel, updates to GEO plugin. 2003-11-28 14:37:46 +00:00
Robert Osfield
4f71f1becd From Qing Shen, addition of computeIntsect methods which take a
node pointer to intersect with rather than assume the viewer's scene pointer.
2003-11-28 13:41:10 +00:00
Robert Osfield
fd2a735be8 From Rune Schmidt Jensen, support for osgSim::VisibilityGroup in the .ive loader
and support for node masks.
2003-11-27 22:53:40 +00:00
Robert Osfield
2353d55697 From Michael Gronager, osgSim::VisibilityGroup 2003-11-27 16:23:07 +00:00
Robert Osfield
dd44734635 From Nikolaus Hanekamp, Fixes to lightpoint code 2003-11-27 13:31:16 +00:00
Robert Osfield
d41a3de37c From Trajce Nikolov:
> There are databases that contain both Matrix and GeneralMatrix records as
> ancillary records. If this happens, this fix will only use one matrix to
> create osg::TransformMatrix node.
2003-11-27 13:25:52 +00:00
Robert Osfield
d950ee8410 Addition of light point. 2003-11-26 16:56:32 +00:00
Robert Osfield
83320374ab Added missing DOFTransform and MultiSwitch implementations 2003-11-26 08:37:03 +00:00
Robert Osfield
023d2254ab Early development work on osgTerrain. 2003-11-25 19:42:35 +00:00
Robert Osfield
fea4688589 Added missing DOFTransform.cpp 2003-11-25 19:06:31 +00:00
Robert Osfield
d20f93d78a Added suport for osgSim::MultiSwitch to .ive plugin 2003-11-25 16:28:32 +00:00
Robert Osfield
953bbd85e8 Tweaked MultiSwitch IO 2003-11-25 16:07:32 +00:00
Robert Osfield
72ba462251 Added osgSim::MultiSwitch and support for it in the OpenFlight and
.osg plugins
2003-11-25 15:58:57 +00:00
Robert Osfield
280eaf56fd Added support for TexMat to .ive plugin 2003-11-25 14:38:16 +00:00
Robert Osfield
31c5528ffb Moved osg::DOFTransform to osgSim::DOFTransform.
Fixed crash associated with .osg files which contain empty description fields.

From Sondra Inverson, added support to .ive plugin for osgSim::DOFTransform.
2003-11-25 14:11:05 +00:00
Robert Osfield
92fc29a22c Fixed type of unrecognized 2003-11-25 11:06:39 +00:00
Robert Osfield
91ccb013a4 Tweaks for debugging output 2003-11-25 10:57:50 +00:00
Robert Osfield
d82b3d0105 Added read(string,float,float,float,float) method 2003-11-25 10:56:12 +00:00
Robert Osfield
787b64999c From Eric Hammil, support for compute the dimensions when the file specified
size is zero.
2003-11-25 10:53:57 +00:00
Robert Osfield
33fabed8c8 Changed error message to something more meaningful 2003-11-25 10:52:13 +00:00
Robert Osfield
7147f52f6d Increased the prevision of outputing the height field parameters 2003-11-25 10:50:57 +00:00
Robert Osfield
781aa4fe45 Added support for case insenstive file searches. 2003-11-25 10:49:38 +00:00
Robert Osfield
357078f207 From Trajce Nicklov, support for GeneralMatrix record 2003-11-25 10:47:13 +00:00
Robert Osfield
689e11693a From Alberto Farre, added support for nesting of files. 2003-11-25 10:32:23 +00:00
Robert Osfield
bd686c4598 From Michael Morrison, added support for the OpenFlight BSPRecord, simply
mapping it to a Group.
2003-11-25 10:20:21 +00:00
Robert Osfield
78a0fd5a16 Added support for case insenstive searches of the filepaths. 2003-11-25 09:04:41 +00:00
Robert Osfield
e9df154427 From John Tan, support for offset and scale tex coords via TexMat. 2003-11-21 19:33:09 +00:00
Robert Osfield
454b474f37 From Stephan Huber, clean up of QTexture.cpp's scaling code and additions
of handling of different extensions in ReaderWriterQT.cpp
2003-11-21 16:30:59 +00:00
Robert Osfield
0283495c11 From Stephan Huber, with mods by Robert to keep old code in place, change to replace
scaling of texture since the OSG does this automatically when required.
2003-11-21 14:30:01 +00:00
Robert Osfield
f28783e22b From Romano J M Silva, changed osg::Texture2D::copyTexImage2D so that it uses the
_internalFormat for the texture format to read rather than default to GL_RGBA.

From Robert Osfield, changed the osg::Texture2D::copyTexImage2D and copyTexSubImage
code so that it set the _internalFormat to GL_RGBA if is is zero.
2003-11-21 13:45:40 +00:00
Robert Osfield
62c955fa19 Added the missing insertChild(index,child) and insertChild(index,child,value) into
osg::Switch.
2003-11-20 12:03:51 +00:00
Robert Osfield
7136a00b9a Changed the freetype plugin so it keeps its own ref_ptr<Font> to fonts
that it creates, rather than have osgText::Font::readFontFile() use the
osgDB::Registry object cache.

This has been done to prevent problems when users flush the object cache,
which was causing a dangling pointer.
2003-11-20 11:07:19 +00:00
Robert Osfield
91da08b525 From Ruben, added support for nested update and cull callbacks. 2003-11-14 13:39:34 +00:00
Robert Osfield
8af38347d1 From Tom Jolly, Fix to handling of triangle fans. 2003-11-13 15:45:31 +00:00
Robert Osfield
3f33163c47 Fixed setting of OSG_SPLIT_STEREO_AUTO_ADJUST_ASPECT_RATIO value. 2003-11-12 15:03:05 +00:00
Robert Osfield
5fb06a1d77 Moved the getTime to inside the locked part of the add events. 2003-11-12 10:13:31 +00:00
Robert Osfield
02274f0ea9 From Tom Jolly, fixed incorrect setTexCoordIndices to setColorIndices.
Added support for triangle fan primitives.
2003-11-11 16:30:35 +00:00
Robert Osfield
21881490cd From Dean Iversion, fix to the ReaderWriter::Options management in Pool.cpp 2003-11-11 08:52:41 +00:00
Robert Osfield
8bbbd1fc70 Made getWidth and getHeight const. 2003-11-07 09:00:22 +00:00
Robert Osfield
d3251dc9d8 From Sondra Iverson:
small optimization to ParticleSystem.cpp moving sqrtf out of inner loop.
     fix of copy and past error changing erronous cullTimes to drawTimes.
2003-11-06 22:06:44 +00:00
Robert Osfield
9184e9190e From David Ergo, patch for setting the shininess strength of the specular material, 2003-11-06 13:44:59 +00:00
Don BURNS
b7eeeea8d1 Fixed loading of dynamic libraries with dlopen if the library is
in the current directory
2003-11-06 04:08:53 +00:00
Don BURNS
4e8992d8c1 MIssing check for ptr == NULL at line 227 in Registry.cpp 2003-11-05 04:58:18 +00:00
Don BURNS
d56ef40d7d Small bug in DynamicLibrary.cpp ptr was not being checked for NULL 2003-11-05 04:56:08 +00:00
Robert Osfield
54a8ea33ce Added support to slideshow3D for -s commandline option allow the size of
the display to be specified.

Also implementaited some code for display position and speed info in
osgProducer::Viewer, not fully implemented yet.
2003-11-04 16:38:10 +00:00
Robert Osfield
bc7622149d Updated to slideshow3D to support animation + pausing of animation.
Updated associated osg/osgUtil classes that provide animation pausing.
2003-11-03 23:13:31 +00:00
Robert Osfield
de77cede2b Merged fixes from Geof Michel. 2003-11-02 20:10:04 +00:00
Robert Osfield
980cfc78f9 Renamed _mips to _mipMapKernel 2003-10-31 10:11:38 +00:00
Robert Osfield
fd016af34b Added support for 565 textures to osgbluemarble.
Added a osg::Image::scaleImage() version which allows the datatype to be varied.
2003-10-29 23:10:11 +00:00
Robert Osfield
27dbfa9810 Added copying of reference to the main CullVisitor's DatabaseRequestHandler over
to the left/right eye CullVisitor to ensure that the database works in stereo.
2003-10-29 19:22:19 +00:00
Robert Osfield
47ec8be272 Commented out verbose debugging messages. 2003-10-29 16:45:17 +00:00
Robert Osfield
f1c4dc3b0d Updates for osgdem. Including new read/writeHeightField() methods. 2003-10-29 11:11:17 +00:00
Robert Osfield
b9775a1a3e Fixed PNG plugin so it handles endianess correctly, and alpha/grey scale textures. 2003-10-29 10:41:36 +00:00
Robert Osfield
eb4ee3afad *** empty log message *** 2003-10-27 16:07:21 +00:00
Robert Osfield
bce184e87c Added a check into osg::Sequence::traverse() against an empty sequence, so
that a non existant child is not traversed.
2003-10-27 10:29:52 +00:00
Robert Osfield
d55d8f941d Fixed error when handling mulltiple non per vertex vertex attributes during
rendering.
2003-10-22 13:39:16 +00:00
Robert Osfield
fa8a06990d From Trajce Nikolov, support for use of PagedLOD in the txp plugin. 2003-10-19 11:46:34 +00:00
Robert Osfield
c199e74bfc Added support for generating compressed textures in osgbluemarble. 2003-10-17 15:26:30 +00:00
Robert Osfield
2db71d01cc Michael Gronager's changes for supporting the in memory gz archiving. 2003-10-17 15:26:03 +00:00
Robert Osfield
247efc1635 From Marco Jez, Fix to the bumping mapping effect. 2003-10-17 14:40:05 +00:00
Robert Osfield
c11762aeb3 Changed the warnings about unhandled op codes to NOTICE instead or WARN 2003-10-17 10:28:55 +00:00
Robert Osfield
8f68ca9cf1 Set default values for datatype & pixelformat. 2003-10-17 10:27:18 +00:00
Robert Osfield
594f25b5d1 Added SceneView::s/getDrawBufferValue(GLenum) to allow customization of what
glDrawBuffer() value is set on each frame.
2003-10-17 10:25:59 +00:00
Robert Osfield
8b0a5035b2 From Eric Hammil, fix for bmp image size. 2003-10-17 10:24:22 +00:00
Robert Osfield
98ed1a8d7d From Michael Gronenger, updates to JP2 plugin. 2003-10-17 10:23:24 +00:00
Robert Osfield
4e7867ba8c From Geoff Michel & Roger James,revised AC3D loader - accepted the improvement from Roger James for texture mapping, and developed his writer until it actually writes most geometries (no text or osgFX nodes of course). 2003-10-12 15:20:09 +00:00
Robert Osfield
ea04f48251 Moved Producer::Block temporarily into osgDB to ensure that osgDB isn't dependent
on Producer.
2003-10-12 14:51:54 +00:00
Robert Osfield
42eb39ef37 Improvements to the DatabasePager 2003-10-12 12:13:58 +00:00
Robert Osfield
fad832425f Improvements to DatabasePager 2003-10-10 19:25:14 +00:00
Robert Osfield
b9423da386 Added ClusterCullingCallback to ive. 2003-10-10 12:56:35 +00:00
Robert Osfield
5d35daa970 Udates to Drawable + IVE plugin with support for new ClusterCullingCallack.
Improvement to osgbluemarble.
2003-10-10 12:54:21 +00:00
Robert Osfield
83b04bd04b Fix for 64bit build. 2003-10-10 11:12:37 +00:00
Robert Osfield
aee27a18eb Fix for 64bit build. 2003-10-09 20:56:15 +00:00
Robert Osfield
6a3f7dfc45 Added DrawElementsUByte to ive plugin. 2003-10-09 14:55:56 +00:00
Robert Osfield
754af22eac Converted the animation path file reading code to use std::ifstream rather
than C style file so that it can handle configurable types better - fixing
a bug associated with reading animation paths with the new osg::Quat defaulting
to doubles.
2003-10-09 10:44:15 +00:00
Robert Osfield
3b65b028b2 Added protection to the DatabasePager::requestNodeFile()'s call to startThread
to ensure that only one startThread is every issued.
2003-10-09 09:48:36 +00:00
Robert Osfield
1a6dc82d32 Made the Drawable::*Callback derive from osg::Object so that they can be
saved to .osg properly.

Added osg::ClusterCullingCallback to Drawable header/source.  Not complete yet,
but will enable drawables to culled is they are facing away from the eye point.
2003-10-08 21:29:45 +00:00
Robert Osfield
83816dac04 Added ImageOptions for use with the GDAL plugin 2003-10-08 14:24:13 +00:00
Robert Osfield
e7c0d70747 Added new GDAL plugin and osgbluemarble example to demonstrate how to create
PagedLOD'd databases using GDAL.
2003-10-08 13:09:23 +00:00
Robert Osfield
48fc18fe8b From Rune Schmidt Jensen, bug fix to reading of osg::Quat's 2003-10-07 18:41:38 +00:00
Robert Osfield
d3ae2ed90a Added -losgGL2 2003-10-06 08:53:56 +00:00
Robert Osfield
b0b73f4ad9 Changed the texture search path mechanism to better utlise the OSG's search file
path mechansim.
2003-10-05 16:16:39 +00:00
Robert Osfield
5c17b5059a From Mike Weiblen, added support for OpenGL SL to osgFX::Cartoon. 2003-10-05 11:42:26 +00:00
Robert Osfield
ce15c880b1 From Mike Weiblen, updates to osgGL2 to support Uniform values 2003-10-05 11:30:54 +00:00
Robert Osfield
9d6bf8d1b6 From Jason Ballenger, fix for ArgumentParser::getApplicationName() 2003-10-03 16:29:34 +00:00
Robert Osfield
5227bc60df Updated docs for 0.9.6-2 release 2003-10-02 14:28:30 +00:00
Robert Osfield
dec5bb1f2a Updated NEWS
Added support for inline/nonlining of texture cube maps.
2003-10-02 14:11:57 +00:00
Robert Osfield
82143f7553 Added osgDB::Registry::s/getUseObjectCacheHint() 2003-10-02 13:26:01 +00:00
Robert Osfield
6deedbf08c Added a check against opaque textures, when detected turn the material white
as per specs for 3ds.
2003-10-01 21:59:55 +00:00
Robert Osfield
4700b8902c Introduced new DisplaySettings::set/getDisplayType() and environemtal variables
to and command line arguments to set it.

Added support for using the DisplaySettings::getDisplayType() to detect use
of a Head Mounted Display when doing stereo so that the asymtric frustum can
be switched off.
2003-10-01 15:56:52 +00:00
Robert Osfield
facbdcf43b Added addEntryToObjectCache method to osgDB::Registry 2003-10-01 13:12:25 +00:00
Robert Osfield
c00a88f4a4 From Tree, added missing setTextureData method. 2003-10-01 09:18:24 +00:00
Robert Osfield
ddde1c4e46 Removed debugging comments. 2003-09-30 21:30:39 +00:00
Robert Osfield
2509c3339d Changed std::vector<>::at to []. 2003-09-30 19:09:31 +00:00
Robert Osfield
8f4c4dbae8 Fixed DriveManipulator::init(,) method so that used a Matrix::set(Quat) rather
than the inappropriate usage Matrix::get(Quat).
2003-09-29 14:42:15 +00:00
Robert Osfield
b57404d17e Fixed the Geometry::verifyBindings && computeCorrectBindingsAndArraySizes so they
correctly check the indices and array elements.
2003-09-29 14:07:46 +00:00
Robert Osfield
e693f148cb Made osg::Quat support either float or double internal representation, defaulting to double.
Generalised the osgDB::Field so that its getFloat() method can be used with either doubles or
floats governed by the type passed in - this helps support either float/double
Quat and Matrix classes seemlessly.
2003-09-29 13:35:02 +00:00
Robert Osfield
7d69f8e193 Added getPerspective() method to Matrix* and SceneView 2003-09-29 13:14:34 +00:00
Robert Osfield
da8ef894c1 Added equals operator to CUllingSet.
Update AUTHORS file.

Change tabs to 4 spaces in ive/TextureCubeMap.cpp
2003-09-28 10:15:10 +00:00
Robert Osfield
00d8ce7a48 Changed std::vector<>::at(i) array access usage to straight [i] to keep things compiling on gcc 2.x serious 2003-09-26 20:14:30 +00:00
Robert Osfield
65c33b0574 From Michael Gronager, jp2 plugin for reading and writing JPEG2000 files. 2003-09-26 16:02:53 +00:00
Robert Osfield
f8df9991b2 Improves to CullStack.
From M.Grngr. options support for f=switching off internal imagery in .ive files
2003-09-26 11:20:43 +00:00
Robert Osfield
7fb9f6be4b Added the beginnings of a new osgforest example.
Added support into osg::TriangleFunctor for specifying whether the vertices
being generates are temporary or not.
2003-09-25 21:54:33 +00:00
Robert Osfield
2812c50329 Improved the Geometry::verifyBinding() and computeCorrectBindingsAndArraySizes()
methods to check all atributes and to report warnigns when errors are detected.

Added a CheckGeomtryVisitor to osgUtil::Optimizer to detect eroneous Geometry
before rendering.
2003-09-24 15:54:22 +00:00
Robert Osfield
49cc9b85d5 From Tom Jolly, added support for TexEnv to pfb plugin. 2003-09-23 14:42:56 +00:00
Robert Osfield
c2b02608d1 Renamed instance of variables called format to pixelFormat to make a
clearer distinction between pixelFormat and internalTextureFormat.
2003-09-22 09:13:22 +00:00
Robert Osfield
d45fcb5613 From Alberto Farre, added support for GL_EXT_blend_color, GL_ARB_multisample,
GL_NV_multisample_filter_hint extension in the form of osg::BlendColor and
osg::Multisample state attribute classes.
2003-09-17 12:04:48 +00:00
Robert Osfield
c91a2d3d3e Updated version numbers and ChangeLog for the release. 2003-09-16 21:25:25 +00:00
Robert Osfield
c342b29a04 Warning fixes for Win32. 2003-09-16 19:56:19 +00:00
Robert Osfield
96388cee67 Added a check for the maximum index values of primitives, and then use this
to select whether to use UByte,UShort or UInt versions of osg::DrawElements.
2003-09-16 19:56:00 +00:00
Robert Osfield
cec0b35cd4 Fixes for .osg output of UByte4 values, and added missing template contructor
to DrawElementsUShort.
2003-09-16 19:54:57 +00:00
Robert Osfield
e7b1edef56 Improved the tesselation of obj surfaces so that rendering performance
is significantly improved.
2003-09-16 19:53:51 +00:00
Robert Osfield
00eff9c860 Warning fixes for VS .NET. 2003-09-16 11:22:48 +00:00
Robert Osfield
6019d54dc2 Added support for per vertex colors. 2003-09-16 09:54:41 +00:00
Robert Osfield
1a65db63fe Added inlucde<osgSim/LightPointNode> to trPageArchive to get round IRIX build
problem.
2003-09-16 08:10:11 +00:00
Robert Osfield
151bd467ca Changed a couple of int64's back to int32. 2003-09-15 22:13:26 +00:00
Robert Osfield
a2f9222753 Added support for handling of wordwrap in osgText::Text, so that whole words
are cut in two, but rather moved completely to the next line.
2003-09-15 21:43:54 +00:00
Robert Osfield
79b87c933e From Julian Ortiz, fix to OpenFlight loader so that it handlers OpenFlight
switches in a more appropriate way.
2003-09-15 15:03:30 +00:00
Robert Osfield
516db08681 Fixes for warnings under VS.NET from Marco Jez. 2003-09-15 10:12:04 +00:00
Robert Osfield
34008a05f4 Fixed warnings in geo plugin. 2003-09-15 08:32:36 +00:00
Robert Osfield
e6cd07f857 From Geoff Michel, updated geo plugin to support latest rev of Geo Modeller's file format. 2003-09-14 22:49:47 +00:00
Robert Osfield
81fbb26d62 Forom yne Schmidt Jansen, added support for osgSim into ive plugin. 2003-09-14 22:48:35 +00:00
Robert Osfield
4c168fc193 Fixed the OBJ loader so that it shares all duplicate state, improving the
load time and rendering performance significantly.
2003-09-13 15:59:38 +00:00
Robert Osfield
df8b9ab26b Changed std::size_t to unsigned int to attempt to fix IRIX build problem. 2003-09-12 21:15:13 +00:00
Robert Osfield
fe06711c9f Work around for OSX errors when reading .ive files. 2003-09-12 19:17:46 +00:00
Robert Osfield
688d52017c Added verbode debugging option to dataoutputstream and datainputstream to
help invstigation into crash under OSX when reading .ive files.
2003-09-12 15:29:02 +00:00
Robert Osfield
7364e23d12 Commented out various osg::notify() calls that were causing crashes under
OSX during initialization.
2003-09-12 13:20:04 +00:00
Robert Osfield
8e15f5fa9d Added #ifdef IVE_CATCH_EXCEPTIONS to allow catching of exceptions to be
turned off for debugging purposes.
2003-09-12 13:02:03 +00:00
Robert Osfield
1e3b346a52 From Sebastien Kuntz, added support for external refernces to vertex/fragment
program files.
2003-09-12 08:45:12 +00:00
Robert Osfield
d8caec91a4 Clean ups for the release. 2003-09-11 09:44:22 +00:00
Robert Osfield
41a07127fe Added applyProjectionMatrix(0); & applyModelViewMatrix(0); into
osg::State::popAllStateSets(), removed some debugging output.
2003-09-10 23:18:52 +00:00
Robert Osfield
69c4e87bb7 Added osg::State::popAllStateSets() method to pop all remain StateSet's off
the state stack, thus readying the state object to recieve a new frame.

Removed the state.reset() call in osgUtil::SceneView::cull() as this was
causing problems with stats producing inheritance of state when toggling
stats on.
2003-09-10 21:22:47 +00:00
Robert Osfield
1707276707 Fixed state inheritance from the stats overlay onto the rest of the scene. 2003-09-10 20:43:27 +00:00
Robert Osfield
f5b4f7ace0 Changed OsgCameraGroup so that it shares osg::State between Producer::Camera's which
share the same Producer::RenderSurface.

Added support for more colors in slideshow3D's constructor code.
2003-09-10 19:25:36 +00:00
Robert Osfield
5ca7659cda Fix warning under Win32. 2003-09-10 14:43:48 +00:00
Robert Osfield
6c22afa51c Fixes for osgFX. 2003-09-10 12:38:28 +00:00
Robert Osfield
a01903ac41 Added -losgText into txp plugin's GNUmakefile for OSX build. 2003-09-10 12:26:54 +00:00
Robert Osfield
514cbbf6f4 Added -losgText for OSX build. 2003-09-10 12:04:17 +00:00
Robert Osfield
252da5e5f9 From Marco Jez, moved color matrix IO code across to using Marix.h so it
handles float's double's properly.
2003-09-10 11:21:56 +00:00
Robert Osfield
2586bd5d1c Added osgText and osgDB to the list of dependencies for OSX build. 2003-09-10 11:18:27 +00:00
Robert Osfield
b165fc9b4d Cleaned up handling of vertex arrays in osg::Geometry.
Added support for vertex attribute arrays in .osg and .ive.
2003-09-09 22:18:35 +00:00
Robert Osfield
584f805327 Updates to osgFX, from Marco Jez, to map Effect across to being derived
from osg::Group rather than from osg::Node.
2003-09-09 11:54:05 +00:00
Robert Osfield
5c3c0ed17c Made writeMatrix/readMatrix use doubles exclusively. 2003-09-09 10:09:20 +00:00
Robert Osfield
131ebabaf5 Added call to handle_cull_callbacks_and_traverse(node) to
CullVisitor::apply(Geode&) to enable cull callbacks to function on geode's.
2003-09-08 08:44:05 +00:00
Robert Osfield
cf1fe8edc2 From Boris Bralo, addition of support for osgSim::LightPoint's into TXP
plugin.
2003-09-07 14:18:22 +00:00
Robert Osfield
507c9c4cf2 Fixes from Marco. 2003-09-06 11:07:05 +00:00
Robert Osfield
792bba05b9 Added new Matrixf and Matrixd implementations.
Made Matrix be a typedef to either Matrixf or Matrixd.  Defaults to Matrixf.

Converted the osgGA::MatrixManipulators and osgProducer::Viewer/OsgCameraGroup
across to using exclusively Matrixd for internal computations and passing betwen
Manipulators, Producer and SceneView. Note, SceneView still uses Matrix internally
so will depend on what is set as the default in include/osg/Matrix.

Added the ability to osgProducer::setDone/getDone(), kept done() as the
method that the viewer main loop uses for detecting the exit condition.
2003-09-05 22:35:34 +00:00
Robert Osfield
a2834d74d2 Added set and get methods for Matrixd and Matrixf. 2003-09-05 20:52:36 +00:00
Robert Osfield
5b93250eb0 Added support for Matrixd and Matrixf implementations, with the default
Matrix typedef's to either Matrixd or Matrixf.
2003-09-05 20:48:42 +00:00
Robert Osfield
604e478f52 Moved testCancel() to end of loop as per TXP pager code. 2003-09-04 19:45:55 +00:00
Robert Osfield
11d1faeeb1 Added testCancel() to DatabasePager::run() loop. 2003-09-04 19:37:49 +00:00
Robert Osfield
f8107a39b9 Build Fixes for IRIX. 2003-09-04 08:50:06 +00:00
Robert Osfield
06046639b5 Fix for IRIX build. 2003-09-03 18:17:07 +00:00
Robert Osfield
bd44cfcfd8 Added a Matrix::value_type typedef'd trait into osg::Matrix, defaulting its
value to float, and converted the internal code across to use value_type.  This
allows Matrix to be converted to use double's simply by change the definition
of value_type.  Added Matrix::glLoadlMatrix and Matrix::glMultMatrix() to
help encapsulate the changes between float and double matrix usage.

Updated code that uses Matrix so it doesn't assume float or double matrices.
2003-09-03 10:47:25 +00:00
Robert Osfield
9a5ab0ac47 Fixes for IRIX build. 2003-09-03 08:14:00 +00:00
Robert Osfield
39b9a5e550 Removed old DatabasePager.cpp from osgProducer. 2003-09-03 07:39:42 +00:00
Robert Osfield
218c6e8d13 Added Inventor plugin, submitted by Sean Spicer, Written by Vivek (c) Magic-Earth.
To compile in do a setenv/export USE_COIN or USE_INVENTOR.
2003-09-02 21:53:41 +00:00
Robert Osfield
4761442005 Merged changed to osgParticle from Marco Jez, the changes are (quoted from
email from Marco)

"Most relevant news:
1) particle systems now have the "freezeOnCull" property set to false by
default. Since it is an optimization, and using it may cause some unwanted
behaviors if not handled properly, it makes more sense to turn it off by
default.
2) new "LINE" shape mode which uses GL_LINES to draw line segments that
point to the direction of motion.
3) particles can now have a rotation angle and angular velocity.
4) new AngularAccelOperator applies angular acceleration to particles.
5) particle processors such as emitters and programs can have a "start",
"end" and "reset" time coordinate. For example, an emitter may be instructed
to start emitting particles only after a certain time, stop after another
amount of time and then start again.

Update (2) is from Gideon May.
Updates (3) to (5) are from Douglas A. Pouk."
2003-09-02 20:39:41 +00:00
Robert Osfield
763ee70f2f Commented out calc near/far debugging messages. 2003-09-02 20:06:20 +00:00
Robert Osfield
e530912744 Made Matrix a typedef to Matrixf, and converted the old Matrix to Matrixf, as
part of prep for supporting both Matrixf (float) and Matrixd (double).

Added osg::Matrixf::glLoadMatrix() and osg::Matrixf::glMultiMatrix() methods
and changed corresponding usage of glLoad/MultMatrixf() calls across to use these
methods. Again prep for support Matrixd.

Fixes for VisualStudio 6.0 compile.
2003-09-02 17:19:18 +00:00
Robert Osfield
f90e4ff5f8 Converted eroneous writeLong/readInt boolean entries used writeBool/readBool. 2003-09-02 17:16:17 +00:00
Robert Osfield
da6f7ebeef Fixes for IRIX build + to_unix on txp plugin files. 2003-09-02 10:27:57 +00:00
Robert Osfield
7575f45800 Support for BumpMapping added by Marco Jez. 2003-09-01 21:53:53 +00:00
Robert Osfield
bc14e4ecdc Updates from Marco:sgfxbrowser.cpp (added specular
component to scene light) and AnisotropicLighting.cpp (workaround for a
multiple-context issue).
2003-09-01 19:43:58 +00:00
Robert Osfield
73094265c3 Fixes for Win32. 2003-09-01 15:46:10 +00:00
Robert Osfield
0ebf005ac1 Added a call to disable all vertex attrib arrays when none are present
on an osg::Geometry.
2003-09-01 11:23:29 +00:00
Robert Osfield
144ac14b07 From Neil Salter, added osgSim::SphereSegment and osgSim::ScalarBar, and
osgspheresegment and osgscalarbar, and osgsimulation examples.
2003-09-01 09:36:03 +00:00
Robert Osfield
5400f8293b Converted cout's to notify's. 2003-08-31 22:17:53 +00:00
Robert Osfield
6bb951a5bb From Alberto Farre, fixes to the file path handling of internally referenced
files.
2003-08-31 22:17:15 +00:00
Robert Osfield
4c62cfe6e5 Added experiment Tempated fast path implemenation, #if 0 out right now. 2003-08-31 22:08:22 +00:00
Robert Osfield
1896b8417e Converted cout's messages to use notify. 2003-08-31 21:13:50 +00:00
Robert Osfield
0fbccf778c From Alberto Farre, added support for both / and \ slashes in path utility
functions.
2003-08-29 22:05:06 +00:00
Robert Osfield
0b75a59cfe Added an explicit check for file extension so that only .jpg and .jpeg files
are loaded with the JPEG plugin, thus avoid a crash which was occuring when
it was passed non JPEG files.
2003-08-29 22:04:35 +00:00
Robert Osfield
d559ff91c3 Added getBound() to the database pager so that once a model has been loaded
it bounding volume is computed upfront and in the database paging thread.
2003-08-28 21:40:23 +00:00