FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,576 Commits 1 Branch 26 Tags 73 MiB
49ad02dffe
Commit Graph

13576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ralf Habacker
49ad02dffe obj plugin: Fix bug not using specular color (Ks) for illumination mode > 2 
See paragraph "Illumination models" at http://paulbourke.net/dataformats/mtl/ for details.
 2019-05-29 10:02:00 +02:00
Robert Osfield
199651ebbd Added handling of the possibility of null Options pointers 
(cherry picked from commit e3c48d9f45)
 2019-05-29 09:47:09 +02:00
Ralf Habacker
aa95d3f9bf example_osgobjectcache: Add a check that we really get the correct nodes. 
(cherry picked from commit 67e6f675e6)
 2019-05-29 09:47:04 +02:00
Ralf Habacker
5cc53e1aa2 Fix finding object cache entries. 
(cherry picked from commit 69929f596f)
 2019-05-29 09:47:00 +02:00
Ralf Habacker
3e7f2feb6b Identify files in object cache by filename and optional provided options. 
Objects with the same filename may be different from others based on the provided
plugin options. Using filename *and* the provided options as object cache key
helps to avoid fetching the wrong object.

(cherry picked from commit 85cd1c456f)
 2019-05-29 09:46:55 +02:00
Robert Osfield
1f89e6eb10 Updated LICENSE to use the WxWidgets-3.1 and updates to the LGPL-2.1-only that updates addresses and tighten up language used. 
Functionality the OSGPL-1.0 is the same as OSGPL-0.0, All the OpenSceneGraph users can use either OSGPL-0.0 or OSGPL-1.0.
 2018-06-03 10:37:34 +01:00
Robert Osfield
8656ab8a3c Fixed support for update and event callbacks on StateSet/Uniform/StateAttributes on View(er) Cameras. 2018-05-14 09:36:34 +01:00
Robert Osfield
970fc7dc5d Merged improvements from master to fix crash when using Terrrain::setEqualizeBoundaries(true); 2018-04-18 10:44:47 +01:00
Robert Osfield
81b7e9e7c2 Fixed the handle of boundary equalization 2018-04-18 10:28:29 +01:00
Robert Osfield
1bf6acd80d Added --equalize-boundaries -e command line option to call terrain->setEqualizeBoundaries(true) 2018-04-18 10:28:02 +01:00
Robert Osfield
018383dca1 Added -4 command line entry that creates two seperate windows within CompositeViewer 2018-04-04 12:30:24 +01:00
Robert Osfield
e486e487db Removed stray CMAkeLists.txt from TARGET_SRC list 2018-04-01 10:41:42 +01:00
Robert Osfield
ddce3e0079 To osgclipe example added --text textstring and --simple command line options to test mixing text and clipping 2018-03-30 15:38:30 +01:00
Robert Osfield
68ec892419 Re-ordered the creating of the DatagbaseThread to avoid startThread being called twice. 2018-03-25 12:28:53 +01:00
Robert Osfield
20cbb25cd1 Added check if thraeding is running before executing start thread. 2018-03-25 12:28:28 +01:00
Robert Osfield
7e476c6f63 Merge branch 'OpenSceneGraph-3.4' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.4 2018-03-22 17:02:07 +00:00
Robert Osfield
68ba89c6dc 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 17:01:17 +00:00
Robert Osfield
cae533dca3 Made CMake 2.8.0 mininum release for build 2018-03-22 16:55:44 +00:00
Victor
74b4e8a758 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:40:16 +00:00
Glen A Johnson Jr
2922eeb2f4 Fixed handling external window integration osgViewer::GraphicsWindowWin32 2018-03-12 16:36:11 +00:00
Robert Osfield
e5ddfcd501 Fixed spacing 2018-03-12 16:31:05 +00:00
Robert Osfield
9ed77cb500 Added missing setDrawBuffer/setReadBuffer() 2018-03-07 10:13:16 +00:00
Robert Osfield
a9f5ce5d91 Merge branch 'OpenSceneGraph-3.4' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.4 2018-03-07 09:38:08 +00:00
Robert Osfield
ee3e820277 Added missing Camera::setDrawBuffer()/setReadBuffer() 2018-03-07 09:37:11 +00:00
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