FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,795 Commits 1 Branch 26 Tags 73 MiB
cd5c75ae72
Commit Graph

15795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mp3butcher
7be09e8dcd fix the particular case when no image assigned (immutable texture storage had no chance to be used) 
Note: There are other paths where immutable arent used even if available
 2018-02-09 01:09:48 +01:00
mp3butcher
c6b5aba249 regroup and add missing funcs related to immutable texture storage 2018-02-08 23:35:43 +01:00
Robert Osfield
97ba981dce Merge branch 'master' into shader_pipeline 2018-02-08 09:28:40 +00:00
Robert Osfield
79f9cfae80 From Ravi Mathur, "he freetype plugin currently forces the use of the first font within a truetype collection (.ttc index 0). I made a slight modification such that users can specify any font index via the userOptions input to osgText::readFontFile(). Specifically, the freetype plugin now accepts a new string option of the format "index=< unsigned int >". Example usage: 
Code:
// Chooses the second font within the Menlo font collection
osg::ref_ptr<osgDB::Options> fontOptions = new osgDB::Options;
fontOptions->setObjectCacheHint(osgDB::Options::CACHE_OBJECTS);
fontOptions->setOptionString("index=1");
text->setFont(osgText::readFontFile("Menlo.ttc", fontOptions));

"
 2018-02-07 18:28:17 +00:00
Robert Osfield
f767ab0cc9 Refactored the event handler so that it contains a helper NodeVistor class rather than inherits from inappropriately using multiple inheritance. 2018-02-07 17:23:14 +00:00
Robert Osfield
a0c23d914d Merge branch 'master' into shader_pipeline 2018-02-07 09:27:53 +00:00
Robert Osfield
55a45e3c0e Changed the text bounding box calcualtion so that it only takes in to account the basic glyph size, and doesn't add in the glyph margin used for accounting for texel sampling 2018-02-06 17:54:33 +00:00
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
Robert Osfield
e77be08e56 Maded CLAMP_TO_EDGE default clamp mode 2018-02-01 10:50:09 +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
Robert Osfield
0c35541fc5 Merge branch 'master' into shader_pipeline 2018-01-27 10:56:09 +00: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
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