FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,489 Commits 1 Branch 26 Tags 73 MiB
f822603446
Commit Graph

13489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OpenSceneGraph git repository
16591a310a Merge pull request #210 from scrawl/programfix_backport 
Backport state leak fix to 3.4 branch
 2017-03-11 11:38:18 +00:00
Nico Kruithof
1b9e1301cf Fixed typo 
osg_ModeViewMatrix -> osg_ModelViewMatrix
 2017-03-10 17:48:54 +00:00
Laurens Voerman
796b9f0a9b fix bug in osgb/osgt/osgx readerwriter causing the osgParticle-SizeInterpolator and -ColorInterpolator to dissapear 2017-03-06 15:33:22 +01:00
Robert Osfield
232d227170 Changed Program::apply() to Program::compileGLObjects() to avoid the Program::apply() setting of setLastAppliedProgramObjects for affect current state. 2017-02-26 17:25:10 +01:00
OpenSceneGraph git repository
95818b0819 Merge pull request #199 from scrawl/statefix_backport 
Backport State fix to 3.4 branch
 2017-02-08 14:54:08 +00:00
Julien Valentin
ad0a73273c fix in StateSet.cpp 
the State::DefineMap::changed flag is not resetted to false after currentDefines are updated
 2017-02-08 00:52:04 +01:00
Robert Osfield
168212f383 Fixed linking bug caused by repeated Program::addShader()/removeShader() operations invalidating the internal attach/dettech lists. 2017-01-24 17:38:33 +00:00
Robert Osfield
320e0ce60c Quitened down verbose debug messages 2017-01-20 17:31:49 +00:00
Robert Osfield
6f1a828b37 Quietened down some verbose debug messages 2017-01-20 17:06:55 +00:00
Robert Osfield
e07f1ff5e9 Fixed indentation of comment 2017-01-19 15:56:17 +00:00
Robert Osfield
b6ec9dc532 Fixed unitialized variable access to premature calling of computeMatrix(). 2017-01-04 12:56:25 +00:00
Robert Osfield
d93d2e0ec1 From Hartwig Wiesmann, "ScalarsToColors returns a wrong color in case a value larger max is passed to getColor" 2016-12-23 17:17:33 +00:00
Robert Osfield
f272089857 From Torben Dannhauer, build updates for NVTT. 2016-12-21 17:03:24 +00:00
Robert Osfield
ad917a5318 From Torben Dannahauer, updates to track changes to Winddows 3rd party package 2016-12-21 16:35:10 +00:00
Robert Osfield
f0056c6d3b From Torben Dannhauer, "When compiling OSG with DCMTK on windows, it throws an compiler error due to a missing ws2_32.lib in the linker settings." 2016-12-21 15:35:43 +00:00
Robert Osfield
fe25b2961b From Andreas Ekstrand, "he attached ESRIShape.cpp contains a small fix in parsing of PointZ features, now correctly comparing with header content length which is defined in 16-bit words. 
This should have been fixed in my old submission from 2012 but was probably overlooked due to an alternative way of comparing to a fix number for this feature type.

Without this fix, the plugin will only read one PointZ feature even if multiple features exist."
 2016-12-21 11:40:16 +00:00
Robert Osfield
6511347d4b Added StateSet::setGlobalDefaults() to fix bug when osgViewer has stats on but no scene graph assigned 2016-12-21 09:15:48 +00:00
Robert Osfield
192e654cdb Fixed handling of #define's that are used as functions 2016-12-16 16:14:10 +00:00
Robert Osfield
b59c46c3cf Added GL_EXT_texture_border_clamp support for GLES 2016-11-30 17:15:06 +00:00
scrawl
29049ea238 Fix typo in StateSet::compileGLObjects, causing compilation of attributes to not be executed unless checkForGLErrors is true. 2016-11-26 12:17:07 +00:00
Robert Osfield
46df1fd141 Fixed crash in handling of osg::Callback attached as Drawable update callback. 
Added handling of osg::Callback as a Drawable cull callback
 2016-11-23 19:18:14 +00:00
Robert Osfield
8af48d369c Added Dragger::applyAppropriateFrontFace(StateSet*) to make it easy to handle inverted matrices by toggling the FrontFace to sure the correct face is visible. 2016-11-11 17:16:40 +00:00
Robert Osfield
95d450e026 Merge branch 'OpenSceneGraph-3.4' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.4 2016-11-11 13:54:54 +00:00
Robert Osfield
b58048e43b Fixed handling of Locator's with negative extents 2016-11-11 13:54:15 +00:00
Robert Osfield
1f1c21772a Added check against binding type of array to decide whether it's appropriate to assign array to VBO. 2016-11-03 11:32:25 +00:00
Robert Osfield
fa27a1f3ed Changed appending of \n to be to the version line. 2016-10-12 17:23:19 +01:00
Robert Osfield
d5d4f7239b From Torben Dannhauer, added freetype27 (2.7) to search list 2016-10-10 11:22:44 +01:00
Laurens Voerman
2a110515c1 remove CMAKE_BUILD_TYPE STREQUAL "Release" (cmake configure time varable) to select pdb install - select CONFIGURATIONS RelWithDebInfo Debug 2016-10-07 17:03:35 +01:00
Laurens Voerman
d2a0315e20 fix bug in SmoothingVisitor tripped by bunny.ply 2016-10-06 14:18:14 +01:00
Robert Osfield
1f9725ea49 Replaced local static usage to avoid threading and mulit-context issues 2016-09-22 14:34:13 +01:00