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

15447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
da68d32482 Improved readaibility of text by removing redundent indirection. 2017-12-02 16:35:16 +00:00
Robert Osfield
59f841bc20 Fixes for cppcheck reported issues 2017-12-02 16:20:34 +00:00
Robert Osfield
803026814a From Raymond de Vries, Windows build fixes 2017-12-01 14:38:52 +00:00
Robert Osfield
c84ad74fa9 Added suppor for StateSet::DefineList 2017-12-01 13:00:42 +00:00
Robert Osfield
8bf575df2f Improvements to lua/OSG integration 2017-12-01 12:07:28 +00:00
Marc Helbling
75af025c55 Improve SharedArrayOptimizer 
When an array is shared within and outside a geometry, it's still worth it and safe
to recreate the reference within each individual geometry.
 2017-12-01 12:26:02 +01: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
OpenSceneGraph git repository
b909ac2d95
Added return to last line 2017-11-30 14:12:05 +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
09eefd7973 Added script to identify Windows version 
Added script to identify the Windows version used to compile the source.
Currently the windows version for Windows NT is hard coded into the
source. By running this CMake script the _WIN32_WINNT preprocessor
variable gets set to the corresponding windows version.
 2017-11-30 12:53:24 +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
4af66f6897 Update version to 3.5.10 2017-11-29 15:06:53 +00:00
Robert Osfield
85a79f53d7 Updated ChangeLog and AUTHORS for 3.5.9 dev release 2017-11-29 14:49:00 +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
Robert Osfield
306275d230 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-11-29 10:40:42 +00:00
Robert Osfield
28af946c4b Bummped the SO version 2017-11-29 10:40:20 +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
0c7972b3f1 Merge branch 'mp3butcher-ComputeDispatch' 2017-11-29 10:14:16 +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
OpenSceneGraph git repository
021dca0072
Cleaned up code layout 2017-11-29 08:14:44 +00:00
OpenSceneGraph git repository
fc1d19b6e5
Merge pull request #390 from filnet/readref 
replace more read*File() usage to readRef*File()
 2017-11-29 08:09:01 +00:00
Julien Valentin
739303b3d9 override compile and createVAS in order to do nothing 2017-11-28 20:38:54 +01:00
Julien Valentin
994c38c0c7 adapt SSBO example for ComputeDispatch 
but have strange runtime errors:
0(100) : error C7623: implicit narrowing of type from "vec3" to "float"
0(108) : error C7623: implicit narrowing of type from "vec3" to "float"
 2017-11-28 20:03:40 +01:00
Philippe Renon
2acddf66b1 replace more read*File() usage to readRef*File() 2017-11-28 19:51:31 +01: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
Robert Osfield
06302a1082 Replaced read*File() usage to readRef*File() 2017-11-27 15:41:54 +00:00
Robert Osfield
cb2c48d015 Added template addShader() method to make it easier to pass ref_ptr<osg::Shader> 2017-11-27 15:40:21 +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
9fc63d7613 Fixes for building with OSG_PROVIDE_READFILE to OFF 2017-11-27 11:10:48 +00:00