FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • a316c30b4a Removed redudent NodeVisitor::s/getUserData() as osg::Object provide this. Robert Osfield 2014-06-06 15:05:31 +00:00
  • 1c699a3664 Added using NodeCallback::run() to avoid warnings Robert Osfield 2014-06-06 09:12:43 +00:00
  • d7b99b9062 Added missing OSG_EXPORT Robert Osfield 2014-06-06 09:01:25 +00:00
  • 977ec20751 Refactored Callback system in osg::Node, osg::Drawable, osg::StateSet and osg::StateAttribute to use a new osg::Callback base class. Robert Osfield 2014-06-05 16:26:13 +00:00
  • 35d6cb812f Updated shaders from OpenSceneGraph-Data sources Robert Osfield 2014-06-04 08:59:31 +00:00
  • 6ea4f4a939 From Pjotr Sventachov and Robert Osfield, added callback unit test to osgcallback example, to use test run osgcallback --test, if everything is functioning then test1 to test7 messages should be reported to the console. Robert Osfield 2014-06-03 15:05:51 +00:00
  • 333a16a88d Reverted change of Node::ParentList from being a vector<Node*> back to a vector<Group*> Robert Osfield 2014-06-03 09:52:55 +00:00
  • 3dde165f14 Refactor osg::Geode to subclass from osg::Group and reuse the NodeList children container Robert Osfield 2014-06-03 09:23:24 +00:00
  • 2d41cbd0cf Removed OSG_USE_BOUND and associated osg::Bound adapter class to avoid problems with BoundingBox::expandBy/expandByRadius() implementation choosing a null BoundingBox from the osg::Bound class causing crashes. Robert Osfield 2014-06-02 16:20:39 +00:00
  • e1ec4ec67f From Roni Zanolli, build fix for iPhone Robert Osfield 2014-06-02 08:13:39 +00:00
  • 199506296a Implemented basic frame graphic Robert Osfield 2014-05-30 16:44:36 +00:00
  • 189c0b3477 Futher work on ComboBox/Popup Robert Osfield 2014-05-29 15:21:42 +00:00
  • a45ba05bdd Added beginnings of ComboBox popup functionality. Robert Osfield 2014-05-29 10:51:26 +00:00
  • 26a7c30229 Added cached Depth and ColorMask to reduce the amount of duplicate state in the osgUI subgraph Robert Osfield 2014-05-28 10:18:57 +00:00
  • 1fcb91900a Replaced Widget::GraphicsSubgraph with GraphicsSubgraphMap to allow finer control of when the rendering subgraphs are done. Robert Osfield 2014-05-28 10:06:14 +00:00
  • 6af9edf33b Improved handling of text Robert Osfield 2014-05-27 14:14:51 +00:00
  • faced0a896 Removed Dialog/Popup::open/close() methods as they are replaced by the setVisible() method Robert Osfield 2014-05-26 16:32:20 +00:00
  • 5d635287c0 Implemented Widger::Visible and Enabled usage Robert Osfield 2014-05-26 16:27:33 +00:00
  • b04a4813ba Added Visible and Enalbed properties to Widget Robert Osfield 2014-05-26 16:15:33 +00:00
  • 5d234ba021 Fixed missing initilaizer Robert Osfield 2014-05-26 16:15:12 +00:00
  • 71352ea56d Added item serializer Robert Osfield 2014-05-26 15:58:18 +00:00
  • f50ec0fe8e Implemented clipping of widget to the widgets extents. Robert Osfield 2014-05-23 18:59:16 +00:00
  • cca18e82e8 Implemented scheme for making sure nested widgest overdraw parent widgets graphics Robert Osfield 2014-05-23 15:00:49 +00:00
  • 55c2041d4d Added wrappers for open and close methods Robert Osfield 2014-05-23 15:00:09 +00:00
  • 52abe9503f Updated release candidate for 3.2.1-rc3 Robert Osfield 2014-05-22 14:52:26 +00:00
  • 95acbe55b5 Upated ChangeLog and AUTHORS in prep for release candidate Robert Osfield 2014-05-22 14:43:30 +00:00
  • bda5ec4875 Added osgUI::Widget::set/getGraphicsSubgraph() to hold the subgraph that does the rendering portion of widgets Robert Osfield 2014-05-22 10:02:35 +00:00
  • 0b5b3213fe Addd method implementation in serializers Robert Osfield 2014-05-21 16:15:02 +00:00
  • d8adc80c2c Fixed handling of traverse Robert Osfield 2014-05-21 10:17:31 +00:00
  • 20fd80de3a Improved handling of callback object to open the door to use of general osg::CallbackObject as mechnisms for something simialr to Qt's signal/slot mechanism. Robert Osfield 2014-05-21 09:45:11 +00:00
  • 28c36d615b Added osg::runNamedCallbackObjects(..) convinience method for run all named osg::CallbackObjects attached to an osg::Object Robert Osfield 2014-05-21 09:07:25 +00:00
  • 9859f3110b Renamed callbacks to avoid overlap with Node callbacks Robert Osfield 2014-05-21 09:06:17 +00:00
  • 30b54e3af2 Moved the _boundingSphere set method into the update section of the Drawable::getBoundingBox() method Robert Osfield 2014-05-20 16:09:34 +00:00
  • e70acf4c51 From Pjotr Svetachov, "I stumbled on a little bug with the new drawables. I was distributing points data into different drawables that I used in a LOD later. When simplifying the system to not use geodes anymore I came upon the following bug: If Drawable::getBoundingBox would compute an invalid bounding box (if it was for example empty) it would make a bounding sphere with a infinite radius which counts as a valid sphere in osg. Robert Osfield 2014-05-20 15:34:12 +00:00
  • 8346f0ebe1 Improved the handling of updating of text Robert Osfield 2014-05-20 08:35:39 +00:00
  • d917987938 Added shell of Popup class Robert Osfield 2014-05-20 08:35:19 +00:00
  • e4004118db Added check against whether an event has been handled or not before actioning escape/quit. Robert Osfield 2014-05-20 08:34:32 +00:00
  • 4ce2e075c4 Add shell of Dialog class Robert Osfield 2014-05-19 10:11:50 +00:00
  • 1b34fed500 Added handling of up/down key to ComboBox Robert Osfield 2014-05-19 09:30:36 +00:00
  • 87fd1d38fb Added initial cut of ComboBox Robert Osfield 2014-05-16 19:24:58 +00:00
  • 3e00764649 Added initial shell of PushButton implementation Robert Osfield 2014-05-16 10:38:40 +00:00
  • 03fc0c3662 Added support for intesecting Drawable that are attached directly to the scene graph without an osg::Geode Robert Osfield 2014-05-15 16:30:17 +00:00
  • 3a5d834643 From Sebastian Messershmidt, "There was some small error due to MS non-conformity handling comments correctly." Robert Osfield 2014-05-15 14:58:43 +00:00
  • 5b60708e80 From Sebastian Messerschmidt, "There was some small error due to MS non-conformity handling comments correctly." Robert Osfield 2014-05-15 14:57:28 +00:00
  • d8a06f827e From Pjotr Svetachov, build fixes for VisualStudio Robert Osfield 2014-05-15 14:45:28 +00:00
  • 85386daa25 Added osgGA dependency Robert Osfield 2014-05-15 13:34:50 +00:00
  • 4f199e36c9 Placed the #include<osg/Node> within #ifdef OSG_USE_BOUND to prevent unncessary inclusion of Node header when OSG_USE_BOUND is false. Robert Osfield 2014-05-15 13:22:47 +00:00
  • 20b9f3ff88 Added Node::asDrawable() and Node::asGeometry() methods to provide a low cost way of casting a node to Drawable and Geoemtry. Robert Osfield 2014-05-15 09:26:59 +00:00
  • afcf54b108 Fixed the bounding sphere computation and handling of Drawable as the root of the scene graph Robert Osfield 2014-05-14 16:52:18 +00:00
  • 74f91037a7 Further work on Bound class/Node::getBound() and Drawable::getBound() and usage in OSG codebase Robert Osfield 2014-05-14 16:01:40 +00:00
  • ff21af2b0d Cleaned up code Robert Osfield 2014-05-14 16:00:08 +00:00
  • 4174d72a52 Robert Osfield 2014-05-14 10:19:43 +00:00
  • 12a737ae02 Changed the Node::ParentList to be a list of osg::Node rather than osg::Group, and added addChild, removeChild, replaceChild virtual method to Node to enable code to user code compile with minimal modifications to account for the new change to the Node ParentList. Robert Osfield 2014-05-13 08:43:07 +00:00
  • b2c7bacfe9 From Farshid Lashkari, "As discussed, I've added the ability to handle Drawable objects within the NodeVisitor class. Here is an overview of the changes: Robert Osfield 2014-05-12 12:10:35 +00:00
  • ead92353fe Added beginnings of new osgUI library, a replacement for osgWidget that works fully in 3D/stereo and is scriptable. Robert Osfield 2014-05-12 11:27:54 +00:00
  • 490b351330 Replaced obsolete __linux usage. Robert Osfield 2014-05-06 16:38:57 +00:00
  • 754a163cbf From Stephan Huber, "Xcode changed the default std-lib-implementation again. Now it’s GNU++98 instead of C++11. I adapted the cMakeList.txt files accordingly to add this new option so we can set it explicitly and link against 3rdparty-c++-libs." Robert Osfield 2014-05-06 09:43:32 +00:00
  • eae4d51e3f From Stephan Huber, "Please revert the change to FindQuickTime.cmake as this breaks compilation for IOS and possibly OS X." Robert Osfield 2014-05-06 08:37:39 +00:00
  • cf66750d7b From Farshid Lashkari, "fix for the Collada loader where it would access a null string in some cases" Robert Osfield 2014-05-02 09:12:36 +00:00
  • 1f33e2a2a0 From Ali Botorabi, "recently I ran into a problem with Microsoft's Appverifier while using OpenThreads on win32 platform. The Appverifier complained about an invalid thread handle during starting of a new thread. After looking closer into the problem it seemed that indeed a potential root of problem may be in the thread startup code. See the line below in Win32Thread.cpp (line number 347): Robert Osfield 2014-05-02 09:11:16 +00:00
  • 35d73ea41c From Stephan Huber, fix for OSX build Robert Osfield 2014-05-01 15:50:14 +00:00
  • 298f1c65b6 Renamed the new include/osg/OpenGL automatically configured header file to include/osg/GL replacing the original hand built GL header Robert Osfield 2014-04-30 13:19:22 +00:00
  • e16eb147a1 From Sebastian Messerschmidt, "attached is the compile/linker fix for multiple definitions of getTypeEnum when compiling the Lua with VisualStudio and potentially other compilers. " Robert Osfield 2014-04-30 11:51:40 +00:00
  • a04232a75a From Pjotr Svetachov, "have added some missing serializers for RigGeomery. Withouth them I ran into two issues. Robert Osfield 2014-04-29 15:14:39 +00:00
  • b6404d18c3 From Pjotr Svetachov, "Today I found a bug in the IutputStream class when saving array attributes in vec3b format. It looks like my compiler takes the wrong overload and outputs integers instead of characters. The problem is that vec3b is of type signed char and that is not the same as char ( see http://stackoverflow.com/questions/436513/char-signed-char-char-unsigned-char ) and visual studio 2013 will promote it to integer when choosing an overload. It looks like that the InputStream class already takes care of this issue (if it didn't it would have read everything ok and I would have not even stumbled upon this bug. :) )" Robert Osfield 2014-04-29 13:41:35 +00:00
  • 2ab66723d5 From Pjotr Svetachov, "Today I found a bug in the IutputStream class when saving array attributes in vec3b format. It looks like my compiler takes the wrong overload and outputs integers instead of characters. The problem is that vec3b is of type signed char and that is not the same as char ( see http://stackoverflow.com/questions/436513/char-signed-char-char-unsigned-char ) and visual studio 2013 will promote it to integer when choosing an overload. It looks like that the InputStream class already takes care of this issue (if it didn't it would have read everything ok and I would have not even stumbled upon this bug. :) )" Robert Osfield 2014-04-29 13:41:33 +00:00
  • fa6f5219bf From Mattias Helsing, "I finally got to fix the cmake Modules that have duplicates in later version of cmake. See attached submission. I have tested the ones that I compile myself (GDAL, Freetype, ZLIB) on ubuntu 12.04 with cmake-2.8.7." Robert Osfield 2014-04-29 12:19:21 +00:00
  • ecd26f9f5b From Paul Martz, "There is no standard place for gl/glcorearb.h on Windows. Previously, the only way to get OSG to build for core profile was to append an additional include directory ("/I") onto the CFLAGS variables This submission adds a FindGLCORE.cmake script so that the path to gl/glcorearb.h can be specified with a variable, GLCORE_ROOT, either in CMake or the environment. Robert Osfield 2014-04-29 12:18:51 +00:00
  • 2bb4e0566c From Pjotr Svetachov, "I had the osgvolume example crash on me when loading large volume datasets due to an overflow in image.cpp after a unneeded cast from unsigned int to int. Here is a small fix." Robert Osfield 2014-04-28 14:58:36 +00:00
  • 044e20911b From Pjotr Svetachov, "I had the osgvolume example crash on me when loading large volume datasets due to an overflow in image.cpp after a unneeded cast from unsigned int to int. Here is a small fix." Robert Osfield 2014-04-28 14:58:33 +00:00
  • 4dd3e3562f From Jason Beverage, "Here is a fix for a small race condition in osgDB::makeDirectory. It attempts to create all the directories in the given path and stops attempting to make directories when one of them fails. I've added a check to see if the failure occurred b/c the directory was created by another thread or process. Robert Osfield 2014-04-28 14:57:05 +00:00
  • a256eac9c5 From Jason Beverage, "Here is a fix for a small race condition in osgDB::makeDirectory. It attempts to create all the directories in the given path and stops attempting to make directories when one of them fails. I've added a check to see if the failure occurred b/c the directory was created by another thread or process. Robert Osfield 2014-04-28 14:57:01 +00:00
  • f5261b9877 Fixed type error Robert Osfield 2014-04-28 11:53:58 +00:00
  • 14b978369e Fixed type error Robert Osfield 2014-04-28 11:53:53 +00:00
  • 4994b806d2 From Pjotr Svetachov, "For me osgviewer.cpp and Renderer.cpp were not compiling (visual studio 2013 with profile GL2) because they were still using GLuintEXT. So I changed that, see the attached files. Robert Osfield 2014-04-25 08:57:27 +00:00
  • 6a0270279c Reordered the configuiration file blocks to make it more understandable Robert Osfield 2014-04-25 08:56:53 +00:00
  • 3ec6938b95 From Paul Martz, fixed placement of OpenGL header so that it gets generated and placed in the build directory as per the Config file Robert Osfield 2014-04-25 08:18:03 +00:00
  • 7b4d7cd221 From Farshid Lashkari, "I've attached a small fix to the Collada loader which prevents a null pointer access in some cases." Robert Osfield 2014-04-24 17:26:46 +00:00
  • 25aeb1dadc From Farshid Lashkari, "I've attached a small fix to the Collada loader which prevents a null pointer access in some cases." Robert Osfield 2014-04-24 17:26:44 +00:00
  • 77f1c58345 From Lionel Lagarde, "In the ::apply method, when the image data need to be re-uploaded, the Texture2DArray checks if the TextureObject can be re-used. The test was made using the constant 1 instead of the real texture depth, so the TextureObject was never re-used." Robert Osfield 2014-04-24 17:23:16 +00:00
  • 762f0819ff In the ::apply method, when the image data need to be re-uploaded, the Texture2DArray checks if the TextureObject can be re-used. The test was made using the constant 1 instead of the real texture depth, so the TextureObject was never re-used. Robert Osfield 2014-04-24 17:23:15 +00:00
  • bc5575f83a From Kristofer Tingdahl, "I and my team have gone over the code again, and we feel that we are comfortable in our current proposal for change. It goes deeper than it did before, and I explain why: Robert Osfield 2014-04-24 17:14:54 +00:00
  • 6f2d003bc5 From Mattias Helsing, "Seems I was only half right given what you asked for. CMP0017 only says that modules that are found and ran from cmake modules dir should prefer cmake-provided modules. find_package() and include() still look in CMAKE_MODULE_PATH first. Robert Osfield 2014-04-24 10:49:57 +00:00
  • 0d30acccf1 Fixed reference invalidation bug. Robert Osfield 2014-04-24 10:39:03 +00:00
  • ec658b115c Fixed reference invalidation bug. Robert Osfield 2014-04-24 10:38:58 +00:00
  • a43cc12394 Fixed typo in OPENSCENEGRAPH_OPENGL_HEADER name Robert Osfield 2014-04-24 07:22:55 +00:00
  • ef76994c05 Removed header as this CMake generated configuration file is not required to be part of svn repository Robert Osfield 2014-04-24 07:20:44 +00:00
  • a1342a6bf6 Added src/osg/OpenGL.in configuration file and include/osg/OpenGL header files Robert Osfield 2014-04-23 19:30:33 +00:00
  • 5597248895 Introduced new scheme for setting up which version of OpenGL/OpenGL ES the OSG is compiled for. Robert Osfield 2014-04-23 09:08:26 +00:00
  • 5c73224c36 Fixed comment Robert Osfield 2014-04-14 16:16:22 +00:00
  • 560587c88f Fixed comment Robert Osfield 2014-04-14 16:16:08 +00:00
  • 5015fb6dac Renamed FindFreeType.cmake to FindFreetype.cmake to enable CMake build to pick up on CMake's own FindFreetype.cmake when it's available. Robert Osfield 2014-04-13 16:04:27 +00:00
  • b65f0043ef Renamed FindFreeType.cmake to FindFreetype.cmake to enable CMake build to pick up on CMake's own FindFreetype.cmake when it's available. Robert Osfield 2014-04-13 16:04:25 +00:00
  • 283b9d4447 Merged changes from svn/trunk to add the REMOVE_CXX_FLAGS macro Robert Osfield 2014-04-13 16:03:17 +00:00
  • c168887e5e From Paul Cheyrou-Lagreze, "Attached is fix/feature for FBX osgplugins against latest trunk: Robert Osfield 2014-04-09 17:40:27 +00:00
  • 2d8b521e33 Disabled warnings that FBX headers are generating that we can't fix Robert Osfield 2014-04-09 17:21:26 +00:00
  • db6df6fefd Disabled warnings to address issues in FBX headers that generate lots of warnings that we can't fix. Robert Osfield 2014-04-09 17:20:26 +00:00
  • a6df790b64 Added extra search files for K/Ubuntu 14.04 new location for freetype headers Robert Osfield 2014-04-08 19:44:29 +00:00
  • ef5be684ed Added extra search paths to add compatibility with Kubuntu/Ubuntu 14.04 now locaton for freetype Robert Osfield 2014-04-08 19:42:05 +00:00
  • 51671348f7 Updated ChangeLog and fixed Contributors list Robert Osfield 2014-04-08 17:45:21 +00:00