Commit Graph

15763 Commits

Author SHA1 Message Date
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
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
f95ca26fab Merge branch 'master' into shader_pipeline 2018-01-11 08:54:53 +00:00
Robert Osfield
0cee5f5d27 Added returns to avoid fall through between case statements 2018-01-11 08:51:08 +00:00
Robert Osfield
6bd2d9054e Moved setFusionDistance() into View::updateSceneView() 2018-01-10 16:55:02 +00:00
Philippe Renon
3e12972a03 osgText: fix typos related to SIGNED_DISTANCE_FIELD 2018-01-10 14:21:25 +01:00
Andreas Ekstrand
0eacd8161a Small fix in the osgjs plugin. Since osgjs uses pixel area for PIXEL_SIZE_ON_SCREEN PagedLOD ranges instead of a diameter, it's a more correct approximation to square the ranges in this case. 2018-01-10 11:07:46 +00:00
Robert Osfield
903b0895f7 Added non const variants of State::getDisplaySettings/getActiveDisplaySettings(). 2018-01-09 12:16:32 +00:00
Robert Osfield
f38575926f Merge branch 'master' into shader_pipeline 2018-01-08 10:53:41 +00:00
Robert Osfield
df280811a1 Merged Program.cpp from shader_pipeline 2018-01-08 10:52:35 +00:00
Robert Osfield
9e7fa60f16 Change index parameter handling to getScalerValue() 2018-01-08 10:49:48 +00:00
Robert Osfield
e65caecf82 Merge branch 'master' into shader_pipeline 2018-01-08 10:46:03 +00:00
Robert Osfield
0fafb385f9 Fixed indentation 2018-01-08 10:31:47 +00:00