Robert Osfield
98c147ff9e
Restructured merge geometry code to make it easier to follow
2018-04-02 14:08:47 +01:00
Robert Osfield
972d80daf9
Fix for MergeGeometryVsiitor bug. Restructured the processing the merge geometry list to avoid missing geometries that aren't binned along with other geometries.
2018-04-02 11:44:03 +01:00
Robert Osfield
d8281257a7
Removed stray CMAkeLists.txt from TARGET_SRC list
2018-04-01 10:41:26 +01:00
Andreas Ekstrand
b8dab29562
Small fix (from the 3.6 branch) in the osgjs plugin, avoiding a double addition of the CullFace attribute when it has been turned off. This resulted in an empty json object in the osgjs file causing warnings in osgjs.
2018-04-01 10:18:45 +01:00
Robert Osfield
683e201dd7
Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
2018-03-30 16:34:51 +01:00
Robert Osfield
b6888f7914
Added suport for writing to gl_ClipVertex
2018-03-30 15:28:32 +01:00
Robert Osfield
bd80a1f687
To osgclipe example added --text textstring and --simple command line options to test mixing text and clipping
2018-03-30 15:28:24 +01:00
Robert Osfield
f02c556874
Changed Layer::get*Value(..) methods to const
2018-03-30 12:39:52 +01:00
Robert Osfield
751d7e8335
Fixed double calling of TerrainTechnique::init().
2018-03-29 11:38:04 +01:00
Robert Osfield
1e05e04a05
Maded TerrainTechnique::setTerrainTile(..), addNeighbour(..), removeNeighbour(..) and containsNeighbour(..) virtual and public to enable implementation of TerrainTechnique that act as a facade to actual TerrainTechnique implementations.
2018-03-29 11:35:34 +01:00
Robert Osfield
7c3006f5ff
Fixed osgDB::findFileInDirectory() handling of directory strings with trailing \ or / that was causing failure to find valid files in otherwise valid directories
2018-03-28 11:34:52 +01:00
OpenSceneGraph git repository
15e2f0ae00
Merge pull request #511 from Haojia521/master
...
OutputStream writes images using its Options object
2018-03-28 09:04:46 +01:00
Haojia Yu
90e95ff63d
OutputStream writes images using its Options object
...
when writing images, OutputStream can search files using its Options object rahter than always using FilePathList object of global Regidtry instance.
2018-03-27 18:56:38 +08:00
Konstantin S. Matveyev
b96587cead
GraphicsWindowIOS: multithreaded viewer's mode support added; updated for iOS-11 SDK; view rotations fixed; GLES2, GLES3 preprocessors fixed; tested on iPhone4 and upper
2018-03-27 08:49:01 +01:00
Konstantin S. Matveyev
c87c78bfdd
VertexArrayState: typo fixed in log
2018-03-27 08:48:50 +01:00
Konstantin S. Matveyev
1f073e6bea
Write support with .curl pseudo extension added
2018-03-27 08:48:30 +01:00
Haojia Yu
fa8f186519
Merge pull request #2 from openscenegraph/master
...
merge new code form source
2018-03-27 15:32:51 +08:00
OpenSceneGraph git repository
af0c3eb41d
Merge pull request #505 from hwiesmann/master
...
Removal of compiler warnings caused by integer conversions
2018-03-26 07:32:15 +01:00
Hartwig
1b3928a017
Removal of compiler warnings caused by integer conversions
...
In most systems today sizeof(size_t) is larger than sizeof(GLsizei). Therefore, the inclusion of GLExtensions may introduce a lot of compiler warnings as array.size() (of type size_t) is passed to a function with a parameter of type GLsizei.
2018-03-25 19:04:10 +02:00
Robert Osfield
aa69f50933
Re-ordered the creating of the DatagbaseThread to avoid startThread being called twice.
2018-03-25 12:17:18 +01:00
Robert Osfield
1224f40011
Added check if thraeding is running before executing start thread.
2018-03-25 12:17:07 +01:00
Haojia Yu
966bf6239d
Merge pull request #1 from openscenegraph/master
...
merge new code from source
2018-03-25 10:05:25 +08:00
Robert Osfield
f492d2c923
Updated AUTHORS
2018-03-24 18:17:14 +00:00
Robert Osfield
be40f58e58
Updated ChangeLog, AUTHORS and Controbitors for 3.6.0-rc1
2018-03-24 18:05:29 +00:00
Robert Osfield
a73f4fca1c
Added new features in 3.6 to NEWS release
2018-03-24 18:05:10 +00:00
Robert Osfield
d34d5ce3bc
First step for 3.6 stable release news
2018-03-24 18:04:57 +00:00
Robert Osfield
8ae8966177
Fixed read shader to safer ref version
2018-03-24 11:25:19 +00:00
Robert Osfield
88b7526a83
Fixed spotlight colour mixing
2018-03-24 11:00:01 +00:00
OpenSceneGraph git repository
097d3ab4ed
Merge pull request #502 from Haojia521/OutputStreamUseTargertSoVersion
...
write binary file with a specific so version
2018-03-23 20:08:37 +00:00
Robert Osfield
837200ae08
Removed serailizers that are now supplied by osg::Node
2018-03-23 20:07:43 +00:00
Robert Osfield
deef029823
Fixed member variable names to avoid conflicts with osg::Node
2018-03-23 20:07:08 +00:00
Robert Osfield
9797b0f56c
Removed Drawable writing out of StateSet as this is now done by Node
2018-03-23 20:06:44 +00:00
OpenSceneGraph git repository
22148711f8
Fixed indentation
2018-03-23 17:09:56 +00:00
OpenSceneGraph git repository
c40a0ded53
Fixed indentation
2018-03-23 17:04:30 +00:00
OpenSceneGraph git repository
c6d092a744
Fixed indentation
2018-03-23 17:01:15 +00:00
OpenSceneGraph git repository
4c3141b62e
Fixed indentation
2018-03-23 17:00:00 +00:00
OpenSceneGraph git repository
248f377e9a
Merge pull request #503 from kornerr/master
...
Provide osgemscripten example CMake flags in a more stable way
2018-03-23 16:37:44 +00:00
Michael Kapelko
1170f6247e
Provide osgemscripten example CMake flags in a more stable way
2018-03-23 18:07:07 +03:00
Haojia Yu
b37cbc665f
fix bugs
2018-03-23 22:51:04 +08:00
Haojia Yu
415a747049
Revert "Revert "write binary file with a specific so version""
...
This reverts commit 0ae6f7fea6
2018-03-23 22:49:47 +08:00
Haojia Yu
0ae6f7fea6
Revert "write binary file with a specific so version"
...
This reverts commit b5bf8864b1
2018-03-23 22:48:11 +08:00
Haojia Yu
b5bf8864b1
write binary file with a specific so version
...
when write binary file, like osgb file, users can set plugin string data, such as "TargetFileVersion=80", to options object, then the features of output file will be limitted to so version 80.
2018-03-23 22:31:12 +08:00
Robert Osfield
b48db74fa3
Changed the isBufferObjectSupported flag so that it's true when either VBO or PBO's are supported
2018-03-23 12:55:00 +00:00
Paul Obermeier
bb169979a1
Fixes for VS2008 and 2010 build
2018-03-22 17:35:13 +00:00
Robert Osfield
084927d5ae
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:05:38 +00:00
Robert Osfield
023a8d99e9
Removed typedef and used osg::GraphicsContext::Cameras explictly to avoid any hiding of type
2018-03-22 09:04:47 +00:00
OpenSceneGraph git repository
d181aba978
Merge pull request #500 from Vic-Min/master
...
Fixed bug of determining availability of functions ‘pthread_getconcur…
2018-03-22 08:34:32 +00:00
Victor
2263ea5dcb
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-21 19:44:25 +03:00
OpenSceneGraph git repository
a3b2f4083e
Merge pull request #497 from openscenegraph/shader_pipeline
...
Shader pipeline
2018-03-20 10:07:34 +00:00
Robert Osfield
58cb5227ff
Merge branch 'master' into shader_pipeline
2018-03-20 09:49:04 +00:00
