16257 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
OpenSceneGraph git repository	c4100174a8	Merge pull request #646 from flashk/patch-7 ... Use options when loading images in Collada loader	2018-10-17 14:43:13 +01:00
flashk	02e9b9b6a6	Update ReaderWriterDAE.cpp	2018-10-15 11:03:54 -07:00
flashk	3a40d93414	Update ReaderWriterDAE.cpp	2018-10-12 13:27:12 -07:00
flashk	11dfe44fb5	Update daeRMaterials.cpp	2018-10-12 13:25:13 -07:00
flashk	dbd392b8a5	Update daeReader.h	2018-10-12 13:23:23 -07:00
OpenSceneGraph git repository	bee53fc925	Merge pull request #645 from flashk/patch-6 ... Fix crash in Collada loader	2018-10-12 07:38:26 +01:00
flashk	6455c04198	Fix crash in Collada loader ... The collada loader would crash when processing effects that didn't have a technique defined.	2018-10-11 16:13:01 -07:00
OpenSceneGraph git repository	68a9eb237b	Merge pull request #642 from tehnick/fix-build-with-gcc5.x ... osgViewer: fix build with GCC < 6.x	2018-10-10 18:29:24 +01:00
OpenSceneGraph git repository	b083eebb95	Merge pull request #641 from tehnick/fix-build-with-pkg-config ... Fix build of gta plugin when pkg-config is used	2018-10-10 18:28:26 +01:00
OpenSceneGraph git repository	83e51f1ab4	Merge pull request #640 from tehnick/fix-build-with-case-sensitive-includes ... Fix builds with case sensitive includes	2018-10-10 18:26:03 +01:00
Robert Osfield	81998b0e65	Fixed buld	2018-10-10 13:12:07 +01:00
OpenSceneGraph git repository	0e87a86404	Merge pull request #638 from alavenant/fix__ReaderWriterSTL_precision_numeric ... fix precision numeric for stl writer	2018-10-10 08:00:45 +01:00
Antoine Lavenant	e8ceebcf57	fix apply once	2018-10-10 08:31:30 +02:00
Boris Pek	dbb00f6581	fix builds with case sensitive includes ... Tested during cross-compilation for MS Windows using MinGW.	2018-10-10 02:33:47 +03:00
Boris Pek	129761ea99	fix build of gta plugin when pkg-config is used ... + update related variable for build without pkg-config Tested during cross-compilation for MS Windows using MinGW.	2018-10-10 02:06:28 +03:00
Boris Pek	b5fa3653fe	osgViewer: fix build with GCC < 6.x ... Tested during cross-compilation for MS Windows using MinGW.	2018-10-10 02:00:35 +03:00
Antoine Lavenant	ede5bdbbc7	fix compil	2018-10-09 14:50:20 +02:00
Antoine Lavenant	a8aa7896a4	fix precision numeric for stl writer	2018-10-09 14:02:44 +02:00
OpenSceneGraph git repository	712f468d52	Merge pull request #633 from flashk/patch-5 ... Fix for HDR DDS images	2018-10-04 08:54:11 +01:00
OpenSceneGraph git repository	dbf63e3fcc	Merge pull request #632 from flashk/patch-4 ... osgDB::OutputStream write array optimization	2018-10-04 08:53:28 +01:00
OpenSceneGraph git repository	0a6f2be9a9	Merge pull request #631 from flashk/patch-3 ... Fix for GifImageStream::setReferenceTime	2018-10-04 08:52:33 +01:00
OpenSceneGraph git repository	3899654d7c	Merge pull request #630 from flashk/patch-2 ... Fix for inconsistent FBX bone hierarchy	2018-10-04 08:51:42 +01:00
flashk	aba6524ff4	Fix for HDR DDS images ... The DDS loader was not applying the correct internal format for certain HDR images (e.g. float/half_float formats)	2018-10-03 14:21:03 -07:00
flashk	0891424610	osgDB::OutputStream write array optimization ... I've made a change to osgDB::OutputStream::writeArrayImplementation so that it writes the array data in a single write operation for binary files. This significantly speeds up writing out osgb files for large data sets (e.g. point clouds). osgDB::InputStream already performs a similar optimization when reading array data from binary files.	2018-10-03 14:12:54 -07:00
flashk	0a37744a54	Fix for GifImageStream::setReferenceTime ... Setting the reference time greater than the duration of a gif would cause a crash. Also, the current reference time is not immediately updated when manually setting the reference time.	2018-10-03 11:32:10 -07:00
flashk	24a856fa6e	Update ReaderWriterFBX.cpp	2018-10-03 09:59:34 -07:00
flashk	79120eb994	Update fbxRMesh.cpp	2018-10-03 09:52:10 -07:00
flashk	0e2e81273b	Update fbxReader.h	2018-10-03 09:49:37 -07:00
OpenSceneGraph git repository	f7d9053ea0	Merge pull request #629 from flashk/patch-1 ... Fix hardware mipmap generation for cube maps	2018-10-03 11:20:34 +01:00
flashk	7bcf9b4bcb	Fix hardware mipmap generation for cube maps ... I was getting a black image when enabling hardware mipmap generation on cubemaps. I believe the problem is that the base Texture class is hard coding GL_TEXTURE_2D when enabling mipmap generation, instead of using the target type from the derived class.	2018-10-02 09:04:26 -07:00
Robert Osfield	594e971f6d	Removed unused static variables	2018-10-02 12:30:28 +01:00
Robert Osfield	5962d2580f	From Andy Skinner, Added ~GLExtensions to clear cached values for context ID	2018-10-02 12:29:30 +01:00
Robert Osfield	41577c6107	Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph	2018-10-02 10:50:40 +01:00
OpenSceneGraph git repository	3d3c7f9940	Merge pull request #628 from mp3butcher/patch-12 ... osgdrawinstanced: add version and required extension to vertex shader	2018-10-02 10:50:32 +01:00
Konstantin S. Matveyev	abd2fa53c4	1px error in GUIEventAdapter, View, Viewer and CompositeViewer major fix	2018-10-02 10:48:26 +01:00
Julien Valentin	3179970a1c	add version and required extension ... let a chance to work on intel chipset	2018-10-01 23:13:10 +02:00
OpenSceneGraph git repository	427ee6b0a2	Merge pull request #626 from mp3butcher/patch-11 ... use OpenGL 3.0 instead of 3.1 for more compatibility	2018-09-19 08:46:33 +01:00
Julien Valentin	4cc06dec4b	use OpenGL 3.0 instead of 3.1 for more compatibility ... ..as there no feature in the example requiring 3.1	2018-09-18 15:20:09 +02:00
Robert Osfield	1985927333	Standardized the glTexStorage*() calls to use osg::maximum(_numMipmapLevels,1) of rnumber of mipmaps to keep the usage consistent. ... Fixed the erronous Texture2DArray glTexStorage call so that it used the _numMipmapLevels as above to resolve bug in allocation.	2018-09-12 19:11:31 +01:00
Robert Osfield	697131a39b	Warning fixes	2018-09-11 15:33:55 +01:00
Robert Osfield	7c1a967a02	Fixed warning	2018-09-11 12:30:28 +01:00
Laurens Voerman	583ecccd75	fix scale problem for osgText with characterSizeMode SCREEN_COORDS and _position set.	2018-09-11 11:56:59 +01:00
Robert Osfield	c4819427fa	Fixed hang using a ReentrantMutex	2018-09-11 11:24:24 +01:00
Robert Osfield	b94c797ed6	Fixed build	2018-09-11 09:32:15 +01:00
OpenSceneGraph git repository	0343ff7eff	Merge pull request #623 from pelicanmapping/implicit-refptr-conversion ... Fixed compilation issues for implicit ref_ptr conversion OFF	2018-09-11 09:25:00 +01:00
Robert Osfield	7a4c6a8c55	Cleaned up code	2018-09-11 09:03:01 +01:00
OpenSceneGraph git repository	a9fa3cdfad	Merge pull request #622 from pelicanmapping/osgText-thread-safety-fixes ... osgText: fixed thread-safety issues in Glyph and Font	2018-09-11 08:43:55 +01:00
OpenSceneGraph git repository	0942bf24a1	Merge pull request #621 from mp3butcher/readDisplay ... fix examples context creation for X11	2018-09-11 08:39:21 +01:00
Mathieu MARACHE	1de7b6a73e	Added saving of inline Images without having the physical image file. ... The can be read from and inlined image file	2018-09-11 08:35:35 +01:00
Robert Osfield	b913367126	Added greater control of how cubemap is set up and controlled	2018-09-11 08:12:36 +01:00