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

16156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
8873381f66 Merge branch 'OpenSceneGraph-3.6' into MultiView 2021-02-18 16:26:22 +00:00
Robert Osfield
5d51e5bf2a Fixed META_ macro usage 2021-02-18 16:13:50 +00:00
Robert Osfield
159c0271b7 Fixed osgWidget event handling 2021-02-18 16:08:25 +00:00
Robert Osfield
94d5211f43 Ran dos2unix to fix line endings 2021-02-17 18:23:32 +00:00
Robert Osfield
219adb7419 Ran dos2unix to fix line endings 2021-02-17 17:50:21 +00:00
Robert Osfield
b8862d0420
Merge pull request #1041 from glebm/3.6-cherry-pick-android-fix 
3.6 cherry-pick: CMakeLists.txt: OSG_FIND_3RD_PARTY_DEPS option
 2021-01-23 18:33:39 +00:00
Robert Osfield
8a0114a46a Replaced std::mem_fun_ref usage to avoid compatiblity with modern compilers. 2021-01-23 18:27:58 +00:00
Gleb Mazovetskiy
199035ae51 CMakeLists.txt: OSG_FIND_3RD_PARTY_DEPS option 
Android-specific macros aren't needed in some cases, e.g. if the NDK is
setup with all the needed dependencies a much easier way to find
packages is to simply specify the correct `CMAKE_FIND_ROOT_PATH`.

The `ANDROID_3RD_PARTY` macro interferes with this.
Adds an option to disable it.

WIN32 build is in a similar situation, the new option affects it also.
 2021-01-23 17:25:45 +00:00
Robert Osfield
23b4345517
Merge pull request #1032 from glebm/3.6-backport-deprecations-fix 
Back-port (cherry-pick) warnings fixes into 3.6
 2021-01-23 16:15:35 +00:00
Robert Osfield
b5b0bed7c3
Merge pull request #1039 from unelsson/clocaletodae 
Use c-locale with std::istream
 2021-01-23 15:57:16 +00:00
Nelsson Huotari
a531f2bd13 Use c-locale with std::istream 2021-01-23 14:46:16 +02:00
Gleb Mazovetskiy
f36e9f2a4a include/osgViewer: Fix typo 
Follow-up to #1027
 2021-01-23 10:53:44 +00:00
Robert Osfield
b7c186f6d3 Fixed warnings reported by gcc-9.3.0 
Note from glebm@:

Back-ported from e0d5e4b0ff

Identical except for the changes to `MatrixTemplate`, which does not
exist in 3.6
 2021-01-19 20:37:40 +00:00
Robert Osfield
cae687cbdd Merge branch 'OpenSceneGraph-3.6' into MultiView 2021-01-18 16:34:47 +00:00
Robert Osfield
644251db98 Fixed warnings 2021-01-18 16:33:34 +00:00
Robert Osfield
295bfffc17 Added 0 to end of array. 2021-01-18 15:38:43 +00:00
Gleb Mazovetskiy
b4663ded94 osgAnimation/Keyframe: Fix -Wshadow warning 
```
include/osgAnimation/Keyframe:108:53: warning: declaration of 'iterator' shadows a member of 'osgAnimation::TemplateKeyframeContainer<osgAnimation::TemplateCubicBezier<double> >' [-Wshadow]
  108 |             for(std::vector<unsigned int>::iterator iterator = intervalSizes.begin() ; iterator != intervalSizes.end() ; ++ iterator) {
      |                                                     ^~~~~~~~

include/osg/MixinVector:39:44: note: shadowed declaration is here
   39 |     typedef typename vector_type::iterator iterator;
      |                                            ^~~~~~~~
```
 2021-01-18 14:51:48 +00:00
Gleb Mazovetskiy
44d3da02a9 Fix osgViewer USE_GRAPHICSWINDOW without a windowing system 
There is no way for the user to know whether OSG was compiled with a
windowing system.

This means calling USE_GRAPHICSWINDOW() in client libraries was unsafe
in the case of the "None" windowing system, as it would fail to link.

Turns the call into a no-op in that case.
 2021-01-18 14:48:12 +00:00
Gleb Mazovetskiy
4093860c32 cmake: Allow passing LTO option 2021-01-18 14:45:41 +00:00
Gleb Mazovetskiy
0161b8ab46 include/osg/Callback: nullptr -> NULL 
Fixes travis, which explictly requires c++98
 2021-01-18 14:45:06 +00:00
ankurverma85
417f78ac5e Update unzip.cpp 2021-01-18 14:07:47 +00:00
Robert Osfield
8195b9c8e7
Merge pull request #1015 from eligovision/OpenSceneGraph-3.6_state_arg_rename 
Wrong argument name rename: uniformMap -> defineMap
 2021-01-18 13:57:29 +00:00
Glenn Waldron
5ca6759a1f Fix for #1013 - Texture2DArray fails to regenerate after a releaseGLObjects/dirtyTextureObject - remove the modified count condition on component images when subloading when there is no texture object 2021-01-18 13:55:53 +00:00
Sam Brkopac
9c7cde1db4 updated cmake to properly disable debug iterators on windows 2021-01-18 13:42:40 +00:00
Robert Osfield
3d28edf528 Added intleave shader and more flexible projection matrix setup. 2020-12-31 15:06:30 +00:00
Robert Osfield
e9c8e3d4a7 Added #Pragma(tic) shader composition for passing widht and height into the shader 2020-12-31 11:47:56 +00:00
Robert Osfield
1d4bf56fd3 Implemented rows in prep for interleaving of 4x4 2020-12-30 18:23:21 +00:00
Robert Osfield
7aec64564c Restructd set up of LeiaIntialFrustumCallback setup. 2020-12-30 13:05:42 +00:00
Robert Osfield
faae6288a5 Fixed depth component type 2020-12-30 12:46:49 +00:00
Robert Osfield
b3d39de208 Moved texture array creation into method. 2020-12-30 12:40:03 +00:00
Robert Osfield
0feeb79d05 Added 4x4 grid of images, currently repeating each row 4 times as step towards full 4x4 rendering. 2020-12-29 18:28:17 +00:00
Robert Osfield
f027c4c420 Fixed setting of pmv matrix 2020-12-29 13:31:15 +00:00
Robert Osfield
ba7334ef29 Added initial template for Leia ViewConfig implementation 2020-12-29 13:30:27 +00:00
valid-ptr
aed9fd74f6 Wrong argument name rename: uniformMap -> defineMap 2020-12-29 15:07:15 +03:00
Robert Osfield
19499d4109 Added ToggleFrustumHandler that toggles the use of the custom frustum when the 'c' key is pressed. 2020-12-24 13:41:42 +00:00
Robert Osfield
38ed11b924 Added custom InitialFrustumCallback 2020-12-24 09:53:09 +00:00
Robert Osfield
6cabb0b012 Added near/far flags to Polytope::setToBoundingBox(). 2020-12-24 09:45:00 +00:00
Robert Osfield
2d6e0b6a66 Added CullSettings::InitialFrustumCallback to enable Camera to provide customization of the the initialzation of the frustum. 2020-12-23 16:16:56 +00:00
Robert Osfield
08c8f3bd7b Updated width of background quad 2020-12-22 12:23:59 +00:00
Robert Osfield
5f03aec6bc Added support for vertex colours 2020-11-12 18:35:16 +00:00
Robert Osfield
8bad3be995 Removed debug right eye camera clear colour setting 2020-11-12 18:32:27 +00:00
Robert Osfield
d77a08bfe7 Fixed format 2020-11-12 18:05:12 +00:00
Robert Osfield
b244e658d6 Removed debug code path 2020-11-12 17:22:03 +00:00
Robert Osfield
9e161a5559 Removed the copyright notices as the code is new and doesn't require the standar OSGPL license. 2020-11-12 17:19:23 +00:00
Robert Osfield
0b0457f46b Added uniform arrays for left and right view and projection matrix offsets 2020-11-12 17:04:22 +00:00
Robert Osfield
e93753e261 Added ovr related shader variables 2020-11-12 15:53:38 +00:00
Robert Osfield
c4c0577726 Selected single threading to avoid multibuffering of multiview structures 2020-11-12 15:52:24 +00:00
Robert Osfield
39dc12fb6b Set up the number of views to be the size of the texture array 2020-11-12 15:49:11 +00:00
Robert Osfield
efe358048b Updated shaders for GL_OVR_multiview2 usage 2020-11-12 15:13:29 +00:00
tomhog
ddbed23537 fix for typo in windows branch of delimiter definition 2020-11-12 12:55:23 +00:00