Commit Graph

420 Commits

Author SHA1 Message Date
Robert Osfield
7994bfa767
Merge branch 'OpenSceneGraph-3.6' into build/windows_clang_3.6_target 2020-11-10 14:41:56 +00:00
Alberto Luaces
2ade061ced Code comments, log strings and some variable spell fixes. 2020-10-29 15:14:29 +00:00
MeyerFabian
ba70c7d543 build/windows_clang 2020-07-21 17:37:24 +02:00
Laurens Voerman
4b6d9287bc replaced "if (apm || !apm->valid())" 2019-06-14 15:46:55 +01:00
Robert Osfield
dd32ee2945 Added basic load and compile stats collection enabled by --stats command line. 2019-03-25 14:09:04 +00:00
Capostrophic
12b298130a Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions 2019-03-14 10:46:42 +00:00
Robert Osfield
658fd4d19d Added support for reading and writing images 2018-11-20 14:19:37 +00:00
mp3butcher
385cfa0cbf fix examples context creation for X11
(when display not :0.0)
2018-09-11 08:40:02 +01:00
Robert Osfield
801069d4cc As the author of all the files in osgPresentation and present3D have rectified the license notices to reflect their intended license rather than histoical license they had prior to being merged into the OpenSceneGraph project. OSGPL was always intended but missed during merge.
Replaced the GPL notices with OSGPL usge in present3D and include/osgPresentation as this was intended when Present3D was merged back into OpenSceneGraph but missed.
2018-05-31 14:45:37 +01:00
Robert Osfield
6b037372b6 Updated ChangeLog, AUTHORS and Controbitors for 3.6.0-rc1 2018-03-24 18:02:35 +00:00
Robert Osfield
ba4791a15d Updated ChangeLog and AUTHORS file 2018-03-20 09:02:05 +00:00
Robert Osfield
7f0baaab61 Added passing of the osgDB::Options to the remove from cache to make sure the cache model for the presentation is found and removed. 2017-12-04 16:43:08 +00:00
Robert Osfield
1810c9e7e3 Updated ChangeLog and AUTHORS file 2017-12-03 14:27:10 +00:00
Jordi Torres
82f0a2d849 same values in || so one of them not needed 2017-12-02 16:49:47 +00:00
Robert Osfield
c95a5486b1 Updated ChangeLog and AUTHORS file for 3.5.8 dev release 2017-11-14 15:04:05 +00:00
Robert Osfield
45f1f23064 Updated ChangeLog and AUTHORS 2017-10-30 14:05:45 +00:00
Laurens Voerman
99491e46ec modified present3D to allow multiple --login arguments like osgViewer, added --login option to osgvnc example 2017-10-12 17:21:10 +02:00
Robert Osfield
d649334662 Updated AUTHORS 2017-10-09 12:23:45 +01:00
Robert Osfield
ddf8c68d26 Added support for multiple --login url username password entries to osgviewer 2017-10-05 15:37:03 +01:00
Robert Osfield
674c25fceb Added catch for controbutors list 2017-08-22 11:59:22 +01:00
Robert Osfield
0dbcfff679 Added name typo fix 2017-08-22 11:58:49 +01:00
luzpaz
2cd31f65e4 misc. typo fixes
mostly non-user-facing but some doxy.
2017-08-15 12:23:49 -04:00
Robert Osfield
d02be06df9 Updated AUTHORS file for dev release 2017-05-11 16:32:13 +01:00
Robert Osfield
4f6b6fc5f8 Updated AUTHORS.txt file and Contributors list for 3.5.6 dev release 2017-03-28 11:50:04 +01:00
Robert Osfield
1668bfb3e8 Improved the contributor filters 2017-03-28 11:45:05 +01:00
Robert Osfield
cbf21f7ef5 Update ChangeLog and AUTHORS file for 3.5.5 dev release 2016-10-07 13:56:46 +01:00
Robert Osfield
b0285b0022 Added handling of return value 2016-06-23 16:32:30 +01:00
Robert Osfield
e044fa0d70 Added handling of return value 2016-06-23 10:06:12 +01:00
Robert Osfield
57b999b310 Fixed check against null 2016-06-23 10:05:50 +01:00
Robert Osfield
07b6016c61 Added handling of return values 2016-06-23 10:01:19 +01:00
Robert Osfield
fff4b4ae65 Fixed unused parameter warning. 2016-06-08 11:02:51 +01:00
Alberto Luaces
68baf15806 defines for building on Hurd and BSD kernels 2016-05-31 12:58:57 +01:00
Alberto Luaces
260cbab518 Typo fixes 2016-05-30 12:30:05 +01:00
Robert Osfield
ae3ba28fee Fixes shadows warnings 2016-05-20 13:38:34 +01:00
Robert Osfield
68430ee8e5 Added a local implementation of SlideEventHandler::checkNeedToDoFrame() so that Present3D can toggle on/off the need for continuous rendering to only slides that require it,
enabling slides with no animation to sit iddle rather keeping rendering, reducing CPU/GPU overhead and saving power.
2016-03-10 16:35:08 +00:00
Robert Osfield
1f5b7855eb Added basic support for OSG_RUN_FRAME_SCHEME ON_DEMAND env var and --run-on-demand, --run-continuous to Present3D 2016-03-10 11:24:21 +00:00
Robert Osfield
bc794e3807 Refactored the signal handling to be thread safe 2015-11-23 11:01:47 +00:00
Robert Osfield
dd996a3289 Introduced CMake option OSG_PROVIDE_READFILE option that defaults to ON, but when switched to OFF disables the building of the osgDB::read*File() methods,
forcing users to use osgDB::readRef*File() methods.  The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache.  This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero.  Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.

To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage.  The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:

    bool addChild(Node* child); // old method which can only be used with a Node*

    tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method

These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697
2015-10-22 13:42:19 +00:00
Robert Osfield
8b37ff25e7 From Laurens Voerman, "I crashed osgconv while compressing textures:
osgconv --compressed-dxt1 cow.osg cow.ive

due to different handling of the extentions in osg 3.4 and up.

attached is a zip with the files:

OpenSceneGraph\applications\osgconv\osgconv.cpp



This file is valid for svn branch and stable3.4."



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15124 16af8721-9629-0410-8352-f15c8da7e697
2015-09-04 14:50:39 +00:00
Robert Osfield
7e3ac0e584 Fixed AUTHORS file
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15011 16af8721-9629-0410-8352-f15c8da7e697
2015-07-22 17:01:03 +00:00
Robert Osfield
cf35354bf7 Fixed contributors list
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15009 16af8721-9629-0410-8352-f15c8da7e697
2015-07-22 14:55:38 +00:00
Robert Osfield
1f0ba7aa4f Updated AUTHORS for dev release
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14895 16af8721-9629-0410-8352-f15c8da7e697
2015-06-04 09:35:19 +00:00
Robert Osfield
d14a602a59 From Jannik Heller, typo fixes
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14882 16af8721-9629-0410-8352-f15c8da7e697
2015-06-01 13:11:49 +00:00
Robert Osfield
180ce288c3 Update ChangeLog and AUTHORS file
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14865 16af8721-9629-0410-8352-f15c8da7e697
2015-05-06 18:39:44 +00:00
Robert Osfield
6a4a21afe3 Updated AUTHORS
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14851 16af8721-9629-0410-8352-f15c8da7e697
2015-04-20 10:41:45 +00:00
Robert Osfield
0a1db3d6fc From Jannik Heller, typo fixes
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14832 16af8721-9629-0410-8352-f15c8da7e697
2015-04-13 10:43:56 +00:00
Robert Osfield
70b5297575 From Jannik Heller, typo fixes
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14826 16af8721-9629-0410-8352-f15c8da7e697
2015-04-07 18:01:12 +00:00
Robert Osfield
abdb23e367 From Janik Heller, clean up of drawable/node usage
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14824 16af8721-9629-0410-8352-f15c8da7e697
2015-04-07 15:53:17 +00:00
Robert Osfield
8c8b8f3305 Restructed the osgPresentation and present3D directories back to the structure that was present in OSG-3.2
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14759 16af8721-9629-0410-8352-f15c8da7e697
2015-03-04 18:36:44 +00:00
Robert Osfield
412a9154c3 Updated AUTHORS for 3.3.5 dev release
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14756 16af8721-9629-0410-8352-f15c8da7e697
2015-03-03 15:26:15 +00:00