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

15637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
1ae954f5c3 Merge branch 'master' into shader_pipeline 2018-02-28 09:11:29 +00:00
Robert Osfield
99bcd95756 Replaced GL_TEXTURE_2D_ARRAY_EXT with GL_TEXTURE_2D_ARRAY 2018-02-28 08:50:48 +00:00
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
OpenSceneGraph git repository
ebf0e8f435
Merge pull request #485 from eligovision/OpenSceneGraph_gles 
GLExtensions fix: No PBO on GLES2 by default
 2018-02-23 08:28:59 +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
OpenSceneGraph git repository
56baa7bf04
Merge pull request #479 from LaurensVoerman/submit_vc14WarnC4800_v2 
move Get/SetScalarvalue out of ValueObject and provide specialization…
 2018-02-19 10:14:36 +00:00
Robert Osfield
f5021e8bc0 Added ADD_DEFINITIONS(-D_WINSOCK_DEPRECATED_NO_WARNINGS) to quieten warning 2018-02-19 10:07:14 +00:00
OpenSceneGraph git repository
2378b41e9f
Merge pull request #482 from hwiesmann/master 
Addition of comments for ClusterCullingCallback
 2018-02-19 08:39:42 +00:00
OpenSceneGraph git repository
c52ae4f99f
Changed the doxygen control characters and clarifications 2018-02-19 08:39:23 +00:00
OpenSceneGraph git repository
7200b21203
Merge pull request #483 from filnet/fix_log_messages 
Fix log messages
 2018-02-19 08:35:00 +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 Wiesmann
f01383c02a Addition of comments for ClusterCullingCallback 2018-02-18 08:49:41 +03:00
OpenSceneGraph git repository
21539466fd
Merge pull request #480 from hwiesmann/master 
Addition of radius parameter for ClusterCullingCallback's constructor
 2018-02-16 19:56:32 +00: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
Laurens Voerman
b79d680580 move Get/SetScalarvalue out of ValueObject and provide specialization for GetScalarValue<bool> fixing MSVC waring C4800 2018-02-15 14:59:24 +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
OpenSceneGraph git repository
03ef16a4fa
Merge pull request #475 from LaurensVoerman/submit_Zeroconf_warningsFix 
fix visual studio compile warnings for ZeroConfDevice project.
 2018-02-14 17:15:31 +00:00
OpenSceneGraph git repository
da31fc9c76
Merge pull request #474 from LaurensVoerman/submit_bool_getScalarvalue_Bug 
bugfix: GetScalarValue returns inverted values for booleans
 2018-02-14 17:12:46 +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
Laurens Voerman
ec4881da5a bugfix: GetScalarValue returns inverted values for booleans; SetScalarValue needs to be a SetValueVisitor 2018-02-13 17:38:35 +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
Robert Osfield
e491c61fa5 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-02-13 12:03:19 +00:00
Robert Osfield
b8e5f22cb7 Added virtual bool Texture::isDirty(contextID) method to help determine whether a GL texture object is likely to be out of date and needs updating 2018-02-13 12:01:57 +00:00
OpenSceneGraph git repository
f9e2fb9d74
Merge pull request #473 from LaurensVoerman/submit_OT_winver 
remove conficting defenition of _WIN32_WINNT in OSG_DETERMINE_WIN_VERSION is ON
 2018-02-12 13:42:47 +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
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