Robert Osfield
66aa7a235f
Added support for Program::addBindAttirbLocation() and removeBindAttribLocation().
2017-12-06 13:29:47 +00:00
Robert Osfield
963ba7b671
Merge branch 'master' into shader_pipeline
2017-12-06 10:33:32 +00:00
Robert Osfield
37dbb04608
Added more flexibility into the State::checkGLErrors() method, allowing calling code to pass in two strings.
...
Improved the StateSet::compileGLObjects() usage of checkGLErrors() to make the warning reports more meaningful.
2017-12-06 10:11:53 +00:00
Robert Osfield
d313184cd0
Added fine grained checking for GL errors in the GLObjectVisitor so that the OSG's default pre compile stage provides better feesback on any GL errors.
2017-12-06 09:51:57 +00:00
Robert Osfield
a92232fd01
Added fine grained checking for GL errors in the GLObjectVisitor so that the OSG's default pre compile stage provides better feesback on any GL errors.
2017-12-06 09:50:42 +00:00
Robert Osfield
d82a7e7c0b
Removed the unncessary rescale to power of two, and added clear of image to prevent previous image data corrupting the rendered image
2017-12-05 17:16:17 +00:00
Robert Osfield
4501320793
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2017-12-05 16:33:55 +00:00
Robert Osfield
a8924a7b36
Added "rs=value" Options support to SVG plugin
2017-12-05 16:33:01 +00:00
Robert Osfield
77e7d7072a
From Raymond de Vries, added missing header
2017-12-04 18:55:47 +00:00
Robert Osfield
bad8939022
Merge branch 'master' into shader_pipeline
2017-12-04 18:46:24 +00:00
Robert Osfield
551e9ba17c
Fixed AUTHORS
2017-12-04 17:51:21 +00:00
Robert Osfield
7f0baaab61
Added passing of the osgDB::Options to the remove from cache to make sure the cache model for the presentation is found and removed.
2017-12-04 16:43:08 +00:00
Robert Osfield
56681c89cd
Changed the reload presentaiton key to 'R' to better match the 'E' for editor
2017-12-04 14:50:12 +00:00
Anna Sokol
279df6d57e
From Anna Sokol, "There is no need to specify WINVER of 0x0603 in order to check for the SetProcessDPIAwareness function existence.
...
If your current OS where the application is running is Windows 8.1 or above it the function will exist in the dll or if its below it wont.
I checked the attached code with both a Windows 7 desktop (where the function doesn't exist) and a Windows 10 tablet (where it does and had my screen scaled to 150%) and in both cases the code worked as intended."
2017-12-04 13:01:52 +00:00
Robert Osfield
a17b1ac547
Added object map to DisplaySettings::setObject(std::string, Object*) & getObject(std::string)
...
This enables caching of data, such as pre-loaded files or other objects
2017-12-03 16:43:06 +00:00
Robert Osfield
d0d00eafa8
Merge branch 'master' into shader_pipeline
2017-12-03 14:27:41 +00:00
Robert Osfield
1810c9e7e3
Updated ChangeLog and AUTHORS file
2017-12-03 14:27:10 +00:00
Robert Osfield
aa26f99367
Updated ChangeLog
2017-12-03 14:14:34 +00:00
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
