Commit Graph

15862 Commits

Author SHA1 Message Date
Robert Osfield
38ad6ed3b3 Fixed inline Drawable::draw(..) method 2018-04-16 17:18:49 +01:00
Robert Osfield
9d72bf4712 Fixed Geometry::drawImplmentation() handling of VBO's to prevent them from being used when display lists are used. 2018-04-16 17:18:37 +01:00
Robert Osfield
15429198b8 Replaced osgViewer::GraphicsWindow dynamic_cast as it's not neccessary. 2018-04-15 08:25:57 +01:00
Robert Osfield
3da4a5e503 Fixed typo 2018-04-07 18:35:19 +01:00
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
7c7a904315 Updated ChangeLog 2018-04-07 07:19:14 +01:00
Robert Osfield
d3c0a90a3c Updated for rc7 2018-04-07 07:18:41 +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
ba4624c437 Updated ChangeLog 2018-04-06 15:33:42 +01:00
Robert Osfield
c9cce01868 Update ChangeLog 2018-04-06 14:58:00 +01:00
Robert Osfield
1866b5ca44 Updated for rc6 2018-04-06 14:47:54 +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
d1c54223cb Added osgtext --alignment test to look the effect of calling Text::setAlignent() before and after the Text::setText(). 2018-04-06 14:10:43 +01:00
OpenSceneGraph git repository
0ce3131ffd
Merge pull request #525 from emminizer/fix-windows-export
osgDB: Added missing extern OSGDB_EXPORT.
2018-04-05 18:00:30 +01:00
Daniel Emminizer
3d8cc71601 osgDB: Added missing extern OSGDB_EXPORT. 2018-04-05 10:51:24 -04: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
Robert Osfield
5d54697c29 Updated ChangeLOG and news 2018-04-05 12:19:56 +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
4136621e93 Updated ChangeLog for rc5 2018-04-04 15:35:28 +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
Robert Osfield
b8b105b54e Added EventHandler to report key and mouse events for debugging purposes 2018-04-04 14:10:43 +01:00
Robert Osfield
3be15a310e Added -4 command line entry that creates two seperate windows within CompositeViewer 2018-04-04 14:10:43 +01:00
Frank Bausch
ceed09afea When testing XYZ/ECEF coordinate values that convert to LLA points with latitude = 90.0 or latitude = -90.0, the heights calculated by EllipsoidModel::convertXYZToLatLongHeight have substantial errors. With the provided change, points at the pole are handled more correctly. This has been tested against US NGA GoldData. 2018-04-04 08:51:38 +01:00
Robert Osfield
7541bc9d48 Updated rc to 5 2018-04-03 17:21:47 +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
Robert Osfield
419c351862 Updated rc number to 4 2018-04-03 16:07:46 +01:00
Robert Osfield
2746f50a7c Updated ChangeLog and NEWS for rc3 2018-04-03 16:04:24 +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
OpenSceneGraph git repository
d0f891ca31
Merge pull request #516 from eligovision/OpenSceneGraph-3.6_program
osg::Program's compileGLObjects and apply methods fixed for OSG witho…
2018-04-03 12:10:29 +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
363a933f25 Updated NEWS and ChangeLog for 3.6.0-rc3 2018-03-30 17:52:12 +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
88e8b1ede0 To osgclipe example added --text textstring and --simple command line options to test mixing text and clipping 2018-03-30 15:16:45 +01:00
Robert Osfield
f54403284f Changed Layer::get*Value(..) methods to const 2018-03-30 12:47:15 +01:00
Robert Osfield
79b181f9c9 Fixed double calling of TerrainTechnique::init(). 2018-03-29 11:38:53 +01:00