FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,807 Commits 1 Branch 26 Tags 73 MiB
5b779ad410
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenSceneGraph git repository
5b779ad410 Merge pull request #285 from mp3butcher/MDI6 
add a very simple example for mdi with basevertex
 2017-07-30 15:40:17 +01:00
Julien Valentin
d810d4a4c0 add a very simple example for mdi with basevertex 2017-07-30 10:28:56 +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
Robert Osfield
5a946e218f Improved the readability and consistency with the rest of the OSG by inserting/removing spaces and line spacing. 2017-07-28 13:30:36 +01:00
OpenSceneGraph git repository
af25f14d73 Merge pull request #278 from mp3butcher/MDI2 
Mdi
 2017-07-28 08:46:30 +01:00
mp3butcher
a45c4c8f39 set DIBO of the drawcommandarray directly in their interface constructor 
it makes osggpu use case lighter + drawcommandarray can't exist without a BO
 2017-07-27 12:27:55 +02: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
OpenSceneGraph git repository
a38e46a30f Merge pull request #277 from mp3butcher/MDI2 
PrimitiveSetIndirect cleanup + serializers
 2017-07-27 10:26:43 +01: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
Robert Osfield
8145791e6f Merge branch 'MDI2' of https://github.com/mp3butcher/OpenSceneGraph into MultiDrawIndirect 2017-07-26 20:46:09 +01: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
Robert Osfield
fcdd3750c2 Replaced FindOurDCMTK.cmake usage with FindDCMTK.cmake 2017-07-26 12:54:37 +01:00
Robert Osfield
e4b4d1aa59 Replaced local FindOurDCMTK.cmake with stock Cmake's FindDCMTK.cmake as the later is now feature complete and has full support for debug and release libraries. 2017-07-26 12:26:38 +01:00
Robert Osfield
9cdeabfbb6 Merged MSVC static build fix from OpenSceneGraph-3.4 2017-07-25 14:56:27 +01: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
OpenSceneGraph git repository
f2176a12a7 Merge pull request #270 from caishanli/patch-1 
fix StatsHandler crash on windows
 2017-07-17 07:53:48 +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
Robert Osfield
0b5f45289d Updated SO version number to 149 to enable uint64 object length read/writing in the .osgb format 2017-06-19 15:55:42 +01: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
OpenSceneGraph git repository
883567851c Merge pull request #263 from cxw42/build-fix 
Still build even if CPACK_GENERATOR is undefined
 2017-06-19 08:43:54 +01:00
Robert Osfield
ce7593c799 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-06-19 08:26:24 +01:00
OpenSceneGraph git repository
9ba59eceaa Merge pull request #260 from blobfish/primitiveIndex 
Intersections and primitive index
 2017-06-19 08:12:47 +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
cxw
dbff652aed Still build even if CPACK_GENERATOR is undefined 
Without the quotes around `${CPACK_GENERATOR}`, Windows CMake, generating
for VS2013, would exit with an error because the `STREQUAL` only had one arg.
 2017-06-10 22:05:19 -04:00
OpenSceneGraph git repository
ca20eb2cba Merge pull request #261 from cxw42/doxy-osgui 
Added osgUI to Doxygen-generated documentation
 2017-06-08 07:10:32 +01:00
Chris White
5812c267b1 Added osgUI to Doxygen-generated documentation 2017-06-07 07:50:55 -04: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
blobfish
69e1df6b65 examples: osgkeyboardmouse: add primitive index to LineSegmentIntersector output 2017-06-04 17:29:57 -04:00
OpenSceneGraph git repository
f3c4234f92 Merge pull request #259 from jtorresfabra/fixes_kdtree 
Fixes kdtree building
 2017-06-02 09:29:05 +01: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
502acc19c9 Build fix 2017-05-25 09:54:11 +01:00
Robert Osfield
2fe039e349 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-05-25 09:37:30 +01:00
OpenSceneGraph git repository
ccd79d9db1 Merge pull request #258 from kornerr/master 
Add x86_64 architecture to iOS simulator
 2017-05-25 09:37:26 +01:00
Robert Osfield
badb914d46 Tidied up spacing 2017-05-25 08:56:53 +01:00
Robert Osfield
5f446e0022 Fixed naming of OSG_USE_DEPRECATED_API 2017-05-25 08:48:45 +01:00