FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,932 Commits 1 Branch 26 Tags 73 MiB
99491e46ec
Commit Graph

444 Commits

Author SHA1 Message Date
Robert Osfield
b2603d6c93 Updated version number 2017-10-09 12:25:40 +01:00
Robert Osfield
be2f2d6595 Bumped SO version to reflect changes in ABI 2017-08-24 11:17:43 +01:00
Robert Osfield
af79ad451e Added remapping of CMAKE_BUILD_TYPE strings that don't have the correct case. 2017-08-16 17:51:58 +01:00
luzpaz
2cd31f65e4 misc. typo fixes 
mostly non-user-facing but some doxy.
 2017-08-15 12:23:49 -04:00
Robert Osfield
fc95045259 Updated version number, ChangeLog and AUTHORS file for 3.5.7 developer release 2017-07-28 17:17:25 +01:00
Robert Osfield
fcdd3750c2 Replaced FindOurDCMTK.cmake usage with FindDCMTK.cmake 2017-07-26 12:54:37 +01:00
Robert Osfield
0b5f45289d Updated SO version number to 149 to enable uint64 object length read/writing in the .osgb format 2017-06-19 15:55:42 +01:00
OpenSceneGraph git repository
ccd79d9db1 Merge pull request #258 from kornerr/master 
Add x86_64 architecture to iOS simulator
 2017-05-25 09:37:26 +01:00
Robert Osfield
20ac472d1f Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config 2017-05-24 19:40:08 +01:00
Michael Kapelko
55d394490a Add x86_64 architecture to iOS simulator 2017-05-24 22:29:19 +07:00
Robert Osfield
36bd42b0dd Updated SO_VERSION to reflect API changes to KdTree 2017-05-11 16:10:47 +01:00
Remo E
3f99ce540f Fix VS2013 build issue 
Fix this build issue on VS2013:

```
\src\osg\State.cpp(99): fatal error C1017: invalid integer constant expression
```

I hope this works also on other platforms.
 2017-03-29 15:28:09 +02:00
Robert Osfield
76afbc9bcf Fixed ac plugin's handling of rot primitive in .ac files 2017-03-27 20:30:14 +01:00
Thomas Hogarth
7ba2e728cd GLES3 now working on iOS, tried to maintain support for have bother gles2 and gles3, allowed avfoundation to be added on iOS, improved iOS example cmake generation 2017-03-20 18:39:56 +00:00
Thomas Hogarth
76fe572934 Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in 2017-03-20 18:33:08 +00:00
Laurens Voerman
7b67ef0c6f split travis-ci apple build into two jobs to avoid job time limit. 2017-02-03 10:01:15 +01:00
Robert Osfield
a9bc508dc4 From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake. 2016-11-30 19:11:15 +00:00
Robert Osfield
4e5f0fc3a5 Added a dedicated FindEGL.cmake script to help with locating the EGL.so library and header 2016-10-14 11:06:31 +01:00
Robert Osfield
dbdd25742d Updated version number to 3.5.6 and SO version to 146 after VAO merge 2016-10-12 09:09:37 +01:00
Mathieu MARACHE
46c86f53ac remove a warning when compiling with GL3 core profile and macOS 2016-10-11 11:29:29 +01:00
Robert Osfield
56a7208891 Removed Qt dependency examples, osgQt NodeKit and qfont plugin as these are now provided by the separate osgQt project 2016-09-26 09:31:22 +01:00
Robert Osfield
3f91c5d970 Changed the min CMake version to 2.8.0 2016-09-22 18:33:35 +01:00
Laurens Voerman
ba3ab1a7c1 fix error in CmakeLists: CMAKE_CXX_COMPILER_VERSIO -> CMAKE_CXX_COMPILER_VERSION 2016-09-22 09:09:46 +02:00
Laurens Voerman
3b029f5d3e short version with gcc warning flags depending on compiler version. 2016-09-20 10:23:15 +02:00
Laurens Voerman
65567fdeac Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph into Submissions10 2016-09-20 10:20:47 +02:00
Laurens Voerman
37bd1c6b93 disable warning C4589 for MSVC 2016-09-19 16:40:59 +02:00
Laurens Voerman
c757fdb779 enable some more aggressive warning flags for gcc 4.7 and cmake version below 3 2016-09-16 17:12:41 +02:00
Laurens Voerman
743ecf3706 remove last Performer reference 2016-09-09 10:58:19 +02:00
Robert Osfield
489860fb87 Updated version number to 3.5.5 2016-09-06 09:31:16 +01:00
Robert Osfield
aae78b8a8b Updated ChangeLog formatting 2016-09-05 19:12:54 +01:00
Ravi Mathur
e9d6737ec4 Updates to the CMake build system for Mac OSX 2016-08-10 14:30:28 +01:00
Robert Osfield
072eace1bf Removed the osgviewerGLUT as GLUT is terrible example of how to build a modern 3D graphics application. 2016-06-21 09:21:45 +01:00
Robert Osfield
3816e4c76e Updated SO version number to reflect changes to API 2016-06-14 12:00:36 +01:00
Robert Osfield
358a882031 Updated version number of to 3.5.4 2016-06-10 18:03:18 +01:00
Robert Osfield
16645b1e25 Added -Wmaybe-uninitialized -Wextra warnings to GNU CXX build. 2016-06-08 10:21:57 +01:00
Robert Osfield
7d7c0daa5e Added check against GCC version when adding the -Wshadow warning to OSG_AGGRESSIVE_WARNING_FLAGS so that it's only used in versions later than 4.9. 2016-06-02 20:00:42 +01:00
Robert Osfield
dd9bcf6013 Set default value of OSG_USE_REF_PTR_SAFE_DEREFERENCE of OFF to avoid the check overhead polutting all OSG applications. 2016-06-02 13:03:07 +01:00
Robert Osfield
c0b560175c Fixed typo 2016-06-02 12:43:09 +01:00
Robert Osfield
88a01aa09d Bumped version number for 3.5.3 dev release 2016-06-02 11:25:40 +01:00
Robert Osfield
045fa05b0d Restructed the control of OSG_AGGRESSIVE_WARNINGS_FLAGS to make it possible to edit them in ccmake/CMakeSetup. 
Changed the name of OSG_USE_AGGRESSIVE_WARNINGS to OSG_AGGRESSIVE_WARNINGS to make sure it sits alongside the OSG_AGGRESSIVE_WARNINGS_FLAGS within ccmake
so that it's easier to see how the two variables are coupled.
 2016-06-02 11:06:50 +01:00
rdiankov
da34da18ca add safety checking when dereferencing ref_ptr 2016-05-21 21:29:14 +02:00
Robert Osfield
e900ecc4c7 Added -Wshadow tp OSG_AGGRESSIVE_WARNING_FLAGS for GNU compiler 2016-05-20 10:51:40 +01:00
Robert Osfield
92ee6de05e Changed svn reference to git 2016-03-01 20:35:58 +00:00
Robert Osfield
cd00f7b558 Fixed the make tag-run and branch-run 2016-03-01 20:24:19 +00:00
Robert Osfield
a1aecc024e Refactored the make tag-test, tag-run, branch-test, branch-run and ChangeLog features of the CMakeLists build system so it now supports working off git instead of subversion 2016-03-01 19:44:32 +00:00
Robert Osfield
0d1c8286a2 Updated version number for 3.5.2 dev release 2016-03-01 15:33:16 +00:00
Robert Osfield
9bde2ef631 Added support for NodeMask to osg::Drawable serializers 2016-02-11 16:25:47 +00:00
Robert Osfield
44130fc527 Cleaned up OSX option selection code. 
Updated version for 3.5.1 dev release


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15180 16af8721-9629-0410-8352-f15c8da7e697
 2015-11-09 15:52:06 +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
d7cd5b1811 Updated SO version for svn/trunk. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15120 16af8721-9629-0410-8352-f15c8da7e697
 2015-09-04 14:24:40 +00:00