Robert Osfield
39dcea9ebb
From Colin McDonald and Robert Osfield, converted Traits::sharedContext from GraphicsContext* to osg:observer_ptr<GraphicsContext> to prevent dangling pointer issues.
2012-09-05 21:03:41 +00:00
Robert Osfield
63444f648f
Fixed inappropriate comment
2012-09-05 13:51:34 +00:00
Robert Osfield
f5a3c40934
Moved the OSG_INIT_SINGLETON_PROXY macro into include/osg/Object to make it more generally useful and added it's usage into the RenderBinPrototypeList initialization.
2012-09-05 13:48:23 +00:00
Robert Osfield
3c9a0cdfd7
From Thomas Hogarth, "I submitted a change for the IOS CMake system a few weeks back which hasn't made it into the trunk. I've just made the modifications again against the latest trunk and have attached the file
...
It basically accounts for the fact that XCode has changed it's default install location.
"
2012-09-05 10:27:08 +00:00
Robert Osfield
e8c4a6785c
From Andreas Ekstrand, The attached ESRIShape.cpp contains fixes for comparing calculated byte sizes with the content length from the record header. According to the ESRI Shape documentation ( http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf ), the content length is specified in 16 bit words, which is why I have multiplied it by 2 when comparing to byte sizes. Note that the comparison in line 813 is made with a fix number of 16-bit words so it hasn't been changed.
...
This fixes problems with PolygonZ records where the previous code was reading past the end of the record since it thought it had M values even if it didn't. I suspect the problem that James McGlone had back in 2006 was the same but reversed, when he tried to simply comment out the check, which was a (correctly) refused submission.""
2012-09-05 10:24:10 +00:00
Robert Osfield
a5478cf910
From Nico Kruithof, "There is a small typo in the ShapeDrawable code for a sphere. There was a gl.Begin(GL_QUAD_STRIP) that was never closed, nor used.
...
"
2012-09-05 10:19:01 +00:00
Robert Osfield
fd2ee19b62
Updated SO version number to avoid collision with new additions to serializers
2012-09-05 09:30:33 +00:00
Robert Osfield
5c9a302beb
Added GL_RGBA8 and GL_RGBA16 entries to the Image::computePixelFormat() and improved he readability of the method by inserting line spacing.
2012-09-05 09:08:25 +00:00
Robert Osfield
e93a838222
From Ulrich Hertlein, "fixes a typo and adds support for OS X 10.8"
2012-09-05 08:48:10 +00:00
Robert Osfield
bc533022ae
Added deprecated note to indices entry.
2012-09-05 08:42:14 +00:00
Robert Osfield
0172bacdf4
From Brad Christiansen, changed OSG_INFO to OSG_DEBUG to quieten down volume of messages in INFO
2012-09-04 08:21:09 +00:00
Robert Osfield
568aeef975
From Brad Christiansen, "fix for the NVTTImageProcessor. When the code was updated in revision 12912 a couple of typos where made. These cause a crash when compressing transparent images and mangled colours when compressing rgb images. "
2012-09-03 15:19:00 +00:00
Robert Osfield
30c35cb407
Adjusted the #define's to help GLES2 build
2012-09-03 09:08:16 +00:00
Robert Osfield
0ce9407c69
From Lilin Xiong, " there is a small bug in osgDB::readNodeFiles(std::vector<std::string>& fileList,const Options* options) in file ReadFile.cpp line 85:
...
osg::Node *node = osgDB::readNodeFile( *itr , Registry::instance()->getOptions() );
It should be:
osg::Node *node = osgDB::readNodeFile( *itr , options );"
2012-09-03 08:30:01 +00:00
Robert Osfield
f13dd3d75d
Added a fix for a multi-threading bug that occured when TerrainTiles were accessed via the Terrain::_updateTerrainTileSet that were being deleted at the same time by the DatabasePager thread.
2012-08-31 16:00:55 +00:00
Robert Osfield
8961d45ebf
From Wang Rui, "This patch fixes a problem of the osg::Program serializers that can't
...
save/load GeometryInputType data correctly. The bug is initially found
by John Kelso."
2012-08-29 16:48:27 +00:00
Robert Osfield
794e0e71f4
From Johannes Scholz, fix for writing out of hexidecimal numbers
2012-08-24 15:05:03 +00:00
Robert Osfield
e489767f71
Fixed bug in GLBufferObjectSet::discardAllDeletedGLBufferObjects() and GLBufferObjectSet::flushDeletedGLBufferObjects(double currentTime, double& availableTime)
...
where the NumberActiveGLBufferObjects was errneously being incremented by numDiscarded.
M osg/BufferObject.cpp
2012-08-23 15:06:27 +00:00
Robert Osfield
583401970a
Fixed typo
2012-08-22 16:39:47 +00:00
Robert Osfield
58b66be7b7
Added check against the Camera NodeMask to decide whether it's appropriate to test for events on that camera.
2012-08-21 09:45:24 +00:00
Robert Osfield
284f410436
Added ShadowSettings::s/getMaximumShadowMapDistance(double) property, usage of these property in ViewDependentShadowMap,
...
and setting of it with --max-shadow-distance <double> in the osgshadow example.
2012-08-15 12:40:48 +00:00
Robert Osfield
52861ecbb0
Added a mutex to protect the removal and addition of Uniform and Program to StateSet to avoid parents being invalidated when multi-threading.
2012-08-14 20:15:00 +00:00
Robert Osfield
fb83c2b061
Introduced --near-far-mode into osgshadow and ShadowSettings::setComputeNearFarModeOverride(..) to allow user control of how the cull traversal is optimized for computing the depth range of the shadow map.
2012-08-03 16:14:14 +00:00
Robert Osfield
35816e6b25
Removed the erronous creation of a local ShadowSettings object
2012-08-03 15:23:44 +00:00
Robert Osfield
42cb311f41
Added FireGL to prefernce list for use glGenerateMipMap
2012-07-24 09:05:04 +00:00
Robert Osfield
2e611be9c9
Fixed build
2012-07-23 08:15:57 +00:00
Robert Osfield
0a746faa2d
Introduced Texture::Extensions::s/getPreferGenerateMipmapSGISForPowerOfTwo() flag that defaults to false for Radeon, true elsewhere.
...
This is used to workaround mipmapping bugs with ATI/AMD cards.
2012-07-12 16:41:53 +00:00
Robert Osfield
2f86ac1896
Fixed indentation
2012-07-11 14:36:14 +00:00
Robert Osfield
283c2d3ed0
Fixed parameter default value to avoid warning
2012-07-11 08:39:11 +00:00
Robert Osfield
86db687bce
Replaced use of now deprecated methods.
2012-07-10 16:20:32 +00:00
Robert Osfield
269d360484
Enabled the use the getReceivesShadowTraversalMask().
2012-07-10 16:11:40 +00:00
Robert Osfield
ec3ad89041
Changed settings of masks to use ShadowSettings.
2012-07-10 16:11:15 +00:00
Robert Osfield
b4d397cfd7
Moved mask settings into ShadowSettings
2012-07-10 15:50:46 +00:00
Robert Osfield
4b220d4fd7
Changed updateCamera(Camera*) to updateCamera(Camera&) to make it clear that a valid Camera object should be passed in.
2012-07-09 17:49:04 +00:00
Robert Osfield
65ab874143
From Riccardo Corsi, introduced CameraManipulator::updateCamera() method that allows more Camera properties to be controlled by the CameraManipulator.
2012-07-09 17:32:13 +00:00
Robert Osfield
f784884fd1
Refactored the way that the static Scene cache is managed by moving all the functionality into a SceneSingleton
2012-06-25 16:31:36 +00:00
Robert Osfield
a821a1cbbc
Restructed the way that the global notify variables are initialized to avoid problems with multi-threaded initialization of these variables.
2012-06-22 16:21:08 +00:00
Robert Osfield
fc4aeac75b
Fixed spelling of FileNameComparator
2012-06-16 09:08:05 +00:00
Robert Osfield
59133b43d3
Moved the frame() event into the event traversal after then events and their state have been accumulated.
2012-06-15 09:04:32 +00:00
Robert Osfield
1dc215a1da
Added FileNameComparator to sort the filenames in an ImageSequence into alphanumerical order so that it can handle the numerical ordering found in screenshot numbered sets of files
2012-06-12 20:15:58 +00:00
Robert Osfield
4ab8cdb746
Enabled 6 ImageThreads in the ImagePager
2012-06-12 18:29:03 +00:00
Robert Osfield
c1a3ab2a5b
Commented out the disabling of use of PBO's in ImageStream, and disabled the use ClientStoreHint in Present3D.
2012-06-12 10:31:50 +00:00
Robert Osfield
2faeaf553b
Added support for setting the <image> paging_mode property to PRE_LOAD_ALL_IMAGES, PAGE_AND_RETAIN_IMAGES or PAGE_AND_DICARD_IMAGE for osg::ImageStream,
...
with PAGE_AND_DICARD_IMAGE set as the default.
2012-06-11 19:54:07 +00:00
Robert Osfield
c39ee015d6
Added ImageStream support to <image> and <stereo_image> tags in .p3d
2012-06-08 10:26:23 +00:00
Robert Osfield
5d3cb4f754
Added osg::ImageSequence support into osgPresentation::SlideShowConstructor and the associated <image> tag in .p3d.
2012-06-08 04:18:28 +00:00
Robert Osfield
4d86f8dc79
Added --fps support
2012-06-07 10:08:42 +00:00
Robert Osfield
9282a367e9
Added typdef for Win32
2012-05-31 14:45:24 +00:00
Robert Osfield
2200ebfbe1
From Wang Rui, "A very small but maybe fatal problem was found when I saved models with shader and uniforms (with new double types support) to osgb format and tried to read it again. The application will crash here. And the serializer file should be slightly changed to fix it. Please replace the original file in osgWrappers/serializers/osg/Uniform.cpp."
2012-05-25 16:07:11 +00:00
Robert Osfield
1dbb0a7a82
Added Dragger::get/setActivationMouseButtonMask(uint).
2012-05-25 15:32:51 +00:00
Robert Osfield
c21f1f488f
From Jaap Glas, "Added a default parameter to the following constructor in TabPlaneDragger
...
and TabPlaneDragger.cpp:
TabPlaneDragger(float handleScaleFactor=20.0f);
The reason for this is that the default OSG tab sizes are way bigger than
those we used in our application so far. And since handleScaleFactor_
is already a (constant) class member, I see no objection against making
it user defined."
2012-05-25 08:56:25 +00:00
