Commit Graph

16110 Commits

Author SHA1 Message Date
Robert Osfield
aae5f87d13 Fixed osgDB::findFileInDirectory() handling of directory strings with trailing \ or / that was causing failure to find valid files in otherwise valid directories 2018-03-28 11:37:42 +01:00
Haojia Yu
0d386ff3f1 OutputStream writes images using its Options object
when writing images, OutputStream can search files using its Options object rahter than always using FilePathList object of global Regidtry instance.
2018-03-28 09:05:40 +01:00
OpenSceneGraph git repository
fb39450067
Merge pull request #510 from eligovision/OpenSceneGraph-3.6_ios
GraphicsWindowIOS: multithreaded viewer's mode support added; updated…
2018-03-27 08:39:52 +01:00
OpenSceneGraph git repository
00e2466bc7
Merge pull request #508 from eligovision/OpenSceneGraph-3.6_plugins
OSG 3.6: Write support with .curl pseudo extension added
2018-03-27 08:37:29 +01:00
OpenSceneGraph git repository
37fabbeecd
Merge pull request #509 from eligovision/OpenSceneGraph-3.6_vas
VertexArrayState: typo fixed in log
2018-03-27 08:35:57 +01:00
Konstantin S. Matveyev
a846c0160c GraphicsWindowIOS: multithreaded viewer's mode support added; updated for iOS-11 SDK; view rotations fixed; GLES2, GLES3 preprocessors fixed; tested on iPhone4 and upper 2018-03-26 20:40:14 +03:00
Konstantin S. Matveyev
cbb9fd4218 VertexArrayState: typo fixed in log 2018-03-26 18:31:23 +03:00
Konstantin S. Matveyev
1a86ed4e7a Write support with .curl pseudo extension added 2018-03-26 17:59:49 +03:00
Robert Osfield
80a2dd924f Updated ChangeLog 2018-03-26 09:55:53 +01:00
Robert Osfield
aebdefbbf7 Updated NEWS for 3.6.0-rc2 2018-03-26 09:54:59 +01:00
Robert Osfield
a399e9ccb2 Re-ordered the creating of the DatagbaseThread to avoid startThread being called twice. 2018-03-25 12:14:46 +01:00
Robert Osfield
862c36a08b Added check if thraeding is running before executing start thread. 2018-03-25 12:13:50 +01:00
Robert Osfield
6b037372b6 Updated ChangeLog, AUTHORS and Controbitors for 3.6.0-rc1 2018-03-24 18:02:35 +00:00
Robert Osfield
ef94f2e391 Added new features in 3.6 to NEWS release 2018-03-24 17:51:06 +00:00
Robert Osfield
6c6ae2db60 First step for 3.6 stable release news 2018-03-24 12:13:59 +00:00
Robert Osfield
1930d9c345 Fixed read shader to safer ref version 2018-03-24 11:23:59 +00:00
Robert Osfield
640e7bc06c Fixed spotlight colour mixing 2018-03-24 10:59:15 +00:00
OpenSceneGraph git repository
46850214df Merge pull request #502 from Haojia521/OutputStreamUseTargertSoVersion
write binary file with a specific so version
2018-03-23 20:20:43 +00:00
Robert Osfield
647b578ce6 Removed serailizers that are now supplied by osg::Node 2018-03-23 19:54:33 +00:00
Robert Osfield
1d5ae1362a Fixed member variable names to avoid conflicts with osg::Node 2018-03-23 19:54:01 +00:00
Robert Osfield
9634688559 Removed Drawable writing out of StateSet as this is now done by Node 2018-03-23 18:07:36 +00:00
Michael Kapelko
96b586c165 Provide osgemscripten example CMake flags in a more stable way 2018-03-23 16:42:40 +00:00
Robert Osfield
b1be6c6def Changed the isBufferObjectSupported flag so that it's true when either VBO or PBO's are supported 2018-03-23 12:56:26 +00:00
Paul Obermeier
b1170621c8 Fixes for VS2008 and 2010 build 2018-03-22 17:36:19 +00:00
Robert Osfield
3c1e29db9f Moved OPENGL_INCLUDE_DIR include into it's own INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) entry to help with FreeBSD builds where a previous rev of the OSG has already been installed 2018-03-22 16:51:03 +00:00
Robert Osfield
ffb3ed8ef7 Removed typedef and used osg::GraphicsContext::Cameras explictly to avoid any hiding of type 2018-03-22 09:05:43 +00:00
Victor
d18f61688d Fixed bug of determining availability of functions ‘pthread_getconcurrency’, ‘pthread_setconcurrency’, ‘pthread_setaffinity_np’ in ‘pthread’ library
CMake cannot find 'pthread_getconcurrency’, ‘pthread_setconcurrency’ and ‘pthread_setaffinity_np' functions in 'pthread' library because when linking internal cmake test did’t specifed ‘-l pthread’.
2018-03-22 08:37:09 +00:00
Robert Osfield
7d290daa73 Removed -m message that was causing problems with branch creation 2018-03-20 09:20:59 +00:00
Robert Osfield
383161c14c Updated version numbers in prep for 3.6 branch 2018-03-20 09:12:58 +00:00
Robert Osfield
ba4791a15d Updated ChangeLog and AUTHORS file 2018-03-20 09:02:05 +00:00
Robert Osfield
950823fac9 Updated ChangeLog and updated version to 3.5.11 2018-03-19 14:27:18 +00:00
Robert Osfield
b563f1bd78 Fixed build issues when building with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF 2018-03-19 14:08:47 +00:00
Robert Osfield
b38a37c3bb Fixed warnings 2018-03-19 10:42:09 +00:00
Robert Osfield
b7147ff532 Updated ShaderGen shaders 2018-03-16 11:33:03 +00:00
Robert Osfield
e5b67a6795 Removed the static osg::Program creation as it's not required 2018-03-15 16:50:47 +00:00
Robert Osfield
add6b3edee Added --shader saderfilename command line option to enable one to manually specify which shaders to use for the uber program. 2018-03-15 16:49:58 +00:00
Robert Osfield
0308dfecf5 Introduced a _specverson to centralizer the control of this variable 2018-03-15 16:12:40 +00:00
Robert Osfield
d365a6a347 Added support for Collada DOM-2.5 2018-03-15 15:58:46 +00:00
OpenSceneGraph git repository
8229d19f21
Merge pull request #495 from aitormoreno/fix_installExamplesPDB
fix installation of PDB files from the examples.
2018-03-15 12:53:32 +00:00
Aitor Moreno
bcd2adf977 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph into fix_installExamplesPDB 2018-03-14 16:56:08 +01:00
Aitor Moreno
79fde49084 (re)fix the installation of the PDB files 2018-03-14 16:54:05 +01:00
Robert Osfield
57f2b1fa27 Standardized the MSCV INSTALL lines between applications and examples 2018-03-14 08:39:12 +00:00
Robert Osfield
4447190dd6 Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition. 2018-03-14 08:22:45 +00:00
Aitor Moreno
5fcaf18025 fix installation of PDB files from the examples. 2018-03-13 11:21:35 +01:00
OpenSceneGraph git repository
009580676f
Merge pull request #494 from pelicanmapping/fix-text-empty-checks
Added required empty vector checks to osg::Text
2018-03-13 08:47:53 +00:00
gwaldron
23b94c2468 Text: added code in accept(functor) methods to check for empty vectors before accessing front() element, which was causing a crash in some cases. Also fixed a negated null check in getCharacterCoords 2018-03-12 17:35:46 -04:00
Yaroslav Tarasov
f8199935fa Fixed renamed of _textureDepth. 2018-03-12 16:14:30 +00:00
Robert Osfield
5c8a5307d6 From Colin McDonald, "If the glCreateProgram in osg::Program fails for any reason, then subsequently
Program::PerContextProgram::linkProgram would crash.  I've put in some
checks to prevent that."
2018-03-12 15:55:35 +00:00
Robert Osfield
3f686d8719 Fixed indentation 2018-03-12 15:29:56 +00:00
Robert Osfield
7ce1938543 Improved indentation 2018-03-12 15:12:44 +00:00