mp3butcher
274b6894af
remove redondant variable and test
2018-08-19 22:46:10 +02:00
Robert Osfield
29e87780f5
Removed check as this is better outside of the function
2018-08-17 16:53:13 +01:00
Robert Osfield
58a51cbc41
Created a GLenum Texture::selectSizedInternalFormat(const osg::Image* image=0) const method to help clean up set up of glTexStorage.
...
Fixed typo.
2018-08-17 12:20:59 +01:00
Robert Osfield
7ae7a994b4
Merged changes to InternalPixelRelations sizedInternalFormats[] from master
2018-08-17 10:31:46 +01:00
Robert Osfield
3808b298d1
Fixed memory leak associated with VertexArrayStte objects not getting released on destruction of Geometry/Drawables.
2018-08-16 19:24:56 +01:00
Robert Osfield
ed13576d03
From Chris White, Cygwin build fix
2018-08-08 14:42:04 +01:00
Vic-Min
15f2ae8d15
Renamed USE_DEPRECATED_API to OSG_USE_DEPRECATED_API
2018-08-08 14:37:28 +01:00
OpenSceneGraph git repository
9ab5aafd02
Merge pull request #583 from emminizer/flt-registry-cache
...
OpenFlight: Replace internal caches with osgDB::ObjectCache use. Fix…
2018-07-31 16:58:41 +01:00
Daniel Emminizer
2e0e78144f
OpenFlight: Replace internal caches with osgDB::ObjectCache use. Fixes unbounded memory growth when using readNode(std::istream&, ...) method.
2018-07-31 11:45:33 -04:00
Robert Osfield
ffb68bec7c
Removed unneccessary FIX ME statement.
2018-07-31 09:14:02 +01:00
Robert Osfield
79bc4c3843
Fixed check against dataType changes
2018-07-27 17:34:30 +01:00
Alex Burton
a7747972dc
updated osgviewerWX to remove deprecated calls in wxWidgets 3.x
2018-07-27 17:12:07 +01:00
OpenSceneGraph git repository
467baa8c00
Merge pull request #573 from emminizer/fix-flt-typo
...
FLT: Fix texture unit typo and code style from PR 568.
2018-07-09 17:55:38 +01:00
Daniel Emminizer
4d6c4a7f1f
FLT: Fix texture unit typo and code style from PR 568.
2018-07-09 06:34:41 -04:00
Robert Osfield
fb40a0d1db
Updated ChangeLog for 3.6.2 release
2018-06-29 10:56:35 +01:00
Robert Osfield
975b62c735
Updated date for 3.6.2 releases
2018-06-29 10:56:01 +01:00
Robert Osfield
dff2faa63b
Updates for 3.6.2 stable release
2018-06-29 10:54:13 +01:00
Robert Osfield
500d3947ef
Fixed isPointSpriteModeSupported assignment bug
2018-06-29 10:53:23 +01:00
Robert Osfield
2b7b051421
Removed the gl3.h usage for GL3 case as these headers were replaced by glcorearb.h, it's probably better to just fallback to gl.h and have the OSG get the extentions at runtime.
2018-06-29 09:52:47 +01:00
Robert Osfield
8a05850048
UPdated ChangeLog
2018-06-28 07:34:49 +01:00
Robert Osfield
469d743bec
Updated for rc3
2018-06-28 07:06:59 +01:00
Larry-Hu
c1dfc39706
Remove call to nonexistent member seekpos() of std::fpos in VS 2017 version 15.8 or later
2018-06-28 06:54:57 +01:00
OpenSceneGraph git repository
aa5e25db8d
Merge pull request #568 from emminizer/fix-flt-texture-export-gl3
...
OpenFlight: Textures now correctly export in GLCORE mode.
2018-06-27 20:59:09 +01:00
Daniel Emminizer
33cb2e6f70
OpenFlight: Textures now correctly export in GLCORE mode.
2018-06-27 12:57:20 -04:00
Robert Osfield
11e4a995c4
Updated for 3.6.2-rc2
2018-06-27 09:17:00 +01:00
Robert Osfield
27fc282bb5
Fixed relaseGLObjects() calls
2018-06-27 09:06:58 +01:00
Robert Osfield
9d897c2555
Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6
2018-06-26 20:50:55 +01:00
Robert Osfield
cbcf7015bb
Replaced creation of a temporary Settings object on the heap with creation on the stack to improve performance
2018-06-26 20:46:49 +01:00
OpenSceneGraph git repository
4d5c1ff14e
Merge pull request #566 from emminizer/fix-gl_rb-in-gluscaleimage
...
GL_RG is now a supported format in gluScaleImage().
2018-06-26 20:17:07 +01:00
Robert Osfield
d01edcb540
Added GLExtensions::isPointSpriteModeSupported to allow it to be enable for GL versions that support GL_POINT_SPRITE_ARB/GL_POINT_SPRITE_OES
2018-06-26 20:10:51 +01:00
Daniel Emminizer
bfa8d157c1
GL_RG is now a support format in gluScaleImage().
2018-06-26 14:44:34 -04:00
Robert Osfield
44b3bcc3fc
Moved osg::clampProjectionMatrix() template from CullVisitor.cpp into include/osg/CullSettings to make it easier to implement custom clampProjectionMatrix callbacks
2018-06-25 20:02:30 +01:00
Robert Osfield
89e186014e
Updates for 3.6.2-rc1
2018-06-20 13:59:10 +01:00
Calum Robinson
40bde873bc
Fix z near calculation for lines
2018-06-20 12:28:06 +01:00
OpenSceneGraph git repository
12db2f8011
Merge pull request #558 from LaurensVoerman/submit-ffmpeg3.2
...
resolve av sync failure with ffmpeg 3.2 and up
2018-06-19 11:50:38 +01:00
Laurens Voerman
e18a03abc3
resolve av sync failure with ffmpeg 3.2 and up
2018-06-19 10:47:23 +02:00
弥继平
2205506aa3
Fixed the position of the viewport for the camera
...
The position of viewport doesn't setup properly, some part of viewer is out of CMFC_OSG_MDIView, and not visible.
2018-06-18 19:38:27 +01:00
Laurens Voerman
15c6b7a196
remove include/osgQt from doxyfiles; add osgPresentation and osgUI
2018-06-14 14:45:49 +01:00
OpenSceneGraph git repository
9171f12069
Merge pull request #555 from emminizer/fix-noisy-flt-loading
...
FLT: Missing optional attr files on textures no longer generates a co…
2018-06-14 14:44:16 +01:00
Daniel Emminizer
acf359777e
FLT: Missing optional attr files on textures no longer generates a console warning.
2018-06-14 07:33:08 -04:00
Robert Osfield
a9f91a875b
Changed version to 3.6.2 in prep for next release
2018-06-14 08:54:21 +01:00
Robert Osfield
4665a2f033
To handle calling Array::setBinding() after Geometry::set*Array() call, to the Geometry::addVertexBufferObjectIfRequired(osg::Array* array) added treatment of array->getBinding()==Array::BIND_UNDEFINED as BIND_PER_VERTEX as a safe fallback.
2018-06-14 08:51:00 +01:00
Robert Osfield
673292b995
Moved Stae::setUseVertexAttributeAliasing(bool) implementation to .cpp an added call to _globalVertexArrayState->assignAllDispatchers(); to ensure state is consistent
2018-06-13 12:23:29 +01:00
Robert Osfield
b1d64ee476
Updated LICENSE to use the WxWidgets-3.1 and updates to the LGPL-2.1-only that updates addresses and tighten up language used.
...
Functionality the OSGPL-1.0 is the same as OSGPL-0.0, All the OpenSceneGraph users can use either OSGPL-0.0 or OSGPL-1.0.
2018-06-03 10:30:55 +01:00
Robert Osfield
5fb1e9c120
Removed deprecated xine plugin to simplify licensing (xine plugin is GPL'd)
2018-05-31 15:11:19 +01:00
Robert Osfield
801069d4cc
As the author of all the files in osgPresentation and present3D have rectified the license notices to reflect their intended license rather than histoical license they had prior to being merged into the OpenSceneGraph project. OSGPL was always intended but missed during merge.
...
Replaced the GPL notices with OSGPL usge in present3D and include/osgPresentation as this was intended when Present3D was merged back into OpenSceneGraph but missed.
2018-05-31 14:45:37 +01:00
Robert Osfield
d3706a24e4
Updated for 3.6.1
2018-05-28 08:58:21 +01:00
Philippe Renon
0a4a31d17b
Notify: silence warning about unused argument
2018-05-28 07:54:42 +01:00
Robert Osfield
3838267770
Updated ChangeLog
2018-05-23 19:54:10 +01:00
Robert Osfield
2c39714dff
Updates for 3.6.1-rc7
2018-05-23 19:53:12 +01:00