1f01d30f72Added tests of various FileNameUtils functions, tests invoked by osgunittests filenames
Robert Osfield
2010-03-10 12:13:31 +00:00
f8665ebfdbRefactored the find_last_of to simplify it.
Robert Osfield
2010-03-10 12:04:14 +00:00
6ae2f4c6c6From Sukender, "Here is my proposal. I fixed what Paul said, added some doxygen comments, added the function I told about, and removed the two "find('/')"-like calls to use only one."
Robert Osfield
2010-03-10 11:40:17 +00:00
ea5af1d010From Nico Krulthof and Jori Torres, additions for detecting OSX 10.6 SDK and setting variable defaults accordingly.
Robert Osfield
2010-03-10 11:09:55 +00:00
4c1af137e0Based on a suggestion from Chuck Seberino, have added a section for testing of 64bit build under OSX and disable the use of quicktime when the build includes 64bit.
Robert Osfield
2010-03-10 11:01:17 +00:00
1d036c0e8cFrom Laurens Voerman, "my compiler (VC Express 9) gives some warnings (see below) about not being able to generate an assignment operator. As those assignment operators are not used and problably should never be used, I solved this by creating an private (empty) assingment operator. "
Robert Osfield
2010-03-10 10:32:58 +00:00
6dc1ec6c4eFrom Stephan Huber, "attached you'll find a small bugfix for the 3ds-reader. It allows reading files with relative paths again. (Hard to explain, easy to see in the diff)"
Robert Osfield
2010-03-10 10:10:57 +00:00
bafe1d0b94Added automatic updating of the OpenThreads version number from the CMake version numbers
Robert Osfield
2010-03-10 09:37:04 +00:00
d01dadca28From Stephan Huber: fixed xcode project again
Stephan Maximilian HUBER
2010-03-09 15:16:58 +00:00
4bc287cedbAdded extra ffmpeg version check
Robert Osfield
2010-03-08 10:20:14 +00:00
c765a35650From Wojcoech Lewandowski, "Attched are aimShadowCastingCamera() call changes, I have described in former post. Basically now MinimalShadowMap overrides first variant and keeps second. So both variants of aimShadowCastingCamera are clearly defined in MinimalShadowMap::ViewData scope. This way compilers have no problem and code looks less obscure. Changes made against the trunk."
Robert Osfield
2010-03-05 16:17:12 +00:00
8743e5d925From Mathias Froehlich, "Not so long time ago, there was a complaint about the ac3d plugin not honoring absolute filenames for the texture images.
Robert Osfield
2010-03-05 16:08:34 +00:00
7db099a9d1Fixed warning
Robert Osfield
2010-03-05 16:07:12 +00:00
84c0ecadd8Fixed usage of osg::swapBytes to properly pass in pointer to data that needs swapping.
Robert Osfield
2010-03-05 16:04:30 +00:00
10a2f389d7From Mathias Froehlich, "If you want to have that qfont plugin loader, this is the updated implementation which uses osgQt and includes the changes to make fonts load without a file on disk."
Robert Osfield
2010-03-05 15:46:17 +00:00
737378c967Replaced find_first_of with find
Robert Osfield
2010-03-05 15:36:32 +00:00
e401fa7461Replaced find_first_of with find.
Robert Osfield
2010-03-05 15:17:26 +00:00
e77fafcd98From Sukender, "Here is a tiny fix for getNameLessExtension(). It does now check for the presence of slashes ('/' and '\') to avoid changing the string when having a dot in a directory. Old behaviour: "abc.d/filename_no_ext" -> "abc" New behaviour: "abc.d/filename_no_ext" -> "abc.d/filename_no_ext"
Robert Osfield
2010-03-05 15:10:34 +00:00
073a60b2a1Fixes for warning from qt headers
Robert Osfield
2010-03-05 15:08:03 +00:00
3d87d6fcbbRemoved files that are now part of osgQt
Robert Osfield
2010-03-05 15:07:11 +00:00
4b1a1213c2From Stephan Huber: updated XCode project
Stephan Maximilian HUBER
2010-03-05 15:05:28 +00:00
f497cd3c24Fixed warnings
Robert Osfield
2010-03-05 15:04:36 +00:00
86f491e649Replaced use of unsigned int/enum mask combinations with int/enum mask combinations to avoid the need for casting enums to unsigned ints, and to avoid associated warnings.
Robert Osfield
2010-03-05 12:55:08 +00:00
273420bb1cUpdated version and soversion numbers
Robert Osfield
2010-03-05 12:53:08 +00:00
5383297cbeChange Shader::getPCS(..) from protected to public scope to enable isCompiled() method to be accessible in applications.
Robert Osfield
2010-03-05 11:30:50 +00:00
4b4dd94b5dAdded an "-a" speed averager option and a "-o filename" output option.
Robert Osfield
2010-03-05 11:21:36 +00:00
c40a4ff9cbChanged Options::setDatabasePath(..) usage to getDatabasePathList().push_front() to paths set by Options to be picked up.
Robert Osfield
2010-03-05 11:19:34 +00:00
e01832763dFixed warning
Robert Osfield
2010-03-05 10:58:47 +00:00
d52910ff67Fixed warning
Robert Osfield
2010-03-05 10:50:50 +00:00
7e56f2d258Fixed warning
Robert Osfield
2010-03-05 10:48:34 +00:00
8b486054b4From Mourad Boufarguine, "The attached CMakeLists allows building osgQt in case BUILD_OSG_EXAMPLES is set to off.
Robert Osfield
2010-03-04 20:45:30 +00:00
0f58cc2628Added BlendFunc for transparent materials
Michael PLATINGS
2010-03-04 17:01:33 +00:00
65489693d9Fix for some FBX files with multiple meshes bound to a bone.
Michael PLATINGS
2010-03-04 16:27:19 +00:00
ace8dad2c3Fixed warnings
Robert Osfield
2010-03-04 13:03:18 +00:00
f1dd820a4eFrom Michael Platings, "Here are a couple more fixes on top of what you've already done." (in reply to fixes submission from Roland Smeenk).
Robert Osfield
2010-03-04 12:59:53 +00:00
225d99c5f1From Roland Smeenk, "I took a quick look at the warnings and they contain nothing serious. Attached you will find updates of the files to hopefully solve the warnings (in VS2005 only one warning occured). In addition I fixed a tiny bug that caused a crash with one of my test files."
Robert Osfield
2010-03-04 12:57:24 +00:00
4282b284e5From Mathias Froehlich, Integration of osgText::Font with QFont to enable use of Qt fonts and selectors in osgText.
Robert Osfield
2010-03-04 12:43:09 +00:00
33b28a816eAdded Export for new osgQt lib
Robert Osfield
2010-03-04 12:18:04 +00:00
1a1b7bd7a1Moved QWebViewImage and QGraphicsViewAdapter into new osgQt utility library.
Robert Osfield
2010-03-04 12:15:35 +00:00
44f8848c9fRemoved now redundent call to register PagedLODs
Robert Osfield
2010-03-04 12:14:39 +00:00
5a47744e0dRemoved old net plugin that is nolonger used. This plugin can be found in the deprecated/src/osgPlugins/net respository
Robert Osfield
2010-03-04 11:45:44 +00:00
7e5dd8ce17Ran dos2unix of files to fix issues with file endings
Robert Osfield
2010-03-03 17:24:04 +00:00
9f8a4be2cdRefactored DatabasePager so that it nolonger takes ref_ptr<PagedLOD>, but instead uses a custom version of observer_ptr<>. This change should make it possible to delete PagedLOD's independantly from the DatabasePager, and also prevent issues of consistency of the pager when subgraphs when are cached elsewhere in the application such as in the Registry filecache.
Robert Osfield
2010-03-03 16:40:19 +00:00
d3779f0092Fixed warning
Robert Osfield
2010-03-03 16:37:45 +00:00
fd6f3edf15
Michael PLATINGS
2010-03-03 16:14:04 +00:00
315e0521c9From Martin Beckett, "I tested DJ's fix to stop flicker on Windows + Qt viewer on 2.6.7
Robert Osfield
2010-03-03 10:11:54 +00:00
2609c4aa02
Michael PLATINGS
2010-03-02 18:18:06 +00:00
1f4060ead6Updated wrappers
Robert Osfield
2010-03-01 13:10:58 +00:00
ba3971bb45Added a ShadowTechnique::computeOrthogonalVector(const osg::Vec3& direction) const method for helping compute an appropriate up vector to setViewMatrixAsLookAt(..) codes in osgShadow. This will addresses previous issues that occured when look vectors co-incided with the hard coded up vectors.
Robert Osfield
2010-03-01 13:00:04 +00:00
42a050e87cFrom Wojciech Lewandowski, "Here comes a list of small fixes in StandardShadowMap and derived classes affecting LispSM techniques. Changes made against SVN trunk.
Robert Osfield
2010-03-01 11:52:44 +00:00
60dd9ad7d0From Mourad Boufarguine, "With the present CMakeLists, the directory ${PROJECT_BINARY_DIR}/include is added to the include path before ${OpenSceneGraph_SOURCE_DIR}/include. This causes problems whenever a header file is changed when updating OSG, because cpp files are build against the old header files contained in ${PROJECT_BINARY_DIR}/include rather than the new ones in ${OpenSceneGraph_SOURCE_DIR}/include. Inverting the order of the two drectories in the include path solves the problem.
Robert Osfield
2010-03-01 11:29:19 +00:00
3d6b53b218Updated wrappers
Robert Osfield
2010-02-26 21:31:13 +00:00
15947b4e6aupdated wrappers
Robert Osfield
2010-02-26 16:02:20 +00:00
56c54958a3Added spaces between < > template parts of macros to prevent compile problems when templates as use as macro parameters
Robert Osfield
2010-02-26 15:54:37 +00:00
3b43810c66From Paul Martz, "Regarding the osg-users thread "mergeGeodes crash", I'm submitting this for consideration as a fix for the problem with the FlattenStaticTransformsVisitor. It seems that the additional nested loop over the Transform's parent was not needed. I'm not sure why it was there, and if it really was unnecessary, then it has probably been resulting in many redundant Nodes for quite some time. Perhaps this fix will result in a cull- and draw-time performance boost."
Robert Osfield
2010-02-26 15:40:19 +00:00
dbe854e9b0From Raymon de Vries, "I've made a small change to DirectShowTexture.cpp: in the options for the directshow plugin it is possible to specify the capture device by number. For instance: options->setPluginStringData("captureVideoDevice", "0");
Robert Osfield
2010-02-26 15:01:00 +00:00
bbca791251From Michael Platings, "Here's the all-new, all-dancing DAE plugin, with support for reading osgAnimation. It's been tested with the majority of the samples in the COLLADA test repository and works with all of them either as well as, or better than, the version of the plugin currently in SVN.
Robert Osfield
2010-02-26 14:41:50 +00:00
e9fa0bc5e3Updated wrappers
Robert Osfield
2010-02-26 14:36:23 +00:00
d50eacd07eFrom Paul Martz, "The changes are very similar to Magne's, except they now take the near plane into account. The changes are:
Robert Osfield
2010-02-26 10:13:28 +00:00
75527fd800From Paul Martz, "Summary: GL3 deprecates "glGetString(GL_EXTENSIONS)". In GL3, individual extension strings are queried by looping over GL_NUM_EXTENSIONS and calling "glGetStringi(GL_EXTENSIONS,<index>)".
Robert Osfield
2010-02-26 10:03:01 +00:00
0e29cd6971From Paul Martz, "Summary: GL3 deprecates "glGetString(GL_EXTENSIONS)". In GL3, individual extension strings are queried by looping over GL_NUM_EXTENSIONS and calling "glGetStringi(GL_EXTENSIONS,<index>)".
Robert Osfield
2010-02-26 09:48:22 +00:00
8a86f47276From Chris Hanson, comment fix
Robert Osfield
2010-02-26 09:40:11 +00:00
eb23514478From Sukender, "I tried a tiny change in is83() function and had no crash (under Windows). "osgconv cow.osg cow.3ds" exports a black cow and "osgconv lz.osg lz.3ds" exports tree(s) at (0,0,0)... I guess there are still things to do about non-zero-index textures and multiple instanciation of a node, but at least it doesn't crash."
Robert Osfield
2010-02-26 09:33:48 +00:00
2e154d5976From Ryan Kawicki, "I guess I missed these during my testing, but if the database pager has outstanding requests while the application is shutting down, the archive can become invalidated through unsafe calls to ReaderWriterTXP::getArchive. I've made this function return a ref_ptr and change other locations to as needed to conform to the change. I've tested this and no more crashes.
Robert Osfield
2010-02-26 09:23:28 +00:00
8c4da68338From Philip Lownman, "The libpng project decided to rename png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8() with the 1.2.9 release. This submission fixes builds of the OSG against versions of libpng < 1.2.9 that don't have the new symbol available. This affects platforms like Red Hat Enterprise Linux 4 which come with libpng 1.2.7."
Robert Osfield
2010-02-26 08:55:50 +00:00
bc202cd4bbFrom Terry Welsh, "As discussed on the osg-users list, I have implemented these rules in Text and Text3D:
Robert Osfield
2010-02-25 18:17:20 +00:00
7ca071192eFrom Erik Johnson, "There is an issue on win32 if the application hides the cursor using GraphicsWindowWin32::useCursor(false). The cursor has a habit of re-showing itself.
Robert Osfield
2010-02-25 18:05:59 +00:00
8059c4a745From Chris Hanson, comment fix.
Robert Osfield
2010-02-25 18:03:14 +00:00
444361272fFrom Trajce Nikolov, "attached is some fix for the directshow plugin. Cleans up the build warnings as well makes the code a bit safer"
Robert Osfield
2010-02-25 18:01:25 +00:00
74687953beFrom Jeremy Moles, submitted by Cedric Pinson "Here an new example from Jeremy Moles that demonstrate EaseMotion from osgAnimation, i have updated EaseMotion with new type, so for users of EaseMotion just have look, it's a great example."
Robert Osfield
2010-02-25 17:58:50 +00:00
605ad76691From Wang Rui, "Attached is the osgTerrain wrappers, based on the latest SVN version of OSG. I modified the osgDB::InputStream and OutputStream and the PagedLOD wrapper as well. Now all seems to work fine with paged scenes. I've tested with the puget terrain data and the osgdem application from VPB: # osgdem --xx 10 --yy 10 -t ps_texture_4k.tif --xx 10 --yy 10 -d ps_height_4k.tif -l 8 -v 0.1 -o puget.osgb
Robert Osfield
2010-02-25 17:53:51 +00:00
26e68926f7From J.P. Delport: "by some strange circumstance I've stumbled across the following problem:
Robert Osfield
2010-02-25 17:18:46 +00:00
e3ad12c4f2From Simon Buckley, "Attached is a small change to the file src\osgPlugins\dxf\dxfFile.cpp that allows the dxf reader to skip comments in a dxf file. I found with the existing version and a test file I had that the loader failed when comments were present. I made a very minor change to allow "999" comment codes to be skipped rather than causing load failure."
Robert Osfield
2010-02-25 17:13:15 +00:00
590bf9070dFrom Michael Platings, "There is a function, convertStringFromCurrentCodePageToUTF8() that would be useful outside the FBX plugin so it belongs in osgDB. I've attached ConvertUTF and ConvertUTF.cpp with the function added for you to commit at your convenience. "
Robert Osfield
2010-02-25 17:07:34 +00:00
440bd7c3e3
Michael PLATINGS
2010-02-24 10:52:51 +00:00
6ec0e11b2a
Michael PLATINGS
2010-02-24 10:25:50 +00:00
4f72d66cbe
Michael PLATINGS
2010-02-24 10:12:11 +00:00
14ef0fa930
Michael PLATINGS
2010-02-24 10:02:14 +00:00
9a45538db9Added an empty() method
Robert Osfield
2010-02-22 17:41:35 +00:00
bb35fcc980Updated authors file
Robert Osfield
2010-02-22 10:43:22 +00:00
3169f44548Updated wrappers
Robert Osfield
2010-02-22 10:36:55 +00:00
d2ecd34d66Fixed STDINT_INCLUDE path
Robert Osfield
2010-02-22 10:10:08 +00:00
c16d55fa9bFrom Trajce Nicklov, fixes to warnings
Robert Osfield
2010-02-22 09:50:37 +00:00
e3a1f664b9Seperated out the #define of GL_PERSPECTIVE_CORRECTION_HINT to fix GL3 build
Robert Osfield
2010-02-22 08:48:02 +00:00
bb21136d92Added missing _ptr = rp._ptr to constructor.
Robert Osfield
2010-02-22 08:39:33 +00:00
7f454bef3eConverted View across to use ObserverNodePath.
Robert Osfield
2010-02-20 17:36:55 +00:00
4acaaa3274Build fixes for GLES2
Robert Osfield
2010-02-19 21:03:33 +00:00
c2d55fdb37Fixed GLES1/GLES2 build
Robert Osfield
2010-02-19 20:58:46 +00:00
46f9e760eeAdded include of osg/FrameBufferObject to fix GLES1/GLES2 build issue
Robert Osfield
2010-02-19 20:43:58 +00:00
521ad875cbBuild fix for GLES1 and GLES2
Robert Osfield
2010-02-19 20:40:41 +00:00
b1001c2a9cMoved implementation of Observer destructor and constructor from header into .cpp to avoid possible issues with imports/exports under Windows build.
Robert Osfield
2010-02-19 20:18:48 +00:00
8b67830f6eAdded check against OSG_GL3_AVAILABLE to avoid issues with GL3 build under linux
Robert Osfield
2010-02-19 20:14:12 +00:00
1924350e1cAdded #include <osg/Notify>, convert osg::notify usage to OSG_NOTICE
Robert Osfield
2010-02-19 20:11:14 +00:00
eca4361c4aClean up observer_ptr<> and removed the eronous casting of ptr in objectDeleted.
Robert Osfield
2010-02-19 19:50:55 +00:00
657c5c4e71Updated wrappers
Robert Osfield
2010-02-19 19:00:48 +00:00
43f9b13199Removed the uncessary subclassing from osg::Object as this base class is already pullled via ViewerBase
Robert Osfield
2010-02-19 18:56:21 +00:00
b807fc83feAdded mutex lock to destructor.
Robert Osfield
2010-02-19 16:04:33 +00:00
8f11af8d3eReplaced local mutex with getObserverMutex().
Robert Osfield
2010-02-19 15:41:42 +00:00
88474271e3From Fabien Lavignotte, "In order to compile on Windows with Wrappers ON, some exports are still missing on osgPresentation::AnimationMaterialCallback and osgUtil::IncrementalCompileOperation::CompileSet."
Robert Osfield
2010-02-19 14:30:01 +00:00