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

Commit Graph

  • fd46645ade From KOS, "New classes for osgAnimation presented: UpdateFloatUniform, UpdateVec3fUniform and UpdateMatrixfUniform (based on UpdateUniform template) Robert Osfield 2015-06-03 09:14:35 +00:00
  • fd806293be From KOS, build fix for osg::Uniform::Callback to osg::UniformCallback change Robert Osfield 2015-06-03 09:07:41 +00:00
  • 9222506a2c Added doxygen comment for typedef Robert Osfield 2015-06-03 09:06:44 +00:00
  • e7244e654a Build fix for when Uniform::Callback isn't defined Robert Osfield 2015-06-03 08:38:18 +00:00
  • da73723949 From Konstantin Matveyev, serializer support for UniformCallback Robert Osfield 2015-06-02 10:25:13 +00:00
  • e3f0876e87 From Konstantin Matveyev, "I've changed osg::Uniform::Callback to osg::UniformCallback. osg::UniformCallback inherits osg::Callback now. Robert Osfield 2015-06-02 09:33:22 +00:00
  • 80791c6972 Changed name of UniformCallback to UniformBufferCallback to avoid conflict with changes to come to the osg::Uniform::Callback -> osg::UniformCallback. Robert Osfield 2015-06-02 09:18:19 +00:00
  • ba9dfb2ff6 From Albert Luaces, typo fixes. Robert Osfield 2015-06-01 13:40:20 +00:00
  • d14a602a59 From Jannik Heller, typo fixes Robert Osfield 2015-06-01 13:11:49 +00:00
  • e0028bef6e From Jannik Heller, "This patch adds a missing initialization of osgParticle::ParticleProcessor::_frameNumber in the copy constructor. I noticed this because valgrind was complaining about use of uninitialized memory." Robert Osfield 2015-06-01 12:14:53 +00:00
  • 120bf699b2 From Frashud Lashkari, "I was getting "Unsupported wrapper class..." error messages when attempting to load osgb models simultaneously from multiple threads. I believe the problem is caused by un-synchronized access to the global osgDB::ObjectWrapperManager class. I've attached a change that adds a mutex to the class and uses it when accessing the internal wrapper/compress maps. This appears to fix the issues I was having." Robert Osfield 2015-06-01 12:07:04 +00:00
  • 78a01ce2a5 From Jannik Heller, "I have added new functions Texture::generateAndAssignTextureObject mirroring the Texture::generateTextureObject functions. Robert Osfield 2015-06-01 10:50:44 +00:00
  • 44c406e167 From Jannik Heller, build fix Robert Osfield 2015-06-01 10:41:43 +00:00
  • f72b62a065 From Jannik Heller, fix for race condition in orphanded BufferObject handling. Robert Osfield 2015-05-29 07:52:27 +00:00
  • 4f423ff66b From Colin McDonald, "rc/osgUtl/MeshOptimizers.cpp won't compile on some systems due to a missing std:: namespace prefix." Robert Osfield 2015-05-26 17:24:48 +00:00
  • 906bb27fa0 From Farshid Lashkari, "attached a small change to osgUtil::SceneView that prevents unnecessary calls to glClear when the split stereo separation is 0." Robert Osfield 2015-05-26 17:22:05 +00:00
  • 0f35f31d72 From Thomas Hogarth, "Little fix for ClassInterface::getSupportedProperties, before if you set searchAssociates to false then it would return the same BaseSerialiser::Type for every entry in the PropertyMap as i was not being incremented on line 539. Fix attached." Robert Osfield 2015-05-26 17:17:26 +00:00
  • ddda9a6a0d From We See, "I found a small bug in osgUtil::RenderStage::draw() (osg 3.3.7), which crashes osg. The problem was caused by an access to the object _camera without checking whether the object is valid. So I changed the line: Robert Osfield 2015-05-26 17:12:05 +00:00
  • 01e87939a4 From Farshid Lashkari and Robert Osfield, "a small change to the CullVisitor class, which will use cloneType() on the root render stage when creating children render stages. This allows us to pass a custom RenderStage object to the SceneView and have it used for all sub-stages." Robert Osfield 2015-05-26 17:09:25 +00:00
  • 820166b49d Rewrote the Text3D bevel implementation to automatically adjust bevel thickness to avoid overalapping and erronous tesselation. Robert Osfield 2015-05-26 10:05:47 +00:00
  • 05841d7c00 Added use of ref_ptr<> Robert Osfield 2015-05-26 08:48:33 +00:00
  • 95a507299b Changed the EventQueue::frame() event generation to use the generatePointerData/reprojectPointerData() methods in the same way that other events are handled. Robert Osfield 2015-05-25 12:39:18 +00:00
  • d5b615a4e1 Added osgGA::GUIEventAdapter* returns from various EventQueue event generation methods. Robert Osfield 2015-05-25 11:33:04 +00:00
  • bc473c4e0e Fixed memory error associated with reading over the end of container due to an unbounded while loop. Robert Osfield 2015-05-21 14:11:54 +00:00
  • 2e11113072 Fixed memory error associated with reading over the end of container due to an unbounded while loop. Robert Osfield 2015-05-21 14:11:32 +00:00
  • 180ce288c3 Update ChangeLog and AUTHORS file Robert Osfield 2015-05-06 18:39:44 +00:00
  • 89fd422c98 Changed the CMP0020 check to > 2.8.10 Updated SO version number Robert Osfield 2015-05-05 11:05:09 +00:00
  • a430566596 Changed the CMP0020 check to > 2.8.10 Robert Osfield 2015-05-05 11:04:05 +00:00
  • 5380aebfc1 From Christian Kehl, changes for making osgAndroid working with GLES1 enabled Robert Osfield 2015-04-30 14:04:51 +00:00
  • eb5791e5e2 From Dmitriy Ogalcev, fix for crash when calling setCursor from a non GUI thread Robert Osfield 2015-04-30 13:59:24 +00:00
  • 8962838e6a Replaced attempt at passing NULL Matrix with two specialized methods. Robert Osfield 2015-04-28 16:12:57 +00:00
  • e52b95e084 Renamed LineSegment::intersect(BoundingSphere/Box, double/float&, double/float&) methods to LineSegment::intersectAndComputeRations(..) to avoid confusion with the change in convention for the old intersect(BoundingBox&, float/double&, float/double&) method as it was inconsitent with the rest of the OSG including the intersect(BoundingSphere) method in how the ratio for the second intersection was measure from - original from the end point, but now made consistent with other places in the OSG so be based on ration from start to end of segment. Robert Osfield 2015-04-27 19:31:13 +00:00
  • 5be2e05b18 Refactoring GlyphGeometry Boundary class to facilate better bevel overlap detection Robert Osfield 2015-04-23 14:44:06 +00:00
  • f66b430476 Comment out debug notification Robert Osfield 2015-04-23 12:58:27 +00:00
  • 7d66324e5d Removed unused method Robert Osfield 2015-04-23 09:49:16 +00:00
  • 2b1abf1937 From Giampaolo Vigano, "please find attached a further fix for 3ds plugin: now reflection map works also with transparent objects (I also removed a redundant setting of BlendFunc)." Robert Osfield 2015-04-22 14:25:34 +00:00
  • 5237185e8c From Chris Denham, "I found a couple of memory leaks in 3DS reader plugin and I have attached corrected files. I have attached an example 3DS file I used to test the leaks/fixes using osgviewer for trunk at rev [14853] and the tagged version 3.2.1. Robert Osfield 2015-04-21 17:29:15 +00:00
  • 3d77abc06d Merged correction to coordinates from svn/trunk Robert Osfield 2015-04-20 10:43:00 +00:00
  • 033e52b8ef Updated contributor fixes Robert Osfield 2015-04-20 10:42:28 +00:00
  • 6a4a21afe3 Updated AUTHORS Robert Osfield 2015-04-20 10:41:45 +00:00
  • e08fd168f6 Build fix Robert Osfield 2015-04-20 10:36:42 +00:00
  • 54b389a18a Build fix Robert Osfield 2015-04-20 10:19:04 +00:00
  • 1020e22c33 Moved uniform substitution to infront of vertex attribute substituion to make sure gl_Vertex usage is replaced when required. Robert Osfield 2015-04-20 09:39:00 +00:00
  • 785ce9f679 Moved uniform substitution to infront of vertex attribute substituion to make sure gl_Vertex usage is replaced when required. Robert Osfield 2015-04-20 09:38:49 +00:00
  • 14ef282297 From Tim Moore, "The order_by_primitive_mode comparer was not providing a strict weak ordering, which was causing a crash in the sort() call in VertexAccessOrderVisitor::optimizeOrder (gcc 4.9, Fedora 21)." Robert Osfield 2015-04-20 09:08:56 +00:00
  • ed7629351f Updated dev release number Robert Osfield 2015-04-17 14:36:05 +00:00
  • f4196dfe64 Added implementations for the libraryName and className for the AntiSquish node. Robert Osfield 2015-04-17 13:33:08 +00:00
  • 3bc1102f11 Fixed CollectParentPaths visitor so that it sets the setNodeMaskOverride(0xffffffff) to make sure all parents are traversed to find parents, even ones that have their NodeMask set to 0x0. Robert Osfield 2015-04-17 13:24:44 +00:00
  • a583b306c5 Added --test-NodeMask option to test crash when a parent of osgmanipulator::AntiSquish node has a NodeMask set to 0x0. Robert Osfield 2015-04-17 13:22:07 +00:00
  • 3a2380932f Changed MSVC version test to <= to enable fallback for VS2010. Robert Osfield 2015-04-16 11:19:50 +00:00
  • c61c3d5500 Fixed crash when AntiSquish node is the root of the scene graph. Robert Osfield 2015-04-16 10:07:23 +00:00
  • 4a734b314c Updated ChangeLog Robert Osfield 2015-04-15 18:34:16 +00:00
  • bf0425f628 Updated version number of dev release Robert Osfield 2015-04-15 18:05:43 +00:00
  • eb893eba75 Added missing const to find VS2005 build Robert Osfield 2015-04-15 17:12:52 +00:00
  • 1909de938a Added check for changes to window size during GraphicsWindowWin32::init() to fix bug that occurs when the window manage resizes the window automatically on creation. Robert Osfield 2015-04-14 18:16:32 +00:00
  • 3add98180c From Philippe Renon, MingW build fix Robert Osfield 2015-04-14 15:50:51 +00:00
  • 87122ca369 Fixed typo of SEPARATE enums Robert Osfield 2015-04-13 11:48:28 +00:00
  • 0a1db3d6fc From Jannik Heller, typo fixes Robert Osfield 2015-04-13 10:43:56 +00:00
  • 166c49eedd From Konstantin Matveyev, "I've added GLES3 profile, which also enables GLES2 features (OSG_GLES3_AVAILABLE=true => OSG_GLES2_AVAILABLE=true). Robert Osfield 2015-04-13 10:11:32 +00:00
  • a711fdba36 From Laurens Voerman, I have modified the FindOpenEXR.cmake to find the debug libraries, and to define a variable (OPENEXR_LIBRARIES_VARS) with the variable names that might have a _DEBUG version defined. Robert Osfield 2015-04-13 09:50:27 +00:00
  • 0335ea3760 Added passing of command line arguments to viewer construction to allow one to specify extra controls for the viewer such as window size etc. Robert Osfield 2015-04-13 08:55:08 +00:00
  • 16b19a0c30 Refactored AntiSquish::computeUnSquishedMatrix() method to use the parent node path of the AntiSquish node to compute the required matrix rather than using the NodePath provided by the NodeVistor. This is required as in osg::computeLocalToWorld() usage case the NodeVisitor pointer is NULL, so the correct matrix isn't possible to compute. Robert Osfield 2015-04-09 18:42:08 +00:00
  • 595a048319 Added WindowSizeHandler to osgmanipulator example Robert Osfield 2015-04-09 18:38:53 +00:00
  • 70b5297575 From Jannik Heller, typo fixes Robert Osfield 2015-04-07 18:01:12 +00:00
  • ab2fc1be76 From Giampaolo Viganò, "you can find in the attached ZIP archive a fix for 3ds plugin transparent/diffuse textures and opacity maps and the support for reflection map" Robert Osfield 2015-04-07 16:58:31 +00:00
  • abdb23e367 From Janik Heller, clean up of drawable/node usage Robert Osfield 2015-04-07 15:53:17 +00:00
  • 31488eeba1 Removed unused ShapesToGeometriesVisitor. Robert Osfield 2015-04-07 15:52:02 +00:00
  • 6cff8650f2 Cleaned up handling of Drawables so it utilizes the Node inheritance properly. Robert Osfield 2015-04-07 15:49:06 +00:00
  • 814693ffc1 Build fix for VS2005. Robert Osfield 2015-04-03 15:43:34 +00:00
  • 4c84742664 Improved the doxygen comment for the new createImageWithOrientationConversion(..) function. Robert Osfield 2015-04-03 13:34:13 +00:00
  • c753dbc3e6 Added automatic rotation of jpeg image based on EXIF rotation information provided in the header. Robert Osfield 2015-04-03 13:29:31 +00:00
  • 40a7f903ec Implemented an osg::createImageWithOrientationConversion(...) method to aid for changing orientation of images. Robert Osfield 2015-04-03 13:19:32 +00:00
  • 8fb08496ae Added reading of EXIF_Orientation tags when present in a jpeg file. Robert Osfield 2015-04-02 16:11:22 +00:00
  • 950d7bb60b From Wojciech Lewandowski, Windows build fixes, "These are the tweaks I had to make. JSON_Objects / json_stream headers attached. I am not sure how these will behave on VS 2010. Someone with VS 2010 should test it. Should be okay on VS 2008 and below + VS 2012 and above, though." Robert Osfield 2015-04-02 10:12:22 +00:00
  • f26be0155c From Lionel Largarde, "fix for the Image::computeNumberOfMipmapLevels method. The method did use the float version of the log function and the / operator. It works for most of the input sizes, but fails for 8192, 32768... For 8192, the method returns 13 instead of 14." Robert Osfield 2015-04-01 09:37:53 +00:00
  • 9aa8d641a0 From Lionel Largarde, "fix for the Image::computeNumberOfMipmapLevels method. The method did use the float version of the log function and the / operator. It works for most of the input sizes, but fails for 8192, 32768... For 8192, the method returns 13 instead of 14." Robert Osfield 2015-04-01 09:37:44 +00:00
  • de415fbcf9 Fixed crash when using a subload callback, where the _images array is empty by _images[0] was still being accessed. Robert Osfield 2015-03-31 19:31:34 +00:00
  • 5229280901 Added --subload command line option and test subload callback for testing purposes Robert Osfield 2015-03-31 19:29:02 +00:00
  • a7ba138dc7 Introduced osg::Camera::resize(..) method and associated enum thus: Robert Osfield 2015-03-31 16:23:43 +00:00
  • 99f7bfab3b Introduced Camera::resizeAttachments(int width, int height) to resize all the Texture and Image assigned the the Camera attachments. Robert Osfield 2015-03-31 15:08:13 +00:00
  • 296c12a8e9 Refactor the RTT Camera resize code into a seperate Callback method in prep for this all being done by a single Camera API call. Robert Osfield 2015-03-31 10:41:33 +00:00
  • 307e70f13b Added Camera::dirtyAttachmentMap(), Camera::s/getAttachmentMapModified() value and usage of this in RenderStage as a new mechanism for telling the rendering backend to update itself to reflect new values in the attachments such as new texture or image sizes. Robert Osfield 2015-03-31 10:36:38 +00:00
  • 06e6f368fc Added StatsHandler to osgtessellationshaders example to test out rendering bug associated with stats rendering. Robert Osfield 2015-03-23 11:36:02 +00:00
  • 890aea9537 Added event handle to alter the RTT Camera's dimensions to follow the windows resizes. Robert Osfield 2015-03-20 17:58:34 +00:00
  • 953828a817 Fixed resize dimensions of X11 window Robert Osfield 2015-03-20 15:49:12 +00:00
  • 6854d2968f From Jannik Heller, "Fix for Qt4 multi-threaded crash. This patch adds the AA_X11InitThreads flag to the QApplication setup, meaning QT will call XInitThreads for us. This also bumps the required QT version to 4.8+, because the AA_X11InitThreads flag was introduced in that version. If that is not acceptable, we could add a QT_VERSION >= 0x040800 guard, or manually call XInitThreads() instead. Let me know what you think." Robert Osfield 2015-03-20 11:48:21 +00:00
  • 63a3595aab Added Texture wrap setting to CLAMP_TO_EDGE to fix rendering problem when running the default osgdistortion example Robert Osfield 2015-03-19 10:49:17 +00:00
  • d9f920ee37 Fixed VisualStudio warning Robert Osfield 2015-03-17 18:10:21 +00:00
  • 31fd2456b6 From Konstantin Matveyev, "Added ComputeBoundingBoxCallback, ComputeBoundingSphereCallback and UpdateCallback implmenentations to serializers" Robert Osfield 2015-03-17 14:50:34 +00:00
  • bf86b031e0 Updated ChangeLog and AUTHORS file for dev release Robert Osfield 2015-03-17 09:40:31 +00:00
  • 9eb02084a6 Removed unimplemented ComputeBoundingBoxCallback and ComputeBoundingSphereCallback Robert Osfield 2015-03-17 09:10:59 +00:00
  • 535b168d81 Fixed library wrapper Robert Osfield 2015-03-17 09:09:10 +00:00
  • bd82047acb Added missing references for static build Robert Osfield 2015-03-17 08:26:13 +00:00
  • c086bef5ed Added ComputeBoundingSphereCallback reference Robert Osfield 2015-03-17 08:25:49 +00:00
  • fb4a2d7128 From Konstantin Matveyev, "More "LibraryWrapper" fixes for osg and osgAnimation NodeKits in the attachment (for 3.3.6 version :) Robert Osfield 2015-03-17 08:24:01 +00:00
  • b8cd439697 Changed to using osgDB::ofstream to work around Windows build issue Robert Osfield 2015-03-17 08:19:05 +00:00
  • 728d5ead52 Removed unneccessary library link line. Robert Osfield 2015-03-16 17:01:57 +00:00
  • 6d47fe4d98 Removed the using namespace std and replaced with local std:: to make the code clearer Robert Osfield 2015-03-16 14:16:52 +00:00
  • e6e39e7924 Refactored the command line setup to enable better control of set up. Added WindowSizeHandler to allow for adjustment of window size. Robert Osfield 2015-03-16 12:13:44 +00:00
  • f9a20d017a From Konstantin Matveyev, "Last update in the osgAnimation::Animation ONCE mode bug fix" Robert Osfield 2015-03-16 10:30:51 +00:00