Commit Graph

15399 Commits

Author SHA1 Message Date
OpenSceneGraph git repository
a1132442ff
Merge pull request #466 from openscenegraph/revert-454-imagebinding
Revert "BindingTextureImage: a more complex condition for  _texture->apply ?"
2018-02-02 09:54:48 +00:00
OpenSceneGraph git repository
6d1d1bb000
Revert "BindingTextureImage: a more complex condition for _texture->apply ?" 2018-02-02 09:54:31 +00:00
OpenSceneGraph git repository
db5e803439
Merge pull request #463 from xyzz/android-gl1
getGLExtensionFuncPtr: support gl4es wrapper on Android.
2018-01-30 09:53:45 +00:00
Ilya Zhuravlev
92b45581af getGLExtensionFuncPtr: support gl4es wrapper on Android. 2018-01-29 16:07:13 -05:00
OpenSceneGraph git repository
8046ef5b6b
Merge pull request #459 from mp3butcher/bufferstorage
add more extensions
2018-01-27 09:20:12 +00:00
OpenSceneGraph git repository
03977b5619
Merge pull request #461 from filnet/issue_458
os_utils: fix non portable use of "defined"
2018-01-27 09:17:30 +00:00
OpenSceneGraph git repository
28245e252c
Merge pull request #457 from PissedCapslock/patch-3
Typo in comment
2018-01-27 09:16:46 +00:00
Philippe Renon
13d88c7fec os_utils: fix non portable use of "defined"
see https://github.com/openscenegraph/OpenSceneGraph/issues/458
2018-01-26 10:33:48 +01:00
Julien Valentin
f4663b0e32 add ARB_BufferStorage extensions 2018-01-25 16:22:33 +01:00
Robin Stevens
3cd5e43fdf
Typo in comment 2018-01-24 10:29:49 +01:00
Robert Osfield
753d86d6d8 Merged shader_pipeline version of CMakeLists.txt 2018-01-23 15:27:24 +00:00
Robert Osfield
e49aaa9f2c Removed the OSG_SYSTEM_SUPPORTED cmake var and added use of posix_spawn under Apple with C system function used elsewhere. 2018-01-23 11:43:55 +00:00
OpenSceneGraph git repository
022d1df97d
Merge pull request #454 from mp3butcher/imagebinding
BindingTextureImage: a more complex condition for  _texture->apply ?
2018-01-23 10:26:20 +00:00
OpenSceneGraph git repository
3b2b2d762c
Merge pull request #456 from PissedCapslock/patch-2
Fixing typos in comments
2018-01-23 09:56:26 +00:00
OpenSceneGraph git repository
afc533283a
Merge pull request #455 from PissedCapslock/patch-1
Typo in comment
2018-01-23 09:55:52 +00:00
Robin Stevens
dcbaa3e64a
Fixing typos in comments 2018-01-23 10:25:32 +01:00
Robin Stevens
5810d2ba18
Typo in comment 2018-01-23 10:20:49 +01:00
Robert Osfield
b36b5fa8da Changed fallback message to be consistent with fucntion name 2018-01-21 12:19:27 +00:00
Robert Osfield
18d5a9159f Restructured the system() fallback to be usable for C and C++ 2018-01-21 12:09:49 +00:00
Julien Valentin
588a9ae10d use introduced getBufferData to determine _target->apply requirements. 2018-01-21 01:24:01 +01:00
Julien Valentin
0aa8008f0a add a virtual getBufferData to Texture 2018-01-21 01:23:38 +01:00
OpenSceneGraph git repository
9cc2bab737
Merge pull request #452 from LaurensVoerman/submit_input_copyWchar
text copy - get unicode text to clipboard.
2018-01-20 12:35:30 +00:00
OpenSceneGraph git repository
c7f5d13e19
Merge pull request #453 from LaurensVoerman/submit_directinput
fix bug: potentially uninitialized local variable 'hr' used
2018-01-20 12:33:54 +00:00
Laurens Voerman
b0b28d21d9 fix bug: potentially uninitialized local variable 'hr' used 2018-01-19 11:38:01 +01:00
Laurens Voerman
9ef68841c0 text copy - get unicode text to clipboard. 2018-01-19 11:20:34 +01:00
OpenSceneGraph git repository
ee7e7a7019
Merge pull request #447 from LaurensVoerman/submit_remove_unused_vars
remove unused variable "newArrays"
2018-01-15 16:30:44 +00:00
OpenSceneGraph git repository
fb4d14d49f
Merge pull request #448 from LaurensVoerman/submit_remove_unused_maxBonePerVertex
remove unused variable "maxBonePerVertex"
2018-01-15 16:30:23 +00:00
OpenSceneGraph git repository
6b9235f185
Merge pull request #449 from LaurensVoerman/submit_toLower
fix vc2017 compile warning 'unsigned int' to 'const char'
2018-01-15 16:28:54 +00:00
Robert Osfield
5ad1a652a0 Moved defined into GLDefines header to avoid compile issues under Windows 2018-01-15 16:02:44 +00:00
Laurens Voerman
33f99e9c70 fix vc2017 compile warning 'unsigned int' to 'const char' 2018-01-15 16:42:31 +01:00
Laurens Voerman
4f7fcb19d5 remove unused variable "newArrays" 2018-01-15 16:04:12 +01:00
Laurens Voerman
df6194de5f remove unused variable "maxBonePerVertex" 2018-01-15 15:59:56 +01:00
OpenSceneGraph git repository
bf6aaed5e0
Merge pull request #445 from mp3butcher/osgSampler3
Osg sampler3  improve example to get command arguments
2018-01-14 13:27:15 +00:00
OpenSceneGraph git repository
1946ff652d
Merge pull request #444 from mp3butcher/osgSampler2
Osg sampler2  add static helper func in order to generate Samplers of a Samplerless StateSet
2018-01-14 13:25:23 +00:00
OpenSceneGraph git repository
a6a72755b8
Merge pull request #443 from mp3butcher/osgSampler1
Add MinLOD MaxLOD and LODBias to Texture
2018-01-14 12:40:34 +00:00
Julien Valentin
480b452e38 improve example to get command arguments 2018-01-13 21:29:02 +01:00
Julien Valentin
4c0a861f91 add static helper func in order to generate Samplers of a Samplerless StateSet
+fix ident
2018-01-13 21:25:47 +01:00
Julien Valentin
8894939577 add MinLOD MaxLOD and LODBias to Texture and its serializer
as well as ShadowTextureMode None enum
2018-01-13 21:20:32 +01:00
Julien Valentin
020bff3ab1 increment SO version 2018-01-13 21:19:25 +01:00
Julien Valentin
d2b8468bf4 add MinLOD MaxLOD and LODBias to Texture 2018-01-13 21:16:16 +01:00
Robert Osfield
3e6d118d10 Disabled the use of the GeometryFinishedObjectReadCallback in the Geometry serializer as this doesn't look it's needed anymore. 2018-01-13 16:43:42 +00:00
OpenSceneGraph git repository
561b49fb78
Merge pull request #442 from eligovision/OpenSceneGraph_viewer
osgViewer::ViewerBase setThreadingModel function fixed
2018-01-13 16:07:56 +00:00
Konstantin S. Matveyev
bb84f1ea3c osgViewer::ViewerBase setThreadingModel func fix: should not start threading, must only restart 2018-01-13 15:49:39 +03:00
Robert Osfield
ae57f3cd46 Added ability to toggle on/off use of C system() function call, using OSG_SYSTEM_SUPPORTED Cmake option 2018-01-12 19:52:31 +00:00
Robert Osfield
6a3d9b2aa2 Added os_utils header 2018-01-12 17:03:31 +00:00
Robert Osfield
a7cc9664c0 Renamed EnvVar header to os_utils in prep for adding more OS related calls to it 2018-01-12 16:48:17 +00:00
OpenSceneGraph git repository
bfbae8ad12
Merge pull request #437 from filnet/text_typo
osgText: fix typos related to SIGNED_DISTANCE_FIELD
2018-01-11 14:32:53 +00:00
Robert Osfield
e84c93dfce Fixed Linux NVTT build issue by restricting the addition of the new libs to just Windows 2018-01-11 10:10:43 +00:00
Robert Osfield
7d311915e7 Merged NVTT cmake fixes from 3.4 branch 2018-01-11 09:39:27 +00:00
Robert Osfield
0cee5f5d27 Added returns to avoid fall through between case statements 2018-01-11 08:51:08 +00:00