FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,204 Commits 1 Branch 26 Tags 73 MiB
5940ac3653
Commit Graph

16204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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