Commit Graph

1979 Commits

Author SHA1 Message Date
Robert Osfield
b050a9877b Added support for osg::LineWidth into ive format 2004-02-18 21:40:18 +00:00
Robert Osfield
dea22aeb8e Added support for a OSG_DISABLE_FAST_PATH_IN_DISPLAY_LISTS environmental
variable in the computeFastPathsUsed() method so that use of vertex arrays
can be forced off.  This is a work around for a bug in the OpenGL drivers in
OSX/Panther.
2004-02-17 09:46:16 +00:00
Robert Osfield
214f1458d9 Removed redundent byte swap on _version 2004-02-16 15:27:45 +00:00
Don BURNS
fc3d4aa5f0 Submission by Paul Martz for doing units conversions on flight files. 2004-02-12 18:40:15 +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
2f63f0fa21 Added support for draw back then front faces of the osg::Sphere shape 2004-02-11 12:06:37 +00:00
Robert Osfield
61cb27806f From Brad Christiansen, fix to enable AutoTransform to keep track of window
size/perspective changes
2004-02-11 10:19:52 +00:00
Robert Osfield
c13ece9672 Added defined(__x86_64__) to force X86-64 build to use standard clock 2004-02-11 10:18:34 +00:00
Robert Osfield
05c2e8bd19 From David Fries, added _frameTime copying into copy constructor of osg::Sequence 2004-02-10 10:07:32 +00:00
Robert Osfield
2af70e3c4c From Ronny Krueger:
In RenderStage.cpp removed erroneous else statement.

    In ShapeDrawable.cpp's PrimitiveShapeVisitor::apply(const Box& box) fixed
    order of the last face.
2004-02-09 22:56:39 +00:00
Robert Osfield
33201a8f25 Added new TriangleIndexFunctor. 2004-02-09 10:14:06 +00:00
Robert Osfield
bf6f27f6d3 Changed fonts to lower case. 2004-02-05 11:53:09 +00:00
Robert Osfield
37ec69a397 From Nick, Improved support for 3D labels. 2004-02-05 11:39:12 +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
e4dac2e6f6 Fixed warning in Tesselation w.r.t unhandled cases in switch statement 2004-02-05 10:15:38 +00:00
Robert Osfield
77840e62e7 Added virtual destructor to LightPointDrawable 2004-02-04 11:03:52 +00:00
Robert Osfield
8cf1cc0dad From Brad Christaiansen, added check for projection matrix changing in
screen coord character size mode.
2004-02-04 09:30:06 +00:00
Robert Osfield
996d292979 Changes to help differentiate between OSX using Quicktime vs not using
quicktime, from Eric Sokolosky and Robert Osfield.
2004-02-03 22:46:10 +00:00
Robert Osfield
519496754c Added dynamic_cast<DisplayListiVisitor> into SceneView::init() method to
properly check for class type before doing setState().
2004-02-03 19:07:32 +00:00
Robert Osfield
e266385769 Moved the InitVisitor::setState() into the SceneView::init() method to make
sure that it always has the correct State object at the of the init.
2004-02-02 16:55:29 +00:00
Robert Osfield
4723b8a059 Commented out the PagedLOD priority offset to leave it at its default
values, so not to force the loading of distance children before near ones,
letting PagedLOD set priorities simply on the depth into a child range.
2004-02-01 17:21:12 +00:00
Robert Osfield
b79c340922 From Nick, "I have modified the gdal code to read ecw images as well
There is a small issue though ... GDALRasterBand::GetColorInterpretation()
is not implemented for ecw images (in GDAL's sources I downloaded today)
... I put small hack in there to interpret the bands based on their index
and it seams to work .."
2004-02-01 17:18:36 +00:00
Robert Osfield
675d38d6f3 Increased expiry delay from 1 second to 30 seconds 2004-02-01 17:17:16 +00:00
Robert Osfield
24b710986f Fixed the PagedLOD::removeExpiredChildren() so it only removes the high
res child that has expired and no more.
2004-02-01 16:13:07 +00:00
Robert Osfield
9f81630453 Fixed GL_COMPRESSED_RGB_S3TC_DXT1_EXT pathway so both pixel and internal
formats are the same.
2004-02-01 15:40:33 +00:00
Robert Osfield
4714f93054 Fixed second pathway for computing HeightField bounding box. 2004-01-31 21:27:02 +00:00
Robert Osfield
1ec93f9cce Fixed HeightField compute bounding box implementation. 2004-01-31 20:45:40 +00:00
Robert Osfield
d83fa3fca5 Added AnimationPathCallback::getAnimationTime() method 2004-01-31 11:34:28 +00:00
Robert Osfield
407fbdb353 From Bob Keuhne, warning fixes under OSX 2004-01-30 16:12:53 +00:00
Robert Osfield
a8b772c09a Changed the snap image filename to save_image.jpg taking advantage of the
new JPEG writing support.
2004-01-30 13:53:15 +00:00
Robert Osfield
eda2d8dfba From Stephane, added support for writing JPEG images. 2004-01-30 13:52:12 +00:00
Robert Osfield
b4774099d6 Fixed the clampProjectionMatrix method so it doesn't modify the input
znar and zfar, by avoid the use of float/double&.
2004-01-29 20:14:20 +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
475c583975 From Pavel Moloshtan, add support to osg::Texture files for GL_ARB_shadow_ambinet support 2004-01-29 11:16:49 +00:00
Robert Osfield
7a94ab3903 Added double's as parameters to _clampProjectionMatrix() template function to
cure compile problems
2004-01-29 10:44:08 +00:00
Don BURNS
362cc3ccc3 Fixed WIREFRAME_CLOSED swap in flt loader. submitted by Andreas Ekstrand 2004-01-28 22:23:10 +00:00
Robert Osfield
b49f70f0ef Made the thread priority outwith the frame PRIORITY_MIN 2004-01-28 20:17:10 +00:00
Robert Osfield
39d7afaed2 Added support for CullVisitor::clampProjectionMatrixCallback 2004-01-28 10:49:23 +00:00
Don BURNS
21633a9b8f Added 1D texture support to .ive plugin. (Fixed a couple of misspellings
as well).
2004-01-27 22:45:03 +00:00
Robert Osfield
635f302a2a Added support for osg::Texture::setBorderWidth(). 2004-01-27 21:29:58 +00:00
Robert Osfield
43df3b90ef Fixed problems with the DatabasePager free of texture objects and display
list before they are finished with.
2004-01-27 14:49:59 +00:00
Robert Osfield
d226e3ec68 From Nick, added VectorUInt in osgText/String hack to get around VS's stoopid compiler bugs.
From Robert, removed an #if #else #endif block, for code clarity.
2004-01-27 11:50:32 +00:00
Robert Osfield
28ce0c232b Re-enabled the unref image of texture apply, since the bug of disappearing
textures was due to a bug in DatabasePager.
2004-01-26 14:52:11 +00:00
Robert Osfield
f21a70a4e7 Set the delete of expired subgraphs in the database thread to false, to
prevent problems with osgText.  Will need to solve the dirtyTextureObject
issue.
2004-01-26 14:51:01 +00:00
Robert Osfield
a32759eafb Removed Texture unref on apply. 2004-01-26 13:55:17 +00:00
Robert Osfield
fbd7a45b8e Fix to computation of size of texture in presense of compressed textures + mipaplevels<=1 2004-01-26 09:01:08 +00:00
Robert Osfield
b10393d001 From Nick, added Text support. 2004-01-25 13:52:55 +00:00
Robert Osfield
e17df6a8a5 Added release of file request block in the DatabasePager destructor. 2004-01-24 09:41:29 +00:00
Robert Osfield
e247b11861 Added proper handling of the rotation of billboards about an artbitary axis.
Note, this code while mathermatically is not optimal, and will need to
reviewed in the future to optimize it.
2004-01-23 21:47:39 +00:00
Robert Osfield
2b9707cdfe Added rotation of billboard normal into flattern transform Optimizer pass. 2004-01-23 16:29:54 +00:00
Robert Osfield
635cf7f7c5 Made getLookAt() etc methods const 2004-01-23 16:09:56 +00:00
Robert Osfield
edce2211fa From Romano Magacho, fixes to handle the subloading from Image when the
internal format changes requiring a rebuild of the texture object.
2004-01-23 13:25:45 +00:00
Robert Osfield
d594982dd2 Added support for copying tex coord data directly from prpgGeometry. 2004-01-22 14:24:51 +00:00
Robert Osfield
ea77b1b031 Added report of LOD scale 2004-01-22 12:28:55 +00:00
Robert Osfield
c49be54142 Added setLODScale into TileMapper traversal 2004-01-22 12:21:59 +00:00
Robert Osfield
a5dd1951fc Added back in handling of non seam children in seam subgraphs, now uses
a seperate group to enclose both the seam and the non seam children.
2004-01-22 11:33:40 +00:00
Robert Osfield
9801bb5cfc From Nick, addition of pruning to remove redundent local materials. 2004-01-22 10:55:56 +00:00
Robert Osfield
2fe34c0b6d Added setName("TileContent") on the subgraphs that represent the contents
of the tiles, this name is then searched for during the TileMapper pre
cull traversal to help cut short traversals, and thereby improve its performance.
2004-01-22 10:43:59 +00:00
Robert Osfield
84737941e1 Added controls over the datatbase pager threading priority during and outwith the frame. 2004-01-22 10:42:32 +00:00
Robert Osfield
b604d22982 Added _activeSwitchSet(sw._activeSwitchSet) into the copy constructor. 2004-01-21 20:38:03 +00:00
Robert Osfield
57a8e5a916 Commented back in osg::Material settings 2004-01-21 19:13:09 +00:00
Robert Osfield
9d1ace20d9 Added new mechanism for handling Seams. 2004-01-21 17:26:23 +00:00
Robert Osfield
2f194ad5a0 Build fix. 2004-01-20 10:02:45 +00:00
Robert Osfield
8dd9d163fc Upates from Nick. 2004-01-19 15:55:51 +00:00
Robert Osfield
9ebffd4055 Added support for osg::Texture::setUnRefImageDataAfterApply(true) into all
objects osg::Textures the TXP plugin creates.
2004-01-19 11:02:54 +00:00
Robert Osfield
694aec666c Fixed bug in logic in areAllTextureObjectsLoaded() which was producing the
exact opposite result to what it should have been generating.
2004-01-19 11:01:45 +00:00
Robert Osfield
b9f032bbb5 Updates for improvements to osgdem, such as adding support for skirt
and border into osg::HeightField, handling of computation of neigherbouring
tiles in osgdem's DestinationGraph.
2004-01-18 21:59:20 +00:00
Robert Osfield
6ff3f430b0 Clean ups of floats & .0f's 2004-01-14 15:14:20 +00:00
Robert Osfield
273b9c47b4 Fixed #undef's 2004-01-13 16:07:02 +00:00
Robert Osfield
29e6cb8cb1 From Daved Ergo, patch for handling group names better 2004-01-13 10:30:36 +00:00
Robert Osfield
4765c8744d Introduce new Matrix::invert() implementation from Ravi Mathur, with tweaks
by Robert Osfield.
2004-01-12 14:22:18 +00:00
Robert Osfield
b89ec5dcf9 Changed of _firstTime intial values of 0 to DBL_MAX. 2004-01-12 13:53:04 +00:00
Robert Osfield
d072e1087c Added support for controlling the LODScale via '*' and '+' keys in
osgProducer::Viewer.
2004-01-10 21:29:15 +00:00
Robert Osfield
23443aa5db From Alberto Farre, added osgDB::SharedStateManager. Also a couple of
ammendments by Robert Osfield, adding get/setSharedStateManager()
methods into osgDB::Registry, and clean up fixes in SharedStateManager
for the StateSet arrays.
2004-01-10 17:13:20 +00:00
Robert Osfield
8747b5161a Standardised on using value_type in most methods in Matrixd & Matrixf interfaces
and Matrix_implementation.cpp.
2004-01-09 20:33:23 +00:00
Robert Osfield
4390114670 From Romano Magacho, add group->setName() to flattening of static transforms 2004-01-09 14:07:26 +00:00
Robert Osfield
5241ca2f2c Fixed to TXP plugin from Nick. 2004-01-09 13:35:55 +00:00
Robert Osfield
ea16360b24 Fixes from Geoff. 2004-01-08 21:39:14 +00:00
Robert Osfield
1353d0ca55 Fixed tabs to be four spaces. 2004-01-07 14:14:38 +00:00
Robert Osfield
dd460006a4 From Nick, updates to TXP plugin to handle differences in LOD levels
between adjacent tiles.
2004-01-07 14:10:47 +00:00
Robert Osfield
7e2aaeffcd Removed redundent DatabasePager pointer. 2004-01-07 12:38:36 +00:00
Robert Osfield
2f918d62d7 Added DatabasePager::setUseFrameBlock(bool) method 2004-01-07 12:37:44 +00:00
Robert Osfield
cace776940 Moaved PagedLOD::PerRangeData implementaton into .cpp and add missing
return *this to copy operator.
2004-01-07 08:39:33 +00:00
Robert Osfield
894537a016 Simplified the API for using the DatabasePager, by providing a single
DatabasePager::updateSceneGraph(..) method, and added a ref_ptr<> into
osDB::Registry for managing a single DatabasePager in a centralised way.
2004-01-06 21:18:36 +00:00
Robert Osfield
4a0a7c7801 Fixed comments 2004-01-06 14:37:25 +00:00
Robert Osfield
3b82c67c13 Added code to the DatagbasePager::removeExpiredSubgraphs() that update
the osgDB::Registry cache.
2004-01-06 14:09:12 +00:00
Robert Osfield
9927c664b5 Merged changes from Cobin Holtz for support of "noUnitsConversion" via
the ReaderWriter::Options string.
2004-01-06 12:27:20 +00:00
Robert Osfield
466497cc8c From Nick, increased info.radius by x 1.3 to avoid culling 2004-01-06 08:38:17 +00:00
Robert Osfield
3f9ba1484c Added code to scale the priority by the offset and scale. 2004-01-05 20:51:30 +00:00
Robert Osfield
413064fc6e Added support for priority offset and scale into PagedLOD. 2004-01-05 20:45:28 +00:00
Robert Osfield
50a7fc16af #if 0'd out code for switch off seam generation. 2004-01-05 19:04:25 +00:00
Robert Osfield
f820a28335 Compile fixes for Win32 2004-01-05 15:40:44 +00:00
Robert Osfield
f230f5a132 Added support into osgProducer::Viewer for flushing and compiling GL objects
via a Producer post swap callback.
2004-01-05 13:40:36 +00:00
Robert Osfield
c71e2100ec Experiments at fixing seam handling. 2004-01-04 22:28:37 +00:00
Robert Osfield
687410145d From Marco Jez, new Light Wave Scene loader 2004-01-03 20:32:27 +00:00
Robert Osfield
c0f2730d99 From Marco Jez, updates to the LWO loader. 2004-01-03 15:20:33 +00:00
Robert Osfield
249eddb3d8 Updates to osgGL2 from Mike Weiblen 2004-01-03 09:06:52 +00:00
Robert Osfield
3034112577 Updates to TXP plugin from Nick. 2004-01-02 17:30:05 +00:00
Robert Osfield
bf9af3f940 Added "&& oitr->second.first->referenceCount()<=1" check to removeExpiredObjectsInCache
so that it only expires objects in the cache that have no external reference.
2004-01-02 17:06:18 +00:00
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