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

10531 Commits

Author SHA1 Message Date
Robert Osfield
8bf575df2f Improvements to lua/OSG integration 2017-12-01 12:07:28 +00:00
Robert Osfield
eb6d74e816 Fixed Lua / osg::UniformBase integration 2017-12-01 10:21:02 +00:00
Robert Osfield
b9d39250da Fixed env var parsing 2017-12-01 10:20:48 +00:00
Robert Osfield
dadfe8ae0b Merge branch 'master' into shader_pipeline 2017-12-01 09:14:52 +00:00
OpenSceneGraph git repository
2366305e83
Merge pull request #396 from bjornblissing/feature/DPIAwareScaling 
Applications declared as DPI-aware in the Windows environment
 2017-11-30 14:13:21 +00:00
Robert Osfield
05b0f142c8 Quieted down dubug output 2017-11-30 12:48:47 +00:00
Björn Blissing
9fac39c5e0 Applications declared DPI-aware in the Windows environment 
Applications that run on a Windows computer with desktop scaling enabled
gets scaled incorrectly since windows assumes that applications are
DPI-unaware unless declared otherwise.

This change declares the application DPI-aware, thus not automatically
scaled by the operating system.

The corresponding library call requires Windows 8.1 or later.
 2017-11-30 13:00:54 +01:00
Björn Blissing
e8f7eeb5dc Removed unnecessary define in FileUtils 
The define of _WIN32_WINNT was added to handle an error case from MinGW
,as described in commit 712ca43219

This was later giving warnings and thus undefined for MinGW by commit
3bf6fb1778

Since the two operations cancel each other out, they should be removed.
 2017-11-30 12:50:09 +01:00
Robert Osfield
a16702627a Typo fix 2017-11-29 21:20:10 +00:00
Robert Osfield
d3815759a9 Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF 2017-11-29 14:44:00 +00:00
Robert Osfield
a6069c3226 Introduced Drawable::CreateVertexArrayStateCallback to enable customization of how VertexArrayState objects. 
Added public accessors to the Drawable::VertexArrayStateList.
 2017-11-29 14:22:31 +00:00
Robert Osfield
03434b20cf Added mapping of GLSL file extension to shader Type. 2017-11-29 12:22:03 +00:00
OpenSceneGraph git repository
27e5041d97
Merge pull request #394 from mathieu/master 
Make the culling be disabled at the drawable level
 2017-11-29 10:38:52 +00:00
Robert Osfield
c0a276e850 Added back in serializer support for comput dispatch groups to retain backwards compatibility. 2017-11-29 10:11:35 +00:00
Mathieu
cf05cd5bf3
Make the culling be disables at the drawable level not at the geode level 2017-11-29 11:05:53 +01:00
Robert Osfield
9f6eb74d28 Merge branch 'ComputeDispatch' of https://github.com/mp3butcher/OpenSceneGraph into mp3butcher-ComputeDispatch 2017-11-29 09:30:56 +00:00
OpenSceneGraph git repository
cd0744ddfa
Cleaned up code layout 2017-11-29 08:16:53 +00:00
Robert Osfield
1152da8bbd Quietened down debug output 2017-11-28 18:08:08 +00:00
Robert Osfield
85917ea4d4 Quietened down debug output 2017-11-28 18:05:59 +00:00
Robert Osfield
5ad22dc4af Quitened down debug output 2017-11-28 18:04:26 +00:00
Julien Valentin
195df4f811 numgroup removed but introduce a reto compatibility bug in Program serializer 
hope nobody use it
 2017-11-28 17:39:32 +01:00
Julien Valentin
bf1b4ec2bb add ComputeDispatch class 
revoke glDispatch in PCProgram::useProgram
update example
 2017-11-28 17:30:04 +01:00
Robert Osfield
117045170d To the GLSL shader plugin added support forL 
#pragma include shaderfile.glsl

To enable easier reuse of shaders
 2017-11-28 15:31:39 +00:00
Robert Osfield
284f91b3e0 Replaced deprecated osg::Shader::reaDShaderFile()/loadShaderFromSource() usage 2017-11-27 18:38:37 +00:00
Robert Osfield
5f13a3aa11 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-11-27 18:36:41 +00:00
Robert Osfield
34336931fa Deprecated the osg::Shader::reaDShaderFile() and osg::Shader::loadShaderSourceFromFile() methods. 
Programmers should use osgDB::readRefShaderFile()/readShaderFile() instead.
 2017-11-27 18:28:15 +00:00
Robert Osfield
f81a46da5b Added support for .cs, .compute, .tctrlm .teval extensions in the GLSL plugin 2017-11-27 18:27:13 +00:00
OpenSceneGraph git repository
6abb9b27f9
Merge pull request #387 from jtorresfabra/remove_custom_code 
Removes custom code added for sketchfab channel compression that shou…
 2017-11-27 15:54:39 +00:00
Robert Osfield
bc4a9d9dd0 Refactored the MergeGeometry::mergeGroup(..) method to avoid O(N^2) issue with using removeChildren() on groups with very large numbers of children. 2017-11-27 15:44:11 +00:00
Jordi
66eeabd7d0 Removes custom code added for sketchfab channel compression that should not be there 2017-11-27 15:48:50 +01:00
Robert Osfield
80d1de7832 Removed use of local static to avoid threading issue. 2017-11-22 11:05:17 +00:00
OpenSceneGraph git repository
a5eb5c7bb0
Merge pull request #383 from anormann1974/patch-1 
Fixed missing initialization of B_ and N_ in constructor
 2017-11-21 14:01:14 +00:00
Robert Osfield
7f97b9f999 Added Text::getCharacterCorners(...) method to help applications that want to find out the positions of characters being rendered. 2017-11-21 13:41:57 +00:00
Andre Normann
e0eb4fbda8
Fixed missing initialization of B_ and N_ in constructor 2017-11-21 13:54:45 +01:00
Raymond de Vries
41dda781ee attached fixes for configuring and building the osgPlugin exr with Visual Studio and using out-of-the-box builds of ilmbase and openexr, i.e. without manual/extra config for using these 2 libs with the OSG. 
Previously, the assumption was made that ilmbase and openexr were installed in a common directory and hence the header files and libs were both found in that common directory. That is not consistent with other libs and this submission makes it consistent and therefore the OSG configures out of the box. I made this work for ilmbase-2.1.0.tar.gz / openexr-2.1.0.tar.gz and ilmbase-2.2.0.tar.gz / openexr-2.2.0.tar.gz
 2017-11-14 10:59:08 +00:00
Robert Osfield
49a5fdbd1f Fixed typo 2017-11-13 13:08:39 +00:00
Robert Osfield
9c605ba9be Fixed CoverityScan reported errors 2017-11-13 13:06:12 +00:00
Robert Osfield
d98d9c9e72 FIxed two CoverityScan detected memory leaks 2017-11-13 12:49:33 +00:00
Andre Normann
a811de2ba7 Attached is a fix in GLExtension, which is based on latest git version, that fixes the usage of uniform buffer objects on macOS. Under macOS core OpenGL features aren't exported as extension. OpenGL 3.1 includes the GL_ARB_uniform_buffer_object as core feature for example. On macOS a simple osg::isGLExtensionSupported() call would fail. It is required to use the isGLExtensionOrVersionSupported() method. This is what my fix does. 2017-11-13 10:24:31 +00:00
OpenSceneGraph git repository
8d36049dcd
Merge pull request #382 from openscenegraph/osganimation 
Osganimation improvements
 2017-11-11 14:43:10 +00:00
OpenSceneGraph git repository
8d5a9e84fc
Build fix 2017-11-11 13:27:43 +00:00
OpenSceneGraph git repository
729680714c
Readbility improvements and updating version to 152 2017-11-11 13:08:42 +00:00
OpenSceneGraph git repository
3567e31009
Added versioning to the new serialization additions 2017-11-11 13:04:34 +00:00
OpenSceneGraph git repository
8694fd61ba
Code readability improvements 2017-11-11 13:00:56 +00:00
OpenSceneGraph git repository
4977939c05
Code readability improvements 2017-11-11 12:58:52 +00:00
OpenSceneGraph git repository
8e55ed5923
Code readability improvements 2017-11-11 12:54:28 +00:00
OpenSceneGraph git repository
f59efe0bfe
Code readability improvement 2017-11-11 12:46:48 +00:00
OpenSceneGraph git repository
8ee8550aac
Fix of incorrect Program assignment bug and coding style 2017-11-11 12:42:34 +00:00
OpenSceneGraph git repository
b23cc72037
coding style/readability fixes 2017-11-11 12:33:44 +00:00
OpenSceneGraph git repository
4753b8b2b9
coding style fix 2017-11-11 12:24:27 +00:00