Commit Graph

16285 Commits

Author SHA1 Message Date
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
blobfish
ec2624ee41 Plugins: Cmake: OpenCasCade: Changing header used for include directory search. See Following.
BRepMesh.hxx is gone in occt 7.4. Now searching for Standard_Version.hxx, which should be more consistent.
2019-12-22 12:39:17 +00:00
blobfish
a051916e6e Plugins: OpenCasCade: Adding 'std' prefix where needed. See Following.
Prior to 7.4, occt had a 'using namespace std' in a header file that
was polluting dependent projects. They have since fixed it and so these
changes are required.
2019-12-22 12:30:55 +00:00
Robert Osfield
1968f3d6e1 Added classic locale setting to avoid local setting of locale affecting the GLSL code generated. 2019-12-18 14:26:33 +00:00
Robert Osfield
1747d1a17b Updated ChangeLog 2019-12-16 17:10:12 +00:00
Robert Osfield
64b5397330 Added automatically removal from the OjbectCache when a object or it's subgraph contain Texture that no longer have an osg::Image. 2019-12-16 17:09:04 +00:00
OpenSceneGraph git repository
2f9537c07d
Merge pull request #872 from LaurensVoerman/commit_tgaFixMaster
fix debug compile error for ReaderWriterTGA
2019-12-16 11:54:34 +00:00
Laurens Voerman
c8b0e11fe7 fix debug compile error for ReaderWriterTGA 2019-12-16 11:22:32 +01:00
OpenSceneGraph git repository
bf7e4a6361
Merge pull request #866 from dedowsdi/fix_cmake_fontconfig
Fontconfig should be external library.
2019-12-13 11:01:00 +00:00
PntAndCnt
86fac74229 Fontconfig should be external library.
Add Fontconfig to TARGET_LIBRARIES cause osg3::osgText target looking for
openscegraph-Fontconfig-import-targets.cmake, which doesn't exists.
2019-12-13 18:58:24 +08:00
OpenSceneGraph git repository
7640c4d21c
Merge pull request #868 from dedowsdi/fix_example_osgtext_alignment
Fix a typo and invisible 3dtext in examples/osgtext.
2019-12-13 10:20:21 +00:00
OpenSceneGraph git repository
3bb5f468a0
Merge pull request #867 from dedowsdi/fix_cmake_existing_target
Set OpenSceneGraph_${component}_FOUND to TRUE for existing target.
2019-12-13 09:50:41 +00:00
PntAndCnt
b0e8b7c96b Fix a typo and invisible 3dtext in examples/osgtext.
Second text alignment is wrong when "--alignment" specified.

3D text radius is too small, only SCREEN_COORDS can be seen.

Text position should multiply radius.
2019-12-13 09:26:43 +08:00
PntAndCnt
cf4d981483 Set OpenSceneGraph_${component}_FOUND to TRUE for existing target.
Following statement will never set OpenSceneGraph_osgText_FOUND to TRUE:

```
FIND_PACKAGE(OpenSceneGraph REQUIRED COMPONENTS osgViewer osgText CONFIG)
```

It cause cmake failure, the error message is confusing:
```
Found package configuration file:

/usr/local/osg/gl2/lib/cmake/OpenSceneGraph/OpenSceneGraphConfig.cmake

but it set OpenSceneGraph_FOUND to FALSE so package "OpenSceneGraph" is
considered to be NOT FOUND.
```

I know one doesn't need to add osgText after osgViewer, but it should
not cause an error with confusing message.
2019-12-13 07:49:44 +08:00
OpenSceneGraph git repository
12084cd0e2
Merge pull request #834 from 0871087123/tif_bug_fix
getInternalTextureFormat() failed after reading a tiff file
2019-12-12 14:15:53 +00:00
OpenSceneGraph git repository
91dfe652b5
Merge pull request #865 from AMDmi3/freebsd-setaffinity
Add FreeBSD-specific code bits for pthread_setaffinity_np support
2019-12-12 13:57:30 +00:00
Robert Osfield
f4c4f76370 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-12-12 13:18:10 +00:00
OpenSceneGraph git repository
bb5620d926
Merge pull request #864 from AMDmi3/xinerama-lib
Fix linking with Xinerama
2019-12-12 13:17:27 +00:00
Alberto Luaces
1ed2d9348e Set ffmpeg as the default plugin for video files.
As xine is not used anymore, there is no plugin in charge of loading
video files, and osgmovie and other programs are not able to open
them.

If ffmpeg is present, it is registered for opening video files.
2019-12-12 13:10:43 +00:00
OpenSceneGraph git repository
f63b2e05c3
Merge pull request #856 from elsid/fix_build_with_libcxx
Fix clang 8 & libc++ build errors
2019-12-12 11:28:55 +00:00
Robert Osfield
69ebd7b323 Removed extraneous indentation 2019-12-12 11:14:39 +00:00
OpenSceneGraph git repository
4ebac62d05
Merge pull request #855 from dsfdeeeg/ffmpeg
Plugins ffmpeg
2019-12-12 10:57:10 +00:00
OpenSceneGraph git repository
653c0692b6
Fixed indentation, replacing tabs with spaces 2019-12-12 10:55:35 +00:00
OpenSceneGraph git repository
c976f045f4
Merge pull request #854 from timoore/transpose
Fix bug in matrix transpose() and transpose3x3
2019-12-12 10:40:17 +00:00
OpenSceneGraph git repository
e34f94fde8
Merge pull request #853 from flashk/patch-12
Support reading RGB float DDS images
2019-12-12 10:20:54 +00:00
OpenSceneGraph git repository
a87b6495ba
Merge pull request #852 from LaurensVoerman/submitCpSubImgMaster
fix copySubImage crash on compressed files
2019-12-12 10:08:35 +00:00
OpenSceneGraph git repository
f3cc67d5a4
Merge pull request #846 from dedowsdi/fixbug_pointsprite
Init isPointSpriteModeSupported correctly.
2019-12-12 10:04:24 +00:00
Robert Osfield
a72fc3c9f4 Merge branch 'arnauddgbes-master' 2019-12-12 10:02:12 +00:00
Robert Osfield
05224e7dac Merge branch 'master' of https://github.com/arnauddgbes/OpenSceneGraph into arnauddgbes-master 2019-12-12 10:00:08 +00:00
OpenSceneGraph git repository
60ba81a7e3
Merge pull request #843 from dchristopherfennell/master
GL_CLAMP_VERTEX_COLOR and GL_CLAMP_FRAGMENT_COLOR deprecated in GL co…
2019-12-12 09:37:39 +00:00
OpenSceneGraph git repository
3a430fd50e
Merge pull request #842 from jpabst0/fix_lua_destruction
Fix: Destruction of LuaScriptEngine
2019-12-12 09:23:39 +00:00
OpenSceneGraph git repository
dfc092c894
Merge pull request #839 from rickyviking/fbxAxisSystem
Fbx Plugin: added plugin option to set the target axis system.
2019-12-12 09:18:40 +00:00
OpenSceneGraph git repository
459bce74c3
Merge pull request #838 from grdowns/vcpkg-instructions
Add vcpkg installation instructions
2019-12-12 09:13:59 +00:00
Laurens Voerman
477dd3cda2 fix apple carbon reference 2019-12-11 18:31:44 +00:00
Colin McDonald
06ff29af09 Update ReaderWriterOSGA.cpp
Fix typo in osga archives which stops node files working
2019-12-11 17:38:59 +00:00
OpenSceneGraph git repository
480e4607a8
Merge pull request #832 from remoe/win_egl_port
WIP: EGL support for Windows. Allow to run OSG with Google/Angle
2019-12-11 17:06:38 +00:00
OpenSceneGraph git repository
938824450c
Replace tabs with spaces 2019-12-11 17:05:03 +00:00
OpenSceneGraph git repository
0e40e4e689
Replaced tab indentation ith spaces 2019-12-11 17:04:24 +00:00