Commit Graph

14440 Commits

Author SHA1 Message Date
Robert Osfield
5f0f7b88cf Refined the list of libraries to link 2016-12-09 17:29:20 +00:00
Robert Osfield
2b1477234e Converted to unix line endings 2016-12-09 17:27:17 +00:00
OpenSceneGraph git repository
811ad9c8bc Merge pull request #172 from blobfish/manipSlop
osgManiputor: TranslateInLineCommand wants Vec3d instead of Vec3
2016-12-08 17:52:46 +00:00
blobfish
a41f498e1f osgManiputor: TranslateInLineCommand wants Vec3d instead of Vec3 2016-12-08 10:12:17 -05:00
OpenSceneGraph git repository
bb36fe7d3c Merge pull request #170 from crubel/PThreadPullRequest
Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING defined
2016-12-05 10:33:23 +00:00
Curtis Rubel
98827b1d49 Missed the printf define at the top of this file.
Put back this:
#ifdef DEBUG
# define DPRINTF(arg) printf arg
#else
# define DPRINTF(arg)
#endif

I think that should do it now...
2016-12-02 08:07:15 -05:00
Curtis Rubel
c829ecf08f Removed all OSGNOTIFY messages and put back all printf output as requested.
Sorry about this mixup, I was not aware that this particular directory was to be considered a separate project and must not rely on any dependencies from the rest of the OSG project.  All OSGNOTIFY messages have been removed and the previous printf statements have been put back.
2016-12-02 08:05:30 -05:00
OpenSceneGraph git repository
98f6984018 Merge pull request #171 from aluaces/iges_fix
Several tweaks for compiling OpenCascade plugin:
2016-12-02 08:04:10 +00:00
Alberto Luaces
b637d080d5 Several tweaks for compiling OpenCascade plugin:
* Remove unneeded XSDRAW.hxx header inclusion.
* Define WNT only on windows, because it is used for choosing between
  win threads or pthreads.
2016-12-01 23:39:56 +01:00
Curtis Rubel
fab6bff310 Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING
defined.  I also replaced all printf's with OSGNOTIFY to get this
more inline with the rest of OSG CGR
2016-12-01 16:36:20 -05:00
Robert Osfield
43b051b984 Teaking FindOpenCascade to help with linking of iges plugin 2016-11-30 20:10:22 +00:00
Robert Osfield
a9bc508dc4 From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake. 2016-11-30 19:11:15 +00:00
Robert Osfield
d4a4993285 Added GL_EXT_texture_border_clamp support for GLES 2016-11-30 17:18:33 +00:00
OpenSceneGraph git repository
5a96c1313b Merge pull request #169 from scrawl/stateset-fix
Fix flow control issue in StateSet::compileGLObjects
2016-11-26 11:45:07 +00:00
scrawl
1fffafb13a Fix typo in StateSet::compileGLObjects, causing compilation of attributes to not be executed unless checkForGLErrors is true. 2016-11-26 01:09:45 +01:00
Robert Osfield
b04271f93e Fixed crash in handling of an osg::Callback attached to a Drawable as update callback.
Added handling of osg::Callback when attavhed to a Drawable as a cull callback.
2016-11-23 18:19:59 +00:00
Robert Osfield
e89885a076 Added guards against division by zero 2016-11-15 17:36:21 +00:00
Robert Osfield
55f4778731 Added usage of GLExtensions::debugObjectLabel() to GLBufferObject::compile() 2016-11-15 14:52:59 +00:00
Robert Osfield
1abd99f084 Added support for glObjectLabel debugging 2016-11-15 14:35:47 +00:00
Robert Osfield
4ecf541cb6 Merge branch 'fredowski-master' 2016-11-15 11:16:53 +00:00
Robert Osfield
2f570ca3a9 Improved the indentation and case to make the code more consistent and readable 2016-11-15 11:16:03 +00:00
Robert Osfield
5aa897b5fd Merge branch 'master' of https://github.com/fredowski/OpenSceneGraph into fredowski-master 2016-11-15 11:13:37 +00:00
Robert Osfield
137b596943 Enabled sharing of main threads processor affinity to the next required thread for CullDrawThreadPerCamera and CullThreadPerCameraDrawThreadPerContext 2016-11-15 11:01:41 +00:00
OpenSceneGraph git repository
5ff6048db0 Merge pull request #156 from LaurensVoerman/Affinity2
unlock cpu's 32-63 on 64 bit windows
2016-11-15 10:41:12 +00:00
Robert Osfield
ddbb1cb064 Removed todo that is not required 2016-11-15 09:47:48 +00:00
Robert Osfield
c560e9a1ef Reduced public documentation generation to just the public headers 2016-11-15 09:29:09 +00:00
OpenSceneGraph git repository
33e28b0971 Merge pull request #164 from CodeDocs/codedocs
Use CodeDocs for Doxygen documentation
2016-11-15 09:28:25 +00:00
Robert Osfield
87a3648e68 To avoid noise in documentation replaced nested namespaced enum with enum with FILE_COPY_ wording prefixed into enum values. 2016-11-15 08:57:24 +00:00
Robert Osfield
80f75bcbdd Fixed doxygen warnings 2016-11-15 08:37:05 +00:00
Robert Osfield
36b2ddac2d Added usage of osg::ConfigureBufferObjectsVisitor to correct for incoherent buffer oject set up due to the adhoc way that the OpenFlight plugin sets up osg::Geometry. 2016-11-14 18:01:22 +00:00
Robert Osfield
5b375124cc Added osg::Geometry::configureBufferObjects() and ConfigureBufferObjectsVisitor visitor to help with setting up buffer objects in a coherent fashion. 2016-11-14 17:59:25 +00:00
Robert Osfield
99cb8ebacf Added more flexibility into the State::checkGLErrors() method, allowing calling code to pass in two strings.
Improved the StateSet::compileGLObjects() usage of checkGLErrors() to make the warning reports more meaningful.
2016-11-14 11:59:47 +00:00
Robert Osfield
e6052ef4b4 Added Dragger::applyAppropriateFrontFace(StateSet*) to make it easy to handle inverted matrices by toggling the FrontFace to sure the correct face is visible. 2016-11-11 17:18:13 +00:00
Robert Osfield
d16ca33f38 Fixed handling of Locator's with negative extents 2016-11-11 14:01:40 +00:00
Paul Novotny
1234619a48 Use CodeDocs for Doxygen documentation
Adds a configuration file (.codedocs) for building the Doxygen
documentation using CodeDocs.xyz. Also, adds a badge to the README.md
to link to the documentation.
2016-11-02 20:56:04 -04:00
Friedrich Beckmann
e506bb3075 added alternative to middle-mouse button in manipulator
I added CTRL + RIGHT-MOUSE-CLICK to the standard manipulator as
an alternative to MIDDLE-MOUSE-CLICK because a 3 Button Mouse
not always available, e.g. on MacOS. I tested this with the
osgAtlasSimbicon example.
2016-10-24 19:54:43 +02:00
Robert Osfield
b5c071eed9 Moved shader file loading to a help function 2016-10-20 09:59:26 +01:00
Robert Osfield
c32e6c01ed Fixed shader filename 2016-10-20 09:46:47 +01:00
Robert Osfield
fda7c838a1 Added osgshaderpipeline example that will server as a testbed for automatically mapping fixed function pipeline to shaders 2016-10-19 20:26:26 +01:00
OpenSceneGraph git repository
26a313d549 Merge pull request #159 from LaurensVoerman/Affinity3b
re-assign thread affinity at the end of setThreadingModel()
2016-10-17 16:36:42 +01:00
Laurens Voerman
d461149969 re-assign thread affinity at the end of setThreadingModel() 2016-10-17 09:50:48 +02:00
Robert Osfield
e17ad60c2d Added _color copy to the copy constructor 2016-10-14 18:00:40 +01:00
Laurens Voerman
16a282ccea unlock cpu's 32-63 on 64 bit windows 2016-10-14 17:19:50 +02:00
Robert Osfield
4e5f0fc3a5 Added a dedicated FindEGL.cmake script to help with locating the EGL.so library and header 2016-10-14 11:06:31 +01:00
Robert Osfield
afb046a196 Bumped OpenThreads version numbers to reflect changes in ABI 2016-10-13 17:43:29 +01:00
Robert Osfield
b10d30242d Fixed GLES build due to lack of GLclampd 2016-10-12 18:00:05 +01:00
Robert Osfield
1cc53246e9 Changed appending of \n to be to the version line. 2016-10-12 17:24:25 +01:00
Robert Osfield
9072f9653e Added OES variants of vertex array object functions 2016-10-12 16:10:40 +01:00
OpenSceneGraph git repository
953af3d1d9 Merge pull request #155 from LaurensVoerman/Texture0
add #define GL_TEXTURE0 for windows users previously provided by GLBeginEndAdapter
2016-10-12 13:41:57 +01:00
Laurens Voerman
1a664b19de add #define GL_TEXTURE0 for windows users previously provided by GLBeginEndAdapter 2016-10-12 13:29:58 +02:00