Commit Graph

13519 Commits

Author SHA1 Message Date
Robert Osfield
ec89d96114 Fixed underflow issue 2017-08-23 15:26:52 +01:00
Robert Osfield
ea17943a74 Bimped SO version due to changes in Windows exports in osgDB::ifstream + ofstream. 2017-08-22 14:17:45 +01:00
Robert Osfield
07d05840e9 Updated RC number to 2 for 3.4.1-rc2 2017-08-22 12:19:40 +01:00
Robert Osfield
d108bea9eb Updated ChangeLog 2017-08-22 12:18:29 +01:00
Robert Osfield
1bc5ef030f Added name typo fix 2017-08-22 12:00:17 +01:00
Robert Osfield
15e60acfb5 Updated ChangeLog 2017-08-22 09:05:27 +01:00
Robert Osfield
4710b6556d Added catch for controbutors list 2017-08-22 09:04:49 +01:00
OpenSceneGraph git repository
a231483ea6 Merge pull request #310 from OpenMW/merge_internalsizedformats
Applied sizedInternalFormats change to 3.4 branch
2017-08-22 08:03:33 +01:00
Robert Osfield
5e48c51bd7 Reversed the order of some sizedInternalFormats enum entries to sync with the change in serach direction that was checked in as an earlier revision. 2017-08-21 21:16:00 +00:00
Robert Osfield
036c6676c1 Added handling of CPACK and automatically generated package files 2017-08-21 15:24:13 +01:00
Robert Osfield
ed9c28b4ec Removed unneccessary DrawArrays->setCount() that was causing a crash. 2017-08-18 16:26:12 +01:00
Robert Osfield
50e471d900 Merged addition of "" around variablesfrom master. 2017-08-18 16:11:29 +01:00
Raymond de Vries
5b7ef57ad7 Fix for better picking up 3rd party dependencies 2017-08-18 16:01:31 +01:00
Robert Osfield
a3e11f1d50 Fixed iterator comparison. 2017-08-18 08:08:28 +01:00
Robert Osfield
4e67d6deb2 Adopted OSG_GL*_FEATURES usage of 0 and 1 in place of false and true to avoid VisualStudio 2012 build issues 2017-08-17 08:53:58 +01:00
Uwe Woessner
edee9d0946 Extension to the PLY plugin to read files with textures. 2017-08-15 15:42:22 +01:00
OpenSceneGraph git repository
e5cccefafe Merge pull request #291 from eligovision/OpenSceneGraph-3.4_animation
osgAnimation: classes UpdateVec2fUniform and UpdateVec4fUniform added
2017-07-31 16:47:09 +01:00
konstantin.matveyev
2c35b63d38 [*] osgDB::OutputStream fix 2017-07-31 17:50:36 +03:00
konstantin.matveyev
700dd2b9a7 [+] Two classes added: osgAnimation::UpdateVec2fUniform, osgAnimation::UpdateVec4fUniform 2017-07-31 17:50:08 +03:00
OpenSceneGraph git repository
c1585d3c17 Merge pull request #289 from eligovision/OpenSceneGraph-3.4_apple
IMAGEIO plugin tweak
2017-07-31 15:06:57 +01:00
OpenSceneGraph git repository
76a92314cf Merge pull request #290 from eligovision/OpenSceneGraph-3.4_apple_ios
osgViewer::GraphicsWindowIOS fixes
2017-07-31 15:05:26 +01:00
konstantin.matveyev
60eb458c47 [*] imageio changed: more methods of storing image supported; tested on macOS (compatibility profile) and iOS(GLES2/3) 2017-07-31 15:37:55 +03:00
konstantin.matveyev
7e5a9582b3 [*] osgViewer::GraphicsWindowIOS fixes 2017-07-31 15:34:21 +03:00
Robert Osfield
662e76d721 Fixed indectation 2017-07-31 12:44:47 +01:00
OpenSceneGraph git repository
428f4a3804 Merge pull request #288 from eligovision/OpenSceneGraph-3.4_pragmatic
pragma(tic) shader composing fixes in the State
2017-07-31 12:42:15 +01:00
konstantin.matveyev
23edfad1fd [**] pragma(tic) fix: 'defineMap.changed flag' condition changed in State::push/popDefineList 2017-07-31 13:40:00 +03:00
Robert Osfield
0c1fad2c91 Updated AUTHORS and CHangeLog for 3.4.1-rc1 2017-07-28 17:57:02 +01:00
Robert Osfield
1201ac230d Updated 3.4 branch to 3.4.1-rc1 version 2017-07-28 17:43:34 +01:00
James Turner
eabd08ef25 Attempt to fix broken DLL exports from osgDB
Only export the osgDB method implementations, instead of the entire
class, and hence avoid exporting symbols from the base class, which
then conflict with other compilation units when linking.

This avoids the need for /FORCE:MULTIPLE linker option with MSVC.
2017-07-27 16:52:22 +01:00
Robert Osfield
a5bcbc1822 Adopted FindFreetype.cmake from master 2017-07-27 10:43:33 +01:00
Robert Osfield
f822603446 Replaced State::_glExtensions initialization to be consistent with master, enabling sharing of GLExtension data structure. 2017-07-26 11:12:11 +01:00
Robert Osfield
f449bd3730 Moved State::initializeExtensionProcs() nearer top of source file to make the position consistent with change in position in master, making it easier to diff between them. 2017-07-26 11:08:46 +01:00
Robert Osfield
b37b635a7c Merged GLExtension deletion mechanism from master to avoid GLEXtension being deleted when shared contexts are used and osg::State is deleted when a context is deleted. 2017-07-25 15:58:27 +01:00
OpenSceneGraph git repository
224f837e0d Merge pull request #272 from psyinf/msvc_static_build
Msvc static build
2017-07-25 14:45:20 +01:00
Sebastian Messerschmidt
1d7d1dda42 FIX: missing change in ENDIF 2017-07-21 13:12:38 +02:00
Sebastian Messerschmidt
ac36649ed6 FIX: <CMake> attempting to install pdb-files for static targets caused failing INSTALL 2017-07-21 12:58:10 +02:00
Anna Sokol
9c7a474032 Since version 2.5.1 freetype has supported the WOFF extension format.
In the attached ReaderWriterFreeType.cpp file I added the following line:

            supportsExtension("woff","web open font format");
2017-07-17 16:47:22 +01:00
Robert Osfield
06a45ef889 Pulled in .gitignore from master 2017-06-20 09:35:49 +01:00
Robert Osfield
1e4f6f675b Backported GLES compatible shaders into ShaderGen 2017-06-19 17:38:54 +01:00
Robert Osfield
e6ab01c7c6 Backported GL2/3, GLES2/3 compatible Text and StatsHandler shaders to OSG-3.4 2017-06-19 17:38:25 +01:00
Robert Osfield
b2cd4b5836 Added TimeMultiplier and LoopingMode to ImageSequence .osg serializer 2017-05-29 12:25:30 +01:00
Robert Osfield
09b37224ff Improved the DrawElements selction 2017-05-25 13:29:42 +01:00
Robert Osfield
6d4afbbb49 Added handlng of Text with large number of characters 2017-05-25 10:53:00 +01:00
Robert Osfield
8b433f8364 Replaced osg::DrawElementeUInt usage for a more flexible DrawElements base class approach with the default set to DrawElementUShort to ensure compatibility with GLES2 implementes that don't support uint for glDrawElements. 2017-05-25 10:41:12 +01:00
Robert Osfield
10c1fedfca Addded a GLES2 compatible osgmovie shader 2017-05-16 12:32:41 +01:00
OpenSceneGraph git repository
0af180f8b0 Merge pull request #251 from emminizer/OpenSceneGraph-3.4
osgText::Glyph: Explicitly set GL_TEXTURE_MIN_FILTER to address disap…
2017-05-10 11:08:27 +01:00
Daniel Emminizer
b001e8d36d osgText::Glyph: Explicitly set GL_TEXTURE_MIN_FILTER to address disappearing glyphs on some Intel cards. 2017-04-25 07:22:16 -04:00
Alexander Roan
397ab4aa51 GLExtenstions: fix checking of isFrameBufferObjectSupported flag for GLES2 2017-04-24 10:38:02 +01:00
Konstantin S. Matveyev
9eaf03e16e Fixes glyphs's MODELVIEW matrices (positions, scales etc.) if state.getUseModelViewAndProjectionUniforms() is true 2017-04-18 15:53:48 +01:00
OpenSceneGraph git repository
9ba9221ccf Merge pull request #214 from LaurensVoerman/submit-3.4serializerParticle
fix bug in osgb/osgt/osgx readerwriter osgParticle
2017-03-13 14:27:08 +00:00