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

Commit Graph

  • 4623c251bb Fixed indentation Robert Osfield 2013-06-11 10:49:57 +00:00
  • b0a28a5b2c Refactored the way the ReadResult/WriteResult lists are handled, with them now being sorted so that the Read/WriteResult with highest numerical value ReadStatus/WriteStatus is returned. Changed the enum order of ReadStatus/WriteStatus to ensure that the more relevant errors are last and with the highest numerical value Robert Osfield 2013-06-11 09:05:35 +00:00
  • bdfd18dc03 From Kristofer Tingdahl, with additions from Riccardo Corsi and Robert Milharcic, support for Qt5 build Robert Osfield 2013-06-10 14:34:25 +00:00
  • 8cf9600e2c Fixed remove and add callback so they properly handle nested callbacks Robert Osfield 2013-06-10 10:37:08 +00:00
  • eb556797e2 From Marcin Prus, "I don't know if you seen my second reply to your information about merging my Image and dds plugin changes. I found one problem in your latest submit. In ReaderWriterDDS::ComputeImageSizeInBytes pixelFormat and pixelType are not passed into osg::Image::computeImageSizeInBytes. Robert Osfield 2013-06-07 10:54:55 +00:00
  • a6e57026b2 From Mathias Froehlich, "attached is a change to osgsharedarray to move completely to the fast geometry path. Also the arrays are moved back to static storage since this is the data that is actually referenced in draw. So the change moving this onto the stack that happend somewhere before broke this." Robert Osfield 2013-06-07 10:52:29 +00:00
  • d66ee2c698 Replaced OpenThreads::Mutex with a OpenThreads::ReentrantMutex to allow draw callbacks to use Renderer. Robert Osfield 2013-06-06 08:23:37 +00:00
  • 49cfece9d4 Reorder member variables to ensure better packing in memory. Robert Osfield 2013-06-05 07:55:05 +00:00
  • 4f1e6b28e8 Moved the Array::AttribDivisor into the Array::Binding enum to avoid conflicts in settings between Binding and AttribDivisor. Robert Osfield 2013-06-05 07:27:35 +00:00
  • eb693f6a92 Updates to GeometryNew, Array and ArraDispatchers to clean up GeometryNew so that is no longer uses ArrayData. Robert Osfield 2013-06-04 19:04:26 +00:00
  • cbea97009c Added s/getNormalize(), s/getPreserveDataType(), s/getAttribDivisor() and s/getBinding() to osg::Array base class in preperation for refactor of osg::Geometry and introduction of new features. Robert Osfield 2013-06-04 14:55:57 +00:00
  • a70318fbd5 Removed now redundent osggeodemo Robert Osfield 2013-06-04 14:43:19 +00:00
  • c0c5fc13b1 Removed geo plugin as the modelling tool it was assocaited is long defunct. Robert Osfield 2013-06-04 13:29:44 +00:00
  • bab251fc59 Cleaned up BIND_PER_PRIMITIVE and array indice usage Robert Osfield 2013-06-04 10:06:19 +00:00
  • caa3a06c70 Introduced GeometryNew which is a cleaned up version of Geometry that removes support for array indices. GeometryNew is only temporary and will be renamed to Geometry on the completion of refactoring work and feedback from community. Ported osggeometry across to use GeometryNew. Robert Osfield 2013-06-04 09:32:59 +00:00
  • 4cca5c1d1c Removed deprecated usage of osg::Geometry indices and BIND_PER_PRIMITIVE Robert Osfield 2013-06-04 09:29:37 +00:00
  • 2dc53ceabb From Aurelien Albert, Added support for texture swizzle. Robert Osfield 2013-06-03 15:10:53 +00:00
  • 9b67578c47 Updated version and so_version in prep for 3.1.8 developer release Robert Osfield 2013-06-03 14:38:23 +00:00
  • 82ecbe98da From Laurens Voerman, "Autodesk released a new version of their FBX Software Development Kit (web page http://usa.autodesk.com/adsk/servlet/pc/item?siteID=123112&id=10775847). The API has changed quite a bit, so lots of changes had to be made in the osg readerwriter. The preious version of the FBX SDK (2013.3) already deprecated a lot of the names and functions. The code I submit now still compiles against 2013.3 (possibly needs a #define FBX_NEW_API). Not sure if that's useful, but it might ease the transition." Robert Osfield 2013-06-03 14:27:14 +00:00
  • 375e7c2d57 From Laurens Voerman, "while updating dependencies I found a problem with libgif 5 from http://sourceforge.net/projects/giflib/ a change in version 5.0.0 required a call to the fuction "DGifOpen" to pass an int ref for an error code. My fix ignores the error, just fixes the compile." Robert Osfield 2013-06-03 14:04:02 +00:00
  • 05a1084e5c From Sergey Polischuk, "this patch fixes light id in gl modes for osg::LightSource's readed from fbx (previously all lightsources were setting GL_LIGHT0 mode, while osg::Lights were using different id's), and enables GL_LIGHT# on root node for all lights contained in model " Robert Osfield 2013-06-03 14:01:13 +00:00
  • ae2b6669ea Added Vec*b, Vec4ub, Vec*s, Vec*i, Vec*ui serializers Robert Osfield 2013-06-03 13:13:18 +00:00
  • 2244f6a371 Added Vec2i, Vec2ui, Vec3i, Vec3ui, Vec4i and Vec4ui headers to CMake header list Robert Osfield 2013-06-03 12:19:06 +00:00
  • 4697b3c68b From Art Tevs, int and uint Vec classes Robert Osfield 2013-06-03 11:38:20 +00:00
  • efe52842fa From Aurelien Albert, "This submission is made against trunk version and add the loading of "glVertexAttribDivisor" extension." Robert Osfield 2013-06-03 09:19:46 +00:00
  • 56dc8fee01 From Laurens Voerman, "I made some changes to the top level CMakeLists.txt that might be usefull to other visualstudio users. 1> Disable project grouping for VCExpress users: the version I proposed previously in Re: [osg-submissions] Cmake patch to support folders in IDE (29 Feb 2012) Robert Osfield 2013-05-31 10:28:39 +00:00
  • 9921c77136 From Ulrich Hertlein, "attached is a patch that fixes another clang++ compiler warning when returning std::vector::size() as 'unsigned int'. " Robert Osfield 2013-05-31 10:23:49 +00:00
  • b6579c5c4a From Wang Rui, "The osgdb_nvtt plugin needs to be updated to work with the latest NVTT library, which changes the interface slightly (adding a new pure virtual method endImage()). I've modified the source file and attached it here." Robert Osfield 2013-05-30 09:07:46 +00:00
  • ae4d87a3be Renamed PanoramicSphericalDisplay.cpp to fix a typo Robert Osfield 2013-05-28 19:16:59 +00:00
  • 6cb9115170 Updated ChangeLog and Contributors list Robert Osfield 2013-05-28 16:39:48 +00:00
  • 3722f46aff From Farshid Lashkari, "The logic for handling opacity maps in the 3ds reader seems to be incorrect. It checks whether the diffuse texture contains transparency, instead of the opacity texture. If the diffuse does not contain an alpha channel it outputs the warning: Robert Osfield 2013-05-28 15:43:12 +00:00
  • 4b223c770b From Michael Bach Jensen and Robert Osfield, "As discussed (http://forum.openscenegraph.org/viewtopic.php?t=12027) here is my submission :-) Robert Osfield 2013-05-28 15:40:28 +00:00
  • fed4d91ecc Replaced the initialization of the strarray to use reseve instead of a initial size provided in the constructor as this was leading to a bug in output. Robert Osfield 2013-05-28 15:18:59 +00:00
  • f730396f0a Fixed date typo Robert Osfield 2013-05-28 14:40:36 +00:00
  • 382c3322c9 From Farshid Lashkari, "I just started looking into the shader composition feature. I enabled shader composition on the osg::State object and noticed a 6x increase in draw time. I figured that the default composer might have performance issues, so I created a custom ShaderComposer that overrides "getOrCreateProgram" and does nothing. This still resulted in a performance drop. Robert Osfield 2013-05-28 14:35:44 +00:00
  • 47f574429a From Marcin Prus and Robert Osfield, moved the key parts of the .dds plugins computeRowWidthInBytes implementation into the osg::Image::computeImageSizeInBytes(..) to address bugs in the computation of image size. Robert Osfield 2013-05-28 14:14:45 +00:00
  • d024444140 From Sukender, "Added ".dds" file deletion on writing failure." Robert Osfield 2013-05-28 11:47:08 +00:00
  • 492459e4dc From Sukender, "Added vertical flipping to the writer depending on the Image::getOrigin() value (= flip the image when Image::BOTTOM_LEFT). Most of the time this will not change DDS writing (= no v-flip), as it seems images are rarely "BOTTOM_LEFT". To skip this behaviour, the "ddsNoAutoFlipWrite" option was added. I also moved a few lines of code about "dds_flip" option, and made options reading more like in other ReaderWriters." Robert Osfield 2013-05-28 11:46:01 +00:00
  • 53fd801088 From Diane Delallée & Sukender, "Added some support of non-modulus-4 dimensions in S3TC-DXTC images (previous implementation seem just not to handle these properly). - Added missing packing value on S3TC images. Images are coded with 4x4 blocs, whatever the image size. So there is an horizontal packing of 4 pixels (2 bytes in DXT1, 4 bytes in DXT2-5). - Added crash guard against writing corrupted S3TC images. Notes: - What is missing is a support of "lines packing" in osg::Image (see code comments). - S3TC-DXTC vertical flipping crashes (access violation) with some unusual dimensions (see code). I could not implement missing cases, so I added guards to avoid crashing." Robert Osfield 2013-05-28 11:44:36 +00:00
  • 39b9351153 From Diane Delallée and Sukender, "1. Image.cpp Failure to perform a vertical flip on S3TC-DXTC now simply leaves the original image instead of corrupting it. Image.cpp was sometimes performing a "normal" (= for uncompressed images) vertical flip on S3TC-DXTC images, producing weird results. Actually, code was trying a "DXTC vertical flip" and relied on the result to call a "normal vertical flip". But when the "DXTC v-flip" encounters an error, this is is not necessarily because the image is not S3TC (ex: unhandled image dimensions)! So now the code simply does "if dxtc, then flip_dxtc; else flip_normal;". Robert Osfield 2013-05-28 11:25:13 +00:00
  • 81b6c82d9a Fixed the computation of the spot light direction. Robert Osfield 2013-05-28 10:46:47 +00:00
  • d7931e3024 Fixed View::setUpViewInWindow() parameter Robert Osfield 2013-05-28 09:20:48 +00:00
  • aa33d213dd Added an OSG_INIT_SINGLETON_PROXY(..) to initialize the static s_GLExtensionDisableString variable Robert Osfield 2013-05-28 08:38:09 +00:00
  • 267802c928 Updated AUTHORS file Robert Osfield 2013-05-27 09:10:18 +00:00
  • f5508d35f9 Updated AUTHORS file Robert Osfield 2013-05-27 09:07:53 +00:00
  • ac77a1e224 Updated ChangeLog and AUTHORS file Robert Osfield 2013-05-27 09:05:14 +00:00
  • 02e4aef5cb From Martin Naylor, "I am receiving 1 build error whilst building the SVN, its in osgforest as follows: Robert Osfield 2013-05-27 08:13:23 +00:00
  • 18c37d14cd Moved quad buffer definitions into include/osg/Camera Robert Osfield 2013-05-27 08:10:42 +00:00
  • 29f3393275 Updated AUTHORS file Robert Osfield 2013-05-26 10:44:11 +00:00
  • ab69c1f9d4 Updated ChangeLog Robert Osfield 2013-05-26 10:27:07 +00:00
  • f3d21bd285 From Farshid Lashkari, " small update to TangentSpaceGenerator to support QUAD_STRIP primitive types." Robert Osfield 2013-05-25 10:09:23 +00:00
  • 0eb95f01d8 Resrtuctured the use of static's in the Uniform::getNameID() method to avoid problems under Android. Robert Osfield 2013-05-24 17:16:57 +00:00
  • 2923c8014a From Jordi Torres, "We must use JNI_FALSE instead of false in JNI code. Otherwise the examples will not compile. This patch should be applied to osgAndroidExampleGLES1/jni and osgAndroidExampleGLES2/jni. the osgNativeLib.cpp is the same. " Robert Osfield 2013-05-24 17:06:08 +00:00
  • 88bbcaecd2 Removed redudent code Robert Osfield 2013-05-24 09:43:08 +00:00
  • fb3178106a Fixed panning bug, when using RUN_ON_DEMAND, that resulted in the camera being thrown off towards infinity. Robert Osfield 2013-05-24 09:35:58 +00:00
  • 1cd73f0238 Added repolation of the _deadparts stack which would otherwise been invalidatd by the depth sort of particles. Robert Osfield 2013-05-23 18:29:47 +00:00
  • 5de095cb1d From Pawel Ksiezopolski, Added example of using osg::TextureBuffer + GLSL to render forest. Robert Osfield 2013-05-23 15:55:22 +00:00
  • 2a32bcaca6 From David Fries, "This updates the CMakeLists.txt instructions for the commands to make the doxygen documentation." Robert Osfield 2013-05-23 14:14:51 +00:00
  • 5e14865877 Refactored the idle mechanism to fix problems with the vnc thread going idle when it shouldn't have. Robert Osfield 2013-05-23 12:29:55 +00:00
  • 71874c2dc5 Added assigned of the InteractiveImageHandler as a cull callback to enable the interactive image to know when it's being actively used as part of rendering a frame. Robert Osfield 2013-05-23 10:25:03 +00:00
  • 448c93dbe9 Quitened down debug messages Robert Osfield 2013-05-22 15:48:42 +00:00
  • 544ef8be5a Removed debug messages Robert Osfield 2013-05-22 13:16:44 +00:00
  • b72faed804 From Nico Kruithof, "For the VNC server, it seems that the wrong include path is used. Robert Osfield 2013-05-22 13:09:38 +00:00
  • 1284a0dd40 From Pawel Ksiezopolski, first email: "This submission adds texture buffer object ( defined in GL_ARB_texture_buffer_object extension ) to the osg::Texture* family. Robert Osfield 2013-05-22 12:49:46 +00:00
  • 7bd050e431 From Jan Ciger, "Here is a little patch to fix a bug in the InfluenceMap serialization. The names of the maps weren't quoted properly and therefore it was breaking loading of rigged models exported from e.g. Blender. Also names that contained spaces wouldn't have been parsed properly. " Robert Osfield 2013-05-22 11:06:12 +00:00
  • 9b77e757f2 From David Callu, "ust a simple IF ENDIF mismatch in last commit (I use git so no available SVN commit number ) : Robert Osfield 2013-05-22 10:28:07 +00:00
  • 94fe9b5fd5 From Farshid Lashkari, "I'm working on a custom ShaderComposer and I need access to the full StateSetStack of the State object within the getOrCreateProgram() method. The problem is that "State::apply(const StateSet* dstate)" does not add the specified stateset to the stack. I'm not sure if this was intentional, but I've updated the function to push/pop the stateset. Robert Osfield 2013-05-21 17:41:07 +00:00
  • 2daff56860 From Valeriy Dubov, fix for Android build under OSX Robert Osfield 2013-05-21 10:22:54 +00:00
  • 255432f76b From Alexander Sinditskiy, "I just noticed that Dragger allways handle events even when handle(const PointerInfo&, const osgGA::GUIEventAdapter&, osgGA::GUIActionAdapter&) returns false.I think it is not correct...i think handled should be changed only when it is really handled." Robert Osfield 2013-05-21 09:48:16 +00:00
  • 9f66a10aa2 Added use of SingleWindow for when only one screen is used Robert Osfield 2013-05-21 09:44:26 +00:00
  • 455ebbc5f1 Refactored the support for stereo and keystone RTT setup so that it can be applied to an existing Camera. Robert Osfield 2013-05-20 19:24:34 +00:00
  • acb4ba8554 Added support for controlling border and override redirect to the SingleWindow View::Config Robert Osfield 2013-05-20 14:17:43 +00:00
  • 086ffd1672 Added a dedicated RTT texture for each of the left and right eyes when doing ANAGLYPHIC stereo to avoid issues with scene graphs containing ClearNode's such as when using in Present3D Robert Osfield 2013-05-20 10:23:03 +00:00
  • 482581feb0 Added support for setting the left/right cull masks Robert Osfield 2013-05-16 15:52:29 +00:00
  • 6926cec135 Changed the default of OSG_SPLIT_STEREO_AUTO_ADJUST_ASPECT_RATIO to OFF Robert Osfield 2013-05-16 14:51:07 +00:00
  • f54f4e40ed Fixed stereo offsets of HORIZONTAL_SPLIT and VERTICAL_SPLIT stereo modes Robert Osfield 2013-05-16 14:11:23 +00:00
  • 6cb26321a9 Reverted back to changes before experiements with ViewConfig Robert Osfield 2013-05-16 14:07:35 +00:00
  • 79ec0e863d Cleaned up the WoWVxDisplay command line parsing Robert Osfield 2013-05-16 10:28:01 +00:00
  • 3b6c2b636a Renamed osgViewer::Config osgViewer::ViewConfig and moved it's declaration into include/osgViewer. Robert Osfield 2013-05-16 10:11:06 +00:00
  • e3ed763c15 Added WoWVxDisplay view config Robert Osfield 2013-05-16 09:08:27 +00:00
  • 625821a91a Created a dedicated include/osgViewer/config and src/osgViewer/config directories to place all the Config classes. Robert Osfield 2013-05-15 16:15:38 +00:00
  • 9552567cd4 Added support for osgViewer::Config in osgViewer::Viewer command line parsing Robert Osfield 2013-05-15 12:50:38 +00:00
  • bcbaaefa02 Introduced osgViewer::Config base class and beginnigs of various Config implementations. Introduced osgViewer serializers plugin for serialization support for osgViewer::Config implementations and Keystone Robert Osfield 2013-05-15 11:31:49 +00:00
  • 07499f6658 From Lionel Lagarde, "When a function do: Robert Osfield 2013-05-14 16:23:53 +00:00
  • c238a7cca2 From Michael Kapelko, "The provided patch (against SVN revision 13380) adds missing constness to returning calls (without it the user code does not compile)." Robert Osfield 2013-05-14 16:18:41 +00:00
  • 0b2c3a9ddb From Farshid Lashkari, "The tga image loader was not properly reading in 16-bit images. Fix is attached." Robert Osfield 2013-05-14 16:15:01 +00:00
  • 1a683e2f83 From Ulrich Hertlein, "Attached is a patch that introduces 'static_cast<unsigned int>' on some instances where the code returns '.size()' of a std::vector. This caused some warnings when using clang++ on OS X." Robert Osfield 2013-05-14 16:12:21 +00:00
  • 93eb471d99 Updated ChangeLog Robert Osfield 2013-05-14 13:35:10 +00:00
  • f1d5ba4278 Updated version after dev release Robert Osfield 2013-05-14 13:34:54 +00:00
  • 191cf8f5aa Added OSGUTIL_EXPORT for Windows build Robert Osfield 2013-05-13 13:12:13 +00:00
  • 1b599fc5ae Updated version number for dev release Robert Osfield 2013-05-13 12:08:05 +00:00
  • 127f3f6396 Updated ChangeLog for dev release Robert Osfield 2013-05-13 11:59:34 +00:00
  • 7b9cace094 Updated links to svn repository Robert Osfield 2013-05-13 11:51:44 +00:00
  • 01e8287b7d Fixed build for when automatic type conversion isn't enabled for ref_ptr<> Robert Osfield 2013-05-13 11:02:40 +00:00
  • 9249a59db2 Fixed the render order to the Render To Texture cameras used in stereo keystoning. Robert Osfield 2013-05-13 09:53:54 +00:00
  • e9388d5ad8 Improved the use of the Keystone's defined in the DisplaySettings object. Robert Osfield 2013-05-13 09:49:54 +00:00
  • 4e34cadee2 Added to Viewer::realize() automatic setup using Keystone when available and enabled, and when no other window setup has been selected. Robert Osfield 2013-05-13 09:18:37 +00:00
  • 9402efe38e Added DisplaySettings::KeystoneHint flag that can be set via --keystone-on and --keystone-off command line parameters, and the OSG_KEYSTONE env var Robert Osfield 2013-05-10 17:59:07 +00:00
  • 5dd07e4d1c Added keystone file handling Robert Osfield 2013-05-10 16:06:10 +00:00
  • 9eb5465ff5 Added --keystone <filename> command line support into DisplaySettings, and added OSG_KEYSTONE_FILES env var support into osg::DisplaySettings. Robert Osfield 2013-05-10 11:56:09 +00:00