FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,801 Commits 1 Branch 26 Tags 73 MiB
e008784ab6
Commit Graph

15801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenSceneGraph git repository
e008784ab6
Merge pull request #586 from cxw42/cygthreads 
On cygwin, don't use pthread functions that require _GNU_SOURCE in OpenThreads
 2018-08-08 14:38:13 +01:00
OpenSceneGraph git repository
08ec85e3a9
Merge pull request #589 from Vic-Min/master 
Renamed USE_DEPRECATED_API to OSG_USE_DEPRECATED_API
 2018-08-08 14:36:35 +01:00
Vic-Min
e7583207db Renamed USE_DEPRECATED_API to OSG_USE_DEPRECATED_API 2018-08-08 15:05:53 +03:00
Robert Osfield
6d0b8c4693 Tightened up the setting of the Member property of Texture attributes 2018-08-08 07:34:14 +01:00
Chris White
b4889a8c06 On cygwin, define _GNU_SOURCE in pthreads-based OpenThreads 
pthread_{yield,getconcurrency,setconcurrency} are not declared in
pthread.h on cygwin with gcc 7.3.0 unless _GNU_SOURCE is defined.
 2018-08-05 08:11:30 -04:00
Daniel Emminizer
985e82049f OpenFlight: Replace internal caches with osgDB::ObjectCache use. Fixes unbounded memory growth when using readNode(std::istream&, ...) method. 2018-07-31 17:06:34 +01:00
Robert Osfield
cd5c75ae72 Removed unneccessary FIX ME statement. 2018-07-31 09:13:20 +01:00
OpenSceneGraph git repository
deea0f2455
Merge pull request #579 from dstephan1/master 
MultiSwitch Name Serialization
 2018-07-30 15:36:08 +01:00
OpenSceneGraph git repository
0e58ad5a2e
Merge pull request #582 from sbrkopac/master 
fixed cmake regression
 2018-07-30 15:09:57 +01:00
David Stephan
c1d3767ca5 removed tests 2018-07-29 14:13:17 -07:00
sam
552c5f38e4 fixed cmake regression 2018-07-28 12:40:05 -07:00
David Stephan
8cdd4ebddc changes for angry travis 2018-07-27 18:39:36 -07:00
David Stephan
b630e2326b tabs to spaces 2018-07-27 14:55:02 -07:00
David Stephan
9454eb53ba added switch names to osgSim::MultiSwitch serializer 2018-07-27 14:48:10 -07:00
OpenSceneGraph git repository
828c50afc0
Merge pull request #578 from nicolas-f/master 
updated osgviewerWX to remove deprecated calls in wxWidgets 3.x
 2018-07-27 16:39:54 +01:00
Alex Burton
cd214245e7 updated osgviewerWX to remove deprecated calls in wxWidgets 3.x 2018-07-27 14:19:14 +02:00
OpenSceneGraph git repository
b7bed3ee87
Merge pull request #577 from calumr/fix-collada-vcpkg 
Fix FindCollada.cmake for vcpkg installs
 2018-07-23 15:30:09 +01:00
Calum Robinson
e4cd1583cc Fix FindCollada.cmake for vcpkg installs 
* Handle MSVC_VERSION versions > 1910
* Specify PATH_SUFFIXES rather than individual PATHS for FIND_PATH
 2018-07-23 13:29:48 +01:00
OpenSceneGraph git repository
dbe722bda1
Merge pull request #469 from mp3butcher/imagebinding3 
immutable storage for ImageLess Texture
 2018-07-23 11:32:27 +01:00
OpenSceneGraph git repository
86bd4a4e8b
Merge branch 'master' into imagebinding3 2018-07-23 07:57:23 +01:00
OpenSceneGraph git repository
8f96bccb51
Merge pull request #576 from mp3butcher/patch-4 
variables renaming to avoid name collision with size_t
 2018-07-21 14:43:16 +01:00
Julien Valentin
39642572d2
Avoid name collision with size_t 2018-07-18 16:19:21 +02:00
Robert Osfield
15d9c08273 Pulled in OpenFlight/expGeometryRecords.cpp from 3.6 branch 2018-07-09 18:00:29 +01:00
Robert Osfield
f94980b1fe Removed the gl3.h usage for GL3 case as these headers were replaced by glcorearb.h, it's probably better to just fallback to gl.h and have the OSG get the extentions at runtime. 2018-06-29 09:57:55 +01:00
OpenSceneGraph git repository
9a51a4979f
Merge pull request #569 from LarryIII/Fix-issues 
Remove call to nonexistent member seekpos() of std::fpos in VS 15.8
 2018-06-28 06:40:25 +01:00
Larry-Hu
1b6a040cf0 Remove call to nonexistent member seekpos() of std::fpos in VS 2017 version 15.8 or later 2018-06-27 21:21:31 -07:00
Robert Osfield
b2087b8dd3 Replaced creation of a temporary Settings object on the heap with creation on the stack to improve performance 2018-06-27 11:07:53 +01:00
Robert Osfield
a774bd5902 Fixed relaseGLObjects() calls 2018-06-27 11:07:10 +01:00
Robert Osfield
dbcd3b0324 Added GLExtensions::isPointSpriteModeSupported to allow it to be enable for GL versions that support GL_POINT_SPRITE_ARB/GL_POINT_SPRITE_OES 2018-06-27 11:04:14 +01:00
Daniel Emminizer
a3ad6d3af9 GL_RG is now a support format in gluScaleImage(). 2018-06-27 11:04:01 +01:00
Robert Osfield
d2c2ef3ec9 Moved osg::clampProjectionMatrix() template from CullVisitor.cpp into include/osg/CullSettings to make it easier to implement custom clampProjectionMatrix callbacks 2018-06-25 20:03:50 +01:00
OpenSceneGraph git repository
ecedf3232c
Merge pull request #561 from LaurensVoerman/submit_ffmpeg3.2_master 
resolve av sync failure with ffmpeg 3.2 and up
 2018-06-21 12:06:25 +01:00
Laurens Voerman
10d88e0455 resolve av sync failure with ffmpeg 3.2 and up 2018-06-21 09:14:09 +02:00
OpenSceneGraph git repository
43957a5bb5
Merge pull request #560 from calumr/fix-near-far-lines 
Fix z near calculation for lines
 2018-06-20 12:19:23 +01:00
Calum Robinson
334638795a Fix z near calculation for lines 2018-06-20 10:59:12 +01:00
OpenSceneGraph git repository
60da1cfd1b
Merge pull request #557 from mijiping/patch-1 
Fixed the position of the viewport for the camera
 2018-06-18 19:37:30 +01:00
弥继平
36aa3a4fc6
Fixed the position of the viewport for the camera 
The position of viewport doesn't setup properly, some part of viewer is out of CMFC_OSG_MDIView,  and not visible.
 2018-06-19 00:33:03 +08:00
Daniel Emminizer
3410d3a37d FLT: Missing optional attr files on textures no longer generates a console warning. 2018-06-14 14:54:34 +01:00
Robert Osfield
6b38107f45 To handle calling Array::setBinding() after Geometry::set*Array() call, to the Geometry::addVertexBufferObjectIfRequired(osg::Array* array) added treatment of array->getBinding()==Array::BIND_UNDEFINED as BIND_PER_VERTEX as a safe fallback. 2018-06-14 14:54:09 +01:00
OpenSceneGraph git repository
3b78d4f902
Merge pull request #556 from LaurensVoerman/doxygenMissingQT 
remove include/osgQt from doxyfiles; add osgPresentation and osgUI
 2018-06-14 14:45:09 +01:00
Laurens Voerman
d2d16a374c remove include/osgQt from doxyfiles; add osgPresentation and osgUI 2018-06-14 14:31:28 +02:00
Robert Osfield
c3326ee621 Updated LICENSE to use the WxWidgets-3.1 and updates to the LGPL-2.1-only that updates addresses and tighten up language used. 
Functionality the OSGPL-1.0 is the same as OSGPL-0.0, All the OpenSceneGraph users can use either OSGPL-0.0 or OSGPL-1.0.
 2018-06-03 10:27:00 +01:00
Robert Osfield
22e5861c0b Removed deprecated xine plugin to simplify licensing (xine plugin is GPL'd) 2018-05-31 15:12:28 +01:00
Robert Osfield
a855faeff3 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:48:54 +01:00
OpenSceneGraph git repository
79033265d5
Merge pull request #551 from filnet/warn 
Notify: silence warning about unused argument
 2018-05-28 07:53:16 +01:00
Philippe Renon
c0848a56bc Notify: silence warning about unused argument 2018-05-27 14:21:57 +02:00
Robert Osfield
6da45d6a73 Updated REMOVE_SERIALIZER( ImageAttachment ); block to use 154 version to retain compatibility with binaries made with 153 SOVERSION prior to the Imageattachement change 2018-05-23 17:03:51 +01:00
Robert Osfield
6eb6634997 Implemented StateGraph reuse in in scene graph Canera's RenderStage. 2018-05-23 14:52:24 +01:00
Robert Osfield
e5ff90e455 Fixed warning of RenderLeaf's having multiple references in CullVisitor::createOrReuseRenderLeaf() but forcing a clean up of the StateGraph at the end of RenderStage::draw() 2018-05-23 14:42:28 +01:00
Robert Osfield
f8dcb20437 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-05-23 14:38:54 +01:00