Robert Osfield
14fdc5da8e
Merged fixes from master
2018-03-06 10:22:05 +00:00
Robert Osfield
7890951ff4
Merge branch 'OpenSceneGraph-3.4' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.4
2018-02-10 18:40:07 +00:00
Robert Osfield
b99f7aaf5a
Changed internalFormat to use pixelFormat
2018-02-10 18:39:05 +00:00
Robert Osfield
54ccde5d02
Refactored the event handler so that it contains a helper NodeVistor class rather than inherits from inappropriately using multiple inheritance.
2018-02-07 18:14:20 +00:00
Robert Osfield
18721039c5
Fixed Linux NVTT build issue by restricting the addition of the new libs to just Windows
2018-01-11 10:11:55 +00:00
OpenSceneGraph git repository
ff1acce59e
Merge pull request #436 from mp3butcher/OpenSceneGraph-3.4
...
add missing NVTT libraries to nvtt plugin linker
2018-01-11 09:31:41 +00:00
Robert Osfield
559dad93b8
Added returns to avoid fall through between case statements
2018-01-11 08:54:20 +00:00
mp3butcher Win32
7118910edd
improve FindNVTT.cmake
...
and add missing NVTT libraries
2018-01-11 02:21:19 +01:00
Robert Osfield
5f7b388c16
Commented out osx build
2018-01-05 13:43:53 +00:00
Robert Osfield
7e592cf1e0
Fixed return values
2018-01-05 12:16:01 +00:00
Robert Osfield
abbfc6c2eb
Fixed file search for shaders
2017-11-29 11:04:53 +00:00
Robert Osfield
a99937e43a
Added support for .vs, .fs. .gs, .cs etc, GLSL file extensions
2017-11-29 11:04:02 +00:00
OpenSceneGraph git repository
93bafec0ce
Merge pull request #393 from mathieu/OpenSceneGraph-3.4
...
Make the culling be disabled at the drawable level
2017-11-29 10:39:22 +00:00
Mathieu
1c4f0b93a0
Make the culling be disables at the drawable level not at the geode level
2017-11-29 11:06:16 +01:00
Robert Osfield
bc562a5858
Removed use of local static to avoid threading issue.
2017-11-22 11:06:09 +00:00
Robert Osfield
f59c87daee
Adopted the improvements to TangentSpaceGenerator.cpp from master
2017-11-21 15:40:01 +00:00
Robert Osfield
f3607134a2
Fixed handling of GL_TEXTURE_CUBE_MAP when using glTextureStorage.
2017-11-10 17:14:03 +00:00
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
