Robert Osfield
bd95db2031
Merge branch 'master' into shader_pipeline
2017-12-03 11:34:15 +00:00
Robert Osfield
9ef79c2f44
Renamed chanels to array to be consistent with the rest of the usage
2017-12-03 11:17:34 +00:00
OpenSceneGraph git repository
92cccff866
Merge pull request #398 from marchelbling/sharedarrayoptimizer-fix
...
Improve SharedArrayOptimizer
2017-12-03 11:12:20 +00:00
Robert Osfield
200537ed6f
Removed redundent !ps
2017-12-03 10:49:39 +00:00
Robert Osfield
5ff16798a3
Removed unused local variable and associated typedef
2017-12-03 09:49:09 +00:00
Robert Osfield
9a96e211f9
Quietened down cppcheck false positive.
2017-12-03 09:45:37 +00:00
Robert Osfield
3870edf376
Fixed leak and clean up formatting.
2017-12-03 09:38:32 +00:00
Robert Osfield
ef5410aaf0
From Jordi Torres, fixed leak and inappropriate read bug
2017-12-03 09:34:43 +00:00
Robert Osfield
6ca3cab0d5
From Jordi Torres, removed unused local variable
2017-12-03 09:32:50 +00:00
Robert Osfield
24d32e89a1
From Jordi Torres, fix indentation and removed redundent break;
2017-12-03 09:30:35 +00:00
Robert Osfield
bd716b38c7
From Jordi Torres, added ref_ptr<> usage to quieten cppcheck false positive
2017-12-03 09:27:41 +00:00
Robert Osfield
24c3b40b56
From Jordi Torres, removed unused local variables
2017-12-02 18:07:13 +00:00
Robert Osfield
c913c0e6f7
From Jordi Torres, removed unused local variables
2017-12-02 18:04:43 +00:00
Robert Osfield
d7f5357059
From Jordi Torres, Removed unused local variables
2017-12-02 18:00:03 +00:00
Robert Osfield
4fc3c8ef26
From Jordi Torres, removed unused local variables
2017-12-02 17:58:17 +00:00
Robert Osfield
c85e56940e
From Jordi Torres, removed unused local variables
2017-12-02 17:52:47 +00:00
Robert Osfield
847e472130
Commented out unused local variables
2017-12-02 17:42:53 +00:00
Robert Osfield
e44fb08f6a
From Jordi Torres, removed unused local variable
2017-12-02 17:41:27 +00:00
Robert Osfield
490b9b0e0e
Fixed string parsing and substituion bugs isn substitudeEnvVars(..)
2017-12-02 17:35:36 +00:00
Robert Osfield
302f625ec7
From Jordi Torres, removed unused local variables
2017-12-02 17:08:14 +00:00
Jordi Torres
82f0a2d849
same values in || so one of them not needed
2017-12-02 16:49:47 +00:00
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 712ca432193bf6fb1778
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
