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

10531 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