Robert Osfield
cf044027a7
Added built-in support for lighting.vert
2017-10-20 11:38:39 +01:00
Robert Osfield
711e04751f
Updated shaders from OpenSceneGraph-Data/shaders
2017-10-20 11:38:39 +01:00
Robert Osfield
2e1a58b6aa
Moved the assignment of the ModifiedCount to before GL texture calls.
2017-10-19 17:48:53 +01:00
Robert Osfield
3b790b5e15
Implemented inplace replacement
2017-10-18 10:11:43 +01:00
OpenSceneGraph git repository
9eb6a274d9
Merge pull request #361 from siu/3.4-pragmaCRLF
...
Fix pragma shader composition when shader source contains windows lin…
2017-10-18 09:09:21 +01:00
David Siñuela Pastor
333c1eae05
Do not break systems with cr as line endings
2017-10-17 17:35:15 +02:00
David Siñuela Pastor
489ff508f9
Fix pragma shader composition when shader source contains windows line endings
...
There was a bug separating the "#version X" line when the shader source code
contained windows line endings. The produced shader code contained single '\r'
characters which failed to compile in the OpenGL driver (at least on nvidia).
The fix unifies line endings to single '\n' character at the beginning of the
parsing.
2017-10-11 12:26:39 +02:00
Robert Osfield
cb2b0a5fe8
Steamlined the handling of osg::Geometry
2017-10-05 15:01:35 +01:00
Robert Osfield
9c30e99b83
Bumped version number of 3.4 branch to 3.4.2 to diferentiate it from the offical 3.4.1 release
2017-08-29 09:54:12 +01:00
Robert Osfield
d69f2a81f9
Updated ChangeLog for 3.4.1 release
2017-08-28 17:50:49 +01:00
Robert Osfield
35334daae4
Build fix
2017-08-28 17:34:51 +01:00
Robert Osfield
14232cd993
Added back in 3.4.0 release entry
2017-08-28 16:55:52 +01:00
Denys Koch
ec86072533
Fix flawed BoundingSphere inequality operator
2017-08-28 16:53:20 +01:00
Robert Osfield
3f66f1d276
Updates for 3.4.1 stable release
2017-08-28 15:36:31 +01:00
Robert Osfield
c1055fdfbc
Updated rc number to 3 or 3.4.1-rc3
2017-08-24 17:49:34 +01:00
Robert Osfield
328632af75
Updated READE and ChangeLog
2017-08-24 17:45:48 +01:00
Robert Osfield
ec89d96114
Fixed underflow issue
2017-08-23 15:26:52 +01:00
Robert Osfield
ea17943a74
Bimped SO version due to changes in Windows exports in osgDB::ifstream + ofstream.
2017-08-22 14:17:45 +01:00
Robert Osfield
07d05840e9
Updated RC number to 2 for 3.4.1-rc2
2017-08-22 12:19:40 +01:00
Robert Osfield
d108bea9eb
Updated ChangeLog
2017-08-22 12:18:29 +01:00
Robert Osfield
1bc5ef030f
Added name typo fix
2017-08-22 12:00:17 +01:00
Robert Osfield
15e60acfb5
Updated ChangeLog
2017-08-22 09:05:27 +01:00
Robert Osfield
4710b6556d
Added catch for controbutors list
2017-08-22 09:04:49 +01:00
OpenSceneGraph git repository
a231483ea6
Merge pull request #310 from OpenMW/merge_internalsizedformats
...
Applied sizedInternalFormats change to 3.4 branch
2017-08-22 08:03:33 +01:00
Robert Osfield
5e48c51bd7
Reversed the order of some sizedInternalFormats enum entries to sync with the change in serach direction that was checked in as an earlier revision.
2017-08-21 21:16:00 +00:00
Robert Osfield
036c6676c1
Added handling of CPACK and automatically generated package files
2017-08-21 15:24:13 +01:00
Robert Osfield
ed9c28b4ec
Removed unneccessary DrawArrays->setCount() that was causing a crash.
2017-08-18 16:26:12 +01:00
Robert Osfield
50e471d900
Merged addition of "" around variablesfrom master.
2017-08-18 16:11:29 +01:00
Raymond de Vries
5b7ef57ad7
Fix for better picking up 3rd party dependencies
2017-08-18 16:01:31 +01:00
Robert Osfield
a3e11f1d50
Fixed iterator comparison.
2017-08-18 08:08:28 +01:00
Robert Osfield
4e67d6deb2
Adopted OSG_GL*_FEATURES usage of 0 and 1 in place of false and true to avoid VisualStudio 2012 build issues
2017-08-17 08:53:58 +01:00
Uwe Woessner
edee9d0946
Extension to the PLY plugin to read files with textures.
2017-08-15 15:42:22 +01:00
OpenSceneGraph git repository
e5cccefafe
Merge pull request #291 from eligovision/OpenSceneGraph-3.4_animation
...
osgAnimation: classes UpdateVec2fUniform and UpdateVec4fUniform added
2017-07-31 16:47:09 +01:00
konstantin.matveyev
2c35b63d38
[*] osgDB::OutputStream fix
2017-07-31 17:50:36 +03:00
konstantin.matveyev
700dd2b9a7
[+] Two classes added: osgAnimation::UpdateVec2fUniform, osgAnimation::UpdateVec4fUniform
2017-07-31 17:50:08 +03:00
OpenSceneGraph git repository
c1585d3c17
Merge pull request #289 from eligovision/OpenSceneGraph-3.4_apple
...
IMAGEIO plugin tweak
2017-07-31 15:06:57 +01:00
OpenSceneGraph git repository
76a92314cf
Merge pull request #290 from eligovision/OpenSceneGraph-3.4_apple_ios
...
osgViewer::GraphicsWindowIOS fixes
2017-07-31 15:05:26 +01:00
konstantin.matveyev
60eb458c47
[*] imageio changed: more methods of storing image supported; tested on macOS (compatibility profile) and iOS(GLES2/3)
2017-07-31 15:37:55 +03:00
konstantin.matveyev
7e5a9582b3
[*] osgViewer::GraphicsWindowIOS fixes
2017-07-31 15:34:21 +03:00
Robert Osfield
662e76d721
Fixed indectation
2017-07-31 12:44:47 +01:00
OpenSceneGraph git repository
428f4a3804
Merge pull request #288 from eligovision/OpenSceneGraph-3.4_pragmatic
...
pragma(tic) shader composing fixes in the State
2017-07-31 12:42:15 +01:00
konstantin.matveyev
23edfad1fd
[**] pragma(tic) fix: 'defineMap.changed flag' condition changed in State::push/popDefineList
2017-07-31 13:40:00 +03:00
Robert Osfield
0c1fad2c91
Updated AUTHORS and CHangeLog for 3.4.1-rc1
2017-07-28 17:57:02 +01:00
Robert Osfield
1201ac230d
Updated 3.4 branch to 3.4.1-rc1 version
2017-07-28 17:43:34 +01:00
James Turner
eabd08ef25
Attempt to fix broken DLL exports from osgDB
...
Only export the osgDB method implementations, instead of the entire
class, and hence avoid exporting symbols from the base class, which
then conflict with other compilation units when linking.
This avoids the need for /FORCE:MULTIPLE linker option with MSVC.
2017-07-27 16:52:22 +01:00
Robert Osfield
a5bcbc1822
Adopted FindFreetype.cmake from master
2017-07-27 10:43:33 +01:00
Robert Osfield
f822603446
Replaced State::_glExtensions initialization to be consistent with master, enabling sharing of GLExtension data structure.
2017-07-26 11:12:11 +01:00
Robert Osfield
f449bd3730
Moved State::initializeExtensionProcs() nearer top of source file to make the position consistent with change in position in master, making it easier to diff between them.
2017-07-26 11:08:46 +01:00
Robert Osfield
b37b635a7c
Merged GLExtension deletion mechanism from master to avoid GLEXtension being deleted when shared contexts are used and osg::State is deleted when a context is deleted.
2017-07-25 15:58:27 +01:00
OpenSceneGraph git repository
224f837e0d
Merge pull request #272 from psyinf/msvc_static_build
...
Msvc static build
2017-07-25 14:45:20 +01:00
