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

10757 Commits

Author SHA1 Message Date
Robert Osfield
3dec244d5b Changed GL enum to fix Windows build issue 2018-02-28 08:02:39 +00:00
Robert Osfield
2a56e2dda1 Changed GL enum to fix Windows build issue 2018-02-28 08:00:40 +00:00
Robert Osfield
d2939da39f Merge branch 'master' into shader_pipeline 2018-02-27 19:10:26 +00:00
Robert Osfield
6a4609c28f Fixed precision issue with filling in the last element of the TransferFunction1D's osg::Image. 2018-02-27 19:09:18 +00:00
Robert Osfield
140633adc1 Merge branch 'master' into shader_pipeline 2018-02-27 18:16:08 +00:00
Robert Osfield
7b6eedbdf4 Restructured the way that applyTexParameters() is applied to address issues with Intel drivers not handling mipmap generations unless the tex parameters are reapplied on new upload of data. 2018-02-27 17:35:13 +00:00
Robert Osfield
fc128db510 Merge branch 'master' into shader_pipeline 2018-02-23 09:58:16 +00:00
Robert Osfield
39881b5576 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-02-23 09:57:19 +00:00
Robert Osfield
2b13166c8d Cleaned up the applying of the glDrawBuffers() 2018-02-23 09:55:00 +00:00
Konstantin S. Matveyev
e3df1e954d GLExtensions fix: No PBO on GLES2 by default 2018-02-22 16:43:14 +03:00
Robert Osfield
a421b5eeac Merge branch 'master' into shader_pipeline 2018-02-22 08:47:46 +00:00
OpenSceneGraph git repository
ffc8e54cdc
Merge pull request #484 from LaurensVoerman/submit_inventor_dllexport 
Remove OSG_EXPORT from deprecated_osg::Geometry in inventor plugin.
 2018-02-22 08:15:46 +00:00
Laurens Voerman
819fb2b14c Remove OSG_EXPORT from deprecated_osg::Geometry in inventor plugin. 2018-02-21 13:38:42 +01:00
Robert Osfield
351e8e3fe1 Merge branch 'master' into shader_pipeline 2018-02-19 11:23:29 +00:00
Robert Osfield
f5021e8bc0 Added ADD_DEFINITIONS(-D_WINSOCK_DEPRECATED_NO_WARNINGS) to quieten warning 2018-02-19 10:07:14 +00:00
Philippe Renon
4a025cafb4 renderstage: fix spelling in log message 2018-02-18 18:39:47 +01:00
Philippe Renon
b4a2114fd4 singlewindow: minor log output fix 
log message made it look like it originated from View::setUpViewOnSingleScreen
 2018-02-18 18:39:47 +01:00
Hartwig
73a36679df Addition of radius parameter for ClusterCullingCallback's constructor 
The radius parameter is already present in ClusterCullingCallback's set method but has been forgotten in the constructor.
 2018-02-15 21:10:59 +01:00
OpenSceneGraph git repository
486cd48daf
Merge pull request #476 from LaurensVoerman/submit_luaWarn 
silence MSVC warning C4324: 'lua_longjmp': structure was padded
 2018-02-14 17:16:39 +00:00
Laurens Voerman
ac00b8537f silence MSVC warning C4324: 'lua_longjmp': structure was padded 2018-02-14 10:49:33 +01:00
Laurens Voerman
01eff6bc6b fix visual studio compile warnings for ZeroConfDevice project. 2018-02-14 10:38:09 +01:00
Robert Osfield
91f3e8fa59 Merge branch 'master' into shader_pipeline 2018-02-13 12:24:26 +00:00
Robert Osfield
68bb67312e Improved handling of updates to the Texture target that require the texture to be reapplied. 
Used State for applying Texture target to work better with lazy state updating.
 2018-02-13 12:12:34 +00:00
Laurens Voerman
59500d78d0 remove conficting defenition of _WIN32_WINNT in OSG_DETERMINE_WIN_VERSION is ON 2018-02-12 10:47:37 +01:00
Robert Osfield
2592701367 Changed internalFormat to use pixelFormat 2018-02-10 18:40:51 +00:00
Robert Osfield
22d6ce826f Changed internalFormat to use pixelFormat 2018-02-10 18:37:57 +00:00
Robert Osfield
a7839d77cd Added support for PixelBufferObject to Texture2DArray 2018-02-10 17:55:50 +00:00
Robert Osfield
1306fe2611 Added support for PixelBufferObject to Texture2DArray 2018-02-10 17:50:39 +00: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
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
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
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
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
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
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
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
fb4d14d49f
Merge pull request #448 from LaurensVoerman/submit_remove_unused_maxBonePerVertex 
remove unused variable "maxBonePerVertex"
 2018-01-15 16:30:23 +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
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
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
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
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
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
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
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
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
Robert Osfield
f866836d60 Added extension support checks 2018-01-08 10:14:13 +00:00
Robert Osfield
818dee31d8 Fixed build with GLES2 2018-01-08 10:04:28 +00:00
Robert Osfield
b45803898d Added suppor for StateSet::DefineList 2018-01-06 14:59:16 +00:00
Robert Osfield
9944d949fc Improvements to lua/OSG integration 2018-01-06 14:57:39 +00:00
Robert Osfield
e677195084 Merge branch 'master' into shader_pipeline 2018-01-06 13:48:28 +00:00
Robert Osfield
2108141b4e Replaced old style access of ValueObject values to new ValueObject::getScaleValue() methods 2018-01-06 13:47:18 +00:00
Robert Osfield
bdff0955dc Added TextureCubeMap::setImage/getImage() methpds 2018-01-06 13:11:36 +00:00
Robert Osfield
6adf226c27 Merge branch 'master' into shader_pipeline 2018-01-06 12:41:41 +00:00
OpenSceneGraph git repository
4d4b02848b
Had to fix spacing and bracket position yet again... 2018-01-06 12:31:23 +00:00
Julien Valentin
518048bc64 allow read of zipped script 2018-01-05 19:57:41 +01:00
Robert Osfield
575474a269 Merge branch 'master' into shader_pipeline 2018-01-05 15:20:07 +00:00
Robert Osfield
4abc97f44b Fixed return values 2018-01-05 12:12:24 +00:00
Robert Osfield
6a413da143 Merge branch 'master' into shader_pipeline 2018-01-05 11:35:11 +00:00
OpenSceneGraph git repository
741db16916
Merge pull request #428 from mp3butcher/serializerfixbis 
add Node associate on Drawable serializers
 2018-01-05 11:26:06 +00:00
OpenSceneGraph git repository
eca7831281
Merge pull request #424 from mp3butcher/osgSampler 
GL3.3 SamplerObject as StateAttribute
 2018-01-05 09:43:16 +00:00
OpenSceneGraph git repository
f5108459be
Fixed indentation and spacing issues 2018-01-05 09:41:32 +00:00
OpenSceneGraph git repository
6ef90054bc
Merge pull request #425 from mp3butcher/callbacks 
Support for multiple nest Camera DrawCallbacks
 2018-01-05 09:18:39 +00:00
Julien Valentin
e33a407aaf add BufferData associate to Image and subclasses 2018-01-04 22:50:30 +01:00