Robert Osfield
fef39b6215
Re-enabled the disable of the transfer function
2013-11-06 09:50:16 +00:00
Robert Osfield
2ebe81cb0e
Fixed handling of web cams
2013-11-06 09:49:51 +00:00
Robert Osfield
6f6c44446c
Introduced a cast(T) method into the ImageUtils template functor to allow code reading images to handle casting from source data to a form that a user can use more conviently
2013-11-06 09:23:21 +00:00
Robert Osfield
ef3a65b93f
Restructed the call to avformat_open_input to provide more information.
2013-11-06 09:20:35 +00:00
Robert Osfield
2b3665f010
Fixed typo
2013-11-05 15:23:32 +00:00
Robert Osfield
ffb0a8e545
From Stephan Huber, "Build Problem with osgGA at MacOS with Xcode 5"..."attached you'll find a possible solution for the issue. This will add a new option to cmake called OSG_CXX_LANGUAGE_STANDARD which defaults to C++11. If you set it to C++98 it will setup the project accordingly."
2013-11-01 14:40:50 +00:00
Robert Osfield
a10e9c6950
Added initial shell of new osgtransferfunction example that will be tested bed for upcomming transfer function editing UI.
2013-10-28 17:46:07 +00:00
Robert Osfield
ff8fe4143e
From Likasz Izebski, "added support for etc2/eac compression"
2013-10-28 12:03:55 +00:00
Robert Osfield
ac383e15c1
Added explict setting of the PolygonMode to over the distion mesh being toggled to wireframe.
2013-10-25 15:47:41 +00:00
Robert Osfield
4a660f6266
Introduce new osgGA::Event and osgGA::EventHandler base classes that the old GUIEventAdapter and GUIEventHandler now subclass from.
...
The new osgGA::Event is written to support more generic events than the original GUIEventAdapter which are written for keyboard and mouse events.
2013-10-25 14:54:15 +00:00
Robert Osfield
2025c511f0
Remoed -fpermissive
2013-10-25 14:46:37 +00:00
Robert Osfield
191eabd3ab
Fixed warning
2013-10-25 09:02:39 +00:00
Robert Osfield
2a9ed125b8
Fixed warning
2013-10-24 20:22:13 +00:00
Robert Osfield
b3603f76e4
Removed depreated glib call
2013-10-24 19:56:04 +00:00
Robert Osfield
95e8d2838c
Fixed FileInfo self intialization bug
2013-10-24 19:32:00 +00:00
Robert Osfield
1861e025e9
Fixed build problems with the OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION off
2013-10-24 17:43:02 +00:00
Robert Osfield
ded27b4971
From Stephan Huber, "attached you’ll find a small enhancement for present3d. Now you can get advanced help via —help-all etc (similar to osgviewer)"
2013-10-24 12:15:37 +00:00
Robert Osfield
37fa2d698f
From Stephan Huber, add support for controlling the OSXMenubarBehavior set by DisplaySettings.
2013-10-24 10:10:16 +00:00
Robert Osfield
234adf7daf
Cleaned up addChild/getChild/setChild/getNumChildren methods and added readNodeFile, readImageFile and readObjectFile functions
2013-10-24 09:06:52 +00:00
Robert Osfield
f548bc79d4
Added support for Group::addChild/setChild/getChild/getNumChildren.
2013-10-23 16:17:26 +00:00
Robert Osfield
c45f3aa4fb
Merged changes to DisplaySettings from Stephan Huber in prep for controlling the menu hiding behaviour under OSX.
...
Added new WindowSystemInterface::setDisplaySettings() method to provide a mechanism for passing settings onto the WindowSystemInterface so it can then set up the system appropriately.
Added assignment of the DisplaySettings to the WindowSystemInterface in Viewer/ComppsiteViewer::realize().
2013-10-22 19:12:34 +00:00
Robert Osfield
b7b7186cf8
Preliminary remapping of internalFormat for GL3 core profile
2013-10-22 18:58:15 +00:00
Robert Osfield
3dba54c10a
Fixed warnings
2013-10-22 16:28:20 +00:00
Robert Osfield
1196f153fc
From Colin McDonald, "The osgt/osgb file formats output a scenegraph node with the type
...
set to "SCENE" in the file header. But if the file is stored and
then extracted again from an osga archive this header info is lost,
and the resulting file is just an "OBJECT". Possibly other plugin
operations would have the same effect. The osgt/osgb plugin won't
then return the scenegraph contents.
I have updated the osgt/osgb plugin to return a node from an "OBJECT"
file."
2013-10-22 11:32:21 +00:00
Robert Osfield
c34a8e4ddb
From Colin McDonald, "The osgb file reader uses seek to position within the file.
...
But the nested stream implementation for osga archive files doesn't
support seeking. So osgb files can't currently be used in an osga
archive e.g. if osgdem is used to output a osgb format database it
can't be packaged in an archive file, in the same manner that ive
files could.
I've added seek support to the osga nested stream implementation."
2013-10-22 11:26:45 +00:00
Robert Osfield
5ed399ca48
Fixed handling of osg::Program so that it's not overriden by shader composition when enabled
2013-10-22 11:18:28 +00:00
Robert Osfield
4493d11ca3
Added State::releaseGLObjects() and ShaderComposer::releaseGLObjects() to avoid problems with cleanup of graphics context
2013-10-21 16:35:12 +00:00
Robert Osfield
074eb8e41c
Build fixes for clang
2013-10-21 09:54:41 +00:00
Robert Osfield
a68f0f26a8
From Farshid Lashkari, "previously discussed change to the dae loader which applies the node ID as a "dae_node_id" user value."
2013-10-18 09:57:49 +00:00
Robert Osfield
9146ba7d44
From Vladimir Chebeav, fix for removal of nested callbacks
2013-10-18 08:37:18 +00:00
Robert Osfield
5bfb2ef26d
From Konstantin Matveyev, "Multiple light fix in FBX-importer"
2013-10-18 07:55:26 +00:00
Robert Osfield
bddeecdbee
From Colin McDonald, "Some missing updates to the serializer static build support."
2013-10-18 07:52:18 +00:00
Robert Osfield
49625a1baf
From Andreas Henne, "in my application I use the TrackballDragger, the ScaleAxisDragger and the TranslateAxisDragger. Unfortunately these draggers are very thin and they do not provide methods to change their visual appearance. Another problem that I noticed is that lighting on the cones and boxes of the TranslateAxisDragger and ScaleAxisDragger is incorrect when the draggers are scaled due to not normalized normals. This small patch adresses these problems, providing methods to make the draggers thicker. I have attached a zip archive containing the corresponding files and also a modified osgManipulator example that makes use of the modifications. I don't want to retain any copyright."
2013-10-18 07:31:22 +00:00
Robert Osfield
a97e092619
Fix for error in getting the uniform block max name length, fix suggested by Christopher Fennell.
2013-10-17 18:29:39 +00:00
Robert Osfield
7de6a0c9e2
From Stephan Huber, build fix
2013-10-17 14:02:15 +00:00
Robert Osfield
eb7c2ae3f7
Added set/get to the ImageSerializer and removed some redudent comments
2013-10-10 20:43:03 +00:00
Robert Osfield
cd86995d7d
From Pjotr Svetachov, "With the new osg::Geometry the binding for arrays now default to undefined. This breaks previously working code in osgAnimation::RigTransformHardware where the arrays got an undefined bounding and because of this the bone indices and weights were not loaded by the shader. Here is a little patch to fix this."
2013-10-10 20:42:24 +00:00
Robert Osfield
08ec0a11bf
From Laurens Voerman, compile fix for VisualStudio
2013-10-10 14:45:57 +00:00
Robert Osfield
0dc55ebc86
Laurens Voerman, "my cmake (2.8.10.2 generating for Visual Studio 11 Win64) doesn't like
...
include(${CMAKE_MODULE_PATH}/FindPackageHandleStandardArgs.cmake)
in CMakeModules/FindLua52.cmake
changing to a more common
include(FindPackageHandleStandardArgs)
solves my problem."
2013-10-10 14:41:41 +00:00
Robert Osfield
4e4d2b35cf
Added get/set method to Serializer to allow pointer passing without going through InputStream/OutputStream.
2013-10-10 09:28:26 +00:00
Robert Osfield
9c53794bc7
Implemented preliminary readNode/readImage support in the lua plugin allow a lua script to create a scene graph as return it.
2013-10-09 15:32:56 +00:00
Robert Osfield
e8b5272b02
From Stephan Huber, "attached you’ll find a bunch of fixes + enhancements for iOS and OS X based on current trunk. I incorporated + tested the submission from Colin Cochran, so his submission is not needed anymore.
...
* fixed a bug with multi-touch and touch-id-generation on iOS and OS X. (will fix a bug reported by Colin Cochran, without ditching the existing logic)
* removed unnecessary warning-flagss when generating xcode-projects via cmake, will enable the usage of OSG_AGGRESSIVE_WARNING_FLAGS
* added support for 10.9 (OS X)
* new cmake-variable: IPHONE_VERSION_MIN, this will set the deployment-target (previously hard-coded) If you set the IPHONE_VERSION_MIN to something like 7.0 osg gets compiled also for 64bit (amd64)
* cmake defaults now to the clang compiler if IPHONE_VERSION_MIN > 4.2
* cmake now sets some xcode-settings so the compiler uses the c++98-standard (clang defaults to c++11, w/o this I got a lot of linking errors)
* removed include-dir for avfoundation-plugin as not needed on OSX/IOS.
* enhanced the ios-example, will now show multitouch-information on a hud (similar to the osgmultitouch-example), and more importantly, will compile + link out of the box
* small enhancements for the osc-device-plugin (send only one msg for MOVE/DRAG, even if multiple msgs/event is enabled)
* better memory-handling for the zeroconf-plugin
* fixed a possible bug in the rest-http-plugin when receiving mouse-events.
* incorporated a fix from Colin Cochran "forwarded touch events are not transformed into the GL UIView“
"
2013-10-07 10:05:09 +00:00
Robert Osfield
20fbad6c29
Cleaned up line endings
2013-10-07 09:33:46 +00:00
Robert Osfield
da2d7e2dde
Added support for automatically select Lua 5.2 is it's available, then falling back to checking for Lua 5.1 otherwise.
2013-10-04 20:42:23 +00:00
Robert Osfield
d260b16981
Moved code across to use lua_userdata to manage pointer to osg::Object that is ref()/unref()
2013-10-04 19:48:03 +00:00
Robert Osfield
79e2d1309f
Added support for Lua 5.2 and osg::Object creation from within Lua scripts.
2013-10-04 16:30:25 +00:00
Robert Osfield
c77dc4fe9e
Added createObject() interface
2013-10-04 16:29:45 +00:00
Robert Osfield
b5b020a138
Updated version number after 3.3.0 dev release
2013-10-04 16:28:49 +00:00
Robert Osfield
910cfeea60
Fixed errors in Contributors list
2013-10-03 16:20:29 +00:00
Robert Osfield
83c396b13b
From Jan Peciva, RayIntersector implementation
2013-10-03 08:45:57 +00:00
