Commit Graph

15749 Commits

Author SHA1 Message Date
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
Robert Osfield
556089e6a1 From Raymond de Vries, added support for latest FBX SDK 2018-03-12 10:43:56 +00:00
Robert Osfield
957bd4b886 Added FbxLayeredTexture support 2018-03-12 10:29:04 +00:00
Robert Osfield
125263f216 Refactored the texture setup to streamline it and make it easier to adapt 2018-03-10 17:51:52 +00:00
Alessandro Terenzi
9010fd8035 iOS CMake project generation improvements (bitcode option)
when building for iOS, Xcode allows developers to specify to enable or disable the 'bitcode' compilation option. There's not a preferred way to go and the choice is really up to the developer but considering that:

1. Currently the generated project defaults the option to YES
2. There are almost 90 projects targets that should be modified if one wants to disable the bitcode option (which considerably reduces the footprint of the app)
3. Even though one can select all the 90+ targets and set the option to NO for all of them, the updates could take a few seconds and could be error prone because one could miss to select some targets

I propose to add a CMake setting that is displayed only when building for iOS. By setting this option "before" the project generation would speed up things for developers and would avoid errors at compiling time.
2018-03-09 10:17:59 +00:00
Robert Osfield
e17f1c4e31 Refactored the handling if RESIZE, CLOSE, QUIT AND USER events so they are dispatched to all views associated with a window, or all views associated with a CompositeViewer 2018-03-08 16:26:01 +00:00
Robert Osfield
1020bddb15 Fixed recursive call bug 2018-03-08 10:47:07 +00:00
Robert Osfield
4e6e0f53be Changed glDrawBuffer/glReadBuffer calls to use the new State::glDrawBuffers/glReadBuffers helper functions to enable lazy state updating to avoid unneccessary GL calls 2018-03-07 17:49:40 +00:00
Robert Osfield
4dac60540a Changed the default values of _drawBuffer and _readBuffer to make sure that the lazy state updating in State.glDrawBuffers(GLenum)/glReadBuffers(Glenum) doesn't ever ignore the first call. 2018-03-07 17:44:48 +00:00
Robert Osfield
178cba7cf0 Fixed build error 2018-03-07 16:45:58 +00:00
Robert Osfield
98cdeac9f6 Added missing Camera::setDrawBuffer/setReadBuffer() 2018-03-06 16:54:57 +00:00
Robert Osfield
f8eabd38ba Added missing Camera::setDrawBuffer() & setReadBuffer() 2018-03-06 16:42:11 +00:00