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

15048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenSceneGraph git repository
55f5335f18 Merge pull request #306 from AnyOldName3/targa-type-one-support 
Add support for type-1 (colour-mapped, uncompressed) targa images to …
 2017-08-20 08:32:02 +01: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
Robert Osfield
904619e219 Merged addition of "" around variable from 3.4 branch 2017-08-18 16:13:16 +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
OpenSceneGraph git repository
fa61cca6ea Merge pull request #301 from LaurensVoerman/Submit_linkWithVariables 
fix for visual studio trying to link "debug.lib" and "release.lib"
 2017-08-17 13:55:13 +01:00
Robert Osfield
34b4e70015 Added version check for boolean, TRUE and FALSE settings 2017-08-17 10:52:59 +01:00
Laurens Voerman
c939f7f0fc fix for visual studio trying to link "debug.lib" and "release.lib" 2017-08-17 11:44:06 +02:00
Robert Osfield
af79ad451e Added remapping of CMAKE_BUILD_TYPE strings that don't have the correct case. 2017-08-16 17:51:58 +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
OpenSceneGraph git repository
2831fc8088 Merge pull request #299 from luzpaz/misc-typo-fixes 
misc. typo fixes
 2017-08-16 09:04:02 +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
Robert Osfield
7b2dbc603c Fixed warning 2017-08-15 16:35:23 +01: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
7e0a20b4ba Merge remote-tracking branch 'upstream/master' 2017-08-14 14:58:29 +03: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
Robert Osfield
b46ccd0aa5 Disabled the building of deprecated serializations in convertity_scan 2017-08-09 08:58:25 +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
Robert Osfield
0d128c3a1a Added link to ABI tracker 2017-08-07 16:32:44 +01:00
OpenSceneGraph git repository
fbb5dabdd5 Merge pull request #294 from mp3butcher/MDI6 
add resize methods method in IndirectCommandArrays ..etc..
 2017-08-06 15:30:27 +01:00
Julien Valentin
899a704eb7 update IndirectCommandArrays interfaces and default impl to use DrawElements like semantic 2017-08-05 18:03:27 +02:00
Julien Valentin
35eb53cc95 add MDI support 2017-08-02 22:10:02 +02:00
Julien Valentin
7f292c3fb5 add resize methods method in CommandArrays (it allows user to work without casting to the concrete class result of MDI.getCommandArray()) 
move getTotalDataSize in CommandArrays interfaces
comply with other DrawElementsXXX removing parameters in mdi constructors and add several method ( allow use of osgUtil::DrawElementTypeSimplifer on these)
 2017-08-02 21:50:25 +02:00
OpenSceneGraph git repository
d4dda546d0 Merge pull request #293 from mp3butcher/MDI6 
fix a bug in MDI serializer
 2017-08-01 07:54:37 +01:00
Julien Valentin
3965b4e66e fix a bug in MDI serializer 2017-08-01 02:18:15 +02:00
Robert Osfield
fda30b36d1 Merged #pragmatic shader fix from OpenSceneGraph-3.4 branch. 2017-07-31 13:38:18 +01:00
OpenSceneGraph git repository
0df8e78391 Merge pull request #287 from mp3butcher/MDI6 
correct a bug and make MDI example more conservative
 2017-07-31 08:09:16 +01:00
Julien Valentin
9e9d3cd249 fix a bug : indices pre incremented should be post 2017-07-31 03:15:03 +02:00
Julien Valentin
3537460b0e Add arguments, command line usage and use DrawElementsUInt for classic case 2017-07-31 03:10:19 +02:00
Julien Valentin
aac146c7bc correct a bug and make it more conservative 2017-07-31 02:43:50 +02:00
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
fc95045259 Updated version number, ChangeLog and AUTHORS file for 3.5.7 developer release 2017-07-28 17:17:25 +01: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
3076779a14 Merge pull request #267 from kornerr/master 
Add osgemscripten example
 2017-07-28 10:27:47 +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