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

10971 Commits

Author SHA1 Message Date
Robert Osfield
bf5a88870f Added check under Windows for a concatinated path that exceeds the MAX_PATH so that it isn't used for file IO operations that could lead to undefined behavior 
https://github.com/openscenegraph/OpenSceneGraph/issues/634
 2018-10-17 15:55:10 +01:00
flashk
8af46a6e98 Update ReaderWriterDAE.cpp 2018-10-17 15:54:54 +01:00
flashk
56617a4bfb Fix crash in Collada loader 
The collada loader would crash when processing effects that didn't have a technique defined.
 2018-10-12 07:38:59 +01:00
Boris Pek
7eaceb0baa fix builds with case sensitive includes 
Tested during cross-compilation for MS Windows using MinGW.
 2018-10-10 18:26:43 +01:00
Robert Osfield
8feae585e1 Fixed buld 2018-10-10 13:10:55 +01:00
Antoine Lavenant
fa7843d520 fix apply once 2018-10-10 08:16:41 +01:00
flashk
d48a304569 Fix for HDR DDS images 
The DDS loader was not applying the correct internal format for certain HDR images (e.g. float/half_float formats)
 2018-10-04 09:22:57 +01:00
flashk
ce90a9b2da osgDB::OutputStream write array optimization 
I've made a change to osgDB::OutputStream::writeArrayImplementation so that it writes the array data in a single write operation for binary files. This significantly speeds up writing out osgb files for large data sets (e.g. point clouds). osgDB::InputStream already performs a similar optimization when reading array data from binary files.
 2018-10-04 09:22:38 +01:00
flashk
273dd046c2 Fix for GifImageStream::setReferenceTime 
Setting the reference time greater than the duration of a gif would cause a crash. Also, the current reference time is not immediately updated when manually setting the reference time.
 2018-10-04 09:22:26 +01:00
flashk
627c3df093 Update ReaderWriterFBX.cpp 2018-10-04 09:22:14 +01:00
flashk
ab372b9ead Update fbxRMesh.cpp 2018-10-04 09:21:58 +01:00
flashk
247eee2ca1 Update fbxReader.h 2018-10-04 09:21:41 +01:00
flashk
d4bbec4a0c Fix hardware mipmap generation for cube maps 
I was getting a black image when enabling hardware mipmap generation on cubemaps. I believe the problem is that the base Texture class is hard coding GL_TEXTURE_2D when enabling mipmap generation, instead of using the target type from the derived class.
 2018-10-03 12:00:04 +01:00
Robert Osfield
114c818f2e Removed unused static variables 2018-10-02 12:21:31 +01:00
Robert Osfield
1ee6d476f8 From Andy Skinner, Added ~GLExtensions to clear cached values for context ID 2018-10-02 11:28:34 +01:00
Konstantin S. Matveyev
e663330bdf 1px error in GUIEventAdapter, View, Viewer and CompositeViewer major fix 2018-09-21 13:30:39 +03:00
Robert Osfield
ca134dca2d Standardized the glTexStorage*() calls to use osg::maximum(_numMipmapLevels,1) of rnumber of mipmaps to keep the usage consistent. 
Fixed the erronous Texture2DArray glTexStorage call so that it used the _numMipmapLevels as above to resolve bug in allocation.
 2018-09-12 17:45:49 +01:00
Robert Osfield
66246703bf Warning fixes 2018-09-11 15:32:44 +01:00
OpenSceneGraph git repository
c2f0da31f2
Merge pull request #620 from LaurensVoerman/txt_SCREEN_COORDS 
fix scale problem for osgText with characterSizeMode SCREEN_COORDS and _position set.
 2018-09-11 11:29:36 +01:00
Robert Osfield
4ea833cc6b Fixed build 2018-09-11 10:13:49 +01:00
Robert Osfield
8780347f2f Cleaned up code 2018-09-11 09:05:16 +01:00
gwaldron
22e6f6038f osgText: fixed thread-safety issues in Glyph and Font 2018-09-11 08:53:40 +01:00
Laurens Voerman
4dc6a6c4cd fix scale problem for osgText with characterSizeMode SCREEN_COORDS and _position set. 2018-09-07 15:09:15 +02:00
Mathieu MARACHE
2e38e4751c
Added saving of inline Images without having the physical image file. 
The can be read from and inlined image file
 2018-09-07 14:05:50 +02:00
Robert Osfield
dfdb946d60 Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6 2018-09-06 12:30:18 +01:00
Robert Osfield
d07fe93f34 Fixed memory leak with assignment of default value to ObjectSerializer 2018-09-06 11:53:35 +01:00
OpenSceneGraph git repository
05297f439c
Merge pull request #616 from eligovision/OpenSceneGraph-3.6_particles 
ParticleSystem: Added support for GLES2 and upper (GL_QUADS -> GL_TRI…
 2018-09-05 18:06:25 +01:00
Robert Osfield
34d58d447d Fixed copy constructor 2018-09-05 18:01:33 +01:00
Konstantin S. Matveyev
637e1cc33b ParticleSystem: Using of GL_TRIANGLES for GLES2 and upper; GL_QUADS otherwise 2018-09-05 19:00:29 +03:00
Alberto Luaces
69667a478f Fix typo in the initial check of Image::scaleImage(). 2018-09-05 13:38:09 +02:00
Konstantin S. Matveyev
f00b7180cb ParticleSystem: Added support for GLES2 and upper (GL_QUADS -> GL_TRIANGLES) 2018-09-05 14:05:29 +03:00
Jason Beverage
6ae1139630 Protect the _programSet in Shader with a mutex. 
This prevents thread safety issues when Shader objects are used in
multiple programs.
 2018-09-05 09:34:54 +01:00
Robert Osfield
5f9c6a0170 Changed the ShapeDrawable::build() methpd so that it does run when the ShadpwDrawabe is a KdTree. 2018-09-04 15:26:30 +01:00
Robert Osfield
afe5644b9f Added support for reading UTF-8 encoded of xml files 2018-09-04 12:42:31 +01:00
Robert Osfield
ae3133522d Changed the logic for whether to call setUpThreading() in setThreadingModel() to make it possible to changed threadings even if the threading model starts of as SingleThreaded 2018-09-03 12:30:02 +01:00
Robert Osfield
006ca64f4b Added reset of _stateset to prevent the releaseGLObjects calling release on th StateSet from the destructor 2018-09-03 09:37:36 +01:00
Robert Osfield
77fd07eaa9 Replaced the glSGetProcAddressARB code with the dlsym() usage as the NVidia driver looks to be returning non NULL pointers for invalid function names. 2018-08-28 12:01:35 +01:00
Robert Osfield
d18c498322 Enabled point sprite validty modes. 2018-08-22 11:13:11 +01:00
Robert Osfield
4f7f34a6b0 Merged fix for PointSprite modes validity checks from master. 2018-08-22 10:43:15 +01:00
plevy
dd9312ae35 Change GL_RGBA16F to GL_RGBA16F_ARB to fix Windows Build 
Change GL_RGBA16F to  GL_RGBA16F_ARB to fix Windows build.
 2018-08-22 07:48:55 +01:00
Robert Osfield
250dcc5b6c Replaced GL_RGBA32F with GL_RGBA32F_ARB to fix Windows build 2018-08-21 09:20:49 +01:00
mp3butcher
e043c3db33 complete TexStorage support 2018-08-20 05:11:43 +02:00
mp3butcher
587e65e674 add more extensions 2018-08-20 05:11:29 +02:00
mp3butcher
274b6894af remove redondant variable and test 2018-08-19 22:46:10 +02:00
Robert Osfield
29e87780f5 Removed check as this is better outside of the function 2018-08-17 16:53:13 +01:00
Robert Osfield
58a51cbc41 Created a GLenum Texture::selectSizedInternalFormat(const osg::Image* image=0) const method to help clean up set up of glTexStorage. 
Fixed typo.
 2018-08-17 12:20:59 +01:00
Robert Osfield
7ae7a994b4 Merged changes to InternalPixelRelations sizedInternalFormats[] from master 2018-08-17 10:31:46 +01:00
Robert Osfield
3808b298d1 Fixed memory leak associated with VertexArrayStte objects not getting released on destruction of Geometry/Drawables. 2018-08-16 19:24:56 +01:00
Robert Osfield
ed13576d03 From Chris White, Cygwin build fix 2018-08-08 14:42:04 +01:00
OpenSceneGraph git repository
9ab5aafd02
Merge pull request #583 from emminizer/flt-registry-cache 
OpenFlight: Replace internal caches with osgDB::ObjectCache use.  Fix…
 2018-07-31 16:58:41 +01:00
Daniel Emminizer
2e0e78144f OpenFlight: Replace internal caches with osgDB::ObjectCache use. Fixes unbounded memory growth when using readNode(std::istream&, ...) method. 2018-07-31 11:45:33 -04:00
Robert Osfield
79bc4c3843 Fixed check against dataType changes 2018-07-27 17:34:30 +01:00
Daniel Emminizer
4d6c4a7f1f FLT: Fix texture unit typo and code style from PR 568. 2018-07-09 06:34:41 -04:00
Robert Osfield
500d3947ef Fixed isPointSpriteModeSupported assignment bug 2018-06-29 10:53:23 +01:00
Larry-Hu
c1dfc39706 Remove call to nonexistent member seekpos() of std::fpos in VS 2017 version 15.8 or later 2018-06-28 06:54:57 +01:00
Daniel Emminizer
33cb2e6f70 OpenFlight: Textures now correctly export in GLCORE mode. 2018-06-27 12:57:20 -04:00
Robert Osfield
27fc282bb5 Fixed relaseGLObjects() calls 2018-06-27 09:06:58 +01:00
Robert Osfield
9d897c2555 Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6 2018-06-26 20:50:55 +01:00
Robert Osfield
cbcf7015bb Replaced creation of a temporary Settings object on the heap with creation on the stack to improve performance 2018-06-26 20:46:49 +01:00
OpenSceneGraph git repository
4d5c1ff14e
Merge pull request #566 from emminizer/fix-gl_rb-in-gluscaleimage 
GL_RG is now a supported format in gluScaleImage().
 2018-06-26 20:17:07 +01:00
Robert Osfield
d01edcb540 Added GLExtensions::isPointSpriteModeSupported to allow it to be enable for GL versions that support GL_POINT_SPRITE_ARB/GL_POINT_SPRITE_OES 2018-06-26 20:10:51 +01:00
Daniel Emminizer
bfa8d157c1 GL_RG is now a support format in gluScaleImage(). 2018-06-26 14:44:34 -04:00
Robert Osfield
44b3bcc3fc Moved osg::clampProjectionMatrix() template from CullVisitor.cpp into include/osg/CullSettings to make it easier to implement custom clampProjectionMatrix callbacks 2018-06-25 20:02:30 +01:00
Calum Robinson
40bde873bc Fix z near calculation for lines 2018-06-20 12:28:06 +01:00
OpenSceneGraph git repository
12db2f8011
Merge pull request #558 from LaurensVoerman/submit-ffmpeg3.2 
resolve av sync failure with ffmpeg 3.2 and up
 2018-06-19 11:50:38 +01:00
Laurens Voerman
e18a03abc3 resolve av sync failure with ffmpeg 3.2 and up 2018-06-19 10:47:23 +02:00
Daniel Emminizer
acf359777e FLT: Missing optional attr files on textures no longer generates a console warning. 2018-06-14 07:33:08 -04:00
Robert Osfield
4665a2f033 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 08:51:00 +01:00
Robert Osfield
673292b995 Moved Stae::setUseVertexAttributeAliasing(bool) implementation to .cpp an added call to _globalVertexArrayState->assignAllDispatchers(); to ensure state is consistent 2018-06-13 12:23:29 +01:00
Robert Osfield
5fb1e9c120 Removed deprecated xine plugin to simplify licensing (xine plugin is GPL'd) 2018-05-31 15:11:19 +01:00
Robert Osfield
801069d4cc 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:45:37 +01:00
Philippe Renon
0a4a31d17b Notify: silence warning about unused argument 2018-05-28 07:54:42 +01:00
Robert Osfield
4291636619 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:02:28 +01:00
Robert Osfield
189e4e3a64 Implemented StateGraph reuse in in scene graph Canera's RenderStage. 2018-05-23 14:30:31 +01:00
Robert Osfield
a6ef1cd66b 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:13:27 +01:00
Robert Osfield
f2012eeeb8 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:47:15 +01:00
gwaldron
e4adb509e0 osgText: perform pixel size computation in double-precision to prevent coordinate jitter 2018-05-21 20:04:45 +01:00
Robert Osfield
eae5f9b958 Moved the rotation to before the scale 2018-05-21 18:14:18 +01:00
Robert Osfield
9c6951e4ba Fixed typos 2018-05-21 13:18:29 +01:00
Robert Osfield
dce6684c59 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:10:40 +01:00
Robert Osfield
55c0afbe3a 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:22:58 +01:00
Robert Osfield
7602b868f4 Added GL_RED and GL_RG support to _readColor()/Image::getColor(); 2018-05-18 13:55:01 +01:00
Robert Osfield
880a100a60 Cleaned up the WindowingSystemInterface registration 2018-05-18 12:52:50 +01:00
Robert Osfield
a86c6dc2c6 Quitened down unsupport compression output when passing in a file with a non rgb extension 2018-05-18 12:42:20 +01:00
Robert Osfield
1476f829c4 Introduced a local StateGraph hierarchy into CullVisitor::apply(osg::Camera&) and RenderBin to fixed RTT Camera bug where multiple RTT Camera end up with the rendering back end results assigned to them which occured when RTT Camera's share the same StateSet or null StateSet. 2018-05-18 10:00:10 +01:00
Robert Osfield
26acc9a6b1 Fixed support for update and event callbacks on StateSet/Uniform/StateAttributes on View(er) Cameras. 2018-05-14 09:46:39 +01:00
Robert Osfield
510a231e14 Renamed the counter used to enable traversal order sorting 2018-05-14 08:43:08 +01:00
Robert Osfield
3bbbbd07ea Improved the handling of precision 2018-05-14 08:24:02 +01:00
Robert Osfield
640b03b671 Fixed crash when using ShapeDrawable with a TriangleMesh or ConvexHull shape due to missing texture coords 2018-05-13 11:52:06 +01:00
Robert Osfield
00a946bc2e Removed _traverseNumber variable that was duplicating the one in NodeVisitor base class 2018-05-13 09:18:31 +01:00
Robert Osfield
312ce9ad05 Build fixes for OSG_USE_REF_PTR_IMPLICIT_OUTPUT set to OFF 2018-05-12 12:41:42 +01:00
Robert Osfield
362e355db2 Rewrote TextBase::computeMatrix(..) computation of the scaling factor with slower but easier to understand and more robust code 2018-05-12 11:40:25 +01:00
Robert Osfield
01f69e6b10 Moved constructors and destructors to .cpp 2018-05-11 11:16:43 +01:00
Robert Osfield
a211ea4e68 Revert "Moved the Options constructors and destructor implementaions into the cpp to make it easier to do debugging" 
This reverts commit 0fc7aa8cc0.
 2018-05-11 11:11:48 +01:00
Robert Osfield
fcde92ad89 Fixed crash the occurred when passing in a osgDB::Options to the ObjectCache that doesn't have any references to it. 2018-05-11 09:00:22 +01:00
Robert Osfield
0fc7aa8cc0 Moved the Options constructors and destructor implementaions into the cpp to make it easier to do debugging 2018-05-11 08:58:30 +01:00
Robert Osfield
be363ef8d4 Fixed build when OSG_ENVVAR_SUPPORTED is disabled and quietened down warnings using OSG_UNUSED* macros 2018-05-10 18:58:29 +01:00
Robert Osfield
05793cb104 Fixed typo 2018-05-10 16:59:56 +01:00
Robert Osfield
e79edabf98 Restructed the handling of SCREEN_COORD scaling to better handle window resizing 2018-05-05 15:47:28 +01:00
Robert Osfield
d95993554e Added C++ specific path for calling std::map<>::erase() to avoid issues with std::map<>::erase implementation that invalidates iterators 2018-05-05 12:31:00 +01:00
Robert Osfield
f49e1d32c9 Replaced std::auto_ptr<> usage as it's deprecated in C++11 and will be removed in C++17 2018-05-05 12:28:45 +01:00
OpenSceneGraph git repository
a15d4532fa
Merge pull request #545 from emminizer/fix-gl3-text-bad-mode 
Text only applies GL_TEXTURE_2D modes when fixed function is availabl…
 2018-05-04 16:11:31 +01:00
Daniel Emminizer
27955ae8e9 Text only applies GL_TEXTURE_2D modes when fixed function is available. Prevents GL3 Core Profile console spam. 2018-05-04 06:44:13 -04:00
Robert Osfield
f90edd0d9f Added check for null to prevent null entries getting into the cache 2018-05-04 09:44:43 +01:00
Robert Osfield
f510613d55 Fixed null pointer warning 2018-05-04 09:22:54 +01:00
Björn Blissing
645704dfd3 Check existence of path before reading image 
When loading texture images inside the FBX plugin check that the path
exists before trying to read the image. This is done to avoid
unnecessary warnings inside the readRefImageFile function.
 2018-05-03 16:13:24 +01:00
Robert Osfield
31c9dbc881 Fixed particle update bug where a ParticleSystem wouldn't start when loaded during the frame loop due to the _last_frame value not being set. 2018-04-27 11:25:46 +01:00
Robert Osfield
37a63d37e2 Split up #pragma so that there only three parameters per line to aovid Intel driver bug crash 2018-04-26 09:52:32 +01:00
Robert Osfield
1daacced5a Renamed text.vert and text.frag to osgText_Text.vert and .frag to avoid name overlapping with user shaders. 2018-04-26 09:52:32 +01:00
Julien Valentin
cea33e40df add wrapper for osg::DrawIndirectBufferObject 2018-04-25 09:49:56 +01:00
Robert Osfield
2b3ac015bb Renamed CMake variable + C++ #define to OSG_GL_CONTEXT_VERSION 2018-04-24 17:06:07 +01:00
Robert Osfield
1aa0a80de7 Added OSG_GL_CONTEXT_STRING cmake variable to set include/osg/GL headers that sets Traits::glContextVersion. 2018-04-24 16:22:13 +01:00
OpenSceneGraph git repository
c10f298dc6
Revert "When GL3 build is enabled, default context requested is version 3.3, …" 2018-04-24 15:37:44 +01:00
OpenSceneGraph git repository
e8c0033f5f
Merge pull request #536 from emminizer/default-gl3-context 
When GL3 build is enabled, default context requested is version 3.3, …
 2018-04-24 15:36:11 +01:00
Robert Osfield
31c29f4318 Refactored the handling of glyph and shadow alpha values to make the text and shadow clearer for fonts with narrow glyphs 2018-04-24 15:33:03 +01:00
Robert Osfield
e0be94389e Refactored the handling of text bounding box to provide more stable bounding box computation 2018-04-24 13:52:53 +01:00
Daniel Emminizer
d660b29ef0 When GL3 build is enabled, default context requested is version 3.3, enabling core profile by default. 2018-04-24 06:31:32 -04:00
Alberto Luaces
02c310982e Fix typos and spelling. 2018-04-23 11:03:37 +01:00
Robert Osfield
709194c88c Replaced osgUtil::IntersectVisitor usage with osgUtil::InteresectionVisitor 2018-04-20 14:32:34 +01:00
Robert Osfield
8de8af6850 Removed TriStripVisitor for default set of Optimizer passes as it doesn't generate efficient scene graphs 2018-04-20 11:48:46 +01:00
Robert Osfield
a082b57c3f 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:44:44 +01:00
Robert Osfield
547340659f Fixed the set*Binding() methods so that they assign BufferObjects when required 2018-04-19 19:43:14 +01:00
Robert Osfield
29d12ddcbc Fixed messages 2018-04-19 19:42:51 +01:00
Robert Osfield
f95fdd4d4e Fixed the GLBufferObject size computation so that it takes into account padding. 2018-04-19 19:41:51 +01:00
Robert Osfield
bf6db4eee7 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:36:19 +01:00
Robert Osfield
fe39589771 Fixed the handle of boundary equalization 2018-04-18 10:15:01 +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
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
Yaroslav Tarasov
f8199935fa Fixed renamed of _textureDepth. 2018-03-12 16:14:30 +00:00
Robert Osfield
5c8a5307d6 From Colin McDonald, "If the glCreateProgram in osg::Program fails for any reason, then subsequently 
Program::PerContextProgram::linkProgram would crash.  I've put in some
checks to prevent that."
 2018-03-12 15:55:35 +00:00
Robert Osfield
3f686d8719 Fixed indentation 2018-03-12 15:29:56 +00:00
Robert Osfield
7ce1938543 Improved indentation 2018-03-12 15:12:44 +00:00
Robert Osfield
957bd4b886 Added FbxLayeredTexture support 2018-03-12 10:29:04 +00:00
Robert Osfield
125263f216 Refactored the texture setup to streamline it and make it easier to adapt 2018-03-10 17:51:52 +00:00
Alessandro Terenzi
9010fd8035 iOS CMake project generation improvements (bitcode option) 
when building for iOS, Xcode allows developers to specify to enable or disable the 'bitcode' compilation option. There's not a preferred way to go and the choice is really up to the developer but considering that:

1. Currently the generated project defaults the option to YES
2. There are almost 90 projects targets that should be modified if one wants to disable the bitcode option (which considerably reduces the footprint of the app)
3. Even though one can select all the 90+ targets and set the option to NO for all of them, the updates could take a few seconds and could be error prone because one could miss to select some targets

I propose to add a CMake setting that is displayed only when building for iOS. By setting this option "before" the project generation would speed up things for developers and would avoid errors at compiling time.
 2018-03-09 10:17:59 +00:00
Robert Osfield
e17f1c4e31 Refactored the handling if RESIZE, CLOSE, QUIT AND USER events so they are dispatched to all views associated with a window, or all views associated with a CompositeViewer 2018-03-08 16:26:01 +00:00
Robert Osfield
1020bddb15 Fixed recursive call bug 2018-03-08 10:47:07 +00:00
Robert Osfield
4e6e0f53be Changed glDrawBuffer/glReadBuffer calls to use the new State::glDrawBuffers/glReadBuffers helper functions to enable lazy state updating to avoid unneccessary GL calls 2018-03-07 17:49:40 +00:00
Robert Osfield
4dac60540a Changed the default values of _drawBuffer and _readBuffer to make sure that the lazy state updating in State.glDrawBuffers(GLenum)/glReadBuffers(Glenum) doesn't ever ignore the first call. 2018-03-07 17:44:48 +00:00
Robert Osfield
b03e76bdb9 Renamed numBytesPerPixel to numBytesPerComponent to be clearer 2018-03-06 09:58:31 +00:00
Robert Osfield
64341cfb72 Added State::glDrawBuffer/glReadBuffer() method to implement lazy state updating for glDrawBuffer and glReadBuffer 2018-03-06 09:49:02 +00:00
OpenSceneGraph git repository
ee3235e7e0
Merge pull request #491 from mmassing/readerwritergdal_fix_reading_of_multichannel_multibyte_images 
ReaderWriterGDAL: fix stride when reading multi-channel images with…
 2018-03-06 09:33:30 +00:00
Manuel Massing
b4cf315d6f - ReaderWriterGDAL: fix stride when reading multi-channel images with more than 1 byte per pixel 2018-03-05 15:48:24 +01:00
TÖRÖK Attila
b7c429a72a osgDB: Fix handling of return value of loadLibrary in Registry. 
"Unable to load ..." was printed if the library could be loaded,
and it wasn't if not.
 2018-03-02 00:13:43 +01:00
Laurens Voerman
c81317b5b0 remove _EXT from GL_MAX_ARRAY_TEXTURE_LAYERS_EXT and GL_TEXTURE_BINDING_2D_ARRAY_EXT 2018-02-28 14:11:41 +01:00
Robert Osfield
be723811c8 Added GUIEventHandler to allow one to write out models with event callbacks 2018-02-28 10:30:47 +00:00
Robert Osfield
99bcd95756 Replaced GL_TEXTURE_2D_ARRAY_EXT with GL_TEXTURE_2D_ARRAY 2018-02-28 08:50:48 +00:00
Robert Osfield
3dec244d5b Changed GL enum to fix Windows build issue 2018-02-28 08:02:39 +00:00
Robert Osfield
6a4609c28f Fixed precision issue with filling in the last element of the TransferFunction1D's osg::Image. 2018-02-27 19:09:18 +00:00
Robert Osfield
7b6eedbdf4 Restructured the way that applyTexParameters() is applied to address issues with Intel drivers not handling mipmap generations unless the tex parameters are reapplied on new upload of data. 2018-02-27 17:35:13 +00:00