Commit Graph

16322 Commits

Author SHA1 Message Date
Robert Osfield
b2f17aa38e Added arguments to viwer construction to allow better command line control 2020-03-13 08:35:35 +00:00
Robert Osfield
9ee206f1c5 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2020-03-13 08:34:59 +00:00
OpenSceneGraph git repository
d43ae0a224
Merge pull request #920 from LaurensVoerman/Win32GWUtils_include
move Win32GWUtils header from src to include.
2020-03-13 08:31:31 +00:00
Philip Lamb
caf3167dbe png and tiff plugins do not depend on C++ exceptions. 2020-03-13 20:00:01 +13:00
Laurens Voerman
9eaf257a67 move Win32GWUtils header from src to include. 2020-03-02 14:48:41 +01:00
Robert Osfield
f0e89c41aa Added mutex lock to avoid threading issues when glyphs are added to a Font from multiple threads 2020-01-31 10:40:29 +00:00
Laurens Voerman
274938e3c5 Fix for older versions of fbxsdk without xml or zlib libraries, fix cmake multiconfig generators (msvc) with irrelevant CMAKE_BUILD_TYPE. 2020-01-30 16:37:36 +00:00
Robert Osfield
25868955d2 Added explicit clean up removeView 2020-01-30 16:23:47 +00:00
Stuart Mentzer
8643c0001f FBX plugin updates / PREFIX-NOTFOUND work-around 2020-01-27 10:25:34 +00:00
dedowsdi
ad11fd06be Add getPreRenderList getPostRenderList to RenderStage. 2020-01-21 09:46:35 +00:00
dedowsdi
32566420c9 Fix particle rotation. 2020-01-20 10:39:13 +00:00
Robert Osfield
25afb086ef Moved setting of isftream locale to Model::readOBJ(..) and Model::readMTL(..). 2020-01-17 09:07:58 +00:00
Robert Osfield
8f231c660a Added explict setting of local to classic to avoid local platform settings affecting parsing 2020-01-17 08:56:02 +00:00
OpenSceneGraph git repository
855f226681
Merge pull request #899 from solvingj/patch-1
Correct condition for copying openthreads PDB
2020-01-15 20:40:20 +00:00
Jerry
65d01832ce
Correct condition for copying openthreads PDB
Related to issue: https://github.com/openscenegraph/OpenSceneGraph/issues/898
2020-01-15 12:46:26 -05:00
Robert Osfield
4b857d9379 Fixed warnings 2020-01-14 16:35:00 +00:00
Robert Osfield
2ca6c55dad Fixed build warning due to auto_ptr<> 2020-01-14 14:57:15 +00:00
Robert Osfield
0405469bf0 Fixed workaround for invalid indices 2020-01-14 14:44:38 +00:00
Robert Osfield
5940ac3653 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2020-01-13 14:23:21 +00:00
OpenSceneGraph git repository
0dcfd23307
Merge pull request #894 from mp3butcher/patch-34
Add GL4.4.1 defines
2020-01-13 14:23:11 +00:00
Robert Osfield
481cb4f770 Added commment explaining that OpenThreads::Thread::CurrentThread() return NULL on non OpenThreads thread. 2020-01-13 14:18:45 +00:00
Robert Osfield
ccf6554d2d Added Thread::CurrentThreadId() method to wrap up thread id functionality in a more platform appropriate way. 2020-01-13 14:18:17 +00:00
Robert Osfield
037e0f3a12 Added support for using CurrentCodePage functionality with osgText::String
To the DXF plugin added Option string support for using CurrentCodePage|WidePage, UTF8, UTF16, UTF32 and FontFile=filename
2020-01-13 14:05:46 +00:00
Robert Osfield
a4054572b9 Added encoding and font setting to dxfText as a first step towards making these user controllable to enble handling of non default settings 2020-01-13 10:00:17 +00:00
Julien Valentin
ecc887bcbb
Add GL4.4.1 defines 2020-01-12 23:31:04 +01:00
Robert Osfield
fb1dff845f Added creation of image directories when required 2020-01-11 14:40:58 +00:00
OpenSceneGraph git repository
7b5eac73c8
Merge pull request #888 from longhuan2018/dxf-support-linewidth
Dxf support linewidth
2020-01-11 11:08:32 +00:00
Robert Osfield
a055579972 Fixed handling of _autoScaleTransitionWidthRatio<=0.0 2020-01-10 10:12:58 +00:00
Long Huan
58f1fa5f10 fix -Wreorder warning 2020-01-10 15:59:16 +08:00
Long Huan
a9399a49c8 Update scene.h 2020-01-10 15:22:51 +08:00
Long Huan
4995ae4c57 Update scene.h 2020-01-10 14:23:56 +08:00
OpenSceneGraph git repository
438d34c059
Merge pull request #890 from LaurensVoerman/submit_def_MAP_WRITE_BIT
add GL_MAP_PERSISTENT_BIT define for outdated gl.h users (like msvc).
2020-01-07 17:31:47 +00:00
Laurens Voerman
395c2677de add GL_MAP_PERSISTENT_BIT define for outdated gl.h users (like msvc). 2020-01-07 15:15:36 +01:00
OpenSceneGraph git repository
6b3c39270d
Merge pull request #880 from mp3butcher/bufferstorage
BufferStorage and Persistent DMA
2020-01-07 11:23:40 +00:00
OpenSceneGraph git repository
32bb3fd91e
Merge branch 'master' into bufferstorage 2020-01-07 11:21:42 +00:00
Robert Osfield
356e16e6c4 Implemented TextBase::compileGLObjects() with handling of VAO/VBOs to address bugs associated with VAO usage of Text. 2020-01-07 11:16:26 +00:00
Long Huan
5235811c47 add linewidth support 2020-01-07 09:16:18 +08:00
Julien Valentin
22473d0f7f add MappingBitField serializer and increment SO version 2020-01-06 20:11:23 +01:00
Julien Valentin
42e665f36f revert irrelevant changes 2020-01-06 20:11:20 +01:00
limbolily
8011d9414b Fix navagation error about Android GLES2 example.
Android GLES2 example use event queue without initializing window rectangle with graphics context,that produce navigation error.
2020-01-06 10:35:04 +00:00
Julien Valentin
9863eb214c add example for testing 2020-01-03 00:02:50 +01:00
Julien Valentin
eaaf83329e Revert "merge _usage and bufferstorage bitfield utilization"
This reverts commit 30e749ae54.
2020-01-03 00:02:08 +01:00
Long Huan
10bdf73650
Merge pull request #1 from openscenegraph/master
Megre from OpenSceneGraph
2020-01-02 09:50:02 +08:00
Julien Valentin
3526292de3 typo fix 2019-12-27 02:46:35 +01:00
Julien Valentin
e605d6aa3d prevent persistance buffer leak 2019-12-26 23:01:13 +01:00
Julien Valentin
30e749ae54 merge _usage and bufferstorage bitfield utilization 2019-12-26 22:48:11 +01:00
mp3butcher
2c942f4771 persistance mapping proposal 2019-12-26 17:52:48 +01:00
OpenSceneGraph git repository
aa94cd4fef
Merge pull request #878 from mike402/master
Fix #877 "Shift key stuck if both shifts switch keymap"
2019-12-23 14:56:44 +00:00
Robert Osfield
9cfad0a7bf Adopted CMake's FindDCMTK.cmake variables 2019-12-23 14:54:16 +00:00
Michael Danilov
75732c9387 Fix #877 "Shift key stuck if both shifts switch keymap"
Adapted the patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687332
2019-12-23 14:20:26 +01:00