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

16036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenSceneGraph git repository
712f468d52
Merge pull request #633 from flashk/patch-5 
Fix for HDR DDS images
 2018-10-04 08:54:11 +01:00
OpenSceneGraph git repository
dbf63e3fcc
Merge pull request #632 from flashk/patch-4 
osgDB::OutputStream write array optimization
 2018-10-04 08:53:28 +01:00
OpenSceneGraph git repository
0a6f2be9a9
Merge pull request #631 from flashk/patch-3 
Fix for GifImageStream::setReferenceTime
 2018-10-04 08:52:33 +01:00
OpenSceneGraph git repository
3899654d7c
Merge pull request #630 from flashk/patch-2 
Fix for inconsistent FBX bone hierarchy
 2018-10-04 08:51:42 +01:00
flashk
aba6524ff4
Fix for HDR DDS images 
The DDS loader was not applying the correct internal format for certain HDR images (e.g. float/half_float formats)
 2018-10-03 14:21:03 -07:00
flashk
0891424610
osgDB::OutputStream write array optimization 
I've made a change to osgDB::OutputStream::writeArrayImplementation so that it writes the array data in a single write operation for binary files. This significantly speeds up writing out osgb files for large data sets (e.g. point clouds). osgDB::InputStream already performs a similar optimization when reading array data from binary files.
 2018-10-03 14:12:54 -07:00
flashk
0a37744a54
Fix for GifImageStream::setReferenceTime 
Setting the reference time greater than the duration of a gif would cause a crash. Also, the current reference time is not immediately updated when manually setting the reference time.
 2018-10-03 11:32:10 -07:00
flashk
24a856fa6e
Update ReaderWriterFBX.cpp 2018-10-03 09:59:34 -07:00
flashk
79120eb994
Update fbxRMesh.cpp 2018-10-03 09:52:10 -07:00
flashk
0e2e81273b
Update fbxReader.h 2018-10-03 09:49:37 -07:00
OpenSceneGraph git repository
f7d9053ea0
Merge pull request #629 from flashk/patch-1 
Fix hardware mipmap generation for cube maps
 2018-10-03 11:20:34 +01:00
flashk
7bcf9b4bcb
Fix hardware mipmap generation for cube maps 
I was getting a black image when enabling hardware mipmap generation on cubemaps. I believe the problem is that the base Texture class is hard coding GL_TEXTURE_2D when enabling mipmap generation, instead of using the target type from the derived class.
 2018-10-02 09:04:26 -07:00
Robert Osfield
594e971f6d Removed unused static variables 2018-10-02 12:30:28 +01:00
Robert Osfield
5962d2580f From Andy Skinner, Added ~GLExtensions to clear cached values for context ID 2018-10-02 12:29:30 +01:00
Robert Osfield
41577c6107 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-10-02 10:50:40 +01:00
OpenSceneGraph git repository
3d3c7f9940
Merge pull request #628 from mp3butcher/patch-12 
osgdrawinstanced: add version and required extension to vertex shader
 2018-10-02 10:50:32 +01:00
Konstantin S. Matveyev
abd2fa53c4 1px error in GUIEventAdapter, View, Viewer and CompositeViewer major fix 2018-10-02 10:48:26 +01:00
Julien Valentin
3179970a1c
add version and required extension 
let a chance to work on intel chipset
 2018-10-01 23:13:10 +02:00
OpenSceneGraph git repository
427ee6b0a2
Merge pull request #626 from mp3butcher/patch-11 
use OpenGL 3.0 instead of 3.1 for more compatibility
 2018-09-19 08:46:33 +01:00
Julien Valentin
4cc06dec4b
use OpenGL 3.0 instead of 3.1 for more compatibility 
..as there no feature in the example requiring 3.1
 2018-09-18 15:20:09 +02:00
Robert Osfield
1985927333 Standardized the glTexStorage*() calls to use osg::maximum(_numMipmapLevels,1) of rnumber of mipmaps to keep the usage consistent. 
Fixed the erronous Texture2DArray glTexStorage call so that it used the _numMipmapLevels as above to resolve bug in allocation.
 2018-09-12 19:11:31 +01:00
Robert Osfield
697131a39b Warning fixes 2018-09-11 15:33:55 +01:00
Robert Osfield
7c1a967a02 Fixed warning 2018-09-11 12:30:28 +01:00
Laurens Voerman
583ecccd75 fix scale problem for osgText with characterSizeMode SCREEN_COORDS and _position set. 2018-09-11 11:56:59 +01:00
Robert Osfield
c4819427fa Fixed hang using a ReentrantMutex 2018-09-11 11:24:24 +01:00
Robert Osfield
b94c797ed6 Fixed build 2018-09-11 09:32:15 +01:00
OpenSceneGraph git repository
0343ff7eff
Merge pull request #623 from pelicanmapping/implicit-refptr-conversion 
Fixed compilation issues for implicit ref_ptr conversion OFF
 2018-09-11 09:25:00 +01:00
Robert Osfield
7a4c6a8c55 Cleaned up code 2018-09-11 09:03:01 +01:00
OpenSceneGraph git repository
a9fa3cdfad
Merge pull request #622 from pelicanmapping/osgText-thread-safety-fixes 
osgText: fixed thread-safety issues in Glyph and Font
 2018-09-11 08:43:55 +01:00
OpenSceneGraph git repository
0942bf24a1
Merge pull request #621 from mp3butcher/readDisplay 
fix examples context creation for X11
 2018-09-11 08:39:21 +01:00
Mathieu MARACHE
1de7b6a73e Added saving of inline Images without having the physical image file. 
The can be read from and inlined image file
 2018-09-11 08:35:35 +01:00
Robert Osfield
b913367126 Added greater control of how cubemap is set up and controlled 2018-09-11 08:12:36 +01:00
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