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

Commit Graph

  • c08d77f7bb From Sukender, "Vertices in DOUBLE PRECISION were not handled by Remapper classes. I added missing virtual methods." Robert Osfield 2011-02-01 18:12:59 +00:00
  • 88f9e7dda8 Fixed the setting of the Drawable modes Robert Osfield 2011-02-01 12:18:47 +00:00
  • 99fc347212 Added experimental timing and PBO usage into ICO+GCE classes Robert Osfield 2011-02-01 12:18:22 +00:00
  • cb26484ac7 Fixed bug in PixelBufferObject constructor for the case when a null Image is passed in to it. Added extra checks for NULL buffer data. Robert Osfield 2011-02-01 12:17:40 +00:00
  • 45c933daf2 Ran: svn propset svn:eol-style native include/*/* svn propset svn:keywords "Author Date Id Revision" include/*/* Robert Osfield 2011-01-31 11:40:35 +00:00
  • ef673dec45 svn propset svn:keywords "Author Date Id Revision" include/OpenThreads/* Robert Osfield 2011-01-31 11:35:50 +00:00
  • e90142c3a5 Set eol-style to native. Robert Osfield 2011-01-31 10:41:17 +00:00
  • 6e80cdcfb2 Temporarily disabled the cost estimate code for the 2.9.11 release Robert Osfield 2011-01-28 14:24:30 +00:00
  • 54d16c74ad From Ulrich Hertlein, "I adapted the Cocoa implementation so that it reports the unmodified key and the modified key as requested. Can other OS X developers please test the attached file, to make sure it works for everybody? Robert Osfield 2011-01-28 13:54:44 +00:00
  • 1c9d800756 Fixed size of default font Robert Osfield 2011-01-28 12:34:49 +00:00
  • b4eaccc3c2 From Per Fahlberg, warning fixes Robert Osfield 2011-01-28 11:07:51 +00:00
  • 6072652875 From Mathias Froehlich, "Driven by the last qfontimplementation changes, I realized, that I never contributed my testcase/demo for the original implementation. This attached change is similar to osgtext but uses the QFontImplementation in a Qt based viewer. With that, it should be easier for all of us to test changes in qfontimplementation" Robert Osfield 2011-01-28 10:59:50 +00:00
  • 523b77ee8f From Ulrich Hertlien, "the changes from r12126 (see below) in dae/domSourceReader.h cause compiler errors on OS X with gcc-4.2.1: Robert Osfield 2011-01-28 10:53:49 +00:00
  • ac65e37ed3 From Mourad Boufarguine, "This is a tiny fix for some typos in osg code." Robert Osfield 2011-01-28 10:50:24 +00:00
  • 9b6e3fbe94 From Andreas Roth, "simple fix to support quad buffer stereo in osgQt" Robert Osfield 2011-01-27 18:49:22 +00:00
  • 2a18c8b02a From Eric Buehler, "I believe that the osgWidget::Window::HA_CENTER alignment should be center aligned rather than by the origin, as the osgWidget::Window::VA_TOP causes. Robert Osfield 2011-01-27 17:14:28 +00:00
  • 278203240b From Sukender, "I found the bug I was chasing! Here is my "twin" submission, from latest trunk rev: 12124. Robert Osfield 2011-01-27 17:12:23 +00:00
  • 67ae23f2cf From Alexander Sinditskiy, "reason of this changes described in http://forum.openscenegraph.org/viewtopic.php?t=7596 Robert Osfield 2011-01-27 16:23:48 +00:00
  • 67e1d14991 Removed the executable property from source files Robert Osfield 2011-01-27 09:41:37 +00:00
  • 373f3931e9 Implement first pass at texture compile estimation Robert Osfield 2011-01-26 18:47:55 +00:00
  • a4f2cbe577 Replaced CompileStats with GraphicsCostEstimator Robert Osfield 2011-01-26 16:47:40 +00:00
  • 3762dc49b9 From Mourad Biyfarguine, "This is a fix to some 'potentially uninitialized local variable' warnings in src/osg/glu/libutil/mipmap.cpp." Robert Osfield 2011-01-26 16:46:58 +00:00
  • f9428e9f45 From Mathias Froehlich, build fix for Solaris Robert Osfield 2011-01-26 16:45:36 +00:00
  • 740b29d0f7 From Wang Rui, "I've found a problem when using QFont (osgQt/QFontImplementation.cpp) to read fonts: only the first character of a whole text is correctly shown and others are disappeared. I haven't got into the font implementation so can't explain why this happened and how it should work under other platforms, but it seems to be fixed by specifying width and height of the glyph object. The source file is attached for future developments. At present it just works for my own project. :-) " Robert Osfield 2011-01-26 16:10:42 +00:00
  • 9df072ce05 Moved GraphicsCostEstimator into osgUtil. Robert Osfield 2011-01-26 12:51:46 +00:00
  • 1079c494d6 Implemented first pass at geometry cost estimation. Robert Osfield 2011-01-26 12:07:56 +00:00
  • 9bb86b5534 Fixed warnings Robert Osfield 2011-01-25 16:48:53 +00:00
  • f20bebe52e Further work on GraphicsCostEstimator classes Robert Osfield 2011-01-25 11:11:47 +00:00
  • abea92ee91 From Mathias Froehlich, build fixes Robert Osfield 2011-01-24 21:12:25 +00:00
  • 442caf6961 Added osggraphicscost example as a base of for developing and testing the new osgUtil::GraphicsCostEsimator class. Robert Osfield 2011-01-24 20:45:02 +00:00
  • a503b143cc From Michael Platings, Fix animation duration when adding channel to animation Cedric Pinson 2011-01-24 11:45:45 +00:00
  • 71f97cb3bc Added #include to fix build Robert Osfield 2011-01-21 14:11:22 +00:00
  • 90508f282a From Sukender, " DAE plugin was linking ORIGINAL images in the Collada file, using image->getName() as a path (even if images were modified in memory!). As the behaviour was not the one of other plugins (3DS, FBX, and such), I made the plugin relativise images filenames (as those plugins) and write the image which is in memory. However, in order to avoid removing features, I kept the previous behaviour but moved it in an option. Here are the options of the plugin I changed: - daeForceTexture was unclear in this new context and removed in favor of two new options - daeLinkOriginalTexturesNoForce: Writes reference to the original image if found, instead of writing the image in memory - daeLinkOriginalTexturesForce: Writes reference to the original image even if not found, instead of writing the image in memory Of course, if you specify no option, images are written as for other plugins. Robert Osfield 2011-01-21 13:40:28 +00:00
  • cc207c1112 From Sukender: I had to call code from the FBX plugin (to relativise paths). I thus extracted it from FBX and moved it in osgDB (FileNameUtils) Michael PLATINGS 2011-01-21 12:17:18 +00:00
  • 43afbab09e From Sukender, getPathRelative() method. Robert Osfield 2011-01-21 11:46:15 +00:00
  • 26c313e258 Added export to see if it address Mingw link problems Robert Osfield 2011-01-20 12:34:41 +00:00
  • 6d1944b9e2 From Matthew Johnson-Roberson, "Small fix for operation thread to protect the access to _operations vector by functions getNumOperationsInQueue() and empty(). It is simply an addition of OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); to protect against accessing while writing which was segfaulting in VPB specifically in void ThreadPool::run(osg::Operation* op) in the waiting loop Robert Osfield 2011-01-20 12:32:20 +00:00
  • 2dc0247bd9 From Per Fahlberg, warning fixes Robert Osfield 2011-01-20 12:27:51 +00:00
  • 34aca88715 From Simon Julier, "I have been using the ply plugin to read files created by bundler and pmvs2 (http://grail.cs.washington.edu/software/pmvs/). This program generates models in the form of vertices only. However, the existing ply reader implementation was not able to handle the models generated in a satisfactory manner for two reasons: Robert Osfield 2011-01-20 12:23:04 +00:00
  • d21009c323 From Simon Julier, "I ran across linking errors with osgdb_exr. Specifically, I found it was necessary to link against libImlIlf, libImlThread, libHalf, libIex and libzip. Robert Osfield 2011-01-19 10:57:58 +00:00
  • 6fb5387473 From Sukender, normalized option names Robert Osfield 2011-01-19 10:38:39 +00:00
  • fc32aa4918 From Sukender, "Added ability for writer to read from Vec3/4d/f. Plugin now warns if it finds another type of data" Robert Osfield 2011-01-19 10:31:49 +00:00
  • 975aea4a2b From Sukender, "Factorized the depth loop ("while ( lastDepth >= _nodePath.size() )...") into a method called updateCurrentDaeNode(). Added missing calls into apply(osg::LightSource &) and daeWriter::apply(osg::Camera &) and daeWriter::apply(osg::CameraView &)" Robert Osfield 2011-01-19 09:53:34 +00:00
  • 0ed6049390 From Sukender, "Fixed ReaderWriterDAE::ConvertFilePathToColladaCompatibleURI(): It now handles paths containing '#' character as expected." Robert Osfield 2011-01-19 09:36:21 +00:00
  • 45f2b29a77 From Sukender and Robert Osfield, clean up of options Robert Osfield 2011-01-19 09:34:26 +00:00
  • bc6a94c5b3 From Michael Platings, "I've attached a fix for a subtle bug that causes animations (and quite possibly other things) to be serialized incorrectly. Robert Osfield 2011-01-18 16:14:24 +00:00
  • f2f9bb11b0 Moved the StateSet query and texcoord settings to within the if (vertices) block to avoid an attempt to dereferences geometry->getStateSet() when non Geometry drawable is intersected. Robert Osfield 2011-01-18 15:00:36 +00:00
  • 57cf04a6bb Fixed CompileSet so it returns true when there is nothing to compile at all. Robert Osfield 2011-01-18 11:20:53 +00:00
  • bf99528322 Build fix Robert Osfield 2011-01-18 09:54:47 +00:00
  • 11cd5a89ed Implemented better coupling of DatabasePager and IcrementalCompileOperation, removing functional duplication and opening the door to dynamic enabling/disabling of pre compile based on load. Robert Osfield 2011-01-17 17:17:19 +00:00
  • 45bd464942 Added getNum methods Robert Osfield 2011-01-17 09:10:14 +00:00
  • 4525dce70e First steps on the path to integrating ImageProcessor Robert Osfield 2011-01-15 18:12:19 +00:00
  • 2b3bba8587 From Guy Volckaert, "Changes to the openflight plugin to support replacing double sided polygons by 2 opposite facing polygons. This is sometimes required to resolved lighting and intersection issues. A new import option was was added to activate this feature called "replaceDoubleSidedPolys". Robert Osfield 2011-01-14 14:30:19 +00:00
  • fac9992bca From Sukender, "- Lowered one notify level (it's now coherent with the "if" just above)" Robert Osfield 2011-01-14 13:31:07 +00:00
  • 942213dc85 From Wang Rui, "I'd like to submit a small new feature to the osgmanipulator example which could fix the dragger size in screen, so that no matter how we zoom in/out the camera, the dragger will never be scaled. Robert Osfield 2011-01-14 12:08:46 +00:00
  • a4f9c19440 From Sukender, "TIFF plugin now outputs messages coming from libtiff. " Robert Osfield 2011-01-14 12:03:37 +00:00
  • ad530c0fc7 From Sukender, "Small submission: - 3DS reader now takes care to not create Texture2D duplicates" Robert Osfield 2011-01-14 11:49:55 +00:00
  • a1eabf18b5 Fixed for build with non autoatic ref_ptr<> to C pointer conversion Robert Osfield 2011-01-14 11:46:43 +00:00
  • b0dd272186 From Brad Christiansen, "Attached is a fix which implements the lazy loading of optional layers (if requested) in the new osgb/osgt formats." Robert Osfield 2011-01-14 11:00:11 +00:00
  • 7c30f204e8 Updated so version number Robert Osfield 2011-01-13 18:49:12 +00:00
  • 0da6d7f298 From Tim Moore, added missing ImageProcessor header reference Robert Osfield 2011-01-13 18:05:59 +00:00
  • 1b67e3ad1f Added ImageProcessor interface class and plugin mechnanism for ImageProcessor implementations to osgDB::Registry. Robert Osfield 2011-01-13 14:59:29 +00:00
  • f61a6aa4e7 Refactored the way that the DatabasePager passes the Terrain decorator node onto the TerrainTile. Robert Osfield 2011-01-12 19:29:24 +00:00
  • 762f8d5360 Fixed comment Robert Osfield 2011-01-12 17:39:35 +00:00
  • 534052f7cb From Sukender, "FBX plugin did not relay the osgDB::ReaderWriter::Options* when writing images (the writeImage() call). Now it does." Robert Osfield 2011-01-11 17:29:47 +00:00
  • 1f0a8aff32 Changed dos endings to unix line endings Robert Osfield 2011-01-11 17:29:11 +00:00
  • 49113e03dc From Mikhail Izmestev, "Current osgManipulator::AntiSquishCallback stops update traversal of childrens." Robert Osfield 2011-01-11 17:23:22 +00:00
  • 5ed5221178 From Wojciech Lewandowski, "We encountered a problem when we tried overloading StandardManipulator class. Linker was unable to find StandardManipulator::AnimationData methods. Prefixing AnimationData with OSGGA_EXPORT removed the issue. Robert Osfield 2011-01-11 17:20:25 +00:00
  • 652c274d09 From Chris Hanson, "As an extension to this excellent work: http://forum.openscenegraph.org/viewtopic.php?t=7285 Robert Osfield 2011-01-11 17:18:44 +00:00
  • 8dc2607c43 Changed debug messages to INFO Robert Osfield 2011-01-11 17:05:24 +00:00
  • 3cac9e9603 From Glenn Waldron, "Attached is a fix to State::convertVertexShaderSourceToOsgBuiltIns. The method was incorrectly inserting new declarations before a GLSL "#version" directive, which must always be the first line in a shader. This patch detects the #version directive and ensures that new declarations are inserted after it. Robert Osfield 2011-01-11 17:04:37 +00:00
  • e4b1b6228d From Tim Moore, "This patch fixes a race condition in Renderer::ThreadSafeQueue that was causing some notifications of available SceneView objects to be missed. I saw a very noticeable performance problem (60 fps -> 8 fps) in DrawThreadPerContext mode in an osgEarth application before this patch. I had high hopes that this change might fix the much-discussed multiple GPU problem; no such luck, but I think the root cause of that is probably a similar threading issue." Robert Osfield 2011-01-11 16:58:17 +00:00
  • 88987d194a From Guy Volckaert, warning fixes Robert Osfield 2011-01-11 16:18:49 +00:00
  • 32a4c0da2e Added more flexible testing of Text3D Robert Osfield 2011-01-11 11:39:50 +00:00
  • 74cf034404 Unified more of the 2D and 3D text setup, fixed bugs in Text3D setup which address the problems of black 3D text and the kerning causing problems with font positioning. Robert Osfield 2011-01-11 11:39:31 +00:00
  • d59ac54b31 Improved the handling of application argument output when the options are very long. Robert Osfield 2011-01-10 13:28:23 +00:00
  • c606604a7e Added check for invalid face size to prevent a crash Robert Osfield 2011-01-05 11:43:37 +00:00
  • a30265de46 Added extra checks to osg::Geometry::verifyArrays(std::ostream&) Robert Osfield 2011-01-04 10:21:50 +00:00
  • d644a6dfe3 Added osg::Geometry::verifyArray(std::ostream&) method to enable checks to be done on osg::Geometry to see if the arrays are big enough to handle the primitives used in the geometry. Robert Osfield 2011-01-03 19:41:06 +00:00
  • 25ef1a9e58 Added iterator include Robert Osfield 2010-12-24 19:47:31 +00:00
  • 0d814bb6b8 Refactored IncrementalCompileOperation to make it more flexible. Robert Osfield 2010-12-24 19:19:48 +00:00
  • 149200f0e9 Fixed warnings Robert Osfield 2010-12-23 13:11:15 +00:00
  • d2c19014ac Deleted old makefile files that are no longer required now we have CMake Robert Osfield 2010-12-23 10:45:43 +00:00
  • 4cb58c703c From Per Fahlberg, "The FindCOLLADA.cmake module failed to find the static libs for the latest collada dom, attached is the fixed file." Robert Osfield 2010-12-23 10:07:27 +00:00
  • 007c8b9df6 From Ulrich Hertlein (applied by Robert Osfield), "OpenThreads/win32/Win32Condition.h is not used anymore and could be removed from the repository and win32/OpenThreads.mak and win32/CMakeLists.txt." Robert Osfield 2010-12-23 10:05:55 +00:00
  • 8202ccc679 From Jean-Sebastien, "In my auto-build today there are 3 errors caused by using a ref_ptr<T> in a function taking a T* when building without the implicit conversion." Robert Osfield 2010-12-23 09:59:35 +00:00
  • 410b4fd109 Converted FrameStamp::g/setFrameNumber from int to uint Robert Osfield 2010-12-22 20:11:05 +00:00
  • b5d4d9954a From Tim Moore, Dereference the databaseRequest while the queue is locked. This prevents the request from being deleted at an unpredictable time within addLoadedDataToSceneGraph. Robert Osfield 2010-12-21 12:54:06 +00:00
  • c38a1eb56d Introduced a local reference to the appropriate EasyCurl object to avoid seperate getEasyCurl() incurring a mutex lock overhead. Robert Osfield 2010-12-21 12:51:15 +00:00
  • 56a8df7ba7 Improved indentation to make it more readable and consistent with OSG. Robert Osfield 2010-12-21 10:23:31 +00:00
  • 7507242891 Cleaned up the frame number increment. Robert Osfield 2010-12-21 09:36:03 +00:00
  • fce0121d26 From Paul Martz, Fix for "in expGeometryRecords.cpp lines 813-820, we write the UV list data incorrectly. According to the FLT spec, the data should be grouped per-vertex, not per-layer. Robert Osfield 2010-12-21 09:12:18 +00:00
  • 89f9aa2ddd From Andy Skinner, "In this file I’ve changed TriangleFunctor to TemplatePrimitiveFunctor, and added operator() methods for: Robert Osfield 2010-12-20 17:04:59 +00:00
  • f3df40aa70 From Andy Skinner, "We use a shared array for our OpenSceneGraph arrays, and the existing (deprecated) OSG plugin casts the Array to IntArray and FloatArray and the like. Because our arrays don’t use FloatArray, this crashes for us. Robert Osfield 2010-12-20 16:23:27 +00:00
  • c9c329e7c4 Moved the GL3 include to within the code block that handles GL1/GL2 Robert Osfield 2010-12-20 12:17:40 +00:00
  • 959b8e6d1d Fixed memory leak by introducing use of ref_ptr<> Robert Osfield 2010-12-20 12:03:56 +00:00
  • 9818c0fee2 From Kim Seokhwan, "Error fix in example/osganimationmorph/osganimationmorph.cpp Robert Osfield 2010-12-20 12:02:50 +00:00
  • 716a00ec59 From Trajce Nikolov, Fixes to avoid cracks in older archives, tested with archives 2.0, 2.1, 2.2 . Robert Osfield 2010-12-20 10:49:30 +00:00
  • 758bf7c3d9 From Trajce Nicklov, "I went thru the TileMapper today very carefuly and I remove all the tileStack approach - it made everything simplier and I think more proper. Cleaned the code as well. It was tested on huge archive with many lods as well with variable lods. Fix attached." Robert Osfield 2010-12-19 13:25:45 +00:00
  • 362edaa1b9 From Tim Moore, fix for race conditions in takeOrGenerate() methods Robert Osfield 2010-12-17 13:43:41 +00:00