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

16257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gwaldron
fac2cc46dc Fixed compilation issues for implicit ref_ptr conversion OFF 2018-09-10 13:19:42 -04:00
gwaldron
5b0d8aca57 osgText: fixed thread-safety issues in Glyph and Font 2018-09-10 08:00:41 -04:00
mp3butcher
369a468083 fix examples context creation for X11 
(when display not :0.0)
 2018-09-08 18:28:51 +02:00
Konstantin S. Matveyev
e72caf957c ParticleSystem: Added support for GLES2 and upper (GL_QUADS -> GL_TRIANGLES) 2018-09-06 12:50:10 +01:00
Robert Osfield
f9f9ea6e15 Fixed memory leak with assignment of default value to ObjectSerializer 2018-09-06 11:50:21 +01:00
Robert Osfield
d1c24d54ed Fixed copy constructor 2018-09-05 18:08:04 +01:00
Robert Osfield
f9cba78ff2 Merged check against data type changes from 3.6 branch. 2018-09-05 14:12:04 +01:00
OpenSceneGraph git repository
eaffb392f3
Merge pull request #614 from jasonbeverage/sharedshaderfix 
Protect the _programSet in Shader with a mutex.
 2018-09-05 09:33:01 +01:00
Jason Beverage
89a5d8b513 Protect the _programSet in Shader with a mutex. 
This prevents thread safety issues when Shader objects are used in
multiple programs.
 2018-09-04 10:35:38 -04:00
Robert Osfield
91df3d8311 Changed the ShapeDrawable::build() methpd so that it does run when the ShadpwDrawabe is a KdTree. 2018-09-04 15:27:41 +01:00
Robert Osfield
9f1205d22d Added support for reading UTF-8 encoded of xml files 2018-09-04 12:41:36 +01:00
Robert Osfield
833756c6b7 Changed the logic for whether to call setUpThreading() in setThreadingModel() to make it possible to changed threadings even if the threading model starts of as SingleThreaded 2018-09-03 12:36:36 +01:00
Robert Osfield
598b16b9bf Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-09-03 10:15:29 +01:00
Robert Osfield
dcd28ba39d Added reset of _stateset to prevent the releaseGLObjects calling release on th StateSet from the destructor 2018-09-03 09:56:37 +01:00
OpenSceneGraph git repository
9c4559362d
Merge pull request #611 from tomhog/topic-gles3-android 
Topic gles3 android
 2018-08-29 09:07:15 +01:00
Thomas Hogarth
9b4b25e4f5 Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merging master
 2018-08-28 15:42:25 +01:00
Thomas Hogarth
9bed712952 Merge remote-tracking branch 'upstream/master' into topic-gles3-android 
merging
 2018-08-28 14:25:38 +01:00
Robert Osfield
ec4b618b7a Replaced the glSGetProcAddressARB code with the dlsym() usage as the NVidia driver looks to be returning non NULL pointers for invalid function names. 2018-08-28 11:22:57 +01:00
Robert Osfield
e8b56c5c97 Added settting of the PointSprite mode validity to State::initializeExtensionProcs() 2018-08-22 10:02:29 +01:00
OpenSceneGraph git repository
34fbba4216
Merge pull request #608 from plevy/patch-2 
Change GL_RGBA16F to  GL_RGBA16F_ARB to fix Windows Build
 2018-08-22 07:46:42 +01:00
plevy
7bd395a77d
Change GL_RGBA16F to GL_RGBA16F_ARB to fix Windows Build 
Change GL_RGBA16F to  GL_RGBA16F_ARB to fix Windows build.
 2018-08-21 09:38:03 -04:00
Robert Osfield
8af2ea48c2 Replaced GL_RGBA32F with GL_RGBA32F_ARB to fix Windows build 2018-08-21 09:21:11 +01:00
OpenSceneGraph git repository
41ee7c1672
Merge pull request #604 from mp3butcher/ImmutableTexture 
add fixe for Cubemap and TexStorage
 2018-08-20 10:05:40 +01:00
mp3butcher
a5a596b33b add fixe for Cubemap and TexStorage 2018-08-19 20:17:30 +02:00
OpenSceneGraph git repository
2d7fc65a8f
Merge pull request #601 from mp3butcher/ImmutableTexture 
TexStorage code cleaning + add feature on Texture2DArray
 2018-08-19 10:41:04 +01:00
mp3butcher
7685235c1d add TexStorage feature on Texture2DArray 2018-08-18 22:55:56 +02:00
mp3butcher
2c9d551452 renaming variable and remove redondant test and variable 2018-08-18 22:55:30 +02:00
mp3butcher
d9f58ff03b fix possible internalformat misregisterings (diff effective gl and osg representation) 2018-08-18 17:26:32 +01:00
Robert Osfield
d37b826a74 Refactored the glTexStorage code paths to use selectSizedInternalFormat() and move the generateAndAssignTextureObject() calls within the two useTexStorage and non TexStorage paths to ensure that the right foramts are matched when generating the texture object 2018-08-17 18:59:04 +01:00
Robert Osfield
d841170d32 Removed check as this is better outside of the function 2018-08-17 16:51:55 +01:00
Robert Osfield
71f134c64b Created a GLenum Texture::selectSizedInternalFormat(const osg::Image* image=0) const method to help clean up set up of glTexStorage. 
Fixed typo.
 2018-08-17 12:22:36 +01:00
OpenSceneGraph git repository
7328e03d23
Merge pull request #594 from mp3butcher/patch-6 
Add valid sizedInternalFormats for glTexStorage path
 2018-08-17 09:54:15 +01:00
OpenSceneGraph git repository
adbfd523f3
Merge pull request #596 from mp3butcher/MeshReindexation 
add a bool parameter to allow forced reindexation of a mesh
 2018-08-17 09:53:26 +01:00
OpenSceneGraph git repository
57ce63fffd
Fixed member variable name 2018-08-17 09:27:09 +01:00
OpenSceneGraph git repository
38cb6b3c49
Changed member variable name to be consistent with header 2018-08-17 09:22:40 +01:00
OpenSceneGraph git repository
aa9173828a
Changed the member variable to be consistent with the method name. 2018-08-17 09:21:31 +01:00
Robert Osfield
eee5d5482e Fixed memory leak associated with VertexArrayStte objects not getting released on destruction of Geometry/Drawables. 2018-08-16 19:23:17 +01:00
mp3butcher
7f12ca4389 add a bool parameter to allow forced reindexation of a mesh 2018-08-16 18:59:47 +02:00
Julien Valentin
3a604b0e10 Add valid sizedInternalFormats 
Why  some much commented?
 2018-08-16 18:56:25 +02:00
OpenSceneGraph git repository
22c0dc379f
Merge pull request #593 from mp3butcher/ImmutableTexture 
add immutability (if available) on ImageLess TextureRectangle
 2018-08-16 16:15:20 +01:00
OpenSceneGraph git repository
1b4677c98a
Merge pull request #595 from cxw42/cygx11 
Remove duplication of REGISTER_WINDOWINGSYSTEMINTERFACE code in GraphicsWindowWin32
 2018-08-16 15:46:56 +01:00
Chris White
c3880a25b6 Remove duplication of REGISTER_WINDOWINGSYSTEMINTERFACE code 
Refactor so GraphicsWindowWin32 doesn't duplicate code in
<osg/GraphicsContext>.

Also, add OSGVIEWER_EXPORT to X11WindowingSystemInterface so
X11WindowingSystemInterface examples can build on cygwin.
This change parallels that in commit 0bca415d5a.
 2018-08-15 12:49:01 -04:00
mp3butcher
c2031836ee add immutability (if available) on ImageLess TextureRectangle 2018-08-11 14:10:13 +02:00
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