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

10831 Commits

Author SHA1 Message Date
Julien Valentin
9560548722 add MorphTransformHardware serializer 2017-09-01 18:10:40 +02:00
Julien Valentin
78dd81a8b4 add void InfluenceMap::removeUnexpressedBones(Skeleton &skel) const; 
a bit experimental but work well without further process on my test set
 2017-09-01 17:48:28 +02:00
Julien Valentin
0d02dfbbbd remove utility classes BoneWeight and IndexWeight in order to avoid unnecessary symbols 
(but decrease a bit clarity of the code)
 2017-09-01 16:23:49 +02:00
Julien Valentin
8b74b04de0 cleanup 2017-09-01 15:19:42 +02:00
Julien Valentin
dee9dc2164 a functional cleanup 2017-09-01 01:43:00 +02:00
Julien Valentin
5aa96727e9 clean and bugfixes 2017-08-31 20:57:19 +02:00
Julien Valentin
b790986f37 few cleanup 2017-08-31 13:49:27 +02:00
Julien Valentin
068a032dac revert s/VertexIndexWeight/IndexWeight/ 2017-08-31 13:30:24 +02:00
Julien Valentin
4c4f760d4a fix a bug in how vertexattributes are filled 2017-08-30 23:19:49 +02:00
Julien Valentin
f4675a5648 I found the damn bug in RigTransformHW 2017-08-30 23:01:21 +02:00
Julien Valentin
1f628235d4 rehabilit an init method to ensure morphing po setted before skinning po in case of rigeom source that are morphgeom 2017-08-30 20:36:34 +02:00
Robert Osfield
1289c4ee41 Added osgText::Font::s/getGlyphInterval(int) and GlyphTexture::s/getGlyphInterval(int) and internal support for clmapping positions of glyph images an defined intervals, defaults to 1. 2017-08-30 16:21:03 +01:00
Julien Valentin
86ad54f671 add parameter to XXXTranformHW to customize reserved texture attribs and vertex attribs 2017-08-30 17:07:11 +02:00
Julien Valentin
705695b41d add a guard (if dirty) on uniform update 2017-08-30 15:48:45 +02:00
Julien Valentin
8fad310ce1 readd VertexInfluence whenever it's bad named and kinda useless 2017-08-30 15:30:03 +02:00
Julien Valentin
fd9b8f103e cleanup 2017-08-30 14:26:15 +02:00
Julien Valentin
985d766f05 uncomment normalization in rigtransformxxx 2017-08-30 12:55:45 +02:00
Julien Valentin
0ebf540d65 add and comment out normlization in rigtransformXXX 2017-08-30 12:09:54 +02:00
Julien Valentin
fe99b568a0 refactor: remove totally VertexInfluence (renamed BoneInfluenceList) everywhere 2017-08-30 11:12:17 +02:00
Robert Osfield
f3bbb686d2 Removed debug messages 2017-08-29 17:32:14 +01:00
Robert Osfield
5566a025b5 Added TextSettings struct to manage values used to set up the text. with the addition of following command line parameters: 
--outline // enable outlne
   --shadow // enable shadow
   --offset ratio // set the backdrop offset
   --text-color r g b a // set the text body color
   --bd-color r g b a // set the shadow/outline color
   --bg-color r g b a // window background color
   -o filename // write create subgraph to disk using specified filename
 2017-08-29 17:19:26 +01:00
Julien Valentin
fae9729560 swap priority in BonePtrWeight comparator< yeild the same VG set 2017-08-29 17:41:38 +02:00
Julien Valentin
ce6a316bde cleanup 2017-08-29 17:41:26 +02:00
Julien Valentin
059fc70337 set defaut implementation at creation 2017-08-29 14:49:11 +02:00
Mathieu MARACHE
e2f826b8fc Under macOS the glValidateProgram reports too many 
false negatives (errors) about missing buffers, etc..

From the internet https://stackoverflow.com/questions/15335510/opengl-glvalidateprogram-error-on-mac-os-x :
« […] The purpose of glValidateProgram is not to use it as an added "check" step after linking the program, because the GL and application state is hardly ready for actually using that program at this point, probably it's even before we get around to initializing the default framebuffer (its bitdepth, its multisample buffers, etc), and that's what the error hints at.

An appropriate place to call glValidateProgram would be right before you make a real render call. »
 2017-08-29 11:34:27 +02:00
Julien Valentin
0c9a624026 few refactoring and fixes 2017-08-29 04:08:55 +02:00
Julien Valentin
b3402d9344 readd the 2 methods in InfluenceMap just in case 2017-08-29 00:34:26 +02:00
Julien Valentin
9856cecb71 cleanup 2017-08-29 00:09:38 +02:00
Julien Valentin
350756e738 add 2 method to VertexInfluenceMap: 
normalize and cullInfluenceCountPerVertex
 2017-08-28 18:42:22 +02:00
Julien Valentin
5123614f89 comply with refactoring 2017-08-28 18:27:23 +02:00
Julien Valentin
925f1524cf total removal of the old path 2017-08-28 18:16:30 +02:00
Julien Valentin
28bb88a038 remove default order for BoneWeight and restore old sort func (behaviors differs) 2017-08-28 18:02:52 +02:00
Julien Valentin
da1d2b67f7 remove old path and add few fixes 2017-08-28 17:01:03 +02:00
Julien Valentin
6d55d8d341 minor fixes 
removed unused
 2017-08-28 16:08:14 +02:00
Julien Valentin
2aab28149f reroot to rigtransform::prepareData old path to rig::buildvertexinfluence 2017-08-28 15:59:13 +02:00
Julien Valentin
7659b23f38 remove unused 2017-08-28 15:44:09 +02:00
Julien Valentin
3efaccb298 add prepareData for RigTransformHW 2017-08-28 15:41:14 +02:00
Julien Valentin
4b56a4d3be minor changes+fix 2017-08-28 15:40:04 +02:00
Julien Valentin
f899a8dde5 add prepareData for rigttransform software 2017-08-28 14:44:09 +02:00
Julien Valentin
e216833286 few refactoring 2017-08-28 14:23:15 +02:00
Robert Osfield
5d55ffe6ee Merge branch 'osganimation' of https://github.com/mp3butcher/OpenSceneGraph into osganimation 2017-08-28 10:28:18 +01:00
Mathieu MARACHE
1408c2664e
osg::Program::isFixedFunction() should'nt return true fixed function is unavailable, even if _shaderList.empty() is true 2017-08-28 09:44:10 +02:00
Julien Valentin
2b2a8f3d2e MorphTransformHardware using TBO added 2017-08-28 04:51:52 +02:00
Julien Valentin
ca224c81dd replace VertexInfluence to BoneInfluenceList 
and VertexIndexWeight to IndexWeight

fix in example
 2017-08-27 05:21:37 +02:00
Julien Valentin
4f0256bcc3 remove unused code and remove a commented section 2017-08-27 01:36:21 +02:00
Julien Valentin
0729e883d8 update serializers 2017-08-26 23:17:54 +02:00
Julien Valentin
32aaeccee1 refactoring and fixes 
only change in design: decouplage between MorphGeometry and MorphTransform technique
no real change in behavior (i hope)
 2017-08-26 23:06:39 +02:00
Julien Valentin
c89b08ea1f Add extensions 2017-08-25 00:19:22 +02:00
Robert Osfield
68e0b25d32 Cleaned up warnings and removed assorts. 2017-08-24 15:13:14 +01:00
OpenSceneGraph git repository
cf91bb42f0 Merge pull request #321 from LaurensVoerman/tgaMissingColormap 
fix gcc/VC compile warnings, reject color mapped tga files with missing colormap.
 2017-08-24 11:08:38 +01:00
Laurens Voerman
9ef4859f55 fix gcc/VC compile warnings, reject color mapped tga files with missing colormap. 2017-08-24 11:37:21 +02:00
Julien Valentin
107b7be95b Merge remote-tracking branch 'upstream/master' into MDI7 2017-08-24 11:26:23 +02:00
OpenSceneGraph git repository
b89384d810 Merge pull request #318 from mp3butcher/osganimation 
change the design of BufferIndexBinding to work with BufferData instead of BufferObject +matrix transpose
 2017-08-24 09:53:32 +01:00
Julien Valentin
d49f0d67af change the design of BufferIndexBinding to work with BufferData instead of BufferObject 
allow convenient BufferData abstraction +  serialization of BufferIndexBinding
 2017-08-24 03:28:55 +02:00
Julien Valentin
3b03699fbc add a transpose method for 4x4 
and a transpose3x3 to transpose only orthogonal part of a mat4x4
 2017-08-23 23:49:36 +02:00
Robert Osfield
3b69755117 Fixed comparison to properly handle texture coordinates being assigned 2017-08-23 14:51:18 +01:00
OpenSceneGraph git repository
90e27d3b7d Merge pull request #314 from LaurensVoerman/notify2 
reduce the need to reallocate the std::ostream buffer behind osg::Notify
 2017-08-23 14:48:04 +01:00
Robert Osfield
bb3b69962a Warning fixes 2017-08-23 14:39:35 +01:00
Laurens Voerman
682730fbe4 reduce the need to reallocate the std::ostream buffer behind osg::Notify (causing multitreading issues) by pre-allocating 4095 bytes. 2017-08-23 11:53:16 +02:00
Michael Kapelko
59d3b1ebac Fix stat64 build issue with NDK 15 by definining at stat for Android 2017-08-22 22:49:56 +03:00
OpenSceneGraph git repository
ad98bdd165 Merge pull request #311 from eligovision/master 
Geometry::compileGLObjects function VAO fix
 2017-08-22 09:22:41 +01:00
Laurens Voerman
3a50e2948b ReaderWriterVNC.cpp fix g++ warnings 2017-08-22 09:35:00 +02:00
Konstantin S. Matveyev
d1453a41c2 Geometry::compileGLObjects function VAO fix 2017-08-22 10:12:36 +03:00
Robert Osfield
8926f0e9c2 Using a PR from Sando Mani for requestioning a specific GL version as a base, cleaned up formattating, made the new code paths simpler and added clean up of memory 2017-08-21 11:40:45 +01:00
OpenSceneGraph git repository
70135d606e Merge pull request #307 from eligovision/master 
[*] createTexturedQuadGeometry: fixed for GL3 spec
 2017-08-20 19:53:41 +01:00
scrawl
fb214b62a1 Use osg::Quat::value_type instead of double in collada plugin 
Note that although the value_type is currently always double, using the proper typedef will open the door to implementing a float Quaternion in the future (as I have done so in my own fork)
 2017-08-20 15:56:40 +00:00
konstantin.matveyev
6841f37ccc [*] createTexturedQuadGeometry: fixed for GL3 spec: GL_QUADS -> GL_TRIANGLES 2017-08-20 18:01:49 +03:00
AnyOldName3
67a0f815e4 Add support for type-1 (colour-mapped, uncompressed) targa images to the osgTGA plugin 2017-08-19 22:22:20 +01:00
OpenSceneGraph git repository
32f895bc5f Merge pull request #304 from eligovision/master 
glClear should not be called with zero-mask in osgUtil::RenderStage::…
 2017-08-19 17:20:40 +01:00
Konstantin S. Matveyev
036add8e9e glClear should not be called with zero-mask in osgUtil::RenderStage::drawImplementation 2017-08-18 10:20:26 +03:00
Robert Osfield
bdbff4824b Fixed iterator comparison. 2017-08-18 08:11:57 +01:00
Robert Osfield
34b4e70015 Added version check for boolean, TRUE and FALSE settings 2017-08-17 10:52:59 +01:00
Robert Osfield
f3adcda6b7 Removed the GLclampd declaration and replaced its usage with GLdouble to standardize the OSG extension setup with current GL/GLES headers. 
Added a float fallback from osg::DepthDangeIndex to suppprt GLES.
 2017-08-16 14:20:00 +01:00
OpenSceneGraph git repository
bfbaecaf49 Merge pull request #300 from eligovision/master 
Text3D character/glyph size fix
 2017-08-16 11:30:14 +01:00
konstantin.matveyev
237ab29ff8 Merge remote-tracking branch 'upstream/master' 2017-08-15 22:15:31 +03:00
konstantin.matveyev
b0ef9b0c42 Text3D character/glyph size fixed 2017-08-15 22:11:15 +03:00
luzpaz
2cd31f65e4 misc. typo fixes 
mostly non-user-facing but some doxy.
 2017-08-15 12:23:49 -04:00
Uwe Woessner
f186f6b2d4 Extension to the PLY plugin to read files with textures. 2017-08-15 15:52:35 +01:00
OpenSceneGraph git repository
86d7a903a1 Merge pull request #298 from eligovision/master 
Emscripten: EGL instead of SDL2 in GLExtensions.cpp
 2017-08-15 06:39:02 +01:00
konstantin.matveyev
8e8d5b2fe0 Emscripten: EGL instead of SDL2 in GLExtensions.cpp 2017-08-14 11:19:04 +03:00
Robert Osfield
c18be2fc41 Replaced local FindZLIB.cmake usage with CMake's own FindZLIB.cmake, and ZLIB_LIBRARY to ZLIB_LIBRARIES 2017-08-09 14:18:35 +01:00
OpenSceneGraph git repository
e606e0b4de Merge pull request #296 from openscenegraph/FullScreen 
From Don Burns, add use of Xinerama to ensure full screen goes across all screens.
 2017-08-09 14:08:59 +01:00
Anna Sokol
9d1234e866 In the attached GraphicsWindowWin32.cpp file, I changed order of the "else-if" for the TOUCHEVENTF_UP and TOUCHEVENTF_MOVE, I made it less intrusive then changing them into "if" events. I tested this on Windows 7 64-bit with a touch screen and a Windows 10 64-bit tablet. 
Separately in the same file, I also needed to address the fact that the close button would not react on touch so I added to the top of the "handleNativeWindowingEvent" close button handling in case of touch events. Again this was tested on the same 2 devices.
 2017-08-08 13:35:35 +01:00
Julien Valentin
35eb53cc95 add MDI support 2017-08-02 22:10:02 +02:00
Julien Valentin
3965b4e66e fix a bug in MDI serializer 2017-08-01 02:18:15 +02:00
Robert Osfield
d1adb9acbc Added missing break statements 2017-07-28 14:34:59 +01:00
Robert Osfield
3bda71ef15 Improved readability and consistency with the rest OSG by adding/removing spaces and brackets where appropriate. 2017-07-28 14:32:56 +01:00
OpenSceneGraph git repository
3076779a14 Merge pull request #267 from kornerr/master 
Add osgemscripten example
 2017-07-28 10:27:47 +01:00
mp3butcher
104b2dfc72 Promote PrimitiveSetIndirect's VBO to a target explicited DIBO (in order to benefit from BOSet queue management) 2017-07-27 12:13:05 +02:00
mp3butcher
7606159a78 add DrawIndirectBufferObject as State variable in order to minimize call to glBindBuffer(GL_DRAW_INDIRECT_BUFFER,X) 
TODO: Promote PrimitiveSetIndirect's VBO to target explicited DIBO (in order to benefit from BOSet queue management)
 2017-07-27 01:54:25 +02:00
mp3butcher
9b53775840 remove deprecated DrawIndirectBufferBinding 2017-07-27 01:40:04 +02:00
mp3butcher
8742ad8da6 fix some errors during renaming and cleanup code 2017-07-27 01:08:37 +02:00
mp3butcher
b26fa74e7e add untested serializers for PrimitiveSetIndirect 2017-07-26 23:38:20 +02:00
mp3butcher
f27c379b1e some renaming and harmonisations with osg metamodel convention 2017-07-26 23:36:55 +02:00
mp3butcher
5be14bc2ba first commit for Indirect Draw integration in osg 
users will have to implement interfaces for their custom drawcommandarrays
add a lot of new primitive set + few defines
integration is made in osggpucull
 2017-07-26 21:20:28 +02:00
Anna Sokol
c32d3eb926 Since version 2.5.1 freetype has supported the WOFF extension format. 
In the attached ReaderWriterFreeType.cpp file I added the following line:

            supportsExtension("woff","web open font format");
 2017-07-17 16:46:16 +01:00
Cai Shanli
bdd6817cee fix StatsHandler crush on windows 
change static_cast to dynamic_cast to avoid type cast error
 2017-07-03 16:24:01 +08:00
Michael Kapelko
f992ec1440 Add osgemscripten example 2017-06-22 09:44:06 +07:00
Robert Osfield
83d08b18f8 Added version checks for when writing out new 64bit object sizes 2017-06-19 15:45:35 +01:00
Robert Osfield
605b3619cd Replaced long long with uint64_t 2017-06-19 15:33:52 +01:00
OpenSceneGraph git repository
eab845a4c5 Merge pull request #264 from rickyviking/binaryStreamLargeBlock 
BinaryStreamOperator: read and write block size as long long integer
 2017-06-19 15:25:04 +01:00
Robert Osfield
9f3533632a Added ability for OSG serializers to get the file version number when writing out via the OutputStream object 2017-06-19 12:04:03 +01:00
OpenSceneGraph git repository
da7a0968be Merge pull request #265 from cxw42/array-classname 
Make Array::className() support all Array::Type values
 2017-06-19 08:50:00 +01:00
Robert Osfield
ce7593c799 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-06-19 08:26:24 +01:00
Chris White
eb99df894a Make Array::className() support all Array::Type's 
Array::className() had fallen out of date with respect to Array::Type.
This commit updates it, and adds documentation and a debug message to
serve as a reminder for future additions of values to Array::Type.
 2017-06-16 11:02:14 -04:00
Riccardo Corsi
eff73bad76 BinaryStreamOperator: read and write block size as long long integer on 8 bytes, to accommodate arbitrarily large block size. 
When reading check of file version for backward compatibility.
 2017-06-14 16:09:40 +02:00
blobfish
f5bd280b51 osg: KdTree: count degenerates to keep original primitive index in sync 2017-06-04 17:29:57 -04:00
blobfish
bb804c2045 osg: KdTree: encode original primitive index into _vertexIndices 2017-06-04 17:29:57 -04:00
blobfish
b52bc2bcd1 osgUtil: LineSegmentIntersector: don't increment primitive index until after adding intersection 2017-06-04 17:29:57 -04:00
blobfish
47efc55621 osgUtil: PolytopeIntersector: don't increment primitive index until after adding intersection 2017-06-04 17:29:57 -04:00
Jordi
8a2f1bc056 Fixes kdtree building 2017-05-31 13:33:37 +02:00
Robert Osfield
8e6a77d216 Added TimeMultiplier and LoopingMode to ImageSequence .osg serializer 2017-05-29 12:24:01 +01:00
Robert Osfield
79e764bd17 Improved support for Text with large numbers of glyphs 2017-05-25 12:38:54 +01:00
Robert Osfield
20ac472d1f Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config 2017-05-24 19:40:08 +01:00
Robert Osfield
a60aed70b5 Replaced DimensionMask naming with more appropriate PrimitiveMask nameing. 2017-05-24 18:36:52 +01:00
Robert Osfield
a201b15648 Added support for PolytopeIntersector::setDimensionsMask. 2017-05-24 18:36:52 +01:00
Robert Osfield
17d39e3db2 From Don Burns, add use of Xinerama to ensure full screen goes across all screens. 2017-05-12 16:26:07 +01:00
Robert Osfield
a74b4b94a9 Fixes/clean up of KdTree/LineSegmentIntersector/PolytopeIntersector 2017-05-11 15:29:31 +01:00
Robert Osfield
6e1866ac18 Added --points and --lines command line options that do a very simplistic conversion of geometry primitives to points or lines respectively, used to aid testing of intersectors 2017-05-11 15:29:31 +01:00
Robert Osfield
1196e82587 Added missing header 2017-05-11 15:29:31 +01:00
Robert Osfield
c9545970ac Removed redudent bool parameter from TriangleFunctor::operator(Vec3, Vec3, Vec3, bool) so it's now simply TriangleFunctor::operator(Vec3, Vec3, Vec3) as the bool was always false in recently OSG versions. 2017-05-11 15:25:10 +01:00
Robert Osfield
e7e372bad2 Added support for using new IntersectFunctor for non kdtree as well as kdtree PolytopeIntersector 2017-05-11 15:25:10 +01:00
Robert Osfield
770a52d354 Implemented the setting of all the PolytopeIntersector::Intersection values on hits detected by KdTree/Polytope intersection codes 2017-05-11 15:25:10 +01:00
Robert Osfield
e03d9f84c6 Moved the Polytope::contains(..) triangle test into PolytopeIntersector to enable customization and optimization. 2017-05-11 15:25:10 +01:00
Robert Osfield
8f5493e573 Implemented Polytope::contains(..) for triangle vertices and added support for using the results mask. 2017-05-11 15:25:10 +01:00
Robert Osfield
265efb85a1 Initial work on adding KdTree support for PolytopeIntersector. 2017-05-11 15:25:10 +01:00
Robert Osfield
728a7f2225 Merge branch 'MultiViewAutoTransform' 2017-05-11 14:35:50 +01:00
OpenSceneGraph git repository
9f9c605422 Merge pull request #252 from remoe/patch-2 
Avoid call of SetupThreads in DatabasePager Constructor
 2017-05-10 11:18:09 +01:00
Thomas Hogarth
2ce5238cf7 Added more plugins to iOS example, Textures now working on GLES3 (missed so if defineds) 2017-05-04 18:17:30 +01:00
Thomas Hogarth
fe0b53d7f5 Added more plugins and texture shader to iOS example, fixed a couple of missed if defines for GLES3 2017-05-04 00:24:46 +01:00
Remo E
36eb0e945f Avoid call of SetupThreads in DatabasePager 
This solves a bug with some shared library configurations. Sometimes the DatabasePager Singleton is initialised before one can call other configuration options like "setNumOfDatabaseThreadsHint". But OSG initialise it here:

https://github.com/openscenegraph/OpenSceneGraph/blob/master/src/osgDB/DatabasePager.cpp#L1555 

So this call is not needed?!
 2017-04-28 16:51:34 +02:00
Robert Osfield
a95d66a587 Replaced dynamoc_cast<osg::CullStack*> with asCullStack() to improve performance of AutoTransform, screen size based LOD and PagedLOD. 2017-04-26 17:10:58 +01:00
Robert Osfield
92092a56ae Refactored AutoTransform so that it dynamically computes the rotation, scale and matrices during the cull traversal to enable usage in multi-view, multi-threaded applications 2017-04-26 11:50:35 +01:00
Robert Osfield
a4b0dc7426 Added missing Node::asAutoTransform() + NodeVisitor::apply(AutoTransform&). 2017-04-25 18:04:04 +01:00
Alexander Roan
3dc3dd3bd6 GLExtenstions: fix checking of isFrameBufferObjectSupported flag for GLES2 2017-04-24 10:19:58 +01:00
Ulrich Hertlein
c5450394b0 RAII memory management for macOS image loading 
- use std::vector instead of manual memory management
- removes dead/commented code
 2017-04-23 21:38:38 +02:00
Ulrich Hertlein
e723c6d63b Fixes compiler warning regarding logic vs bitwise AND 2017-04-23 11:52:05 +02:00
Farshid Lashkari
9bc93fb18e There is a small bug in how the FBX importer computes the rotation matrix for nodes. It applies the "RotationOrder" property to the local, pre, and post rotation values. However, the pre/post rotation values should always use a fixed XYZ order. The "RotationOrder" property should only apply to the local rotation value. I've attached the updated file with the fix. 2017-04-18 17:01:26 +01:00
Farshid Lashkari
2523dee7e0 Modified the FBX loader to support bump, specular, and gloss maps. I've attached a zip containing the modified files. 2017-04-18 16:40:56 +01:00
Farshid Lashkari
420d3065f4 When the "ZUp" option was added to the fbx loader, it broke the previous behavior of converting to the OpenGL axis system. I'm referencing the following commit: 
c168887e5e

This commit inverted the value of the "fSign" variable, but did not update the previous code that used the variable. I've attached the change that restores the original behavior when not using the "ZUp"
 2017-04-18 16:01:58 +01:00
OpenSceneGraph git repository
a7548794c0 Merge pull request #244 from LaurensVoerman/submit_osgtMissingTextureCrash 
fix a crash when reading an osgt file with multiple references to a missing texture.
 2017-04-07 17:34:22 +01:00
Laurens Voerman
36fc30d8e7 avoid INFO message about duplicate enums with and without _EXT 2017-04-07 15:56:32 +02:00
Laurens Voerman
4bc855b610 fix a crash when reading an osgt file with multiple references to a missing texture. 2017-04-07 15:27:56 +02:00
OpenSceneGraph git repository
977bd22e36 Merge pull request #243 from mp3butcher/moreExtensions 
add Extensions
 2017-04-05 17:39:05 +01:00
mp3butcher
8d40323761 add Extensions 2017-04-05 18:11:50 +02:00
mp3butcher
0993edda11 forgot a lua_pop(_lua, 16) 2017-04-05 17:59:06 +02:00
mp3butcher
912f9e18cb few fixes for Matrix support.. 
but getElements still fails..
 2017-04-05 17:57:08 +02:00
OpenSceneGraph git repository
a30e5df6f2 Merge pull request #238 from filnet/silence_thread_logging 
openthread: silence some log output
 2017-03-30 15:23:17 +01:00
Robert Osfield
a6baf00956 Reordered command line parsing and replace throw with cout. 2017-03-30 13:21:05 +01:00
Robert Osfield
c2684ca1f5 Improved the error warning message 2017-03-30 12:18:16 +01:00
Philippe Renon
b843fb19fc openthread: silence some log output 2017-03-30 11:29:53 +02:00
Robert Osfield
1f0515ceff Fix for GL3 2017-03-29 11:38:29 +01:00
Robert Osfield
cb7140aa04 Fixed windings 2017-03-29 10:02:03 +01:00
OpenSceneGraph git repository
373204ef7f Merge pull request #236 from mp3butcher/ScriptBranch 
add ScriptNodeCallback serializer
 2017-03-29 09:27:58 +01:00
mp3butcher
9d490bbf1c add ScriptNodeCallback serializer 2017-03-28 22:37:34 +02:00
mp3butcher
3142b682f2 remove spaces in the previsouly added macro 2017-03-28 22:19:32 +02:00
mp3butcher
fc3afbe449 oups forgot an associaterevisions 2017-03-28 22:14:44 +02:00
mp3butcher
0555bc4bc7 add BufferData associate as well as revisionassociate in PrimitiveSet Seriliazer 2017-03-28 20:48:35 +02:00
Robert Osfield
eb59590d77 Added handling of large shapes 2017-03-28 18:29:26 +01:00
Robert Osfield
10d87c40db Quiten down debug messages 2017-03-28 11:45:55 +01:00
Robert Osfield
76afbc9bcf Fixed ac plugin's handling of rot primitive in .ac files 2017-03-27 20:30:14 +01:00
Robert Osfield
70e7cb886b Added serializers for BufferObject and BufferData 2017-03-27 20:02:33 +01:00
OpenSceneGraph git repository
11b3424984 Merge pull request #230 from mp3butcher/commitMaster 
add new serializers
 2017-03-27 15:05:59 +01:00
Robert Osfield
6308b497f2 Replaced macro based selection of which shaders to use by default with DisplaySettings::setShaderHint() and OSG_SHADER=HINT=GL2|GL3|GLES2|GLES3|NONE controls 2017-03-27 11:44:41 +01:00
mp3butcher
96db8033f2 add an include to osg/geometry 2017-03-26 16:26:43 +02:00
mp3butcher
46a37618ef add new serializers 2017-03-26 15:59:36 +02:00
Robert Osfield
ec5cbe18d5 Restructed the marco to resolve Windows build issues 2017-03-25 16:05:57 +00:00
Robert Osfield
c6228fabbd Added built-in shaders for shader_pipeline functionality 
Added support for enabling shader_pipeline shaders using OSG_SHADER_PIPELINE=ON/OFF env var
Added support for setting the shader_pipeline shaders using OSG_SHADER_PIPELINE_FILES=shader.vert:shader.shaderpipeline_frag env var
Added support for setting the maximum number of texture units used by shader_pipeline shaders via OSG_SHADER_PIPELINE_MAX_TEXTURE_UNITS=<num> env var
 2017-03-24 18:53:22 +00:00
Robert Osfield
7772ef8606 Renamed the osgVolume/Shaders directory to osgVolume/shaders to make it consistent with OpenSceneGraph-Data/shaders 2017-03-24 13:47:05 +00:00
Robert Osfield
7346831082 Added parameter to invocation of all GLSL TexEnv combinations and cleaned up debug output from new osg::UniformTemplate implementations 2017-03-24 10:08:51 +00:00
Robert Osfield
1fbb2ce01c Removed debug message 2017-03-23 18:12:52 +00:00
Robert Osfield
986674e547 Added CopyOp handling of Uniform. 2017-03-23 18:12:52 +00:00
Robert Osfield
d5e9a2c447 Added shader pipeline support to various Texture subclasses 2017-03-23 18:12:52 +00:00
Robert Osfield
83372ff864 Added shader pipeline support to osg::TexEnv 2017-03-23 17:59:39 +00:00
Robert Osfield
59a28859ec Added shader pipeline support to osg::TexGen. 2017-03-23 17:59:39 +00:00
Robert Osfield
2fc28a7f64 Added mapping of GL modes to 0 (disabled) or 1 (enabled) for the fixed function -> shaders mapping. 
Added flags for hinting to StateAttribute::apply() implementations whether to toggling on/off the fixed function or shader equivilants.
 2017-03-23 17:59:39 +00:00
Robert Osfield
2574894e17 Added TextureAttribute base class from Texture related StateAttribute that need texture unit information from StateSet::setTextureAttribute assigned to 
help set configure the appropriate uniforms.
 2017-03-23 17:58:34 +00:00
Robert Osfield
ccfb320ae8 Cleaned up set of ModeDefine maps using the new osg:MakeString helper class 2017-03-23 17:58:34 +00:00
Robert Osfield
bbbfa19ce2 Added osg::PlaneUniform. 
Added osg::UniformBase::setName(const std::string&) ability to be reset.
Added osg::UniformBase::setName(const std::string& baseName, unsigned int unit) so set the uniform name in the form "baseName[unit]".
 2017-03-23 17:58:34 +00:00
Robert Osfield
c0b04cc37b Introduced new osg::UniformBase class to enable an extensible uniform class hierachy 
Added osg::UniformTemplate, osg::UniformArrayTemplate and a set of IntUniform, IntArrayUniform etc. to make it easier to interact with basic types more efficiently.
 2017-03-23 17:58:34 +00:00
Robert Osfield
5bfefdae6a Added mapping of texture modes to #define's to inject into shaders where required 2017-03-23 17:42:33 +00:00
Robert Osfield
1c9219560b if'd 0 out resetting of the Projection and ModelView and Program object pointers in the popAllStateSets() as this was causing problems when using the RootStateSet. 2017-03-23 17:42:33 +00:00
Robert Osfield
4600acb3b7 Restructed check for whether to print out shaders to make it easier to toggle on/off 2017-03-23 17:42:33 +00:00
Robert Osfield
6d531fd643 Moved the implementation of the State::setUseModelViewAndProjectionUniforms(bool) and State::setUseVertexAttributeAliasing(bool) into State.cpp and added initialization of the VertexArrayState array bindings to ensure that bindings get updated correctly. 
Refined the State::popStateSet() method to make it more efficient
 2017-03-23 17:42:33 +00:00
Robert Osfield
a99b05ff87 Added State::s/getRootStateSet() that enables applications to insert a StateSet above all rendering for a graphics context. Utilized in the new shadper pipeline functionality 2017-03-23 17:42:33 +00:00
Robert Osfield
172ca9bae5 Removed debug version of applyUniformList 2017-03-23 17:42:33 +00:00
Robert Osfield
d1222fc2ef Added fallback textures to handle cases where no texture is provided 2017-03-23 17:42:33 +00:00
Robert Osfield
0bcfa8d980 Added shader defines for setting up vertex and fragment shaders with texture support 2017-03-23 17:42:33 +00:00
Robert Osfield
40e08813e2 Improved debug output of shaders that use shader defines. 2017-03-23 17:42:33 +00:00
Robert Osfield
df034d6fb8 if'd out ShaderGenVisitor usage under GLES2 to enble proper testing of new fixed function -> shaders infrastructure. 2017-03-23 17:42:33 +00:00
Robert Osfield
de0334e654 Added support for mapping texture modes to #define's 2017-03-23 17:42:33 +00:00
Robert Osfield
7e0551e7e8 Added #pragma import_texture_modes() -> #define into #pragma data structure a GLSL parsing 2017-03-23 17:42:33 +00:00
Robert Osfield
fe2811e822 REplaced _EXT GLenum for standard GL versions 2017-03-23 17:42:33 +00:00
Robert Osfield
71da950cee Standardized GLenum's on non EXT versions 2017-03-23 17:42:33 +00:00
Robert Osfield
c33f33139e Added more mods to the mode string map 2017-03-23 17:42:33 +00:00
Robert Osfield
5c2ea3ad1f Intial work on providing mapping from OpenGL modes to #pragma(tic) shader composition defines. 
Shader  usage:

   #pragma import_modes ( GL_LIGHTING, GL_TEXGTURE_2D )

Will provide #define in shaders for GL_LIGHTING and GL_TEXTURE_2D if these Modes are enabled via StateSet::setMode(..);
 2017-03-23 17:42:33 +00:00
Robert Osfield
b4152d9634 Added simple fallback from osg::Material::apply() when fixed function pipeline is disabled 2017-03-23 14:53:08 +00:00
Robert Osfield
7ccd25a4d5 Fixed missing initializer for _color and assignment of color to ShapeDrawable 2017-03-23 14:40:44 +00:00
Robert Osfield
9848c1d264 First pass at default shader for GLES2,GLES3 and GL3. 2017-03-23 11:09:49 +00:00
Robert Osfield
d70d00607f Removed no longer relevant line 2017-03-23 10:25:25 +00:00
Robert Osfield
717cb182ce Removed hardwaring to online write inine when writing to binary files to allow inline images in asci and binary files 2017-03-23 09:52:21 +00:00
Robert Osfield
e74f8f4bbe Added TextureBuffer serializer 2017-03-22 14:20:03 +00:00
OpenSceneGraph git repository
602a6beda8 Merge pull request #225 from MPursche/add_texture2dmultisample_serializer 
Added serializer for Texture2DMultisample
 2017-03-22 10:31:45 +00:00
Marcel Pursche
422587a285 Added serializer for Texture2DMultisample 2017-03-22 10:47:58 +01:00
Robert Osfield
48aa852f42 Replaced GL_QUADS and GL_QUAD_STRIP usage with indexed GL_TRIANGLES 2017-03-22 09:43:19 +00:00
OpenSceneGraph git repository
429aef3b08 Merge pull request #221 from tomhog/topic-gles3-ios 
GLES3 support improvements on iOS
 2017-03-21 17:56:39 +00:00
Robert Osfield
1778a2a6fb Made VAO the default for GL3 builds. 
Improved the handling of DisplaySettings::getVertexBufferHint() values.
 2017-03-21 15:38:52 +00:00
tomhog
423e14f92f Merge branch 'master' into topic-gles3-ios 2017-03-21 15:33:13 +00:00
Robert Osfield
a74872c6bf Refactored GlyphTexture so that it utlizes standard osg::Texture2D/osg::Image combinations rather than locally implemented per glyph subloading. 2017-03-21 13:10:45 +00:00
Thomas Hogarth
630af80635 Adusted Font shaders to use gl3 path on gles3, iphone example using inbuilt shaders 2017-03-20 19:35:01 +00:00
Thomas Hogarth
7ba2e728cd GLES3 now working on iOS, tried to maintain support for have bother gles2 and gles3, allowed avfoundation to be added on iOS, improved iOS example cmake generation 2017-03-20 18:39:56 +00:00
Thomas Hogarth
3a6e28da9c More gles3 tweaks 2017-03-20 18:39:56 +00:00
Thomas Hogarth
76fe572934 Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in 2017-03-20 18:33:08 +00:00
Robert Osfield
6670a6e070 Improved support for stats, fonts and shadergen for GLES2, GLES3 and GL3 2017-03-20 14:07:14 +00:00
Robert Osfield
e0592b6d11 Added shader for GL3/GLES/GL2/GL2 2017-03-20 10:31:58 +00:00
Robert Osfield
4498945b98 Quited debug messages 2017-03-20 09:25:49 +00:00
Robert Osfield
c7711fd2d4 Added support for GL3/GLES3, GL2,GLE2 shaders to osgText::Font/Text. 2017-03-18 18:08:12 +00:00
Robert Osfield
279cc82a01 Improved readability of code 2017-03-18 11:48:55 +00:00
Robert Osfield
943beb220d Improved handling of osgText::Text with and wihout shaders 2017-03-18 11:48:55 +00:00
Robert Osfield
e6703e3cb0 Removed no longer supported code paths 2017-03-18 11:48:55 +00:00
Robert Osfield
feb0214ddc Introduced streamlined text rendering dispatch code. 2017-03-18 11:48:55 +00:00
OpenSceneGraph git repository
2cefcc8bfc Merge pull request #220 from rickyviking/addPenInputWin32 
Added PEN input support to GraphicsWindowWin32 with the WM_POINTER*
 2017-03-18 11:17:03 +00:00
Robert Osfield
44e303ad90 Added explict call to state.applyModelViewAndProjectionUniformsIfRequired() when required for better GL3/GlES2 support. 2017-03-16 15:46:51 +00:00
Riccardo Corsi
b3ccf02e06 Added PEN input support to GraphicsWindowWin32 with the WM_POINTER* framework available since Windows 8. 
Fallback on existing WM_TOUCH implementation for actual touch inputs.
 2017-03-16 15:32:05 +01:00
Robert Osfield
2c2097ce24 Replaced GL_QUADS usage with GL_TRIANGLES to aid portability. 2017-03-13 17:46:51 +00:00
OpenSceneGraph git repository
ce0fbabb4e Merge pull request #207 from LaurensVoerman/submitOpenCascade 
fix OpenCascade library list for use with shared libs; added list and…
 2017-03-13 15:01:08 +00:00
OpenSceneGraph git repository
c364bbb19b Merge pull request #215 from LaurensVoerman/submit-SerializerParticle 
Submit serializer particle
 2017-03-13 14:25:33 +00:00
Laurens Voerman
75e6889366 fix OpenCascade library list for use with shared libs; added list and options for static lib 2017-03-13 12:54:02 +01:00
Robert Osfield
ffbc1167de Added lazy state updating for vertex array object binding/unbinding 2017-03-13 11:44:34 +00:00
Laurens Voerman
a2ce0a0e0f bugfix: read endbracket for fileversion 145 (introduced 25/8/2016) 2017-03-13 09:27:08 +01:00
OpenSceneGraph git repository
a6453ad877 Merge pull request #198 from scrawl/buildswitch 
Add cmake options for disabling plugins from the build
 2017-03-11 17:31:27 +00:00
OpenSceneGraph git repository
f1f6d23eeb Merge pull request #213 from marchelbling/bug/osg-fixes 
Bug/osg fixes
 2017-03-11 15:08:57 +00:00
Robert Osfield
61782d8f29 Build fixes 2017-03-11 12:31:19 +00:00
OpenSceneGraph git repository
75e4d85681 Merge pull request #211 from D-A-Heitbrink/master 
Added support for unsigned 64 bit ints + some code for bindless textures
 2017-03-11 11:58:20 +00:00
OpenSceneGraph git repository
8dd22d9178 Merge pull request #208 from LaurensVoerman/submitRWlas 
rewrote las plugin to read in a single pass: more speed, better precision
 2017-03-11 11:37:33 +00:00
OpenSceneGraph git repository
58b9f5208f Merge pull request #206 from LaurensVoerman/submitLAScmake 
allow library names liblas.lib and liblas_c.lib;fix include dirs typo…
 2017-03-11 11:36:31 +00:00
OpenSceneGraph git repository
fea86426ed Merge pull request #205 from LaurensVoerman/submitGTAcmake 
GTA: use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug lnk
 2017-03-11 11:35:36 +00:00
OpenSceneGraph git repository
1d8efb1a3a Merge pull request #203 from scrawl/optimizer 
MergeGeometryVisitor fix
 2017-03-11 11:34:16 +00:00
Robert Osfield
a4b1a4ce29 Fixed handling of VAO's Text with backdrop and per vertex colours 2017-03-10 17:06:04 +00:00
Robert Osfield
0eb0656d52 Improved handling of backdrops 2017-03-10 12:08:22 +00:00
Robert Osfield
5b78e334a9 Improved the management of the unbinding of VBO's and EBO's 2017-03-09 18:17:53 +00:00
Robert Osfield
445f2bfe21 Reordered operations to make code easier to follow 2017-03-09 18:16:04 +00:00
Robert Osfield
91564e36b0 Cleaned up VertexArrayState handling 2017-03-09 17:48:06 +00:00
Robert Osfield
7f3f995c56 Improved handling of VBO/VAO's in Text3D 2017-03-09 17:47:27 +00:00
Robert Osfield
2cad221d80 Cleaned out old code paths 2017-03-09 17:33:38 +00:00
Robert Osfield
96760970ed Added setDataVariance(DYNAMIC) to stats text labels that are dyanmically updated. 2017-03-09 17:01:33 +00:00
Robert Osfield
7868909f43 Improved the handling of array updates and support for VBO and VAO's. 2017-03-08 18:15:06 +00:00
Robert Osfield
854dac5340 Improved the checks against VBO+VAO usage and cleaned up setup. 2017-03-08 18:12:37 +00:00
Laurens Voerman
15a90f63b8 fix bug in osgb/osgt/osgx readerwriter causing the osgParticle-SizeInterpolator and -ColorInterpolator to dissapear 2017-03-06 15:43:32 +01:00
Robert Osfield
26878fa7ab Fixed text background tessellation 2017-03-06 14:37:21 +00:00
Laurens Voerman
8743c18c5a rewrote las plugin to read in a single pass: more speed, compressed file (.laz) support and better precision. 2017-03-06 14:23:17 +01:00
Marc Helbling
e906465dcb Fix commented variable assertions in inventor writer 2017-03-06 14:08:27 +01:00
Marc Helbling
18826a9ebc Fix implicit ref_ptr conversions 2017-03-06 14:08:27 +01:00
Marc Helbling
4627821e79 Revert bad change in 3ds reader 2017-03-06 12:29:19 +01:00
Marc Helbling
a97cdebe11 Remove unused offset attribute in MergeArrayVisitor 2017-03-06 12:25:48 +01:00
Marc Helbling
c765b0b62d Add missing type for attribute merge 2017-03-06 12:25:23 +01:00
Robert Osfield
bb754b6f0a Moved all vertex array set up to start of Text/Text3D::drawImplementation(). 2017-03-04 17:20:54 +00:00
Robert Osfield
b88be0fbda Implemented better handling of VertexBufferObjects and ElementBufferObjects in osgText 2017-03-03 18:31:51 +00:00
Robert Osfield
59931d1591 Removed unneccessary mutable usage 2017-03-02 17:05:24 +00:00
Robert Osfield
1e36a12a17 Updated Attribute and PrimitiveFunctor implementations 2017-03-02 16:33:09 +00:00
Robert Osfield
a69216a79d Refactored osgText::Tex3D to use a single vertex and normal arrays and a combined set of primitive sets. Deprecated Text3D::RenderMode as it's no longer used. 2017-03-02 16:11:10 +00:00
Robert Osfield
4721651dbe Added NEW_APPROACH code path that merges the separate GlyphGeometry arrays and primitives into a single set of arrays and primitives 2017-03-02 11:12:55 +00:00
d-a-heitbrink
7b3fc0925c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-03-01 16:12:49 -06:00
Robert Osfield
f233005988 Merged the decoration vertices with the same vertex arrays used for text glyphs 2017-03-01 16:43:05 +00:00
Robert Osfield
f4966a96d4 Replaced hardwired glDrawArrays calls with use of osg::DrawElementsUshort. 2017-03-01 11:51:27 +00:00
scrawl
c1dd0eb348 Add CMake options to control which osgPlugins/ are built 2017-02-28 22:56:42 +01:00
Robert Osfield
256441906f Removed unused member variable 2017-02-28 17:12:58 +00:00
Robert Osfield
1290f1584a Removed old Text::GlyphQuads array code paths 2017-02-28 17:02:02 +00:00
Robert Osfield
138af70bd8 Merged the Text::GlyphQuads cooordinate arrays 2017-02-28 16:34:33 +00:00
Robert Osfield
e5685dfca5 Removed old code paths 2017-02-27 15:15:37 +00:00
Robert Osfield
80c96cd54f Added option for combining the GlyphQuad::backdropcoords into the GlyphQuad::coords. 2017-02-27 11:53:42 +00:00
Robert Osfield
8adbf322a0 Scaled back the primitives sets set up so they match the requirements of the osgText::Text accordinging to the BackdropType 2017-02-24 18:25:16 +00:00
Robert Osfield
a84a6bd309 Moved glyph quad setup into dedicated method 2017-02-24 17:08:48 +00:00
Laurens Voerman
ef01913b9a allow library names liblas.lib and liblas_c.lib;fix include dirs typo; link only liblas_c in plugin. 2017-02-24 16:21:20 +01:00
Laurens Voerman
f8ed554ddb use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug linking with SET(TARGET_LIBRARIES_VARS GTA_LIBRARY) 2017-02-24 16:09:13 +01:00
Robert Osfield
cefecaec10 Removed unused lineNumber 2017-02-24 11:17:22 +00:00
Robert Osfield
aa621e1a4a Grouped GlyphQuad setup 2017-02-24 11:08:15 +00:00
Robert Osfield
4c032723ba Fixed indentation 2017-02-24 10:40:52 +00:00
Robert Osfield
93f28d4eee Moved to use of single vector of DrawElementsUShort for backdrops and foreground text quads 2017-02-24 10:07:01 +00:00
scrawl
c9621ff17a Add missing copy of callbacks when a Transform is replaced by Group 2017-02-24 07:41:19 +01:00
scrawl
7e2436aba9 Change the order of optimizations to allow for the possibility of merging Geometries that have just become siblings after the removal of redundant nodes 2017-02-24 01:09:09 +01:00
scrawl
ef431eec29 Fix unused parameter warning 2017-02-24 01:07:24 +01:00
scrawl
e0f7d3241a Fix MergeGeometryVisitor to work with a Group instead of Geode 2017-02-24 01:05:57 +01:00
scrawl
a918306a99 Use asDrawable()/asNode() over dynamic_cast in the Optimizer 2017-02-24 01:00:49 +01:00
Robert Osfield
22b8a5cc0f Added missing relaseGLObjects()/resizeGLObjects(). 
Reordered calls to make it easier to read and see patterns.
 2017-02-23 18:36:35 +00:00
Robert Osfield
b5048d3b74 Cleaned up types 2017-02-23 18:14:36 +00:00
Robert Osfield
8ff17ddf52 Restructed and unified the position computation 2017-02-23 15:45:43 +00:00
Robert Osfield
7b3ecefcfc Removed the old code paths 2017-02-22 14:14:03 +00:00
Robert Osfield
f816436771 Removed the unncessary array. 2017-02-22 12:41:45 +00:00
Robert Osfield
04d23659b3 Added the option for changing the type of the GlyphQuads::Coords 2017-02-22 12:07:43 +00:00
Robert Osfield
f8dc5c4988 Fixed FadeText when using NEW_APPROACH 2017-02-21 17:47:54 +00:00
Robert Osfield
cd991eaa97 Refactored the computation of the transforms for the osgText::Text 2017-02-21 17:07:53 +00:00
blobfish
d3a925e675 osgManipulator: Constraint: snap_point_to_grid wants Vec3d instead of Vec3 2017-02-16 10:37:03 -05:00
scrawl
94061aa9fb Add CMake option to not build deprecated serializers 2017-02-07 20:23:14 +01:00
OpenSceneGraph git repository
71bf79cf6f Merge pull request #197 from scrawl/geodefix 
More fixes for Geode/Drawable handling in visitors
 2017-02-03 18:03:13 +00:00
scrawl
6deefe0646 Remove seemingly redundant handling of Geode in GLObjectsVisitor 2017-02-03 18:10:37 +01:00
scrawl
fdf6d55b9d Fix handling of in-scenegraph Drawables in osgShadow 2017-02-03 18:08:16 +01:00
scrawl
e38c3d0303 Fix handling of in-scenegraph Drawables in SmoothingVisitor, TriStripVisitor and GraphicsCostEstimator 2017-02-03 17:55:55 +01:00
scrawl
4e1a2d3246 Fix handling of in-scenegraph Drawables in ShaderGenVisitor 2017-02-03 17:51:03 +01:00
scrawl
e48aa118b6 Fix handling of in-scenegraph Drawables in MeshOptimizers 2017-02-03 17:48:18 +01:00
scrawl
9403a4c949 Fix unused parameter warning 2017-02-03 17:45:22 +01:00
scrawl
c901694290 Fix handling of in-scenegraph Drawables in DrawElementTypeSimplifier 2017-02-03 17:43:42 +01:00
scrawl
853418db94 Remove redundant handling of Geode in DisplayRequirementsVisitor 2017-02-03 17:42:21 +01:00
scrawl
09ca132102 Remove redundant handling of Geode in SharedStateManager 2017-02-03 17:35:40 +01:00
Laurens Voerman
7b67ef0c6f split travis-ci apple build into two jobs to avoid job time limit. 2017-02-03 10:01:15 +01:00
Kjell Andersson
f5483b0ad6 Bug fix to not crash when using shared context and adding / removing windowed views dynamically. 
The GLExtension object is now reused instead of creating a new when allocating a state on the same ContextID. The static map that stores the GLExtensions is only reset when all references to the extension object are released.
 2017-02-02 11:46:16 +01:00
OpenSceneGraph git repository
2a7d72c203 Merge pull request #191 from LaurensVoerman/glExtentions 
GLExtensions.cpp: Fixed a few typo's in old function names.
 2017-01-27 15:15:39 +00:00
Laurens Voerman
9183f275f5 Fixed a few old function names. 
Check extensions trough extermination string - not by function pointer value.
Added a few validContext tests to ensure no functions or isExterntionSupported bool is set for an non valid context.
Remove duplicates / merge some lines.
Removed "GL_APPLE_texture_2D_limited_npot" form isNonPowerOfTwoTextureMipMappedSupported.
 2017-01-25 17:05:56 +01:00
Robert Osfield
23da167c27 Fixed linking bug caused by repeated Program::addShader()/removeShader() operations invalidating the internal attach/dettech lists. 2017-01-24 17:36:36 +00:00
OpenSceneGraph git repository
d1e162a61f Merge pull request #190 from scrawl/optimizer 
Optimizer fixes
 2017-01-24 09:27:07 +00:00
OpenSceneGraph git repository
00984d0e77 Merge pull request #189 from marchelbling/master 
osgjs/gles updates
 2017-01-24 09:15:26 +00:00
scrawl
f13fbff251 Remove CheckGeometryVisitor which was a no-op 2017-01-20 23:02:15 +01:00
scrawl
4a05caf4f7 MakeFastGeometryVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode 2017-01-20 23:01:04 +01:00
scrawl
833f37ea57 StateVisitor: remove redundant code for Geode handling 2017-01-20 22:49:17 +01:00
scrawl
f229b19496 TessellateVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode 2017-01-20 22:47:51 +01:00
scrawl
41cbf9a45e FlattenStaticTransformsVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode 2017-01-20 22:43:58 +01:00
scrawl
ff1a9a195a StaticObjectDetectionVisitor: make use of apply(Drawable) visitor function 2017-01-20 21:48:45 +01:00
scrawl
764b2f60c6 TextureAtlasVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode 2017-01-20 21:47:21 +01:00
scrawl
dc2689f779 TextureVisitor: remove redundant code for Geode handling 2017-01-20 21:47:13 +01:00
scrawl
4457df9a8a RemoveEmptyNodesVisitor: add missing isOperationPermissible check 2017-01-20 21:46:46 +01:00
scrawl
7611f95078 RemoveEmptyNodesVisitor: remove redundant code for Geode handling 2017-01-20 21:46:03 +01:00
Robert Osfield
33f7500a59 Quitened down verbose debug messages 2017-01-20 17:31:09 +00:00
Robert Osfield
e5b493289d Quitened down debug messages 2017-01-20 17:24:49 +00:00
Robert Osfield
ed596c3335 Quietened down some verbose debug messages 2017-01-20 17:07:55 +00:00
Marc Helbling
c84b667fa5 Updates osgjs from sketchfab 
* updates uservalue serialization (avoid creating multie UserDataContainer for a same object)
* removes vec4ubarray specific serialization (serialization should not enforce the previous color transformation)
 2017-01-20 15:17:16 +01:00
Marc Helbling
7cd7618e8c Updates gles from sketchfab 
* fixes bbox issue for animated scenes
* fixes geometry split (perf + line/point primitive management)
* removes degenerated faces
 2017-01-20 15:15:31 +01:00
Robert Osfield
10b6f7aa47 Fixed indentation of comment 2017-01-19 15:56:57 +00:00
Robert Osfield
771efca5c6 Removed unused class 2017-01-16 17:18:58 +00:00
d-a-heitbrink
3d2f4ea404 Added support for Bindless texture extension, 
64 bit uniforms, 64 bit buffers
Added new bindless texture example
 2017-01-13 09:56:42 -06:00
d-a-heitbrink
18369bed2d added code to deal with #extension for shader, added int64 and uint64 support 2017-01-13 09:33:49 -06:00
Robert Osfield
1af1b4dfda Fixed smallTile test as it was checking against <=2^14 rather than <2^16 which is more conservative than required for a ushort container 2017-01-07 13:03:22 +00:00
OpenSceneGraph git repository
3cccdaddab Merge pull request #184 from hwiesmann/master 
BUG FIX - Wrong calculation of terrain normals in GeometryTechnique
 2017-01-04 13:22:22 +00:00
Robert Osfield
b5c4f461bc Fixed unitialized variable access to premature calling of computeMatrix(). 2017-01-04 12:55:15 +00:00
Hartwig
192dcec5f9 Blending out of local functions 
Some local functions are only needed for OS X compatibility. Define these functions only for OS X versions older than 10.6.
 2017-01-01 16:33:37 +01:00
Hartwig
3c482467ea BUG FIX - Wrong calculation of terrain normals 
The partial derivative for the x-coordinate has been wrongly calculated: only a single sided derivative was calculated.
 2016-12-29 21:43:20 +01:00
OpenSceneGraph git repository
d36302cb0c Merge pull request #183 from rickyviking/master 
Additional info when fail to load images
 2016-12-23 17:23:07 +00:00
Robert Osfield
52fe86dcc9 From Hartwig Wiesmann, "ScalarsToColors returns a wrong color in case a value larger max is passed to getColor" 2016-12-23 17:16:16 +00:00
Riccardo Corsi
a526cab590 InputStream::readImage() : added info about which file failed to load when printing error message 2016-12-23 11:55:08 +01:00
OpenSceneGraph git repository
dc13d4d5dc Merge pull request #182 from LaurensVoerman/fileStats 
added some info about dynamic drawables and transparent bin to Statistics
 2016-12-21 17:16:30 +00:00
Robert Osfield
28799b1ff6 Refactored the minimum width of bars. 2016-12-21 16:11:39 +00:00
OpenSceneGraph git repository
2b8bcf5475 Merge pull request #180 from LaurensVoerman/stats_bars 
improve stats display
 2016-12-21 16:04:24 +00:00
Laurens Voerman
7a39857ea7 added some info about dynamic drawables and transparent bin to Statistics 2016-12-21 16:58:02 +01:00
OpenSceneGraph git repository
960672d093 Merge pull request #181 from LaurensVoerman/DebugFPS 
DEBUG FPS counter in red and named "DEBUG Frame Rate:"
 2016-12-21 15:55:50 +00:00
OpenSceneGraph git repository
bf3def9303 Merge pull request #179 from LaurensVoerman/ktx_write_support 
ktx write support
 2016-12-21 15:54:20 +00:00
Robert Osfield
43e506a843 From Torben Dannhauer, "When compiling OSG with DCMTK on windows, it throws an compiler error due to a missing ws2_32.lib in the linker settings." 2016-12-21 15:33:02 +00:00
Robert Osfield
b950c428a6 From Vladimir Chebaev, "Dynamic linking of fbx plugin and fbx SDK" 2016-12-21 15:13:49 +00:00
Laurens Voerman
a9657bf5e8 DEBUG FPS counter in red and named "DEBUG Frame Rate:" 2016-12-21 15:58:09 +01:00
Laurens Voerman
f567d4702d improve stats display 2016-12-21 15:47:04 +01:00
Laurens Voerman
c06c57e0db ktx write support 2016-12-21 15:21:44 +01:00
Robert Osfield
723849c57c From Andreas Ekstrand, "he attached ESRIShape.cpp contains a small fix in parsing of PointZ features, now correctly comparing with header content length which is defined in 16-bit words. 
This should have been fixed in my old submission from 2012 but was probably overlooked due to an alternative way of comparing to a fix number for this feature type.

Without this fix, the plugin will only read one PointZ feature even if multiple features exist."
 2016-12-21 11:41:36 +00:00
Robert Osfield
9478d27263 Changed Program::apply() to Program::compileGLObjects() to avoid the Program::apply() setting of setLastAppliedProgramObjects for affect current state. 2016-12-21 11:02:29 +00:00
Robert Osfield
ff8b5536a5 Added StateSet::setGlobalDefaults() to fix bug when osgViewer has stats on but no scene graph assigned 2016-12-21 09:10:50 +00:00
Robert Osfield
38c515a600 Fixed handling of #define's that are used as functions 2016-12-16 16:16:50 +00:00
OpenSceneGraph git repository
ca6578026a Merge pull request #174 from etlapale/obj_plugin_improvements 
Improvements for the OBJ writer plugin
 2016-12-13 11:42:57 +00:00
Émilien Tlapale
34fb582074 Uncommenting missing argument. 2016-12-13 11:56:06 +01:00
Robert Osfield
d57a67e31c Added header 2016-12-13 10:47:12 +00:00
Émilien Tlapale
d0fb365e25 Adding configurable precision for OBJ output. 2016-12-13 10:58:46 +01:00
Émilien Tlapale
f16853c7bb Support for stateset in groups for OBJ. 2016-12-13 10:57:42 +01:00
Robert Osfield
d6c245a2f3 Added create angle of 20 degrees to SmoothingVisitor to improve visual quality. 
Added geometry.setUseVertexBufferObjects(true) to geometry set up for improved performance.
Refactored the color set up so that by default it assigns just a single color to the geometry to improve performance.
 2016-12-12 10:23:50 +00:00
Robert Osfield
3432f02d5f Renamed the iges plugin to OpenCASCADE to make it clearer what the plugin is, and added file extension aliases for stp, step, igs and iges to the OpenCASCADE plugin to enable automatic loading. 2016-12-09 17:52:17 +00:00
Robert Osfield
61462dcf97 Added support for reading from STEP (.stp) files. 2016-12-09 17:29:55 +00:00
Robert Osfield
2b1477234e Converted to unix line endings 2016-12-09 17:27:17 +00:00
OpenSceneGraph git repository
bb36fe7d3c Merge pull request #170 from crubel/PThreadPullRequest 
Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING defined
 2016-12-05 10:33:23 +00:00
Curtis Rubel
98827b1d49 Missed the printf define at the top of this file. 
Put back this:
#ifdef DEBUG
# define DPRINTF(arg) printf arg
#else
# define DPRINTF(arg)
#endif

I think that should do it now...
 2016-12-02 08:07:15 -05:00
Curtis Rubel
c829ecf08f Removed all OSGNOTIFY messages and put back all printf output as requested. 
Sorry about this mixup, I was not aware that this particular directory was to be considered a separate project and must not rely on any dependencies from the rest of the OSG project.  All OSGNOTIFY messages have been removed and the previous printf statements have been put back.
 2016-12-02 08:05:30 -05:00
Alberto Luaces
b637d080d5 Several tweaks for compiling OpenCascade plugin: 
* Remove unneeded XSDRAW.hxx header inclusion.
* Define WNT only on windows, because it is used for choosing between
  win threads or pthreads.
 2016-12-01 23:39:56 +01:00
Curtis Rubel
fab6bff310 Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING 
defined.  I also replaced all printf's with OSGNOTIFY to get this
more inline with the rest of OSG CGR
 2016-12-01 16:36:20 -05:00
Robert Osfield
a9bc508dc4 From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake. 2016-11-30 19:11:15 +00:00
Robert Osfield
d4a4993285 Added GL_EXT_texture_border_clamp support for GLES 2016-11-30 17:18:33 +00:00
scrawl
1fffafb13a Fix typo in StateSet::compileGLObjects, causing compilation of attributes to not be executed unless checkForGLErrors is true. 2016-11-26 01:09:45 +01:00
Robert Osfield
b04271f93e Fixed crash in handling of an osg::Callback attached to a Drawable as update callback. 
Added handling of osg::Callback when attavhed to a Drawable as a cull callback.
 2016-11-23 18:19:59 +00:00
Robert Osfield
e89885a076 Added guards against division by zero 2016-11-15 17:36:21 +00:00
Robert Osfield
55f4778731 Added usage of GLExtensions::debugObjectLabel() to GLBufferObject::compile() 2016-11-15 14:52:59 +00:00
Robert Osfield
1abd99f084 Added support for glObjectLabel debugging 2016-11-15 14:35:47 +00:00
Robert Osfield
2f570ca3a9 Improved the indentation and case to make the code more consistent and readable 2016-11-15 11:16:03 +00:00
Robert Osfield
5aa897b5fd Merge branch 'master' of https://github.com/fredowski/OpenSceneGraph into fredowski-master 2016-11-15 11:13:37 +00:00
Robert Osfield
137b596943 Enabled sharing of main threads processor affinity to the next required thread for CullDrawThreadPerCamera and CullThreadPerCameraDrawThreadPerContext 2016-11-15 11:01:41 +00:00
OpenSceneGraph git repository
5ff6048db0 Merge pull request #156 from LaurensVoerman/Affinity2 
unlock cpu's 32-63 on 64 bit windows
 2016-11-15 10:41:12 +00:00
Robert Osfield
87a3648e68 To avoid noise in documentation replaced nested namespaced enum with enum with FILE_COPY_ wording prefixed into enum values. 2016-11-15 08:57:24 +00:00
Robert Osfield
36b2ddac2d Added usage of osg::ConfigureBufferObjectsVisitor to correct for incoherent buffer oject set up due to the adhoc way that the OpenFlight plugin sets up osg::Geometry. 2016-11-14 18:01:22 +00:00
Robert Osfield
5b375124cc Added osg::Geometry::configureBufferObjects() and ConfigureBufferObjectsVisitor visitor to help with setting up buffer objects in a coherent fashion. 2016-11-14 17:59:25 +00:00
Robert Osfield
99cb8ebacf Added more flexibility into the State::checkGLErrors() method, allowing calling code to pass in two strings. 
Improved the StateSet::compileGLObjects() usage of checkGLErrors() to make the warning reports more meaningful.
 2016-11-14 11:59:47 +00:00
Robert Osfield
e6052ef4b4 Added Dragger::applyAppropriateFrontFace(StateSet*) to make it easy to handle inverted matrices by toggling the FrontFace to sure the correct face is visible. 2016-11-11 17:18:13 +00:00
Robert Osfield
d16ca33f38 Fixed handling of Locator's with negative extents 2016-11-11 14:01:40 +00:00
Friedrich Beckmann
e506bb3075 added alternative to middle-mouse button in manipulator 
I added CTRL + RIGHT-MOUSE-CLICK to the standard manipulator as
an alternative to MIDDLE-MOUSE-CLICK because a 3 Button Mouse
not always available, e.g. on MacOS. I tested this with the
osgAtlasSimbicon example.
 2016-10-24 19:54:43 +02:00
Laurens Voerman
d461149969 re-assign thread affinity at the end of setThreadingModel() 2016-10-17 09:50:48 +02:00
Robert Osfield
e17ad60c2d Added _color copy to the copy constructor 2016-10-14 18:00:40 +01:00
Laurens Voerman
16a282ccea unlock cpu's 32-63 on 64 bit windows 2016-10-14 17:19:50 +02:00
Robert Osfield
afb046a196 Bumped OpenThreads version numbers to reflect changes in ABI 2016-10-13 17:43:29 +01:00
Robert Osfield
1cc53246e9 Changed appending of \n to be to the version line. 2016-10-12 17:24:25 +01:00
Robert Osfield
9072f9653e Added OES variants of vertex array object functions 2016-10-12 16:10:40 +01:00
Robert Osfield
c92de93429 Altered the configureAffinity() scheme so that it places threads preferentially on even based number processors first, which should work better in case the processors available have hyper-threading 2016-10-12 10:08:56 +01:00
Robert Osfield
0314fd593a Added VAO support to osgTerrain::GeometryPool 2016-10-11 20:11:39 +01:00
Robert Osfield
b6afce773a Removed unneccessary includes 2016-10-11 20:11:24 +01:00
Robert Osfield
38ff11f8c5 Renamed ArrayDispatchers to AttributeDispatchers to better reflect it's role 2016-10-11 15:14:14 +01:00
Robert Osfield
e14ee80282 Streamlined the dispatch and activation of attribute dispatchers 2016-10-11 11:29:29 +01:00
Robert Osfield
364c838ea1 Removed unused vertex and texcoord array dispatchers 2016-10-11 11:29:29 +01:00
Fabian Wiesel
1f562c003c Missed rename in VertexAttribArrayDispatch 
The variable array is by initialisation a null-pointer, new_array is the new array
 2016-10-11 11:29:29 +01:00
Robert Osfield
66873b8c6c Fixed build errors when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to OFF 2016-10-11 11:29:29 +01:00
Robert Osfield
007a19a027 Fixed warnings 2016-10-11 11:29:29 +01:00
Robert Osfield
0ee65c9d2f Removed unneccessary parameter 2016-10-11 11:29:29 +01:00
Robert Osfield
e11e45a2e3 Removed GLBeginEndAdapter as it is no longer needed 2016-10-11 11:29:29 +01:00
Robert Osfield
0f3e61146d Refactored osgText so that it no longer uses GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
53cdacd926 Refactored Text3D so that it no longer depends upon GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
5a4754deef Refactored osgParticle so that it natives support vertex arrays, vertex buffer objects and vertex array objects 2016-10-11 11:29:29 +01:00
Robert Osfield
10f1d84f7e Added explict setup of the stats graphing geometry so that it's VertexBufferObject is intialized to the correct size to prevent any need for later resizing 2016-10-11 11:29:29 +01:00
Robert Osfield
d4d32cbde7 Improved handling of the BufferObject::Profile::_size, utilizing it's intial value when it is non zero and larger than the arrays assigned to it. 2016-10-11 11:29:29 +01:00
Robert Osfield
8febae1546 Fixed VertexArrayState::bind*BufferObject(..) methods so they correctly handle dirtied buffer objects 2016-10-11 11:29:29 +01:00
Robert Osfield
96b0e42c42 Fixed typo in comment 2016-10-11 11:29:29 +01:00
Robert Osfield
ff779e58ab Added check against Array::Binding to decide whether to assign a VertexBufferObject to an array or not, only assigning it when Binding is BIND_PER_VERTEX 2016-10-11 11:29:29 +01:00
Robert Osfield
886b922596 Beginings of refactoring ParticleSystem so that it does uses vertex arrays rather than GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
c15f6d3e8c Made ordering of case clearer 2016-10-11 11:29:29 +01:00
Robert Osfield
56ed225f17 Removed Particle::Shape support for QUAD_TRIANGLESTRIP, HEXAGON, USER as these are unlikely to be used as their implementation prevents refactoring to use vertex array code paths 2016-10-11 11:29:29 +01:00
Robert Osfield
c637010c9d Refactored ImpostorSprite so that it no longer uses GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
037e8f24c6 Removed commented out debug message 2016-10-11 11:29:29 +01:00
Robert Osfield
7c432fbe11 Refactored osgSim::SphereSegment so that it no longer uses GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
e5ab4355be Added osg::convertShapeToGeometry(...) convinience functions for creating osg::Geometry from osg::Shape descriptions. 2016-10-11 11:29:29 +01:00
Robert Osfield
83b5cabac9 Refactored ShapeDrawable so that it is subclassed from osg::Geometry rather than osg::Drawable. 
Created a BuildShapeGeometryVisitor visitor that can create osg::Geometry for osg::Shape objects
 2016-10-11 11:29:29 +01:00
Robert Osfield
3be951f279 Fixed crash when using vertex attribute arrays 2016-10-11 11:29:29 +01:00
Robert Osfield
b2873132be Added support for interleaved arrays 2016-10-11 11:29:29 +01:00
Robert Osfield
f842750342 Removed no longer used member variables 2016-10-11 11:29:29 +01:00
Robert Osfield
16da432be3 Moved FOG_COORD and SECONDARY_COLOR #define's from State header into VertexArrayState.cpp 2016-10-11 11:29:29 +01:00
Robert Osfield
164981f7a3 Replaced osg::State:set*Pointer() calls with VertexArrayState::set*Array() calls 2016-10-11 11:29:29 +01:00
Robert Osfield
359b136b5e Added check against State::useVertexBufferObjects(..) so that Display Lists are only used when VBO is OFF. 2016-10-11 11:29:29 +01:00
Robert Osfield
94891778c4 Restructred the enabling of vertex array object support to allow one to set enable the default via osg::State. 
Added OSG_VERTEX_BUFFER_HINT env var to osg::DisplaySettings with VERTEX_BUFFER_OBJECT/VBO, VERTEX_ARRAY_OBJECT/VAO and NO_PREFERENCE to allow one to foce on VBO or VAO usage.

Restructred BufferObject assigned in osg::Geometry

Added
 2016-10-11 11:29:29 +01:00
Robert Osfield
d8fdf33be5 Cleaned up set up of osg::Geometry for stats 2016-10-11 11:29:29 +01:00
Robert Osfield
cf52b2db50 Removed unncessary checks 2016-10-11 11:29:29 +01:00
Robert Osfield
ee31921520 Streamlined State::_is*Supported variables 2016-10-11 11:29:29 +01:00
Robert Osfield
1d75089bf8 Build fixes when compiling wuth CMake options OPENGL_PROFILE set to GLCORE 2016-10-11 11:29:29 +01:00
Mathieu MARACHE
3745b958e5 compilation fixes when no OSG_GL_DISPLAYLISTS_AVAILABLE 2016-10-11 11:29:29 +01:00
Mathieu MARACHE
afe45f66d2 compilation fixes when no OSG_GL_FIXED_FUNCTION_AVAILABLE 2016-10-11 11:29:29 +01:00
Robert Osfield
e3c663bb02 Removed deprecated code paths and moved implementations into headers 2016-10-11 11:29:29 +01:00
Robert Osfield
bf28e2d037 Refactored the VertexArrayState's handling of vertex attribute aliasing 2016-10-11 11:29:29 +01:00
Robert Osfield
1f147f6bc6 Moved implementations from .cpp's to headers as inline methods to improve performance. 2016-10-11 11:29:29 +01:00
Robert Osfield
97df15b205 Improved naming of createVertexArrayState(..) method 2016-10-11 11:29:29 +01:00
Robert Osfield
98344157c0 Removed resetting of the pointer state. 2016-10-11 11:29:29 +01:00
Robert Osfield
83f73df814 Added State::useVertexArrayObject() member to streamline toggling on/off of VAO usage 2016-10-11 11:29:29 +01:00
Robert Osfield
a4e682bb28 Added support for clean up Vertex Array Objects 2016-10-11 11:29:29 +01:00
Robert Osfield
4131d2da34 Added intialization of the VAO in Geometry::compileGLObjects() and refined the invocation of updates to the VAO 2016-10-11 11:29:29 +01:00
Robert Osfield
078598872f Added lazy setting of arrays for osg::Geometry using vertex_array_object 2016-10-11 11:29:29 +01:00
Robert Osfield
4b4cd13d31 Implemented lighter weight setting of the CurrentVertexArrayState and introduced GlobalVertexArrayState. 2016-10-11 11:29:29 +01:00
Robert Osfield
7d83d735ad Implemented a different approach to vertex array object support to enable creation of a single global vertex array object as well as provide individual vertex array objects per Drawable when required. 2016-10-11 11:29:29 +01:00
Robert Osfield
4d8a29b987 Added ability to initializer GL vertex array object id with Geometry::compileGLObjects(). 
Improved the handling of buffer object state when not using VAO's
 2016-10-11 11:29:29 +01:00
Robert Osfield
14d1483b06 Experimental support for OpenGL Vertex Array Object 2016-10-11 11:29:29 +01:00
Robert Osfield
d92a79b876 Fixed crash associated with setting the affinity on a null pointer 2016-10-08 15:58:33 +01:00
OpenSceneGraph git repository
05ed7d1336 Merge pull request #152 from aluaces/spelling2 
Some spelling fixes in comments.
 2016-10-07 17:05:58 +01:00
Robert Osfield
548c9739ed Restructed how CPU affinity is set to fix build problems when local pthreads doesn't support setting affinity 2016-10-07 15:57:01 +01:00
Robert Osfield
10d8ac7f65 Fixed extension string typo 2016-10-07 12:17:03 +01:00
Robert Osfield
dc6b55a5e9 Added support for checking GL_OES_texture_npot 2016-10-07 12:17:03 +01:00
Robert Osfield
91538d90f8 Added ViewerBase::s/getUseConfigureAffinity(bool flag) to allow users to toggle whether they want the ViewerBase::setUpThreads() method to call ViewerBase::configureAffinity() or not. 2016-10-07 12:17:03 +01:00
Robert Osfield
ee97db3488 Introduced OpenThreads::Affinity support into osg::Camera, osg::GraphicsContext::Traitse, osgDB::DatabasePager and osgViewer::ViewerBase/Viewer/CompositeViewer. 
Added ViewerBase::configureAffinity() to help with the setting of the affinity of camera, graphics context and pager threads
 2016-10-07 12:17:03 +01:00
Robert Osfield
77c5e96ccb Added DatabasePager::setProcessorAffinity(const OpenThreads::Affinity&) support to allow the database threads to have affinity to user controls sets of CPU cores. 2016-10-07 12:17:03 +01:00
Robert Osfield
171e4f0f29 Implemented setting thread affinity for threads that aren't OpenThreads threads, such as main thread 2016-10-07 12:17:03 +01:00
Robert Osfield
b9869e137d First cut of OpenThrads::Affinity support for Win32. 2016-10-07 12:17:03 +01:00
Robert Osfield
bc44da49e6 Introduced new OpenThreads::Affinity class to wrap up specification of thread affinity. 
Simplified the OpenThreads::SetProcessorAffinityOfCurrentThread/Thread::SetProcessorAffinity() to utilize the new Affinity class
 2016-10-07 12:17:03 +01:00
Robert Osfield
0f8a5a86e2 Introduced OpenThreads::SetProcessorAffinityMaskOfCurrentThread(unsigned long cpumask) and Threads::setProcessorAffinityMask(unsigned long cpumask) to allow finer grained control over the CPU affinity. 2016-10-07 12:17:03 +01:00
Robert Osfield
cd56639e67 Added CullingActive support for Drawable serializer 2016-10-07 11:13:40 +01:00
Laurens Voerman
6ad0f9badc fix bug in SmoothingVisitor tripped by bunny.ply 2016-10-06 14:23:46 +02:00
Robert Osfield
197b4a0d30 Added GL_OES_geometry_shader and GL_OES_tessellation_shader checks 2016-10-06 10:48:29 +01:00
Alberto Luaces
7f3c92f492 Some spelling fixes in comments. 2016-10-05 18:10:46 +02:00
René Molenaar
48dbd61632 Fixed VisualStudio build 2016-10-05 16:31:23 +01:00
Robert Osfield
0fab759c1b Removed the unused debug header as it was causing building compile problems with the Debug build under Windows 2016-10-05 14:00:46 +01:00
OpenSceneGraph git repository
f705e39eb9 Merge pull request #142 from LaurensVoerman/Submissions12 
fix a few minor warnings from Visual Studio 2015
 2016-09-27 09:48:38 +01:00
Laurens Voerman
0619fe1cfa src\osgplugins\osgjs\Animation(9): warning C4099: 'WriteVisitor': type name first seen using 'class' now seen using 'struct' 2016-09-26 13:56:38 +02:00
Laurens Voerman
0ee744f7a0 fix Visual studio warning C4138: '*/' found outside of comment 2016-09-26 13:43:51 +02:00
Robert Osfield
1bdd2aceab Removed __sgi blocks as IRIX is no longer available 2016-09-26 10:03:32 +01:00
Robert Osfield
56a7208891 Removed Qt dependency examples, osgQt NodeKit and qfont plugin as these are now provided by the separate osgQt project 2016-09-26 09:31:22 +01:00
Robert Osfield
13fa75fc12 Removed qt threads 2016-09-26 09:22:10 +01:00
Robert Osfield
05f37bec53 Removed IRIX Sproc thead support as IRIX is load dead 2016-09-26 09:08:56 +01:00
Robert Osfield
2c39fa52b8 Removed IRIX Sproc threading support form OpenThreads as IRIX is long dead. 2016-09-26 09:06:28 +01:00
Alberto Luaces
01c712e851 Explicit signed char declarations for portability. 
Some platforms (ARM, PowerPC, s390x) have "unsigned char" as the default
char type, and thus the build fails for certain parts of the code where
negative values are assigned to those kind of variables.
 2016-09-24 12:33:37 +02:00
Robert Osfield
c6813cf8e2 Replaced local static usage to avoid threading and mulit-context issues 2016-09-22 14:33:03 +01:00
Robert Osfield
7e0c30b884 Refactored texture sharing code so that it modifies the RefAttributePair directly thus honouring the override flags and fixing a bug of loosing these override flags when sharing 2016-09-20 17:23:37 +01:00
Robert Osfield
b0df75e674 Cleaned up the spacing and const of various method parameters. 
Added non const versions of StateSet::getAttributePair() and getTextureAttributePair()
 2016-09-20 17:01:26 +01:00
Laurens Voerman
cf3c2b18e3 VS2015 fix a few warning C4456: declaration of 'X' hides previous local declaration 2016-09-13 17:07:28 +02:00
Robert Osfield
cb6e6ff2be Fixed warnings, deprecated another out of date method 2016-09-05 15:35:54 +01:00
Robert Osfield
ec344a85b4 Fixed warnings 2016-09-05 13:44:59 +01:00
Robert Osfield
a494cd71e8 Fixed typo 2016-09-05 07:59:15 +01:00
Robert Osfield
4a6fb5a49a Fixed warnings 2016-09-04 19:50:28 +01:00
Robert Osfield
fb4f7a025b Added local deprecated_osg::Geometry implementation from OpenSceneGraph-3.4 to keep build working now that deprecated_osg::Geometry has been removed from the core OSG. 2016-09-04 18:31:13 +01:00
Robert Osfield
19270d0833 Fixed warning 2016-09-02 19:09:13 +01:00
Robert Osfield
79ff8ba273 Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e 2016-09-02 18:26:11 +01:00
OpenSceneGraph git repository
c19b271586 Merge pull request #119 from LaurensVoerman/Submissions2c 
Fixed clone osgVolume::Scalarproperty and osg::TextureBuffer crash
 2016-09-02 17:47:37 +01:00
OpenSceneGraph git repository
14bdadaf86 Merge pull request #123 from LaurensVoerman/Submissions2f 
Submissions2f
 2016-09-02 17:44:57 +01:00
OpenSceneGraph git repository
0873a69ff5 Merge pull request #124 from LaurensVoerman/Submissions3 
RigTransformHardware fix: warn; don't crash if MAX_MATRIX not found
 2016-09-02 17:28:40 +01:00
Laurens Voerman
92ca556243 fix the missing ")" in BasicAnimationManager copy constuctor 2016-08-29 17:00:00 +02:00
Laurens Voerman
1da43a5960 added copyconstructor for osgAnimation::BasicAnimationManager 2016-08-29 13:03:36 +02:00
Laurens Voerman
628f8fd9dc added call to copy constructor for virtual base classes in copy constructor of derived classes, removed these for abstract classes 2016-08-29 10:41:40 +02:00
Laurens Voerman
d0020b7dfc bugfix: osg::TextureBuffer::clone() crash 2016-08-29 10:01:48 +02:00
Laurens Voerman
0433d29d11 bugfix: osgVolume::ScalarProperty clone crash 2016-08-29 10:01:48 +02:00
Robert Osfield
2e6f0d7aab Quitened unused parameter warnings 2016-08-26 19:28:36 +01:00
Robert Osfield
0ad09d6dad Fixed unused variable warnings 2016-08-26 19:18:00 +01:00
Robert Osfield
322adc266c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2016-08-26 18:00:52 +01:00
Robert Osfield
11ddd53eb4 Removed redundent Referenced::s/getThreadSafeReferenceCounting() and associated static and env vars as there are now inapprorpiate and no longer supported 2016-08-26 17:59:30 +01:00
Laurens Voerman
5c66ecfc99 RigTransformHardware fix: warn; don't crash if MAX_MATRIX not found 2016-08-16 14:33:48 +02:00
OpenSceneGraph git repository
2bdf56cb4b Merge pull request #114 from scrawl/const-cast 
Remove an unneeded const_cast
 2016-08-16 12:40:35 +01:00
Robert Osfield
8f68da89d7 Fixed handling in osgUtil::IncrementalCompileOperation/CompileSet/StateToCompile when the _markerObject is NULL. 2016-08-15 12:59:21 +01:00
Robert Osfield
06cb31a3d2 Added automatic assignment of _markerObject to CompileSet. 2016-08-15 11:46:48 +01:00
scrawl
0b450a5113 Remove an unneeded const_cast 2016-08-14 19:30:55 +02:00
Ravi Mathur
e9d6737ec4 Updates to the CMake build system for Mac OSX 2016-08-10 14:30:28 +01:00
Anish Thomas
2b9dfab1fc GLSL 1.3 support for vertex-attrib aliasing 2016-08-10 14:12:27 +01:00
Konstantin S. Matveyev
e6d4d99edb Fixed filename encoding bug 2016-08-10 12:58:38 +01:00
Robert Osfield
26bce07f2b Fixed handlinge of fgets returning a 0 length string 2016-08-10 12:00:18 +01:00
OpenSceneGraph git repository
f8c090ff7f Merge pull request #111 from hernando/master 
Added missing GL enums to Texture::computeInternalFormatType
 2016-08-10 11:32:15 +01:00
Mathieu MARACHE
a54dc34752 Added CoreProfile selection if OSG_GL3_AVAILABLE defined 2016-08-05 07:49:22 +02:00
Juan Hernando Vieites
b3c242e270 Added missing GL enums to Texture::computeInternalFormatType 2016-08-04 17:03:51 +02:00
OpenSceneGraph git repository
02cb58d3d9 Merge pull request #106 from rafagaitan/osgdb_curl 
Added OSG_CURL_SSL_VERIFYPEER option to the curl plugin
 2016-08-02 15:45:49 +01:00
scrawl
5b70f208e3 Fix RenderBuffer not being attached (bug introduced with commit 55b3becb7c ) 2016-08-01 17:48:14 +02:00
Robert Osfield
2578fce085 Added FT_LOAD_NO_HINTING 2016-07-31 14:00:30 +01:00
Robert Osfield
1794374c78 Fixed build error reported on gcc 4.6.4/Ubuntu 12.04 32bit, issue #108 2016-07-31 11:06:51 +01:00
Cedric Pinson
e1c0b74454 OsgUtil::TangentSpaceGenerator, merge tangent space for index array 2016-07-19 14:48:28 +02:00
Rafael Gaitán
5e4543513b Added OSG_CURL_SSL_VERIFYPEER option to the curl plugin to allow connecting to secure servers without the certificate 2016-07-19 13:44:31 +02:00
Marc Helbling
a44057b0df Moves gles visitors implementation in cpp files 2016-07-12 11:54:51 +02:00
Robert Osfield
fd0af1d9df Added Optimizer::BufferObjectVisitor and associated BUFFER_OBJECT_SETTINGS value to enable it via the OSG_OPTIMZIER env var. 
The BufferObjectVisitor enbales vertex buffer objects usage on Drawable in the scene graph.
 2016-07-11 09:52:07 +01:00
Robert Osfield
51f85f4c94 Added dirty of the vertex arrays to make sure they are uploaded when using VBO + VAO's 2016-07-11 09:46:50 +01:00
Robert Osfield
483982de3a Fixed coverity issue 2016-07-07 07:31:15 +01:00
Robert Osfield
f62a07beba Removed dead code 2016-07-07 07:27:37 +01:00
Robert Osfield
5ab9a1b420 Fixed potential memory leak 2016-07-07 07:16:56 +01:00
Robert Osfield
6d85404cf0 Added ref_ptr<> to quieten down Coverity 2016-07-06 20:57:53 +01:00
Robert Osfield
c820b611ed Removed dead code 2016-07-06 20:36:50 +01:00
Robert Osfield
f99408f254 Fixed possible memory leak 2016-07-06 20:34:41 +01:00
Robert Osfield
e5e89a3ac9 Added handling of null 2016-07-06 20:23:34 +01:00
Robert Osfield
8b3944f51c Changed dynamic_cast<> to static_cast<> as type is known based on getType() query. 
Added missing break statement.
 2016-07-06 20:21:53 +01:00
Robert Osfield
0ef196b84c Added null pointer check 2016-07-06 20:15:49 +01:00
Robert Osfield
b907a6e1a6 Fixed null pointer check 2016-07-06 20:13:36 +01:00
Robert Osfield
84eca67498 Added null pointer check 2016-07-06 20:08:03 +01:00
Robert Osfield
666a5def96 Fixed use of invalidated iterator 2016-07-06 20:04:13 +01:00
Robert Osfield
5c5cdbabf7 Added null pointer check 2016-07-06 19:58:23 +01:00
Robert Osfield
a898f2a7e1 Fixed TabPlaneDragger's handling of pressing the right mouse button whilst holding the left mouse button down, then releasing hte left mouse button. 2016-07-06 19:45:02 +01:00
Robert Osfield
c753a99a38 Added ability to assign callbacks from lua scripts 2016-07-06 11:36:25 +01:00
Robert Osfield
d8bac1d363 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2016-07-05 18:11:31 +01:00
Robert Osfield
8066a1da04 Added readObject() implementation. 2016-07-05 18:10:51 +01:00
OpenSceneGraph git repository
bb509879ca Merge pull request #103 from marchelbling/update_stl 
Update stl.

    fixes magics color parsing
    adds support for incomplete binary stl files
 2016-07-05 18:04:50 +01:00
Robert Osfield
ca4355974f Fixed warnings 2016-07-05 17:57:28 +01:00
Marc Helbling
e4c31cdcbf Adds support for incomplete stl binary files 
The logic is
* if a file is not ascii
* if its sizeis less than the expected binary size
then we can assume that the data is incomplete but still try to load it.
 2016-07-05 17:09:45 +02:00
Marc Helbling
f4d0131967 Fixes magics color parsing 
`fread` returns the number of objects read, not a byte-size.
 2016-07-05 17:09:41 +02:00
Marc Helbling
67c301c236 Adds specific flag for compressed animation buffers 2016-07-05 16:52:17 +02:00
Marc Helbling
67b17fa801 Updates osgjs plugin for animation serialization 2016-07-05 16:48:53 +02:00
Marc Helbling
6fd972fa42 Fixes gles coverity defects 2016-07-05 16:32:00 +02:00
Robert Osfield
ab69edb506 Fixed typo 2016-07-05 12:57:41 +01:00
Robert Osfield
dce1473a53 Seperated out the scene->requiresRedraw() method into a osgViewer::Viewer::requiresRedraw() method to make the functionality clearer and easier to override. 2016-07-05 11:54:31 +01:00
Robert Osfield
16d497ef80 Simplified DatabasePager::requires*() methods 2016-07-05 11:42:03 +01:00
OpenSceneGraph git repository
076503f247 Merge pull request #100 from filnet/checkneedtodoframe 
streamline DatabasePager::requiresUpdateSceneGraph()
 2016-07-05 11:27:44 +01:00
Robert Osfield
7635f1774f Added missing Plane and Quat handling 2016-07-05 07:41:23 +01:00
Philippe Renon
22d53357d3 split requiresUpdateSceneGraph() into requires update and requires redraw (wip) 2016-07-04 23:19:20 +02:00
Philippe Renon
e23a30652d streamline DatabasePager::requiresUpdateSceneGraph() 
would trigger unnecessary redraws when there were pending file requests or active database threads

tested ok with and without IncrementalCompileOperation
 2016-07-04 21:42:19 +02:00
Robert Osfield
935a5c4e22 Added version guard around new parameter serializer 2016-07-04 20:26:28 +01:00
Julien Valentin
36930dcd18 Added serializer support for RigTransforms 2016-07-04 20:19:58 +01:00
Robert Osfield
1fe2d6d31f Added templte methods and implementations for Vec2,3,4 for b,ub,s,us,i and ui. 2016-07-04 13:37:29 +01:00
Robert Osfield
2ebe4813d6 Replaced seperate implementations with template implementations 2016-07-04 11:02:58 +01:00