flashk
d4bbec4a0c
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-03 12:00:04 +01:00
Robert Osfield
114c818f2e
Removed unused static variables
2018-10-02 12:21:31 +01:00
Robert Osfield
1ee6d476f8
From Andy Skinner, Added ~GLExtensions to clear cached values for context ID
2018-10-02 11:28:34 +01:00
Julien Valentin
8a29c504e4
add version and required extension
...
let a chance to work on intel chipset
2018-10-02 11:06:22 +01:00
OpenSceneGraph git repository
f376af1fd5
Merge pull request #627 from eligovision/OpenSceneGraph-3.6_gui_adapters_1px
...
1px error in GUIEventAdapter, View, Viewer and CompositeViewer major fix
2018-10-02 10:46:25 +01:00
Konstantin S. Matveyev
e663330bdf
1px error in GUIEventAdapter, View, Viewer and CompositeViewer major fix
2018-09-21 13:30:39 +03:00
Robert Osfield
d011ca4e8d
Updated ChangeLog for 3.6.3 release
2018-09-14 11:16:53 +01:00
Robert Osfield
3a6b13c46e
Updated version number and date for 3.6.3 stable release
2018-09-14 10:41:24 +01:00
Robert Osfield
88afccd85e
Updated ChangeLog for 3.6.3-rc3
2018-09-13 08:52:21 +01:00
Robert Osfield
d6d6c3cda2
Updated for 3.6.3-rc3
2018-09-13 08:47:17 +01:00
Robert Osfield
ca134dca2d
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 17:45:49 +01:00
Robert Osfield
66246703bf
Warning fixes
2018-09-11 15:32:44 +01:00
Robert Osfield
fb09be05a9
Fixed warning
2018-09-11 12:29:40 +01:00
Robert Osfield
41fa8fecd1
Updated for 3.6.3-rc2
2018-09-11 12:23:01 +01:00
Robert Osfield
2213011caa
Updated rc number 2 for 3.6.3-rc2
2018-09-11 11:56:04 +01:00
OpenSceneGraph git repository
c2f0da31f2
Merge pull request #620 from LaurensVoerman/txt_SCREEN_COORDS
...
fix scale problem for osgText with characterSizeMode SCREEN_COORDS and _position set.
2018-09-11 11:29:36 +01:00
Robert Osfield
2e14bd52bf
Fixed hang using a ReentrantMutex
2018-09-11 11:23:34 +01:00
Robert Osfield
4ea833cc6b
Fixed build
2018-09-11 10:13:49 +01:00
Robert Osfield
7fae3b67cd
Fixed build
2018-09-11 09:31:35 +01:00
Robert Osfield
8780347f2f
Cleaned up code
2018-09-11 09:05:16 +01:00
gwaldron
22e6f6038f
osgText: fixed thread-safety issues in Glyph and Font
2018-09-11 08:53:40 +01:00
mp3butcher
385cfa0cbf
fix examples context creation for X11
...
(when display not :0.0)
2018-09-11 08:40:02 +01:00
OpenSceneGraph git repository
960f4d1ef2
Merge pull request #619 from mathieu/topic/SaveInlinedImages
...
Added saving of inline Images without having the physical image file.
2018-09-11 08:34:20 +01:00
Robert Osfield
257c2deb86
Added greater control of how cubemap is set up and controlled
2018-09-11 08:11:27 +01:00
Laurens Voerman
4dc6a6c4cd
fix scale problem for osgText with characterSizeMode SCREEN_COORDS and _position set.
2018-09-07 15:09:15 +02:00
Mathieu MARACHE
2e38e4751c
Added saving of inline Images without having the physical image file.
...
The can be read from and inlined image file
2018-09-07 14:05:50 +02:00
Robert Osfield
dfdb946d60
Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6
2018-09-06 12:30:18 +01:00
Robert Osfield
2f056dcaa9
Updated for 3.6.3-rc1
2018-09-06 12:29:44 +01:00
Robert Osfield
d07fe93f34
Fixed memory leak with assignment of default value to ObjectSerializer
2018-09-06 11:53:35 +01:00
OpenSceneGraph git repository
05297f439c
Merge pull request #616 from eligovision/OpenSceneGraph-3.6_particles
...
ParticleSystem: Added support for GLES2 and upper (GL_QUADS -> GL_TRI…
2018-09-05 18:06:25 +01:00
Robert Osfield
34d58d447d
Fixed copy constructor
2018-09-05 18:01:33 +01:00
Konstantin S. Matveyev
637e1cc33b
ParticleSystem: Using of GL_TRIANGLES for GLES2 and upper; GL_QUADS otherwise
2018-09-05 19:00:29 +03:00
OpenSceneGraph git repository
5d6ab3e6b7
Merge pull request #617 from aluaces/Image_scaleImage_typo
...
Fix typo in the initial check of Image::scaleImage().
2018-09-05 14:04:57 +01:00
Alberto Luaces
69667a478f
Fix typo in the initial check of Image::scaleImage().
2018-09-05 13:38:09 +02:00
Konstantin S. Matveyev
f00b7180cb
ParticleSystem: Added support for GLES2 and upper (GL_QUADS -> GL_TRIANGLES)
2018-09-05 14:05:29 +03:00
Jason Beverage
6ae1139630
Protect the _programSet in Shader with a mutex.
...
This prevents thread safety issues when Shader objects are used in
multiple programs.
2018-09-05 09:34:54 +01:00
Robert Osfield
a06fcbe5d9
Updated ChangeLog
2018-09-05 09:33:24 +01:00
Robert Osfield
5f9c6a0170
Changed the ShapeDrawable::build() methpd so that it does run when the ShadpwDrawabe is a KdTree.
2018-09-04 15:26:30 +01:00
Robert Osfield
2a4dd6e03b
Updated SO version as XmlNode::Input changes change the ABI
2018-09-04 14:13:32 +01:00
Robert Osfield
afe5644b9f
Added support for reading UTF-8 encoded of xml files
2018-09-04 12:42:31 +01:00
Robert Osfield
ae3133522d
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:30:02 +01:00
Robert Osfield
5040c583b4
Updated version number to 3.6.3 in prep for next naintainance release
2018-09-03 11:19:50 +01:00
Robert Osfield
61967a7d1a
Merge branch 'OpenSceneGraph-3.6-TexStorage' into OpenSceneGraph-3.6
2018-09-03 10:16:45 +01:00
Robert Osfield
bcba3928e6
Added reset of _stateset to prevent the releaseGLObjects calling release on th StateSet from the destructor
2018-09-03 09:41:59 +01:00
Robert Osfield
006ca64f4b
Added reset of _stateset to prevent the releaseGLObjects calling release on th StateSet from the destructor
2018-09-03 09:37:36 +01:00
Robert Osfield
77fd07eaa9
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 12:01:35 +01:00
Robert Osfield
8b8c427afe
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:52:42 +01:00
Robert Osfield
f55b864d59
Enabled point sprite validty modes.
2018-08-22 11:21:30 +01:00
Robert Osfield
d18c498322
Enabled point sprite validty modes.
2018-08-22 11:13:11 +01:00
Robert Osfield
4f7f34a6b0
Merged fix for PointSprite modes validity checks from master.
2018-08-22 10:43:15 +01:00