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

15786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Hogarth
4d4ba22b8a removed ios simulator reference, adjusted readme 2018-07-23 23:52:16 +01:00
Thomas Hogarth
9e288e3138 Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merge master
 2018-07-10 02:09:56 +01:00
Thomas Hogarth
49e9aadbf5 Improved iOS cmake support for xcode 9.4 and cmake 3.11 2018-07-10 02:09:28 +01:00
Robert Osfield
15d9c08273 Pulled in OpenFlight/expGeometryRecords.cpp from 3.6 branch 2018-07-09 18:00:29 +01:00
Thomas Hogarth
45d59ef03a Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merging with master
 2018-07-09 15:20:23 +01:00
Robert Osfield
f94980b1fe Removed the gl3.h usage for GL3 case as these headers were replaced by glcorearb.h, it's probably better to just fallback to gl.h and have the OSG get the extentions at runtime. 2018-06-29 09:57:55 +01:00
Thomas Hogarth
014255bd9e Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merging with master
 2018-06-29 03:08:24 +01:00
OpenSceneGraph git repository
9a51a4979f
Merge pull request #569 from LarryIII/Fix-issues 
Remove call to nonexistent member seekpos() of std::fpos in VS 15.8
 2018-06-28 06:40:25 +01:00
Larry-Hu
1b6a040cf0 Remove call to nonexistent member seekpos() of std::fpos in VS 2017 version 15.8 or later 2018-06-27 21:21:31 -07:00
Robert Osfield
b2087b8dd3 Replaced creation of a temporary Settings object on the heap with creation on the stack to improve performance 2018-06-27 11:07:53 +01:00
Robert Osfield
a774bd5902 Fixed relaseGLObjects() calls 2018-06-27 11:07:10 +01:00
Robert Osfield
dbcd3b0324 Added GLExtensions::isPointSpriteModeSupported to allow it to be enable for GL versions that support GL_POINT_SPRITE_ARB/GL_POINT_SPRITE_OES 2018-06-27 11:04:14 +01:00
Daniel Emminizer
a3ad6d3af9 GL_RG is now a support format in gluScaleImage(). 2018-06-27 11:04:01 +01:00
Robert Osfield
d2c2ef3ec9 Moved osg::clampProjectionMatrix() template from CullVisitor.cpp into include/osg/CullSettings to make it easier to implement custom clampProjectionMatrix callbacks 2018-06-25 20:03:50 +01:00
OpenSceneGraph git repository
ecedf3232c
Merge pull request #561 from LaurensVoerman/submit_ffmpeg3.2_master 
resolve av sync failure with ffmpeg 3.2 and up
 2018-06-21 12:06:25 +01:00
Laurens Voerman
10d88e0455 resolve av sync failure with ffmpeg 3.2 and up 2018-06-21 09:14:09 +02:00
OpenSceneGraph git repository
43957a5bb5
Merge pull request #560 from calumr/fix-near-far-lines 
Fix z near calculation for lines
 2018-06-20 12:19:23 +01:00
Calum Robinson
334638795a Fix z near calculation for lines 2018-06-20 10:59:12 +01:00
OpenSceneGraph git repository
60da1cfd1b
Merge pull request #557 from mijiping/patch-1 
Fixed the position of the viewport for the camera
 2018-06-18 19:37:30 +01:00
弥继平
36aa3a4fc6
Fixed the position of the viewport for the camera 
The position of viewport doesn't setup properly, some part of viewer is out of CMFC_OSG_MDIView,  and not visible.
 2018-06-19 00:33:03 +08:00
Daniel Emminizer
3410d3a37d FLT: Missing optional attr files on textures no longer generates a console warning. 2018-06-14 14:54:34 +01:00
Robert Osfield
6b38107f45 To handle calling Array::setBinding() after Geometry::set*Array() call, to the Geometry::addVertexBufferObjectIfRequired(osg::Array* array) added treatment of array->getBinding()==Array::BIND_UNDEFINED as BIND_PER_VERTEX as a safe fallback. 2018-06-14 14:54:09 +01:00
OpenSceneGraph git repository
3b78d4f902
Merge pull request #556 from LaurensVoerman/doxygenMissingQT 
remove include/osgQt from doxyfiles; add osgPresentation and osgUI
 2018-06-14 14:45:09 +01:00
Laurens Voerman
d2d16a374c remove include/osgQt from doxyfiles; add osgPresentation and osgUI 2018-06-14 14:31:28 +02:00
Robert Osfield
c3326ee621 Updated LICENSE to use the WxWidgets-3.1 and updates to the LGPL-2.1-only that updates addresses and tighten up language used. 
Functionality the OSGPL-1.0 is the same as OSGPL-0.0, All the OpenSceneGraph users can use either OSGPL-0.0 or OSGPL-1.0.
 2018-06-03 10:27:00 +01:00
Robert Osfield
22e5861c0b Removed deprecated xine plugin to simplify licensing (xine plugin is GPL'd) 2018-05-31 15:12:28 +01:00
Robert Osfield
a855faeff3 As the author of all the files in osgPresentation and present3D have rectified the license notices to reflect their intended license rather than histoical license they had prior to being merged into the OpenSceneGraph project. OSGPL was always intended but missed during merge. 
Replaced the GPL notices with OSGPL usge in present3D and include/osgPresentation as this was intended when Present3D was merged back into OpenSceneGraph but missed.
 2018-05-31 14:48:54 +01:00
OpenSceneGraph git repository
79033265d5
Merge pull request #551 from filnet/warn 
Notify: silence warning about unused argument
 2018-05-28 07:53:16 +01:00
Philippe Renon
c0848a56bc Notify: silence warning about unused argument 2018-05-27 14:21:57 +02:00
Robert Osfield
6da45d6a73 Updated REMOVE_SERIALIZER( ImageAttachment ); block to use 154 version to retain compatibility with binaries made with 153 SOVERSION prior to the Imageattachement change 2018-05-23 17:03:51 +01:00
Robert Osfield
6eb6634997 Implemented StateGraph reuse in in scene graph Canera's RenderStage. 2018-05-23 14:52:24 +01:00
Robert Osfield
e5ff90e455 Fixed warning of RenderLeaf's having multiple references in CullVisitor::createOrReuseRenderLeaf() but forcing a clean up of the StateGraph at the end of RenderStage::draw() 2018-05-23 14:42:28 +01:00
Robert Osfield
f8dcb20437 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-05-23 14:38:54 +01:00
OpenSceneGraph git repository
57a561f697
Merge pull request #550 from pelicanmapping/fix-implicit-ref-ptr 
Fix for compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION=OFF
 2018-05-23 14:15:54 +01:00
Thomas Hogarth
b14ecd27f1 fixed error with android sdk packaging 2018-05-23 10:20:13 +01:00
Robert Osfield
ed683678c0 Added check to make sure that glEnablei and glDisablei are only called when the capability is non zero to fix GL invalid value error. 2018-05-23 07:49:00 +01:00
Robert Osfield
8127ddc541 Fixed type of Timer_t under Windows 2018-05-23 06:34:51 +01:00
Thomas Hogarth
30f16ff91f upped default sdk version on android gles3 example 2018-05-23 04:22:35 +01:00
Thomas Hogarth
e34012196d Updated java side to gles3 2018-05-23 03:10:20 +01:00
Thomas Hogarth
b67a7c5981 compile fix for gles3 on android, copied example folder to create gles3 android example 2018-05-23 02:01:21 +01:00
gwaldron
633e0aa20b Fix for compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION=OFF 2018-05-22 12:13:37 -04:00
Robert Osfield
1b56fc1c00 Moved the rotation to before the scale 2018-05-22 09:07:06 +01:00
OpenSceneGraph git repository
5aa630a257
Merge pull request #548 from pelicanmapping/osgtext-fix-screen-coords-precision 
osgText: perform pixel size computation in double-precision to prevent jitter
 2018-05-21 18:50:54 +01:00
gwaldron
a2447c8dc0 osgText: perform pixel size computation in double-precision to prevent coordinate jitter 2018-05-21 13:26:04 -04:00
Robert Osfield
2c7d97266d Fixed typos 2018-05-21 13:19:06 +01:00
Robert Osfield
0bca415d5a Restored the REGISTER_WINDOWINGSYSTEMINTERFACE macro to the include/osg/GraphicsContext header and removed the OSGVIEWER_EXPORT as this was causing compatibility issues with osgQt. 
In GraphicsWindowWin32 replaced REGISTER_WINDOWINGSYSTEMINTERFACE usage with locally implemented equivilant with the required OSGVIEWER_EXPORT.
 2018-05-21 13:19:06 +01:00
Robert Osfield
76d1b85778 Restructed SCREEN auto scaling so that it's removes the rotation of the modelview matrix so that the XY coords of the text map directly to window xy coords for all text alignment types 2018-05-20 13:26:36 +01:00
Robert Osfield
c4c84d4f94 Moved REGISTER_WINDOWINGSYSTEMINTERFACE from include/osg/GraphicsContext to include/osgViewer/GraphicsWindow and added OSGVIEWER_EXPORT 2018-05-18 15:33:29 +01:00
Robert Osfield
0df03b09f9 Added GL_RED and GL_RG support to _readColor()/Image::getColor(); 2018-05-18 14:25:30 +01:00
Robert Osfield
ba766b88a8 Cleaned up the WindowingSystemInterface registration 2018-05-18 14:25:30 +01:00