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

15978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mp3butcher
2c9d551452 renaming variable and remove redondant test and variable 2018-08-18 22:55:30 +02:00
mp3butcher
d9f58ff03b fix possible internalformat misregisterings (diff effective gl and osg representation) 2018-08-18 17:26:32 +01:00
Robert Osfield
d37b826a74 Refactored the glTexStorage code paths to use selectSizedInternalFormat() and move the generateAndAssignTextureObject() calls within the two useTexStorage and non TexStorage paths to ensure that the right foramts are matched when generating the texture object 2018-08-17 18:59:04 +01:00
Robert Osfield
d841170d32 Removed check as this is better outside of the function 2018-08-17 16:51:55 +01:00
Robert Osfield
71f134c64b Created a GLenum Texture::selectSizedInternalFormat(const osg::Image* image=0) const method to help clean up set up of glTexStorage. 
Fixed typo.
 2018-08-17 12:22:36 +01:00
OpenSceneGraph git repository
7328e03d23
Merge pull request #594 from mp3butcher/patch-6 
Add valid sizedInternalFormats for glTexStorage path
 2018-08-17 09:54:15 +01:00
OpenSceneGraph git repository
adbfd523f3
Merge pull request #596 from mp3butcher/MeshReindexation 
add a bool parameter to allow forced reindexation of a mesh
 2018-08-17 09:53:26 +01:00
OpenSceneGraph git repository
57ce63fffd
Fixed member variable name 2018-08-17 09:27:09 +01:00
OpenSceneGraph git repository
38cb6b3c49
Changed member variable name to be consistent with header 2018-08-17 09:22:40 +01:00
OpenSceneGraph git repository
aa9173828a
Changed the member variable to be consistent with the method name. 2018-08-17 09:21:31 +01:00
Robert Osfield
eee5d5482e Fixed memory leak associated with VertexArrayStte objects not getting released on destruction of Geometry/Drawables. 2018-08-16 19:23:17 +01:00
mp3butcher
7f12ca4389 add a bool parameter to allow forced reindexation of a mesh 2018-08-16 18:59:47 +02:00
Julien Valentin
3a604b0e10 Add valid sizedInternalFormats 
Why  some much commented?
 2018-08-16 18:56:25 +02:00
OpenSceneGraph git repository
22c0dc379f
Merge pull request #593 from mp3butcher/ImmutableTexture 
add immutability (if available) on ImageLess TextureRectangle
 2018-08-16 16:15:20 +01:00
OpenSceneGraph git repository
1b4677c98a
Merge pull request #595 from cxw42/cygx11 
Remove duplication of REGISTER_WINDOWINGSYSTEMINTERFACE code in GraphicsWindowWin32
 2018-08-16 15:46:56 +01:00
Chris White
c3880a25b6 Remove duplication of REGISTER_WINDOWINGSYSTEMINTERFACE code 
Refactor so GraphicsWindowWin32 doesn't duplicate code in
<osg/GraphicsContext>.

Also, add OSGVIEWER_EXPORT to X11WindowingSystemInterface so
X11WindowingSystemInterface examples can build on cygwin.
This change parallels that in commit 0bca415d5a.
 2018-08-15 12:49:01 -04:00
mp3butcher
c2031836ee add immutability (if available) on ImageLess TextureRectangle 2018-08-11 14:10:13 +02:00
OpenSceneGraph git repository
e008784ab6
Merge pull request #586 from cxw42/cygthreads 
On cygwin, don't use pthread functions that require _GNU_SOURCE in OpenThreads
 2018-08-08 14:38:13 +01:00
OpenSceneGraph git repository
08ec85e3a9
Merge pull request #589 from Vic-Min/master 
Renamed USE_DEPRECATED_API to OSG_USE_DEPRECATED_API
 2018-08-08 14:36:35 +01:00
Vic-Min
e7583207db Renamed USE_DEPRECATED_API to OSG_USE_DEPRECATED_API 2018-08-08 15:05:53 +03:00
Robert Osfield
6d0b8c4693 Tightened up the setting of the Member property of Texture attributes 2018-08-08 07:34:14 +01:00
Chris White
b4889a8c06 On cygwin, define _GNU_SOURCE in pthreads-based OpenThreads 
pthread_{yield,getconcurrency,setconcurrency} are not declared in
pthread.h on cygwin with gcc 7.3.0 unless _GNU_SOURCE is defined.
 2018-08-05 08:11:30 -04:00
Daniel Emminizer
985e82049f OpenFlight: Replace internal caches with osgDB::ObjectCache use. Fixes unbounded memory growth when using readNode(std::istream&, ...) method. 2018-07-31 17:06:34 +01:00
Robert Osfield
cd5c75ae72 Removed unneccessary FIX ME statement. 2018-07-31 09:13:20 +01:00
OpenSceneGraph git repository
deea0f2455
Merge pull request #579 from dstephan1/master 
MultiSwitch Name Serialization
 2018-07-30 15:36:08 +01:00
OpenSceneGraph git repository
0e58ad5a2e
Merge pull request #582 from sbrkopac/master 
fixed cmake regression
 2018-07-30 15:09:57 +01:00
David Stephan
c1d3767ca5 removed tests 2018-07-29 14:13:17 -07:00
sam
552c5f38e4 fixed cmake regression 2018-07-28 12:40:05 -07:00
David Stephan
8cdd4ebddc changes for angry travis 2018-07-27 18:39:36 -07:00
David Stephan
b630e2326b tabs to spaces 2018-07-27 14:55:02 -07:00
David Stephan
9454eb53ba added switch names to osgSim::MultiSwitch serializer 2018-07-27 14:48:10 -07:00
OpenSceneGraph git repository
828c50afc0
Merge pull request #578 from nicolas-f/master 
updated osgviewerWX to remove deprecated calls in wxWidgets 3.x
 2018-07-27 16:39:54 +01:00
Alex Burton
cd214245e7 updated osgviewerWX to remove deprecated calls in wxWidgets 3.x 2018-07-27 14:19:14 +02:00
Thomas Hogarth
5058a9cd9c Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merge with master
 2018-07-23 23:52:30 +01:00
Thomas Hogarth
4d4ba22b8a removed ios simulator reference, adjusted readme 2018-07-23 23:52:16 +01:00
OpenSceneGraph git repository
b7bed3ee87
Merge pull request #577 from calumr/fix-collada-vcpkg 
Fix FindCollada.cmake for vcpkg installs
 2018-07-23 15:30:09 +01:00
Calum Robinson
e4cd1583cc Fix FindCollada.cmake for vcpkg installs 
* Handle MSVC_VERSION versions > 1910
* Specify PATH_SUFFIXES rather than individual PATHS for FIND_PATH
 2018-07-23 13:29:48 +01:00
OpenSceneGraph git repository
dbe722bda1
Merge pull request #469 from mp3butcher/imagebinding3 
immutable storage for ImageLess Texture
 2018-07-23 11:32:27 +01:00
OpenSceneGraph git repository
86bd4a4e8b
Merge branch 'master' into imagebinding3 2018-07-23 07:57:23 +01:00
OpenSceneGraph git repository
8f96bccb51
Merge pull request #576 from mp3butcher/patch-4 
variables renaming to avoid name collision with size_t
 2018-07-21 14:43:16 +01:00
Julien Valentin
39642572d2
Avoid name collision with size_t 2018-07-18 16:19:21 +02:00
Thomas Hogarth
9e288e3138 Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merge master
 2018-07-10 02:09:56 +01:00
Thomas Hogarth
49e9aadbf5 Improved iOS cmake support for xcode 9.4 and cmake 3.11 2018-07-10 02:09:28 +01:00
Robert Osfield
15d9c08273 Pulled in OpenFlight/expGeometryRecords.cpp from 3.6 branch 2018-07-09 18:00:29 +01:00
Thomas Hogarth
45d59ef03a Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merging with master
 2018-07-09 15:20:23 +01:00
Robert Osfield
f94980b1fe Removed the gl3.h usage for GL3 case as these headers were replaced by glcorearb.h, it's probably better to just fallback to gl.h and have the OSG get the extentions at runtime. 2018-06-29 09:57:55 +01:00
Thomas Hogarth
014255bd9e Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merging with master
 2018-06-29 03:08:24 +01:00
OpenSceneGraph git repository
9a51a4979f
Merge pull request #569 from LarryIII/Fix-issues 
Remove call to nonexistent member seekpos() of std::fpos in VS 15.8
 2018-06-28 06:40:25 +01:00
Larry-Hu
1b6a040cf0 Remove call to nonexistent member seekpos() of std::fpos in VS 2017 version 15.8 or later 2018-06-27 21:21:31 -07:00
Robert Osfield
b2087b8dd3 Replaced creation of a temporary Settings object on the heap with creation on the stack to improve performance 2018-06-27 11:07:53 +01:00