Commit Graph

15367 Commits

Author SHA1 Message Date
Julien Valentin
bf1b4ec2bb add ComputeDispatch class
revoke glDispatch in PCProgram::useProgram
update example
2017-11-28 17:30:04 +01:00
Robert Osfield
117045170d To the GLSL shader plugin added support forL
#pragma include shaderfile.glsl

To enable easier reuse of shaders
2017-11-28 15:31:39 +00:00
Robert Osfield
284f91b3e0 Replaced deprecated osg::Shader::reaDShaderFile()/loadShaderFromSource() usage 2017-11-27 18:38:37 +00:00
Robert Osfield
5f13a3aa11 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-11-27 18:36:41 +00:00
Robert Osfield
34336931fa Deprecated the osg::Shader::reaDShaderFile() and osg::Shader::loadShaderSourceFromFile() methods.
Programmers should use osgDB::readRefShaderFile()/readShaderFile() instead.
2017-11-27 18:28:15 +00:00
Robert Osfield
f81a46da5b Added support for .cs, .compute, .tctrlm .teval extensions in the GLSL plugin 2017-11-27 18:27:13 +00:00
OpenSceneGraph git repository
6abb9b27f9
Merge pull request #387 from jtorresfabra/remove_custom_code
Removes custom code added for sketchfab channel compression that shou…
2017-11-27 15:54:39 +00:00
Robert Osfield
bc4a9d9dd0 Refactored the MergeGeometry::mergeGroup(..) method to avoid O(N^2) issue with using removeChildren() on groups with very large numbers of children. 2017-11-27 15:44:11 +00:00
Robert Osfield
06302a1082 Replaced read*File() usage to readRef*File() 2017-11-27 15:41:54 +00:00
Robert Osfield
cb2c48d015 Added template addShader() method to make it easier to pass ref_ptr<osg::Shader> 2017-11-27 15:40:21 +00:00
Jordi
66eeabd7d0 Removes custom code added for sketchfab channel compression that should not be there 2017-11-27 15:48:50 +01:00
Robert Osfield
9fc63d7613 Fixes for building with OSG_PROVIDE_READFILE to OFF 2017-11-27 11:10:48 +00:00
Robert Osfield
a72a929d12 Fixed build issues when compiling with OSG_PROVIDE_READFILE to OFF 2017-11-27 11:05:31 +00:00
Robert Osfield
93a5213b99 Build fix 2017-11-27 10:32:02 +00:00
Robert Osfield
80d1de7832 Removed use of local static to avoid threading issue. 2017-11-22 11:05:17 +00:00
OpenSceneGraph git repository
a5eb5c7bb0
Merge pull request #383 from anormann1974/patch-1
Fixed missing initialization of B_ and N_ in constructor
2017-11-21 14:01:14 +00:00
Robert Osfield
13c593ce0e Fixed typo 2017-11-21 13:59:51 +00:00
Robert Osfield
7f97b9f999 Added Text::getCharacterCorners(...) method to help applications that want to find out the positions of characters being rendered. 2017-11-21 13:41:57 +00:00
Andre Normann
e0eb4fbda8
Fixed missing initialization of B_ and N_ in constructor 2017-11-21 13:54:45 +01:00
Robert Osfield
d60b9714fe Moved the version to 3.5.9 and the version setting code to top of CMake file 2017-11-20 12:49:20 +00:00
Robert Osfield
c95a5486b1 Updated ChangeLog and AUTHORS file for 3.5.8 dev release 2017-11-14 15:04:05 +00:00
Raymond de Vries
41dda781ee attached fixes for configuring and building the osgPlugin exr with Visual Studio and using out-of-the-box builds of ilmbase and openexr, i.e. without manual/extra config for using these 2 libs with the OSG.
Previously, the assumption was made that ilmbase and openexr were installed in a common directory and hence the header files and libs were both found in that common directory. That is not consistent with other libs and this submission makes it consistent and therefore the OSG configures out of the box. I made this work for ilmbase-2.1.0.tar.gz / openexr-2.1.0.tar.gz and ilmbase-2.2.0.tar.gz / openexr-2.2.0.tar.gz
2017-11-14 10:59:08 +00:00
Robert Osfield
49a5fdbd1f Fixed typo 2017-11-13 13:08:39 +00:00
Robert Osfield
9c605ba9be Fixed CoverityScan reported errors 2017-11-13 13:06:12 +00:00
Robert Osfield
d98d9c9e72 FIxed two CoverityScan detected memory leaks 2017-11-13 12:49:33 +00:00
Andre Normann
a811de2ba7 Attached is a fix in GLExtension, which is based on latest git version, that fixes the usage of uniform buffer objects on macOS. Under macOS core OpenGL features aren't exported as extension. OpenGL 3.1 includes the GL_ARB_uniform_buffer_object as core feature for example. On macOS a simple osg::isGLExtensionSupported() call would fail. It is required to use the isGLExtensionOrVersionSupported() method. This is what my fix does. 2017-11-13 10:24:31 +00:00
Robert Osfield
cba8559137 Updated SO version to 152 to reflect the resent API changes to osgAnimation. 2017-11-11 14:50:55 +00:00
OpenSceneGraph git repository
8d36049dcd
Merge pull request #382 from openscenegraph/osganimation
Osganimation improvements
2017-11-11 14:43:10 +00:00
OpenSceneGraph git repository
8d5a9e84fc
Build fix 2017-11-11 13:27:43 +00:00
OpenSceneGraph git repository
729680714c
Readbility improvements and updating version to 152 2017-11-11 13:08:42 +00:00
OpenSceneGraph git repository
3567e31009
Added versioning to the new serialization additions 2017-11-11 13:04:34 +00:00
OpenSceneGraph git repository
8694fd61ba
Code readability improvements 2017-11-11 13:00:56 +00:00
OpenSceneGraph git repository
4977939c05
Code readability improvements 2017-11-11 12:58:52 +00:00
OpenSceneGraph git repository
8e55ed5923
Code readability improvements 2017-11-11 12:54:28 +00:00
OpenSceneGraph git repository
f59efe0bfe
Code readability improvement 2017-11-11 12:46:48 +00:00
OpenSceneGraph git repository
a5f6e4b0c4
Small readability improvements 2017-11-11 12:45:55 +00:00
OpenSceneGraph git repository
8ee8550aac
Fix of incorrect Program assignment bug and coding style 2017-11-11 12:42:34 +00:00
OpenSceneGraph git repository
b23cc72037
coding style/readability fixes 2017-11-11 12:33:44 +00:00
OpenSceneGraph git repository
ca5ce00783
coding style/readability fixes 2017-11-11 12:29:45 +00:00
OpenSceneGraph git repository
252c28d516
coding style/readability fixes 2017-11-11 12:27:56 +00:00
OpenSceneGraph git repository
4753b8b2b9
coding style fix 2017-11-11 12:24:27 +00:00
Robert Osfield
ee118c872f Restructed the ref counting of the rawImageRec structure so that it's done with a separate refImageRec struct so it doesn't interfer with the writing of the rawImageRec as a header when writing to .rgb 2017-11-11 11:17:34 +00:00
Andreas Ekstrand
eb061d9acc I have implemented readObject to make loading objects from SceneLoader in the LWS plugin work. I'm not sure about other implications from changes leading up to this problem (readRefFile instead of readNodeFile in SceneLoader) but this fix works for me. 2017-11-11 10:19:09 +00:00
Robert Osfield
dfec052eb9 Fixed handling of GL_TEXTURE_CUBE_MAP when using glTextureStorage. 2017-11-10 17:12:20 +00:00
OpenSceneGraph git repository
054727cb00
Merge pull request #381 from openscenegraph/revert-379-osganimbugfix
Revert "    following guidance from OpenGL Common Mistakes:"
2017-11-10 17:00:52 +00:00
OpenSceneGraph git repository
821ca4e5cd
Revert " following guidance from OpenGL Common Mistakes:" 2017-11-10 16:58:29 +00:00
OpenSceneGraph git repository
9b6fa79e32
Merge pull request #379 from mp3butcher/osganimbugfix
Fixed handling of mipmaps
2017-11-10 14:49:54 +00:00
OpenSceneGraph git repository
860df3e10e
Merge pull request #380 from mp3butcher/MDI7
add funcs to read GZ Objects from a stream
2017-11-10 13:36:52 +00:00
Robert Osfield
826c139ef3 Fixed crash in copy constructor due to copy and paste/typo. 2017-11-10 12:41:21 +00:00
Julien Valentin
79afe82774 replace string with stringstream (avoid a string copy at read) 2017-11-08 16:44:09 +01:00