FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,559 Commits 1 Branch 26 Tags
OpenSceneGraph-3.6.0
Commit Graph

10693 Commits

Author SHA1 Message Date
Robert Osfield
7ab1208c65 Renamed osg::ComputeDispatch to osg::DispatchCompute to make sure the nameing between GL and OSG is consistent i.e glDispatchCompute -> osg::DispatchCompute 
Updated AUTHORS.txt, NEWS.txt and README.txt for CMakeLists.txt for 3.6.0 release
 2018-04-07 17:59:55 +01:00
Robert Osfield
6bfca1582e Refactored the way that margin is applied to the text buounding box to prevent growth of the bounding box each time Text::setPosition() is called. 2018-04-06 20:07:57 +01:00
Robert Osfield
1145b84f8b Fixed warning 2018-04-06 14:17:35 +01:00
Robert Osfield
36f891c6cd Changed TextBase::setAlignment() to use computeGlyphRepresentation(); rather than computePositions(); to address issues seen with calling Text::setAlignment() after calls to Text::setText() 2018-04-06 14:10:51 +01:00
Robert Osfield
914e60a872 Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation 2018-04-05 14:18:30 +01:00
Robert Osfield
4cb697205e Changed DisplaySettings::setShaderHint(..) messages to INFO 2018-04-05 12:35:36 +01:00
Philippe Renon
edbca390ed mingw: fix compile error in GraphicsWindowWin32.cpp 
compilation error was introduced by msvc specific change
see bb169979a1
 2018-04-05 11:15:49 +01:00
Ralf Habacker
d468cae86b Remove duplicated and incorrect fetching of 'map_bump' attributes in obj plugin 
Parsing the key 'map_bump' was processed in the block, where the attributes
for 'bump' are extracted and results into having parts of the key in the
extracted filename, generating an invalid filename.

The mentioned string compare could be removed without loosing any features,
because the key 'map_bump' is parsed correctly some lines below.
 2018-04-05 08:46:33 +01:00
Robert Osfield
9168b6e5de Fixed threading crash in osgFX that occurred when an osgFX node is added to the scene being rendered in multiple threaded windows. 2018-04-04 15:11:25 +01:00
Robert Osfield
74e74d76d9 Added focus classifiction of handling of keyboard events 2018-04-04 14:10:43 +01:00
OpenSceneGraph git repository
23c3ea4ecc Merge pull request #518 from emminizer/fix-scroll-event 
CompositeViewer: SCROLL event now only goes to view with focus.  Incl…
 2018-04-03 17:17:59 +01:00
Thomas Hogarth
7c57dd04de missing gles2 check 2018-04-03 15:48:37 +01:00
Daniel Emminizer
59eae3260d CompositeViewer: SCROLL event now only goes to view with focus. Includes minor typo fixes. 2018-04-03 10:32:58 -04:00
Robert Osfield
f9f475d76d Added a ShadowTechniue::setShadowedScene() virtual method to make it possible to implement techniques as fascades to other techniques 2018-04-03 15:30:58 +01:00
Andreas Ekstrand
e888e9621c The attached code (from the 3.6 branch) adds a keepSeparatePoints option to the SHP plugin which makes it possible to avoid merging point features into multi-points, in case you e.g. need to keep separate point attributes. 
It also contains a fix in the Xbase DBF parser, converting a numeric shape attribute to double instead of integer. As stated in e.g. https://en.wikipedia.org/wiki/.dbf the numeric field can contain decimals.
 2018-04-03 12:43:34 +01:00
Robert Osfield
3450b9fee8 Removed osgShadow::ShadowVolume as it functionality isn't functional 2018-04-03 12:23:18 +01:00
Konstantin S. Matveyev
41f5157c1e osg::Program's compileGLObjects and apply methods fixed for OSG without OSG_GL_FIXED_FUNCTION_AVAILABLE 2018-04-02 23:58:33 +03:00
Robert Osfield
f71513cab5 Rewrote the handling of AutoTransform::setAutoScaleToScreen(bool) functionality so that is disabling CullingActive when switched on. 2018-04-02 18:29:39 +01:00
Robert Osfield
6c055e3400 Added __VERSION__<140 check for usage of gl_ClipVertex to avoid GL3 core profile usage issues 2018-04-02 16:23:07 +01:00
Robert Osfield
7ed0389051 Restructured merge geometry code to make it easier to follow 2018-04-02 14:09:57 +01:00
Robert Osfield
2946ea0759 Fix for MergeGeometryVsiitor bug. Restructured the processing the merge geometry list to avoid missing geometries that aren't binned along with other geometries. 2018-04-02 14:09:49 +01:00
Robert Osfield
589905fc38 Removed stray CMAkeLists.txt from TARGET_SRC list 2018-04-01 10:40:25 +01:00
Andreas Ekstrand
4cdca85699 Small fix (from the 3.6 branch) in the osgjs plugin, avoiding a double addition of the CullFace attribute when it has been turned off. This resulted in an empty json object in the osgjs file causing warnings in osgjs. 2018-04-01 10:19:27 +01:00
Robert Osfield
d0f7b85ae0 Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF 2018-03-30 16:34:01 +01:00
Robert Osfield
9d5a22a0aa Added suport for writing to gl_ClipVertex 2018-03-30 15:27:35 +01:00
Robert Osfield
79b181f9c9 Fixed double calling of TerrainTechnique::init(). 2018-03-29 11:38:53 +01:00
Robert Osfield
aae5f87d13 Fixed osgDB::findFileInDirectory() handling of directory strings with trailing \ or / that was causing failure to find valid files in otherwise valid directories 2018-03-28 11:37:42 +01:00
Haojia Yu
0d386ff3f1 OutputStream writes images using its Options object 
when writing images, OutputStream can search files using its Options object rahter than always using FilePathList object of global Regidtry instance.
 2018-03-28 09:05:40 +01:00
OpenSceneGraph git repository
fb39450067 Merge pull request #510 from eligovision/OpenSceneGraph-3.6_ios 
GraphicsWindowIOS: multithreaded viewer's mode support added; updated…
 2018-03-27 08:39:52 +01:00
OpenSceneGraph git repository
00e2466bc7 Merge pull request #508 from eligovision/OpenSceneGraph-3.6_plugins 
OSG 3.6: Write support with .curl pseudo extension added
 2018-03-27 08:37:29 +01:00
Konstantin S. Matveyev
a846c0160c GraphicsWindowIOS: multithreaded viewer's mode support added; updated for iOS-11 SDK; view rotations fixed; GLES2, GLES3 preprocessors fixed; tested on iPhone4 and upper 2018-03-26 20:40:14 +03:00
Konstantin S. Matveyev
cbb9fd4218 VertexArrayState: typo fixed in log 2018-03-26 18:31:23 +03:00
Konstantin S. Matveyev
1a86ed4e7a Write support with .curl pseudo extension added 2018-03-26 17:59:49 +03:00
Robert Osfield
a399e9ccb2 Re-ordered the creating of the DatagbaseThread to avoid startThread being called twice. 2018-03-25 12:14:46 +01:00
Robert Osfield
862c36a08b Added check if thraeding is running before executing start thread. 2018-03-25 12:13:50 +01:00
OpenSceneGraph git repository
46850214df Merge pull request #502 from Haojia521/OutputStreamUseTargertSoVersion 
write binary file with a specific so version
 2018-03-23 20:20:43 +00:00
Robert Osfield
647b578ce6 Removed serailizers that are now supplied by osg::Node 2018-03-23 19:54:33 +00:00
Robert Osfield
1d5ae1362a Fixed member variable names to avoid conflicts with osg::Node 2018-03-23 19:54:01 +00:00
Robert Osfield
9634688559 Removed Drawable writing out of StateSet as this is now done by Node 2018-03-23 18:07:36 +00:00
Robert Osfield
b1be6c6def Changed the isBufferObjectSupported flag so that it's true when either VBO or PBO's are supported 2018-03-23 12:56:26 +00:00
Paul Obermeier
b1170621c8 Fixes for VS2008 and 2010 build 2018-03-22 17:36:19 +00:00
Robert Osfield
ffb3ed8ef7 Removed typedef and used osg::GraphicsContext::Cameras explictly to avoid any hiding of type 2018-03-22 09:05:43 +00:00
Victor
d18f61688d Fixed bug of determining availability of functions ‘pthread_getconcurrency’, ‘pthread_setconcurrency’, ‘pthread_setaffinity_np’ in ‘pthread’ library 
CMake cannot find 'pthread_getconcurrency’, ‘pthread_setconcurrency’ and ‘pthread_setaffinity_np' functions in 'pthread' library because when linking internal cmake test did’t specifed ‘-l pthread’.
 2018-03-22 08:37:09 +00:00
Robert Osfield
b563f1bd78 Fixed build issues when building with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF 2018-03-19 14:08:47 +00:00
Robert Osfield
b38a37c3bb Fixed warnings 2018-03-19 10:42:09 +00:00
Robert Osfield
b7147ff532 Updated ShaderGen shaders 2018-03-16 11:33:03 +00:00
Robert Osfield
e5b67a6795 Removed the static osg::Program creation as it's not required 2018-03-15 16:50:47 +00:00
Robert Osfield
0308dfecf5 Introduced a _specverson to centralizer the control of this variable 2018-03-15 16:12:40 +00:00
Robert Osfield
4447190dd6 Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition. 2018-03-14 08:22:45 +00:00
gwaldron
23b94c2468 Text: added code in accept(functor) methods to check for empty vectors before accessing front() element, which was causing a crash in some cases. Also fixed a negated null check in getCharacterCoords 2018-03-12 17:35:46 -04:00