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

Commit Graph

  • d3a7115c45 Removed trailing spaces, added missing return to last lines Robert Osfield 2013-11-22 09:38:50 +00:00
  • 5bea13c172 Added new osgVolume::VolumeScene and osgVolume::MultipassTechnique class shells that will be filled out to provide multi-pass volume rendering that handles mixing of 3D meshes with volume rendering and segmentation of volumes via a user defined hull mesh. Robert Osfield 2013-11-21 18:17:44 +00:00
  • 1b269a7711 From Stephan Huber, "CLang / LLVM on OS X seems to have a problem compiling the osgGA-serializer. (It was reported before on the list, but the error is hard to track as it shows up only sometimes) Robert Osfield 2013-11-21 14:21:55 +00:00
  • 3ef97ddeea From Stephan Huber, "attached you’ll find some minor ios-fixes/-enhancements Robert Osfield 2013-11-21 14:09:20 +00:00
  • 9a9efb1c58 From Farshid Lashkari, " recently encountered an issue attempting to load an IVE file generated by an older version of OSG. The file contained dxt1 compressed image data with mipmaps. The loaded model would cause crashes when passing the mipmap data to glCompressedTexImage2D. It seems that the size of the data array within the IVE file did not match the computed size from Image::getTotalSizeInBytesIncludingMipmaps(). This essentially made the mipmap offsets invalid within the Image object. Robert Osfield 2013-11-21 14:08:01 +00:00
  • a5d78953d4 From Farshid Lashkari, "I recently encountered an issue attempting to load an IVE file generated by an older version of OSG. The file contained dxt1 compressed image data with mipmaps. The loaded model would cause crashes when passing the mipmap data to glCompressedTexImage2D. It seems that the size of the data array within the IVE file did not match the computed size from Image::getTotalSizeInBytesIncludingMipmaps(). This essentially made the mipmap offsets invalid within the Image object. Robert Osfield 2013-11-21 13:59:00 +00:00
  • 31c54aa3e4 From Farshid Lashkari, "I recently encountered an issue attempting to load an IVE file generated by an older version of OSG. The file contained dxt1 compressed image data with mipmaps. The loaded model would cause crashes when passing the mipmap data to glCompressedTexImage2D. It seems that the size of the data array within the IVE file did not match the computed size from Image::getTotalSizeInBytesIncludingMipmaps(). This essentially made the mipmap offsets invalid within the Image object. Robert Osfield 2013-11-21 13:58:36 +00:00
  • 1e2bead9bc Converted std::max to osg::maximum to fix VS2013 build error Robert Osfield 2013-11-21 11:02:08 +00:00
  • 76c45c7731 Changed std::max to osg::minimum to addres build error under VS2013. Robert Osfield 2013-11-21 11:00:50 +00:00
  • a54b999ccc Added Geometry::drawVertexArraysomplemetation(..) and drawPrimitivesImplemenation(..) methods that are called from drawImplementation(..). These new vertex methods allow subclasses from osg::Geometry to specialize the vertex array setup or how the primitives are dispatched to OpenGL. Robert Osfield 2013-11-21 10:31:34 +00:00
  • dbf88cc209 From Stephan Huber, "minor ios-fixes/-enhancements Robert Osfield 2013-11-18 14:21:06 +00:00
  • d8c1c4bbeb From Stephan Huber, compile fix for OpenGL ES on iOS. Robert Osfield 2013-11-18 13:31:44 +00:00
  • e0d3ab4412 From Stephan Huber, * GUIEventAdapter: add support for getting normalized touch points * MultiTouchTrackball: some code cleanup and support for normalized touch-points * oscdevice: receiving and sending multi-touch-events via the Cursor2D-profile from TUIO * added some documentation Robert Osfield 2013-11-18 13:25:55 +00:00
  • d7442e7456 Added panning and zooming functionality to transfer function UI prototype code. Robert Osfield 2013-11-18 12:46:00 +00:00
  • 80c45ad46a Added BoundingBox::contains(const vec_type& v, value_type epsilon) method with new epsilon parameter to make it easier to test for containment in the presence of numerical errors Robert Osfield 2013-11-18 12:45:04 +00:00
  • c194e92df8 Moved Handled propety from GUIEventAdapter to Event base class. Robert Osfield 2013-11-15 16:15:09 +00:00
  • 835d9455a9 Restored the rescaleToZeroToOneRange() to address rendering issues. Robert Osfield 2013-11-12 14:21:00 +00:00
  • eede49d15c Removed unused variables Robert Osfield 2013-11-11 10:55:51 +00:00
  • 829cd9718a From Stepan Huber, "attached are my changes for the osc, zeroconf and resthttp-plugin to use the new event-class. I refactored the osgoscdevice-example so that it’s working again. " Robert Osfield 2013-11-08 12:28:51 +00:00
  • 1a90789402 Added support for assinging and display transfer functions Robert Osfield 2013-11-08 12:26:14 +00:00
  • 25b8b8bd16 Quietened down debug messages Robert Osfield 2013-11-08 12:25:35 +00:00
  • 70c78264dc Changed the LineSegmentIntersector to RayIntersector to provide more reliable intersections with flat meshes. Robert Osfield 2013-11-07 12:37:10 +00:00
  • 7a2900e238 Added osgUtil::Intersector::PrecisionHint member and set it's default to USE_DOUBLE_COMPUTATIONS, and implemented support for use double or float maths internally in LineSegmentIntersector and RayIntersector classes Robert Osfield 2013-11-07 12:35:34 +00:00
  • fef39b6215 Re-enabled the disable of the transfer function Robert Osfield 2013-11-06 09:50:16 +00:00
  • 2ebe81cb0e Fixed handling of web cams Robert Osfield 2013-11-06 09:49:51 +00:00
  • 6f6c44446c Introduced a cast(T) method into the ImageUtils template functor to allow code reading images to handle casting from source data to a form that a user can use more conviently Robert Osfield 2013-11-06 09:23:21 +00:00
  • ef3a65b93f Restructed the call to avformat_open_input to provide more information. Robert Osfield 2013-11-06 09:20:35 +00:00
  • 2b3665f010 Fixed typo Robert Osfield 2013-11-05 15:23:32 +00:00
  • ffb0a8e545 From Stephan Huber, "Build Problem with osgGA at MacOS with Xcode 5"..."attached you'll find a possible solution for the issue. This will add a new option to cmake called OSG_CXX_LANGUAGE_STANDARD which defaults to C++11. If you set it to C++98 it will setup the project accordingly." Robert Osfield 2013-11-01 14:40:50 +00:00
  • a10e9c6950 Added initial shell of new osgtransferfunction example that will be tested bed for upcomming transfer function editing UI. Robert Osfield 2013-10-28 17:46:07 +00:00
  • ff8fe4143e From Likasz Izebski, "added support for etc2/eac compression" Robert Osfield 2013-10-28 12:03:55 +00:00
  • 5efce09451 Removed -fpermissive flag from GCC build, and fixed warning Robert Osfield 2013-10-25 15:48:15 +00:00
  • ac383e15c1 Added explict setting of the PolygonMode to over the distion mesh being toggled to wireframe. Robert Osfield 2013-10-25 15:47:41 +00:00
  • 3f8e6d0a74 Added explict setting of the PolygonMode to over the distion mesh being toggled to wireframe. Robert Osfield 2013-10-25 15:47:41 +00:00
  • 4a660f6266 Introduce new osgGA::Event and osgGA::EventHandler base classes that the old GUIEventAdapter and GUIEventHandler now subclass from. Robert Osfield 2013-10-25 14:54:15 +00:00
  • 2025c511f0 Remoed -fpermissive Robert Osfield 2013-10-25 14:46:37 +00:00
  • 191eabd3ab Fixed warning Robert Osfield 2013-10-25 09:02:39 +00:00
  • 2a9ed125b8 Fixed warning Robert Osfield 2013-10-24 20:22:13 +00:00
  • 9433947d2a Fixed warning Robert Osfield 2013-10-24 20:22:05 +00:00
  • 6f9b82142a Removed deprecated glib call Robert Osfield 2013-10-24 19:56:14 +00:00
  • b3603f76e4 Removed depreated glib call Robert Osfield 2013-10-24 19:56:04 +00:00
  • 95e8d2838c Fixed FileInfo self intialization bug Robert Osfield 2013-10-24 19:32:00 +00:00
  • 1dcc2555e7 Fixed FileInfo self initialization bug Robert Osfield 2013-10-24 19:31:41 +00:00
  • 1861e025e9 Fixed build problems with the OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION off Robert Osfield 2013-10-24 17:43:02 +00:00
  • ded27b4971 From Stephan Huber, "attached you’ll find a small enhancement for present3d. Now you can get advanced help via —help-all etc (similar to osgviewer)" Robert Osfield 2013-10-24 12:15:37 +00:00
  • 37fa2d698f From Stephan Huber, add support for controlling the OSXMenubarBehavior set by DisplaySettings. Robert Osfield 2013-10-24 10:10:16 +00:00
  • 234adf7daf Cleaned up addChild/getChild/setChild/getNumChildren methods and added readNodeFile, readImageFile and readObjectFile functions Robert Osfield 2013-10-24 09:06:52 +00:00
  • f548bc79d4 Added support for Group::addChild/setChild/getChild/getNumChildren. Robert Osfield 2013-10-23 16:17:26 +00:00
  • c45f3aa4fb Merged changes to DisplaySettings from Stephan Huber in prep for controlling the menu hiding behaviour under OSX. Robert Osfield 2013-10-22 19:12:34 +00:00
  • b7b7186cf8 Preliminary remapping of internalFormat for GL3 core profile Robert Osfield 2013-10-22 18:58:15 +00:00
  • 3dba54c10a Fixed warnings Robert Osfield 2013-10-22 16:28:20 +00:00
  • 27f9021df7 Fixed warnings Robert Osfield 2013-10-22 16:28:03 +00:00
  • 9af08d6715 From Colin McDonald, two submissions merged from svn/trunk: Robert Osfield 2013-10-22 11:33:45 +00:00
  • 1196f153fc From Colin McDonald, "The osgt/osgb file formats output a scenegraph node with the type set to "SCENE" in the file header. But if the file is stored and then extracted again from an osga archive this header info is lost, and the resulting file is just an "OBJECT". Possibly other plugin operations would have the same effect. The osgt/osgb plugin won't then return the scenegraph contents. Robert Osfield 2013-10-22 11:32:21 +00:00
  • c34a8e4ddb From Colin McDonald, "The osgb file reader uses seek to position within the file. But the nested stream implementation for osga archive files doesn't support seeking. So osgb files can't currently be used in an osga archive e.g. if osgdem is used to output a osgb format database it can't be packaged in an archive file, in the same manner that ive files could. Robert Osfield 2013-10-22 11:26:45 +00:00
  • 5ed399ca48 Fixed handling of osg::Program so that it's not overriden by shader composition when enabled Robert Osfield 2013-10-22 11:18:28 +00:00
  • 5c4800c774 Fixed handling of in scene graph osg::Program being overriden by shader composition. Robert Osfield 2013-10-22 11:17:29 +00:00
  • dfd8594042 From Robert Milharcic, workaround for ShaderComposer clean up bug. Robert Osfield 2013-10-21 17:44:24 +00:00
  • 4493d11ca3 Added State::releaseGLObjects() and ShaderComposer::releaseGLObjects() to avoid problems with cleanup of graphics context Robert Osfield 2013-10-21 16:35:12 +00:00
  • be2d80abca Build fixes for clang Robert Osfield 2013-10-21 09:56:57 +00:00
  • 074eb8e41c Build fixes for clang Robert Osfield 2013-10-21 09:54:41 +00:00
  • ca8f3d5f8a From Farshid Lashkari, "previously discussed change to the dae loader which applies the node ID as a "dae_node_id" user value." Robert Osfield 2013-10-18 09:57:53 +00:00
  • a68f0f26a8 From Farshid Lashkari, "previously discussed change to the dae loader which applies the node ID as a "dae_node_id" user value." Robert Osfield 2013-10-18 09:57:49 +00:00
  • 790c0091e6 From Vladimir Chebeav, fix for removal of nested callbacks Robert Osfield 2013-10-18 08:37:19 +00:00
  • 9146ba7d44 From Vladimir Chebeav, fix for removal of nested callbacks Robert Osfield 2013-10-18 08:37:18 +00:00
  • 5bfb2ef26d From Konstantin Matveyev, "Multiple light fix in FBX-importer" Robert Osfield 2013-10-18 07:55:26 +00:00
  • ce58131cfc From Konstantin Matveyev, "Multiple light fix in FBX-importer" Robert Osfield 2013-10-18 07:54:59 +00:00
  • bddeecdbee From Colin McDonald, "Some missing updates to the serializer static build support." Robert Osfield 2013-10-18 07:52:18 +00:00
  • 309da2fe07 From Colin McDonald, "Added some missing updates to the serializer static build support." Robert Osfield 2013-10-18 07:52:00 +00:00
  • 49625a1baf From Andreas Henne, "in my application I use the TrackballDragger, the ScaleAxisDragger and the TranslateAxisDragger. Unfortunately these draggers are very thin and they do not provide methods to change their visual appearance. Another problem that I noticed is that lighting on the cones and boxes of the TranslateAxisDragger and ScaleAxisDragger is incorrect when the draggers are scaled due to not normalized normals. This small patch adresses these problems, providing methods to make the draggers thicker. I have attached a zip archive containing the corresponding files and also a modified osgManipulator example that makes use of the modifications. I don't want to retain any copyright." Robert Osfield 2013-10-18 07:31:22 +00:00
  • 97d706c640 Build fix Robert Osfield 2013-10-17 18:34:16 +00:00
  • a97e092619 Fix for error in getting the uniform block max name length, fix suggested by Christopher Fennell. Robert Osfield 2013-10-17 18:29:39 +00:00
  • f14f58c486 Fix for error in getting the uniform block max name length, fix suggested by Christopher Fennell. Robert Osfield 2013-10-17 18:29:38 +00:00
  • 7de6a0c9e2 From Stephan Huber, build fix Robert Osfield 2013-10-17 14:02:15 +00:00
  • eb7c2ae3f7 Added set/get to the ImageSerializer and removed some redudent comments Robert Osfield 2013-10-10 20:43:03 +00:00
  • cd86995d7d From Pjotr Svetachov, "With the new osg::Geometry the binding for arrays now default to undefined. This breaks previously working code in osgAnimation::RigTransformHardware where the arrays got an undefined bounding and because of this the bone indices and weights were not loaded by the shader. Here is a little patch to fix this." Robert Osfield 2013-10-10 20:42:24 +00:00
  • 7c9cbc5ff9 From Pjotr Svetachov, "With the new osg::Geometry the binding for arrays now default to undefined. This breaks previously working code in osgAnimation::RigTransformHardware where the arrays got an undefined bounding and because of this the bone indices and weights were not loaded by the shader. Here is a little patch to fix this." Robert Osfield 2013-10-10 20:42:21 +00:00
  • 08ec0a11bf From Laurens Voerman, compile fix for VisualStudio Robert Osfield 2013-10-10 14:45:57 +00:00
  • 0dc55ebc86 Laurens Voerman, "my cmake (2.8.10.2 generating for Visual Studio 11 Win64) doesn't like include(${CMAKE_MODULE_PATH}/FindPackageHandleStandardArgs.cmake) in CMakeModules/FindLua52.cmake changing to a more common include(FindPackageHandleStandardArgs) solves my problem." Robert Osfield 2013-10-10 14:41:41 +00:00
  • 4e4d2b35cf Added get/set method to Serializer to allow pointer passing without going through InputStream/OutputStream. Robert Osfield 2013-10-10 09:28:26 +00:00
  • 9c53794bc7 Implemented preliminary readNode/readImage support in the lua plugin allow a lua script to create a scene graph as return it. Robert Osfield 2013-10-09 15:32:56 +00:00
  • 2a70ea9f64 Updated rc number Robert Osfield 2013-10-07 10:40:10 +00:00
  • 2f71509ebf From Stephan Huber, "attached you’ll find a bunch of fixes + enhancements for iOS and OS X based on current trunk. I incorporated + tested the submission from Colin Cochran, so his submission is not needed anymore. Robert Osfield 2013-10-07 10:38:58 +00:00
  • e8b5272b02 From Stephan Huber, "attached you’ll find a bunch of fixes + enhancements for iOS and OS X based on current trunk. I incorporated + tested the submission from Colin Cochran, so his submission is not needed anymore. Robert Osfield 2013-10-07 10:05:09 +00:00
  • 20fbad6c29 Cleaned up line endings Robert Osfield 2013-10-07 09:33:46 +00:00
  • da2d7e2dde Added support for automatically select Lua 5.2 is it's available, then falling back to checking for Lua 5.1 otherwise. Robert Osfield 2013-10-04 20:42:23 +00:00
  • d260b16981 Moved code across to use lua_userdata to manage pointer to osg::Object that is ref()/unref() Robert Osfield 2013-10-04 19:48:03 +00:00
  • 79e2d1309f Added support for Lua 5.2 and osg::Object creation from within Lua scripts. Robert Osfield 2013-10-04 16:30:25 +00:00
  • c77dc4fe9e Added createObject() interface Robert Osfield 2013-10-04 16:29:45 +00:00
  • b5b020a138 Updated version number after 3.3.0 dev release Robert Osfield 2013-10-04 16:28:49 +00:00
  • 910cfeea60 Fixed errors in Contributors list Robert Osfield 2013-10-03 16:20:29 +00:00
  • 320c51aa96 Updated Controbutors to fix errors Robert Osfield 2013-10-03 16:13:54 +00:00
  • 8de7ad3fa3 Updated AUTHORS and ChangeLog for 3.2.1-rc1 Robert Osfield 2013-10-03 15:40:08 +00:00
  • 316726445d Updated versions in prep for 3.2.1-rc1 Robert Osfield 2013-10-03 15:29:26 +00:00
  • eac772a841 Updated AUTHORS for for rc Robert Osfield 2013-10-03 15:24:07 +00:00
  • 83c396b13b From Jan Peciva, RayIntersector implementation Robert Osfield 2013-10-03 08:45:57 +00:00
  • 69f2fb56b3 From Colin McDonald and Robert Osfield, "When a serializer shared library is loaded it registers all of the wrappers it contains. The registration creates a prototype object for all of the wrapped classes. For some of the higher-level classes this can be a bit heavy. Robert Osfield 2013-10-02 13:59:00 +00:00
  • 0ec35d5a5d From Dmitry Marakasov, "These are FreeBSD bits for src/osgPlugins/osc/osc/OscHostEndianness.h, required to build newever OSG on this OS. Also corrects file name in the error message - I was confused not to find OSCHostEndianness.h after I've got this error. Robert Osfield 2013-10-02 11:29:58 +00:00
  • f2428e961f From Dmitry Marakasov, "These are FreeBSD bits for src/osgPlugins/osc/osc/OscHostEndianness.h, required to build newever OSG on this OS. Also corrects file name in the error message - I was confused not to find OSCHostEndianness.h after I've got this error. Robert Osfield 2013-10-02 11:29:56 +00:00
  • 0eb435e118 Re-ordered the public/protected sections to keep the public section all together Robert Osfield 2013-10-02 11:28:38 +00:00