FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,944 Commits 1 Branch 26 Tags 73 MiB
7efe889537
Commit Graph

15944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
6863cdee9a Removed usage of the osgUtil::TriStripVisitor is it generates osg::Geometry that perform very poorly when using VBO and VAO's vs GL DisplayLists. 
With DisplayLists being deprecated in GL and VBO and VAO becoming standard it's best to standardize on using the osgUtil::MeshOptimizers instead of TripStrupVisitor
 2018-04-20 11:42:31 +01:00
Robert Osfield
f1593c38d9 Removed TriStripVisitor for default set of Optimizer passes as it doesn't generate efficient scene graphs 2018-04-20 10:24:17 +01:00
Robert Osfield
c58041cf0b Added osgUtil::optimizeMesh(osg::Node* node) convinience method 2018-04-20 09:57:04 +01:00
Robert Osfield
85c835b902 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-04-19 20:11:19 +01:00
Robert Osfield
37e3c428b6 Fixed the set*Binding() methods so that they assign BufferObjects when required 2018-04-19 19:46:20 +01:00
Robert Osfield
1e32282806 Fixed messages 2018-04-19 19:45:53 +01:00
Robert Osfield
0836fa602a Fixed the GLBufferObject size computation so that it takes into account padding. 2018-04-19 19:45:29 +01:00
Robert Osfield
71583b825f Replaced the use of osgUtil::TriStripVisitor with ogUtil::MeshOptimizer usage to improve performance. 
Fixed set setColorArray assignement to pass in the color binding
 2018-04-19 19:45:21 +01:00
OpenSceneGraph git repository
989c8832c8
Merge pull request #532 from jasonbeverage/remove_getNameID 
Removed unimplemented Uniform::getNameID from Uniform header
 2018-04-19 08:38:47 +01:00
Jason Beverage
7250cd717c Removed unimplemented Uniform::getNameID from Uniform header as it's defined in UniformBase now. 2018-04-18 14:59:51 -04:00
Robert Osfield
c9b1c234a6 Fixed the handle of boundary equalization 2018-04-18 10:02:43 +01:00
Robert Osfield
7efc10d0e6 Added --equalize-boundaries -e command line option to call terrain->setEqualizeBoundaries(true) 2018-04-18 09:33:12 +01:00
Robert Osfield
1d4f6c2543 Cleaned up includes 2018-04-17 09:20:23 +01:00
OpenSceneGraph git repository
aeeec59f33
Merge pull request #531 from jasonbeverage/fixosgmanipulator 
Including osg/Geode to fix osgManipulator build
 2018-04-17 09:06:18 +01:00
Jason Beverage
c09d209bd0 Including osg/Geode to fix osgManipulator build 2018-04-16 15:58:12 -04:00
Robert Osfield
8a2e6b1eaa Removed long deprecated IntersectVisitor. 2018-04-16 19:41:53 +01:00
Robert Osfield
724dbac41c Fixed inline Drawable::draw(..) method 2018-04-16 15:08:24 +01:00
Robert Osfield
675702d258 Fixed Geometry::drawImplmentation() handling of VBO's to prevent them from being used when display lists are used. 2018-04-16 15:05:11 +01:00
Robert Osfield
a58f6c68d6 Replaced osgViewer::GraphicsWindow dynamic_cast as it's not neccessary. 2018-04-15 08:30:16 +01:00
Robert Osfield
3e2e16c42c Fixed typo 2018-04-07 18:36:23 +01:00
Robert Osfield
e884df59c7 Pulled in latest changes from 3.6 branch 2018-04-07 18:14:57 +01:00
Robert Osfield
159f0fd584 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:05:26 +01:00
Robert Osfield
03879ca19b Updated ChangeLog 2018-04-06 15:34:10 +01:00
Robert Osfield
72054e6f6b Fixed warning 2018-04-06 14:49:32 +01:00
Robert Osfield
45fb5ae1aa 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:07:58 +01:00
Robert Osfield
db1ff4c415 Added osgtext --alignment test to look the effect of calling Text::setAlignent() before and after the Text::setText(). 2018-04-06 14:06:50 +01:00
Daniel Emminizer
5063a0b41a osgDB: Added missing extern OSGDB_EXPORT. 2018-04-05 18:01:29 +01:00
Robert Osfield
decaf57fef Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation 2018-04-05 14:14:49 +01:00
Robert Osfield
b92158ed33 Changed DisplaySettings::setShaderHint(..) messages to INFO 2018-04-05 12:36:24 +01:00
OpenSceneGraph git repository
9ea9ab6ae2
Merge pull request #521 from filnet/mingw_compile_fix 
mingw: fix compile error in GraphicsWindowWin32.cpp
 2018-04-05 11:12:53 +01:00
Philippe Renon
4672a8672c mingw: fix compile error in GraphicsWindowWin32.cpp 
compilation error was introduced by msvc specific change
see bb169979a1
 2018-04-05 11:21:55 +02:00
OpenSceneGraph git repository
6e4abcde7c
Merge pull request #520 from rhabacker/master 
Remove duplicated and incorrect fetching of 'map_bump' attributes in obj plugin
 2018-04-04 19:35:40 +01:00
Ralf Habacker
40c24a7a49 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-04 19:04:27 +02:00
Robert Osfield
146fe3e294 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:09:43 +01:00
Robert Osfield
1f56d4905f Added focus classifiction of handling of keyboard events 2018-04-04 13:40:51 +01:00
Robert Osfield
38534c453a Added EventHandler to report key and mouse events for debugging purposes 2018-04-04 13:40:06 +01:00
Robert Osfield
fdc7d225a0 Added -4 command line entry that creates two seperate windows within CompositeViewer 2018-04-04 12:26:53 +01:00
Frank Bausch
72ab22e539 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:50:39 +01:00
Daniel Emminizer
10f000f043 CompositeViewer: SCROLL event now only goes to view with focus. Includes minor typo fixes. 2018-04-03 17:20:54 +01:00
OpenSceneGraph git repository
75aed8c309
Merge pull request #517 from tomhog/master 
missing gles2 check
 2018-04-03 15:34:20 +01:00
Robert Osfield
a34df91de7 Added a ShadowTechniue::setShadowedScene() virtual method to make it possible to implement techniques as fascades to other techniques 2018-04-03 15:29:54 +01:00
Thomas Hogarth
f1b2a4a968 missing gles2 check 2018-04-03 13:58:22 +01:00
Andreas Ekstrand
110b9e95dd 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:42:37 +01:00
Konstantin S. Matveyev
6cd00edd6c osg::Program's compileGLObjects and apply methods fixed for OSG without OSG_GL_FIXED_FUNCTION_AVAILABLE 2018-04-03 12:22:34 +01:00
Robert Osfield
b920d482c7 Removed osgShadow::ShadowVolume as it functionality isn't functional 2018-04-03 11:35:31 +01:00
Robert Osfield
5c48904626 Rewrote the handling of AutoTransform::setAutoScaleToScreen(bool) functionality so that is disabling CullingActive when switched on. 2018-04-02 18:26:26 +01:00
Robert Osfield
11230c3f0b Added __VERSION__<140 check for usage of gl_ClipVertex to avoid GL3 core profile usage issues 2018-04-02 16:21:20 +01:00
Robert Osfield
98c147ff9e Restructured merge geometry code to make it easier to follow 2018-04-02 14:08:47 +01:00
Robert Osfield
972d80daf9 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 11:44:03 +01:00
Robert Osfield
d8281257a7 Removed stray CMAkeLists.txt from TARGET_SRC list 2018-04-01 10:41:26 +01:00