9a4e17b766From Bryan Thrall, "The attached ReaderWriterGLSL.cpp conveniently sets the shader type when the filename extension is "vert" or "frag" but still lets this be overridden by the Options (for those crazy people who store their fragment shaders in .vert files :) )."
Robert Osfield
2009-03-13 10:40:00 +00:00
ed2aa7c90fFrom Frank Midgley, "I tried running osgconv --formats yesterday on OS X and got no results. Turns out the changes discussed in the "osgDB::listAllAvailablePlugins win32 fix" thread back in Sep '08 broke this. The OSG_PLUGIN_EXTENSION macro is being defined in src/osgDB/CMakeLists.txt from CMAKE_SHARED_LIBRARY_SUFFIX which is "dylib" on OS X. The problem is that all of the plug-ins are setup in OsgMacroUtils.cmake with:
Robert Osfield
2009-03-12 17:57:52 +00:00
f2fb93aeecFrom Frank Midgley, "I tried running osgconv --formats yesterday on OS X and got no results. Turns out the changes discussed in the "osgDB::listAllAvailablePlugins win32 fix" thread back in Sep '08 broke this. The OSG_PLUGIN_EXTENSION macro is being defined in src/osgDB/CMakeLists.txt from CMAKE_SHARED_LIBRARY_SUFFIX which is "dylib" on OS X. The problem is that all of the plug-ins are setup in OsgMacroUtils.cmake with:
Robert Osfield
2009-03-12 17:54:58 +00:00
8cd7d36982From Konstantin Sinitsyn, "At this moment, I just introducing to OSG. When I reviewing optimizer code, I find a mistake in Optimizer::RemoveLoadedProxyNodesVisitor, as it seems. This optimizer removes proxy nodes that fully loaded and in some cases attach their childs to parrents directly (without creating of group). I dont understand how this works, because if proxy node doesn't have any attributes such as name, description, node mask and any callbacks, then new group does not created to hold proxy node childs. And code below trying to attach their children to all parents but seems like only first child beeing attached to all parents correctly."
Robert Osfield
2009-03-12 17:51:52 +00:00
8194246ba3From Konstantin Sinitsyn, "At this moment, I just introducing to OSG. When I reviewing optimizer code, I find a mistake in Optimizer::RemoveLoadedProxyNodesVisitor, as it seems. This optimizer removes proxy nodes that fully loaded and in some cases attach their childs to parrents directly (without creating of group). I dont understand how this works, because if proxy node doesn't have any attributes such as name, description, node mask and any callbacks, then new group does not created to hold proxy node childs. And code below trying to attach their children to all parents but seems like only first child beeing attached to all parents correctly.
Robert Osfield
2009-03-12 17:47:50 +00:00
f3ba8c8707Introduced a releaseAllOperation after completeion of OperationThread::run() to enable CUDA integration (in osgCuda) to be able to free up its resources. Code drawn from a submission from Mick.
Robert Osfield
2009-03-12 17:26:21 +00:00
f6eae8dc3eUpdated wrappers
Robert Osfield
2009-03-12 17:12:48 +00:00
7b5f3ec92aMoved IncrementalCompileOperation out of include-src/osgUtil/GLObjectVisitor into their own files.
Robert Osfield
2009-03-12 15:21:04 +00:00
c3fc21fa82Added support for tracking the time since the last clear() call to enable other classes to be able to find out how long the current graphics frame has been running.
Robert Osfield
2009-03-12 15:18:51 +00:00
5a537261a6From Michael Platings, "I've been looking at the discussion from 2006 ("[osg-users] osgDB/Reentrant Mutex not threadsafe ?") about this, and having looked closely at OpenThreads::ReentrantMutex it's still not thread safe in the following situation:
Robert Osfield
2009-03-12 10:12:42 +00:00
1211fd1120Changed audio playing so that it only happens for a single movie to avoid problems with audio stalling.
Robert Osfield
2009-03-11 18:13:58 +00:00
73cffacf09Added docs on getPixelAspectRatio and corrected usage of getPixelAspection in osgmovie.cpp
Robert Osfield
2009-03-11 17:57:33 +00:00
7994ed1eb7changed debug info to output to INFO instaed of NOTICE.
Robert Osfield
2009-03-11 17:39:08 +00:00
5233a716c8Added handling of Image::isImageTranslucent(), when it is enabling blending. Added handling of Image::getPixelAspectRatio() in geometry sizing. Added scaling of the projection matrix to ensure that aspect ratio is honoured with running in fullscreen mode
Robert Osfield
2009-03-11 15:43:13 +00:00
b6bffdd02fFrom Tanguy Fautre,
Robert Osfield
2009-03-11 15:12:46 +00:00
998cfec137Added View::removeEventHandler(..) method and added check into addEventHandler() to prevent handlers being added twice.
Robert Osfield
2009-03-11 14:18:30 +00:00
d808149e05From Philip Lowman, "At a cost of bumping the required version to CMake 2.4.4 (released all the way back on November 21, 2006)... this cmake script patch
Robert Osfield
2009-03-11 14:08:43 +00:00
d843de261eFrom Neil Hughes, changed the handling of opacity maps so that when they are used blending in enabled. Merged from svn/trunk using:
Robert Osfield
2009-03-11 13:31:17 +00:00
6791f65addFrom Neil Hughes, "I've spent the past four days playing with PNG files on 3DS objects, and I think I may have come across a small issue with the 3DS loader.
Robert Osfield
2009-03-11 13:27:51 +00:00
ec63cfd930From Mathias Froehlich, "small addition to osg::Texture to include all possible depth test variants for the shadow depth comparison."
Robert Osfield
2009-03-11 13:08:12 +00:00
771f3a3238From Stephan Huber, files were are missed by Robert in check in of changes to GraphicsWindowCarbon.cpp
Robert Osfield
2009-03-11 12:55:20 +00:00
c60cff5eb6From Lionel Lagarde, "the attachment contains a correction of the Optimizer::MergeGeometryVisitor. When 2 geometries are merged, the primitive sets of the second geometry are copied to the first geometry.
Robert Osfield
2009-03-11 12:42:44 +00:00
d040b9f9d6From Lionel Lagarde, "the attachment contains a correction of the Optimizer::MergeGeometryVisitor. When 2 geometries are merged, the primitive sets of the second geometry are copied to the first geometry.
Robert Osfield
2009-03-11 12:08:24 +00:00
18726b72eaFix to crash due to indices being present witout any associated arrays. Merged from svn/trunk using:
Robert Osfield
2009-03-11 12:02:04 +00:00
3e535d7456Fixed crash due to Geometry::copyToAndOptimize(..) not handling cases where indices are present, but no arrays are assocaited with them.
Robert Osfield
2009-03-11 11:58:31 +00:00
31608b2559From David Callu, "osgManipulator Object have not META_Object macro call in class definition. > I add META_OSGMANIPULATOR_Object macro which define className, libraryName, > isSameKindAs methods. > Clone method is not appropriate for osgManipulator Object."
Robert Osfield
2009-03-11 11:29:00 +00:00
04e10363bbFrom Lionel Lagarde, "The copy constructor of the nodes and the drawables do :
Robert Osfield
2009-03-11 11:03:44 +00:00
c58ff9b656From Lionel Lagarde, "The copy constructor of the nodes and the drawables do :
Robert Osfield
2009-03-11 11:00:24 +00:00
06ef559d91From Martin Beckett, added get/setScrollWheelZoomDelta() support for controlling the mouse scroll wheel zoom delta.
Robert Osfield
2009-03-11 10:50:03 +00:00
c3810e130bConverted tabs to four spaces
Robert Osfield
2009-03-11 10:34:29 +00:00
357d465d49From Stephan Huber, "refactored the code and moved some stuff out into DarwinUtils.h/.mm so both implementations can share some of the code. There's even a bugfix for GraphicsWindowCarbon, which fixes some issues with multiple windows on different screens."
Robert Osfield
2009-03-11 10:34:04 +00:00
529685c6b1From Mathias Froehlich, "an other topic pointed out by some Microsoft verification tool: On destruction of some static variables, the global referenced mutex is used to lock access to the parent lists of state attributes, nodes and so on. This even happens past the mutex is already destroyed.
Robert Osfield
2009-03-10 17:51:05 +00:00
5157f06bcdFrom Konstantin Matveyev, submitted by Valery Bickov:
Robert Osfield
2009-03-10 17:47:54 +00:00
9cccd087a8From Martin Beckett, "Modified osgGA::TrackballManipulator so that osgGA::GUIEventAdapter::SCROLL performs a zoom. Arbitrarily zooms 10% in/out for each click."
Robert Osfield
2009-03-10 17:39:46 +00:00
a0a06c8b2aCompleted support for automatic detection of plugin features.
Robert Osfield
2009-03-10 17:27:39 +00:00
3ec2da76e8quitened down debug info
Robert Osfield
2009-03-10 17:13:51 +00:00
c0863e96caMade bool isImageTranslucent() const virtual to allow subclasses to provide their own implementation
Robert Osfield
2009-03-10 16:52:18 +00:00
287ff37b34From Ralf Habacker, "The appended patch fixes this issue by adding a virtual method named supportedFeatures() to the class ReaderWriter, which could be overriden by a specific plugin to adjust the set of features. Single features are implemented as bits asother enums in ReaderWriter class already does, so that combinations are possible and fast comparison operations are possible
Robert Osfield
2009-03-10 15:00:39 +00:00
0669107287From Roland Smeenk, "While working on the Collada plugin I noticed that all geometry created by the dae reader result in slow path geometry. Because there already exists the option to convert slow path geometry to the fast path by computing an internal fast path alternative, I added a new optimizer option that automatically does this. To check the results I also made some changes to the statistics gathering and rendering.
Robert Osfield
2009-03-10 14:15:59 +00:00
9ddb8f65b6Added copyright + fixed typo
Robert Osfield
2009-03-10 13:46:55 +00:00
b5a15fb5b4From Stephan Huber, "Attached you'll find a proposal for using different protocols. The idea behind the new code is:
Robert Osfield
2009-03-10 12:21:13 +00:00
ee4d49c398From Martin Spott, fixes for IBM AIX build. Merged from svn/trunk using:
Robert Osfield
2009-03-10 11:56:43 +00:00
199067d150From Martin Spott, compile fixes for IBM AIX.
Robert Osfield
2009-03-10 11:14:56 +00:00
9643c15346From David Callu, "Problem: osgText::Text and osgText::Text3D use the same font file. The first really load the file and obtain an osgText::Font object, the second use the cache created during the first load of the font file, and so obtain an osgText::Font object instead of osgText::Font3D object. To obtain an osgText::Font3D object, osgText::Text3D call osgDB::readObjectFile(...) with an option to specify the plugin we want an osgText::Font3D instead of osgText::Font.
Robert Osfield
2009-03-10 10:56:00 +00:00
e7c4cda108From Eric Wing and Stephan Huber, ImageIO code originally wrote by Eric Wing, and then later conveted into an OSG plugin by Stephan Huber.
Robert Osfield
2009-03-10 10:30:34 +00:00
5059aa808bFrom Stephan Huber, support for Cocoa windowing under OSX.
Robert Osfield
2009-03-10 10:13:20 +00:00
22c7ff353bFixed osgWrappers for osgAnimation library
Robert Osfield
2009-03-09 23:11:23 +00:00
ae50d8d956From Roland Smeenk & Cedric Pinson,
Robert Osfield
2009-03-09 17:38:39 +00:00
99477fa422Tweaked API to get wrappers to build
Robert Osfield
2009-03-09 16:53:57 +00:00
f4b7a5b274Updated wrappers
Robert Osfield
2009-03-09 16:17:57 +00:00
173357252bFurther work on IncrementalCompileOperation
Robert Osfield
2009-03-09 14:56:20 +00:00
73c2615d17Fixed thread exit problems
Robert Osfield
2009-03-08 16:48:48 +00:00
7473b06275Preliminary work on general purpose incremental compile support in osgViewer.
Robert Osfield
2009-03-08 12:00:36 +00:00
43a081ee98Updated wrappers and dev release version numbers
Robert Osfield
2009-03-05 15:31:03 +00:00
9eac90b8cbCleaned up FindFFmpeg.cmake
Robert Osfield
2009-03-05 14:33:21 +00:00
fa14e7d5f2Added quick proof of concept for live video streaming under linux
Robert Osfield
2009-03-05 10:57:54 +00:00
56330d5b29Added search for headers in ffmpeg directory
Robert Osfield
2009-03-04 16:35:08 +00:00
273be5f0aeFrom Jean-Sebastien Guay, added non pkg-config based ffmpeg search scheme.
Robert Osfield
2009-03-04 16:16:07 +00:00
d2099da5cbFixed indentation
Robert Osfield
2009-03-04 16:15:05 +00:00
6fd4cd4933Removed boost reference and cleaned up debug output
Robert Osfield
2009-03-04 16:03:28 +00:00
ab82553f97Introduced double buffering of video stream to avoid tearing of image.
Robert Osfield
2009-03-04 14:49:39 +00:00
df2964c315Added handling of ImageStream Origin to make sure the movie always appears the correct way up.
Robert Osfield
2009-03-04 13:24:36 +00:00
ac8ee3792cFixes to non swscale code path
Robert Osfield
2009-03-04 11:59:15 +00:00
d0dabd2665Fixed img_convert usage
Robert Osfield
2009-03-04 11:46:34 +00:00
4ffef96874Removed reference to OpenAL plugin
Robert Osfield
2009-03-04 11:06:34 +00:00
fb54fd0a69Added support for using libswscale
Robert Osfield
2009-03-04 11:05:55 +00:00
97e987a9d9Added SDL audio path
Robert Osfield
2009-03-03 20:59:16 +00:00
ac49ca81caImproved the clean up ordering
Robert Osfield
2009-03-03 20:49:46 +00:00
b678c8ca85Added SDL audio support for reading from ffmpeg movies
Robert Osfield
2009-03-03 17:37:48 +00:00
325fe37a6aFrom Stephan Huber: updated xcode project, added AudioStream to project
Stephan Maximilian HUBER
2009-03-03 17:28:50 +00:00
e035decd95Introduce FFmpegAudioStream implementation
Robert Osfield
2009-03-03 16:51:01 +00:00
e0959ea804Removed redudent export
Robert Osfield
2009-03-03 14:59:04 +00:00
8419ac6975Added LINK_DIRECTORIES
Robert Osfield
2009-03-03 11:52:26 +00:00
79e65b48feFixed include list
Robert Osfield
2009-03-03 11:25:31 +00:00
8a8cee05c5From Ulrich Hertlein, build fixes for OSX.
Robert Osfield
2009-03-03 10:53:26 +00:00
ae2e2c5075Added ffmpeg to include search paths
Robert Osfield
2009-03-03 09:50:43 +00:00
439b240abcAdded ogg to accepted formats
Robert Osfield
2009-03-03 09:49:53 +00:00
1a2e6aae8eAdded extern for img_convert to get round disappeance of the declaration from headers.
Robert Osfield
2009-03-02 16:01:13 +00:00
a6774396bdFrom Mathias Froehlich, "An other one: The TLS Varialbe is accessed before it is initialized. Attached is a change to rev 9791."
Robert Osfield
2009-03-02 10:51:41 +00:00
48c8402c1cFrom Mathias Froehlich, "An other one: The TLS Varialbe is accessed before it is initialized. Attached is a change to rev 9791."
Robert Osfield
2009-03-02 10:49:29 +00:00
c37b478ed6From Petr Salinger, build fix for GNU/kFreeBSD.
Robert Osfield
2009-03-02 09:59:27 +00:00
7dc849b97aFrom Petr Salinger, fix for build under GNU/kFreeBSD.
Robert Osfield
2009-03-02 09:56:39 +00:00
4ebd316130Introduced osg::AudioStream class to help manage audio streams coming in from movie reading plugins
Robert Osfield
2009-02-27 20:16:08 +00:00
116655c7c5Ported across from using boost pointers, and prepped for integration of audio interface into core OSG
Robert Osfield
2009-02-27 17:00:28 +00:00
339026a0f2From Roland Smeenk, "Attached is a small bug fix for the redundant messages that are created in OSG applications on windows. GraphicsWindowWin32::setCursor is called every frame from the WM_NCHITTEST message. This will result in a call to ::SetCursor(_currentCursor) every frame, which again causes a WM_MOUSEMOVE to occur. The fix exits GraphicsWindowWin32::setCursor if the requested cursor already is the current cursor.
Robert Osfield
2009-02-27 11:14:04 +00:00
eef4801ba7From Roland Smeenk, "Attached is a small bug fix for the redundant messages that are created in OSG applications on windows. GraphicsWindowWin32::setCursor is called every frame from the WM_NCHITTEST message. This will result in a call to ::SetCursor(_currentCursor) every frame, which again causes a WM_MOUSEMOVE to occur. The fix exits GraphicsWindowWin32::setCursor if the requested cursor already is the current cursor.
Robert Osfield
2009-02-27 11:11:06 +00:00
e68110f303From Atr Tevs, fixes to FBO blitting. Merged from svn/trunk using:
Robert Osfield
2009-02-27 10:50:12 +00:00
898a313272From Atr Tevs,
Robert Osfield
2009-02-27 10:47:33 +00:00
1490271272From Mattias Helsing, " In file "/home/robert/OpenSceneGraph/CMakeModules//Find3rdPartyDependencies.cmake": ------------------------------ 64: SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}") "
Robert Osfield
2009-02-26 22:10:53 +00:00
90afd31baaFrom Mattias Helsing, "I added FORCE to set cmake vars FREETYPE_INCLUDE_DIR_ft2build and FREETYPE_INCLUDE_DIR_freetype2. The error case was that during first cmake run (unspecified ACTUAL_3RDPARTY_DIR) FindFreeType set these to xxx-NOTFOUND. After specifying ACTUAL_3RDPARTY_DIR, Find3rdPartyDependencies warn't able to change these (without FORCE).
Robert Osfield
2009-02-26 22:09:47 +00:00
fa95b7e874Addded setting of FREETYPE_INCLUDE_DIRS to Find3rdPartyDependencies.cmake
Robert Osfield
2009-02-26 10:48:04 +00:00
19ee0f011eTweaks to handle more modern version of ffmpeg compiled form source.
Robert Osfield
2009-02-25 20:52:34 +00:00
1bad5770b6Added Cmake support for new ffmpeg plugin
Robert Osfield
2009-02-25 16:05:12 +00:00
9d91163508Updated version info for 2.9.0 release
Robert Osfield
2009-02-23 10:50:42 +00:00
8f612f6facUpdated ChangeLog for 2.9.0 dev release
Robert Osfield
2009-02-23 10:41:16 +00:00
4a0e9a6ad2From Ralf Habacker & Robert Osfield, fixed handling of file name string of the form"PG:host=localhost user=postgres dbname=osm tables=public.planet_osm_line". The patch also routes gdal debug and error message to the related osg::notify debug port - this is usefull for debugging ogr plugin.
Robert Osfield
2009-02-23 09:54:25 +00:00
8faa9d3f63From Mathieu Marache, "I was trying to use the archive output of osgdem without success when I eventually found out that it was now disabled (the mailing list archive tells me it is because of multithreaded write issues with vpn). I then decided to use osgarchive to make it myself from the generated output. However if one of the insert parameters is a directory, it won't be able to find them. The attached versions corrects this"
Robert Osfield
2009-02-20 17:28:14 +00:00
01a72afe0aFrom Mathieu Marache, "I was trying to use the archive output of osgdem without success when I eventually found out that it was now disabled (the mailing list archive tells me it is because of multithreaded write issues with vpn). I then decided to use osgarchive to make it myself from the generated output. However if one of the insert parameters is a directory, it won't be able to find them. The attached versions corrects this."
Robert Osfield
2009-02-20 16:27:57 +00:00
9e4cbe9308From Maciej Krol, "Small improvement in --compressed option of osgconv. For non IVE output files compressed images are written into directory of output file as DDS. " + "Further improvement for conversion to IVE format. Compressed DDS files are written for IVE output when noTexturesInIVEFile option is defined i.e. osgconv --compressed -O noTexturesInIVEFile dir1/input.osg dir2/output.ive will write images into dir2."
Robert Osfield
2009-02-20 15:47:28 +00:00