Robert Osfield
65c09c8e0d
From Tim Moore, improved doxygen comments
2010-05-17 14:43:41 +00:00
Robert Osfield
ccd9f31309
Removed signalUnreffed interface
2010-05-17 14:21:53 +00:00
Robert Osfield
f832198128
From Tim Moore, refactore WeakReference/Referenced to avoid signalling the observers when do a unref_nodelete.
2010-05-17 09:03:44 +00:00
Robert Osfield
4d88ba6efe
Re-ordered the inclusion of platform specific headers to fix compile error under Windows
2010-05-17 08:29:35 +00:00
Robert Osfield
a0eb7de060
From Alok Priyadarshi, support for statically linking to GLES2.lib
2010-05-14 19:47:50 +00:00
Robert Osfield
554adfc8e6
Refactored Observer/ObserverNodePath and DatabasePager to improve their robustness.
2010-05-14 12:24:13 +00:00
Robert Osfield
2b2ea4487a
From Tim Moore, new more robust observer_ptr<> implementation
2010-05-14 12:14:14 +00:00
Robert Osfield
4e8f0561ad
From Farshid Lashkari, "I modified some plugins to use the osgDB file stream functions in order to support UTF-8 encoded filenames."
2010-05-13 11:01:06 +00:00
Robert Osfield
29ea65c12b
From Gunter Huber, fixes for better GLES2 support
2010-05-13 10:01:07 +00:00
Robert Osfield
42527fe859
From Wang Rui, "I'd like to submit my inbuilt schema data support of
...
the OutputStream/InputStream implementations, which was just finished
last weekend with a few tests on Windows and Ubuntu. Hope it could
work and get more feedbacks soon.
I've added a new option "SchemaData" to the osg2 plugin. Developers
may test the new feature with the command line:
# osgconv cow.osg cow.osgb -O SchemaData
It will record all serializer properties used in the scene graph, at
the beginning of the generated file. And when osgviewer and user
applications is going to read the osgb file, the inbuilt data will be
automatically read and applied first, to keep backwards compatibility
partly. This will not affect osgb files generated with older versions.
"
2010-05-12 20:02:31 +00:00
Robert Osfield
a04d83efa7
From Mathias Froehlich, fixed memory leak when using OpenThread::Mutex based reference counting.
2010-05-12 15:11:15 +00:00
Robert Osfield
046b6a4bfd
Removed inappropriate code which was causing a memory leak. This code was clearly a copy and paste error. The mistake was spotted by Robin Bourianes, with code changes made by Robert Osfield.
2010-05-12 14:34:18 +00:00
Robert Osfield
cfd4c514cb
Improved the indentation/replaced tabs
2010-05-12 11:58:01 +00:00
Robert Osfield
688323fbed
From Sukender, "Here is a tiny fix about texture wrap mode not being written correctly in 3DS files."
2010-05-12 11:44:30 +00:00
Robert Osfield
b1179978f5
From Stephan Huber, "attached you'll find a fix for a crash when closeImplementation gets
...
called more than once."
2010-05-12 11:41:36 +00:00
Robert Osfield
68a1ed2dcf
Fixes for building OSG with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF.
...
Fixed copy and paste error in Camera::getImplicitBufferAttachmentResolveMask().
2010-05-12 11:37:27 +00:00
Michael PLATINGS
e91557fe1d
From Martins Innus: The current fbx writer doesn't seem to support BIND_PER_VERTEX for normals. If you have this type of geometry it, exports the the first normal in the array over the whole primitive set. I don't know that the attached change should be applied as is, since I don't know enough about DrawArrays and Draw Elements to know if the indices for the vertices and normals are guaranteed to be the same. I tried it on a couple models and that seemed to be the case. The alternative is to have the logic down in setControlPointAndNormalsAndUV and set the normals there with the "vertexIndex" if the binding type is per vertex. Not sure what is cleaner.
2010-05-12 08:54:22 +00:00
Michael PLATINGS
047b70c265
From Martins Innus: allow the fbx exporter to reference textures correctly if the stateset is applied to the Geode instead of Geometry
2010-05-11 17:02:18 +00:00
Michael PLATINGS
c51e94725b
Fix from Martins Innus for error: extra qualification 'FbxMaterialToOsgStateSet::' on member 'FbxMaterialToOsgStateSet'
2010-05-11 09:08:55 +00:00
Robert Osfield
c0c4585ac3
updated wrappers
2010-04-30 20:04:25 +00:00
Robert Osfield
ed5f0578b8
Added support for stripping all by text nodes from a p3d xml file, and merging of an original and stripped p3d xml file for the purpose of using external editors to fix spelling mistakes
2010-04-30 19:42:43 +00:00
Robert Osfield
400aa8ebcd
Added proper support for writing out Xml graph
2010-04-30 19:41:56 +00:00
Robert Osfield
7ef776ec5f
Fixed warnings
2010-04-30 19:41:24 +00:00
Robert Osfield
5ef3952a76
Added beginnings of spell checking support
2010-04-30 15:51:38 +00:00
Robert Osfield
6d046e9fa1
From Wang Rui, "I've just made another OSG+Qt (GUI) examples to demonstrate how to create OSG views, add them to a CompositeViewer, and add corresponding widgets to Qt layouts or as popup windows. The example inherits a GraphicsWindowQt from the GraphicsWindow base class and implements most of the virtual methods. A QGLWidget is created at the same time to perform keyboards and mouse events, who is also added as the main widget's child.
...
The new example, named osgviewerQtContext (because of deriving from GraphicsContext), works fine on Windows XP SP3 and Qt 4.5.0, with 4 widgets in QGridLayout and a popup window and 60Hz frame rate. I haven't tested it on Unix/Linux and Mac OSX yet. So any feedback from these platforms is appreciated. I wish this example be a useful complement to current osgviewerQt and osgviewerQtWidgets ones. :)
Some unfinished functionalities: inheritedWindowData, sharedContext, and more tests needed."
2010-04-30 12:22:31 +00:00
Robert Osfield
c2a59415ce
Changed DisplaySetting::instance() to return a ref_ptr<>& rathern than a raw C pointer to enable apps to delete the singleton or assign their own.
2010-04-30 11:48:30 +00:00
Robert Osfield
afce262601
Added free of _visualInfo if it's already been allocated
2010-04-30 10:52:24 +00:00
Robert Osfield
087559f7a0
Changed debug messages to use printf to avoid issues with using notify at startup and exit.
2010-04-30 10:51:27 +00:00
Robert Osfield
38276b0d92
Added support for using dot graphs directly in the <graph></graph> token
2010-04-30 10:50:17 +00:00
Robert Osfield
12a0b9ab6d
From Bernardt Duvenhage: "I noticed that in 'src/OpenThreads/pthreads/CMakeLists.txt' a '!' has been written instead of 'NOT' within an if statement expression.
...
IF(!OSG_COMPILE_FRAMEWORKS) ...
vs.
IF(NOT OSG_COMPILE_FRAMEWORKS) ...
This has the effect of always compiling OpenThreads as a framework under OSX. The CMakeLists.txt that I use to be able to compile the non-framework version of OpenThreads is attached. I simply replaced the '!' replaced by a 'NOT' and added a MESSAGE to notify me when the .framework will be compiled."
2010-04-29 15:23:43 +00:00
Robert Osfield
b028a59720
From Michael Platings, "I've updated the FBX plugin to use the latest version of the FBX SDK. I've checked in the plugin files myself, but I need you to check in this change to FindFBX.cmake to change the SDK directory."
2010-04-29 11:59:51 +00:00
Robert Osfield
4012841053
Fixed handling of Terrain/CoordinateSystem node so that the code now handles the fact that Terrain now subclasses from CoordinateSystemNode.
2010-04-29 09:46:14 +00:00
Robert Osfield
a4718ef88b
Updated wrappers
2010-04-28 22:08:48 +00:00
Robert Osfield
a6c7fee246
From Alok Priyadarshi, "1. Replaced APIENTRY to GL_APIENTRY which is used by OpenGL ES
...
headers. For desktop GL GL_APIENTRY has been defined as APIENTRY."
2010-04-28 21:22:44 +00:00
Robert Osfield
c019e2f76d
Fixed typo
2010-04-28 21:10:29 +00:00
Robert Osfield
5435f6cf50
From Wang Rui, "Two small bugs were just found when I was writing examples for my book
...
in process: a wrong definition of the OSG_FATAL macro, and wrong logic
inside the KeySwitchMatrixManipulator::getDistance() function. I
believe both were slips."
2010-04-28 20:33:40 +00:00
Robert Osfield
363f32536b
From Farshid Lashkari, "There's a subtle bug in osgDB::getFileExtension where it returns an incorrect value if the filename does not contain an extension but a sub-directory contains a dot character. I've modified the function so that it checks for this case."
2010-04-28 20:21:28 +00:00
Robert Osfield
0adf26ec6e
From Wang Rui, "The osgManipulator serializers are ready now. I need to modify the
...
META_OSGMANIPULATOR_Object macro to ensure these classes could work
with their wrappers, and a few naming styles should be changed as
well. Fortunately everything seems to compile fine under Windows and
my new Ubuntu system.
And I finally find the problem of the
serializers/osgTerrain/Terrain.cpp, it just missed an "osg::Group"
before "osg::CoordinateSystemNode" indicator. With the small fix
attached now VPB could generate terrain with osgt/osgb formats."
2010-04-28 20:16:44 +00:00
Robert Osfield
22dfe6f8d1
From John Ivar Haugland and Michael Platings,
...
JIV:"I deleted a line from the ReaderWriterDAE.cpp file that was introduced in rev 11341. I got a crash on this line when the options pointer was NULL."
MP:"Good spot John. The next line is also unnecessary and can be removed as well (attached, plus some minor code beautifying)"
2010-04-28 20:10:53 +00:00
Robert Osfield
8b8ca09ab1
Added support for passing options to the .dot plugin
2010-04-28 18:53:34 +00:00
Robert Osfield
b459fb4a25
Added support for passing in an options string to control the orientation of the generated graph
2010-04-28 18:52:58 +00:00
Robert Osfield
f27678dbb9
Introduced the use of ref_ptr<> in read show methods
2010-04-28 17:29:31 +00:00
Robert Osfield
bff3fcbe72
Removed redundent files
2010-04-28 17:18:01 +00:00
Robert Osfield
dbbe73304a
Added support for using graphviz dot for graphics visualization via <graph>filename</graph> token.
2010-04-28 14:56:38 +00:00
Robert Osfield
4143f2f839
Fixed typo
2010-04-28 14:55:42 +00:00
Robert Osfield
b86431fdf7
Added colours and different style to drawable and statesets
2010-04-28 14:55:07 +00:00
Michael PLATINGS
324ddd0ca3
No longer removes redundant nodes because node structure may be important.
2010-04-28 14:05:47 +00:00
Robert Osfield
dfda4ce35f
Replaced afprintf usage with std::string to fix memory leak and improve portability of code.
2010-04-28 10:15:16 +00:00
Stephan Maximilian HUBER
7fb49c6d2f
From Stephan Huber: updated xcode-project
2010-04-26 10:07:49 +00:00
Robert Osfield
117d949d1f
From Roland Smeenk and Robert Osfield, improvements to the indentation of comments.
2010-04-23 16:35:44 +00:00
