Robert Osfield
|
753d86d6d8
|
Merged shader_pipeline version of CMakeLists.txt
|
2018-01-23 15:27:24 +00:00 |
|
Robert Osfield
|
a2eb879965
|
Merge branch 'master' into shader_pipeline
|
2018-01-23 12:38:50 +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 |
|
Robert Osfield
|
368dd5dd92
|
Merge branch 'master' into shader_pipeline
|
2018-01-23 10:39:05 +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 |
|
Robert Osfield
|
1e8879f2e2
|
Merge branch 'master' into shader_pipeline
|
2018-01-23 10:08:27 +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
|
2f65456dd4
|
Merge branch 'master' into shader_pipeline
|
2018-01-21 13:11:51 +00: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 |
|
Robert Osfield
|
ea5086ca9e
|
Quitended down debug output
|
2018-01-17 16:17:24 +00:00 |
|
Robert Osfield
|
41e3b723a7
|
Merge branch 'master' into shader_pipeline
|
2018-01-15 16:52:10 +00: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
|
6a5afd63e7
|
Merge branch 'master' into shader_pipeline
|
2018-01-15 16:03:21 +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 |
|
Robert Osfield
|
9fdc713b97
|
Merge branch 'master' into shader_pipeline
|
2018-01-14 13:28:45 +00: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
|
2dc6c568a9
|
Merge branch 'master' into shader_pipeline
|
2018-01-13 16:52:21 +00: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
|
a810b80b77
|
Fixed typo and improved readability of description
|
2018-01-13 11:13:54 +00:00 |
|
Robert Osfield
|
26b06a8daa
|
Merge branch 'master' into shader_pipeline
|
2018-01-12 19:55:34 +00: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 |
|
Robert Osfield
|
8d170ccfe6
|
Merge branch 'master' into shader_pipeline
|
2018-01-11 14:34:11 +00:00 |
|
Robert Osfield
|
eea0cf9642
|
Merge branch 'master' into shader_pipeline
|
2018-01-11 14:33:24 +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 |
|