3fcba1bc51From Jean-Sebastien Guay, "Some clients at my new job noticed that picking did not work with the osg::Capsule subclass of osg::Shape in an osg::ShapeDrawable. Other shapes worked fine. So I have fixed this. Code attached.
Robert Osfield
2007-12-16 17:57:19 +00:00
6eaa273116Added check to make set up a sequencegroup only happen when required.
Robert Osfield
2007-12-16 17:53:16 +00:00
1e996afe81From Wojciech Lewandowski, "osgSim::BlinkSequence has sequenceGroup unitialized by default (=NULL ref_ptr). By looking at the code I figured out that unset sequenceGroup is completely correct and thus allowed.
Robert Osfield
2007-12-16 17:46:57 +00:00
b76b85770fFrom Wojiech Lewandowski, "There was a bug in ShadowMap camera view matrix computation. View matrix was wrong when light was directional and shadowed scene was not centered at zero coord. I fixed that and also modified cast distance to much smaller value. With former range it was possible to generate shadows with lowest LODs. "
Robert Osfield
2007-12-16 17:41:46 +00:00
f1154f99bfFixed HeightField coordinates set up
Robert Osfield
2007-12-16 17:33:05 +00:00
0cdc3e9506Added intializers.
Robert Osfield
2007-12-16 17:01:40 +00:00
4a79644810Added support for automatically setting the coordinate system of a shapefile by reading associate .prj file
Robert Osfield
2007-12-16 16:18:58 +00:00
998ba32501Added parsing of parameters to Viewer constructor.
Robert Osfield
2007-12-16 13:29:02 +00:00
fddcebd479Added StateSetManipulator for testing purposes, and fixed typo
Robert Osfield
2007-12-16 13:25:40 +00:00
e29423bba9Removed used of ref_ptr<>'s internally to avoid ciricular calls on destruction.
Robert Osfield
2007-12-16 13:20:38 +00:00
becf6c22eaAdded initilizers of variables to FreeTypeFont3D constructors.
Robert Osfield
2007-12-16 12:36:52 +00:00
32e43cb789Fixed handling of DISPLAY variable, and mapped the rest of Producer config settings
Robert Osfield
2007-12-15 17:16:11 +00:00
6d945df96dCommented out rendendent warnings
Robert Osfield
2007-12-15 17:15:19 +00:00
43611a6ff5commented out rendudent warning
Robert Osfield
2007-12-15 17:15:05 +00:00
8b21b87d96Added setting of ambient bias uniform
Robert Osfield
2007-12-15 15:22:00 +00:00
af922cc355Added separate unform variable to keep track of abmient contribution.
Robert Osfield
2007-12-15 15:19:18 +00:00
2ab66d9948Tweaked the abmient lighting contribution so that the OpenGL vertex lighting has the ambient light source switched off, and use the fragment shader to add this contribution back in.
Robert Osfield
2007-12-15 15:17:51 +00:00
9f63b89e6aRefectored the loading of Locator out into its own separate file
Robert Osfield
2007-12-14 17:40:11 +00:00
f7e91fa28eAdded Locator::s/getTransformScaledByResolution(bool) to assist with VPB integration
Robert Osfield
2007-12-13 17:51:43 +00:00
3bfa74222bWarning fixes
Robert Osfield
2007-12-13 16:06:02 +00:00
831dc38166From Andy Skinner, build fixes for Solaris
Robert Osfield
2007-12-13 15:24:42 +00:00
492e01d244Convert tabs to four spaces
Robert Osfield
2007-12-13 15:23:21 +00:00
0dc71306e7Fixed memory leak
Robert Osfield
2007-12-13 14:26:03 +00:00
1fbb0a8674Updated the shapefile attribute IO so that its more streamlined.
Robert Osfield
2007-12-13 14:16:51 +00:00
b6f32a3ed0Added copy operator to ShapeAttribute to prevent problems when assigned them or use within a vector
Robert Osfield
2007-12-13 12:30:31 +00:00
6cca3b8f49Added a osgViewer::setSceneData(ref_ptr<Node>) method.
Robert Osfield
2007-12-12 17:59:06 +00:00
213a370c25Added new setFont(ref_ptr<>) variants to Text and Text3D
Robert Osfield
2007-12-12 17:48:20 +00:00
256391c3b4From Serge Lages, introduce readRef*File() methods which pass back ref_ptr<> rather than C pointers.
Robert Osfield
2007-12-12 17:04:48 +00:00
88f3a864acUpdated copyright notices
Robert Osfield
2007-12-12 16:56:28 +00:00
6bb7935deaFrom Andy Skinner, build fixes for Solaris.
Robert Osfield
2007-12-12 16:55:13 +00:00
6eaace8f6eAdded std:: infront of sort call
Robert Osfield
2007-12-12 11:57:03 +00:00
6ca74544bcAdded const to operators.
Robert Osfield
2007-12-12 10:47:58 +00:00
afdd141d73Added std:: in front of find enties
Robert Osfield
2007-12-12 10:35:47 +00:00
33e3054fcaFrom Serge Lages, "Here is a new modification to CMake adding an option (OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS) to specify if we want to generate or not the manifest files under VS8 for the plugins and the wrappers. It seems that the manifests are needed if we try to load dynamically a core OSG dll."
Robert Osfield
2007-12-12 09:48:39 +00:00
1c2726fd07From Paul Martz, "Function declaration returns a bool, function body was returning a pointer. Changed body to return (pointer != NULL)."
Robert Osfield
2007-12-12 09:45:29 +00:00
4ab22a405bUpdated wrappers
Robert Osfield
2007-12-11 17:01:53 +00:00
32e520d5a1From Brede Johnansen, support for continuation records.
Robert Osfield
2007-12-11 16:42:10 +00:00
ffab16ba2fFrom Karl Heijdenberg, moved set/getFrameStamp() from osgViewer::View to osg::View.
Robert Osfield
2007-12-11 16:34:37 +00:00
be5f709bdbFrom Mike Garrity, "There was an on again/off again thread on OSG users about creating subclasses of osg::Array that referenced data stored an application's internal data structures. I took a stab at implementing that and ran into a couple of downcasts in Geometry.cpp. Enclosed is my take at fixing those along with a simple example of how to do this."
Robert Osfield
2007-12-11 15:55:02 +00:00
669e86145cAdded missing copyright notices
Robert Osfield
2007-12-11 14:48:51 +00:00
f779c3a71aFrom Mathias Froehlich, "Attached is a change to the PBuffer initialsation code that checks for the GLX version before issuing commands that require GLX-1.3.
Robert Osfield
2007-12-11 14:39:15 +00:00
8062406d54From Roger James, "The changes are as follows:-
Robert Osfield
2007-12-11 14:06:45 +00:00
3341c42873Updated wrappers
Robert Osfield
2007-12-11 12:35:10 +00:00
640999dea6From Tim More, "This submission tries to optimize redundant compilation of StateSets and Drawables in the DatabasePager. The practical effects of these are to greatly reduce startup time and the time to load an individual scenery tile in FlightGear.
Robert Osfield
2007-12-11 12:32:31 +00:00
42723fec8fFrom Joseph Steel, "he change is to initializeExtensionProcs() to verify the version of the OpenGL implementation before attempting to get the MaxTextureCoords parameter."
Robert Osfield
2007-12-11 11:57:32 +00:00
880682f138From Mathias Froelich, "I have cleaned up the state set handling of the osg::ClipNode. Previously the complete StateSet was cleared, even the non clipping releted state attributes and modes in this stateset on a call to setLocalSetateSetModes. With this change only those modes/attributes are changed that need to be changed. That is, if a clip plane is removed from the ClipNode, only this assiciated mode is removed from the state set, instead of throwing away the whole state set.
Robert Osfield
2007-12-11 11:55:15 +00:00
298e07fc72From Mathias Froechlich, "I have extended the StateSet api with a
Robert Osfield
2007-12-11 11:42:02 +00:00
b467fdeb6cFrom Alberto Luaces, "it seems that include/osgParticle/BoxPlacer was created from the SectorPlacer file. The code works well but the SectorPlacer comments stayed in the new file. I have altered those comments so they now contain valid information for the BoxPlacer class and the doxygen generated documentation is correct.
Robert Osfield
2007-12-11 11:37:03 +00:00
4e5ce63c85From Per Fahlberg, "Attached is a fix allowing removal of shaders from a program after it is first compiled. It will also allow new shaders to be attached after the program is first compiled."
Robert Osfield
2007-12-11 11:21:13 +00:00
62bba8e52bFrom Sherman Wilcox, "In ESRIShapeParser.cpp, wasn't closing the file handle. Added:
Robert Osfield
2007-12-10 20:56:26 +00:00
b668a54e17From Eric Wing, "For osgviewerCocoa, a very simple change to allow toggling between fullscreen mode and back between views. (To activate, double click on the view to toggle.) It demonstrates/uses the new one-liner fullscreen method introduced in Leopard. Code will still compile and run in pre-Leopard (thanks to Obj-C dynamic/late binding), but code path is treated as a no-op in those cases."
Robert Osfield
2007-12-10 20:36:34 +00:00
aa24c273c7Updated wrappers
Robert Osfield
2007-12-10 20:35:50 +00:00
c43606e3feFrom Richard Schmidt, fix on ordering to be standard OpenGL way.
Robert Osfield
2007-12-10 20:33:22 +00:00
c5704586f9From Richard Schmidt, "attached you will find a set of small fixes and features.
Robert Osfield
2007-12-10 20:30:05 +00:00
9d260213f7From Ulrich Hertlein, "attached are some fixes and tweaks I made to the .obj loader: - Material class contained both 'shininess' and 'Ns' member variables - 'Ns' and 'Ni' are initialized to 0 ('Ni' is unused at the moment) - only 'Ns' was read from .mtl file but 'shininess' was used for osg::Material - 'illum' was read from .mtl file but never used; it is now used as follows -- illum==0 -> no osg::Material created/attached therefore no lighting -- illum==1 -> osg::Material specular is set to black -- illum==2 (default) -> specular read from .mtl file is used - 'map_Kd' and 'map_Ks' may contain additional arguments (e.g. '-s 1 1 1'), these are now skipped over and the texture filename is properly extracted "
Robert Osfield
2007-12-10 20:27:06 +00:00
d0cc647986From David Callu, IO support for Text3D
Robert Osfield
2007-12-10 19:51:33 +00:00
eef88e7e83From David Callu, Text3D
Robert Osfield
2007-12-10 19:49:17 +00:00
f4afa427a7From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."
Robert Osfield
2007-12-10 17:30:18 +00:00
1dcb6cc4fdUpdated wrappers
Robert Osfield
2007-12-10 16:21:13 +00:00
a59790ed6eAdded osgViewerGetVersion() usage to force Windows to link osgViewer.
Robert Osfield
2007-12-10 16:14:21 +00:00
f69a48e552From David Callu, added support of 3D text to osgText and associated plugins.
Robert Osfield
2007-12-10 15:15:56 +00:00
9b56dbe83aFrom David Callu, added support for automatically reading associate dbase files
Robert Osfield
2007-12-10 12:45:16 +00:00
13ff9f28d5Char char[] to char* with new allocation.
Robert Osfield
2007-12-10 12:00:09 +00:00
695df58bc9Refactored record allocation to fix build errors under Windows.
Robert Osfield
2007-12-10 11:34:00 +00:00
9946cb3b24Added export macro for windows build
Robert Osfield
2007-12-10 11:20:22 +00:00
0c4648e027Added include<string.h> to fix compile errors under gcc 4.3
Robert Osfield
2007-12-10 10:16:13 +00:00
8648cd12eaFrom Gustavo Wagner, fixed bugs in reading M records from shapefile
Robert Osfield
2007-12-09 16:38:33 +00:00
e2ad20a887From Gino van den Bergen, "I've added the following features to the OSG VRML plugin: * Support for Box, Sphere, Cone, and Cylinder. These nodes are converted to osg::Geometry conform the VRML97 spec. * Backface culling is enabled/disabled according to the "solid" flag for geometries that are converted from IndexFaceSets. * PROTO instances can now be used for "appearance" and "geometry" fields in a Shape node.
Robert Osfield
2007-12-09 16:29:18 +00:00
457d3fd7e4Removed redundent OpenFlightOptimizer
Robert Osfield
2007-12-09 16:23:19 +00:00
df2f9f5f7cFrom Ralf Karn, fixed "invalid enumerant" warning on TEXTURE_2D_ARRAY_EXT initialization
Robert Osfield
2007-12-09 16:14:07 +00:00
6ff9810be1From Mihai Radu, "After someone asked for a fix for non-textured object appearing black with the shader for textured objects. This works very well in cases where there could be a mix of textured and non-textured objects in the scene, and it makes the initialization more robust. The idea is from PSSM, to add a 1pixel texture to the main rendering as to provide white for any objects missing textures."
Robert Osfield
2007-12-09 16:06:14 +00:00
2be3992a2fUpdated wrappers
Robert Osfield
2007-12-09 16:01:29 +00:00
78c1fd4844From David Callu, added DBase attribute support for shapefiles
Robert Osfield
2007-12-09 15:43:49 +00:00
5e6bab7de1Updated wrappers
Robert Osfield
2007-12-09 14:54:02 +00:00
a45d7fdee4From Aderian Egli, changed the window dimension clamping code to work independantly for width and height.
Robert Osfield
2007-12-09 12:19:06 +00:00
a0c2349438From Mario Guimaraes, "Currently, in the StateSet::merge method, the rhs state attributes and modes are not merged into the lhs state when the rhs is PROTECTED. The changes I'm providing here address this problem."
Robert Osfield
2007-12-08 17:10:07 +00:00
fb65fc5e0aFrom Serge Lages, "Hi Robert,
Robert Osfield
2007-12-08 17:04:52 +00:00
2d4ef642e6from Paul Matz, "Understood. Well, I think it's reasonable to assume that the non-env var case is the more tested case, and therefore it is correct to set _supportsVertexBufferObjects to the same value as _fastPath. So here's a change that does the same thing for the env var case."
Robert Osfield
2007-12-08 17:00:38 +00:00
f2d59416aaFrom Jeremy Moles, Anders Backman and Robert Osfield,
Robert Osfield
2007-12-08 16:52:27 +00:00
65bef96a6eFrom Peter Hrenka, "Due to popular demand I would like to submit this enhanced version of PolytopeIntersector.
Robert Osfield
2007-12-08 16:37:05 +00:00
195ed8ba26From David Cullu and Robert Osfield, David addded a new style of OSG integration with QT by sublcassing from QTWidget and using osgViewer to create the graphics context, Robert added integration of this codes with the original AdapterWidget implementation still available by default. The new implementation can be accessed by running:
Robert Osfield
2007-12-08 15:46:19 +00:00
e7fbacc3b6From Daniel Larimer, "There was a error with QTUtils.h when compiling on HFS case-sensitive file system. The #include<Quicktime/Quicktime.h> line needs to be replaced with #include<QuickTime/QuickTime.h"
Robert Osfield
2007-12-08 15:32:16 +00:00
5fe9da12c9From Neil Hughes, "Please find attached a replacement for the 3DS pluggin's ReaderWriter3DS.cpp file. This contains a minor fix (one line added) to ensure that the OSG Material structure is given the name of the material definition within a loaded 3DS file. "
Robert Osfield
2007-12-08 15:27:29 +00:00
cdb9a0baecFrom Donald Cipperly, Fixed memory leak in computeIntersections
Robert Osfield
2007-12-08 15:08:32 +00:00
0120bae9f7From Jeremy Moles, "This extra call to SDL_VideoSetMode() prevents my viewport from getting all wonky when I resize the SDL window. I'm not sure if this bug has always existed or not, but according to the SDL documentation this operation should be safe regardless, and doesn't not introduce the need for extra memory management (that is: there is no need to "cleanup" the old screen variable, that is all handled by SDL for us). "
Robert Osfield
2007-12-08 15:04:47 +00:00
13e8af6305From Robert Osfield and Richard Schmidt, made fixes inspired by an original submission from Richard which highlighted problems with Light, ClipPlane and Hint usage in osg::State's usage of cloneType and reassignment of target/num in StateSet/these StateAttributes.
Robert Osfield
2007-12-08 13:29:31 +00:00
ede9b4ff6bFrom David Callu, added IO_FluidProgram implementation.
Robert Osfield
2007-12-08 12:12:05 +00:00
71f71f18b6Added an #include<assert.h> to avoid compile problems on some systems.
Robert Osfield
2007-12-07 13:42:14 +00:00
ab7043ea45From Tony Horrobin, "Attached is a small fix for the openflight loader with regard to road segment and construction records.
Robert Osfield
2007-12-07 13:28:02 +00:00
4c217b0d1cFrom Paul Martz, minor typo fixes in notify messages
Robert Osfield
2007-12-07 13:19:53 +00:00
b112e15b13From Bob Kuehne, added extra event handlers
Robert Osfield
2007-12-06 17:53:22 +00:00
5906e0861cFrom Farshid Lashkari, "The bmp writer crashes in certain cases. It happens when the computed size of the image data is greater than the actual image size. This causes the memcpy call to go out of the array bounds. I modified the code so that it copies the data during the iteration, instead of memcpy'ing. This fixes the problems i was having.
Robert Osfield
2007-12-06 17:44:56 +00:00
c07598dc39From Hautio Jari, "Current version of GraphicsWindowWin32 allows resize to zero height window. This breaks rendering in for example MFC SDI applications and in MFC MDI applications if user resizes the window so that client area has zero height. Current safeguard for minimized window:
Robert Osfield
2007-12-06 17:41:20 +00:00
b7881943d4From Serge Lages, "Here are some modifications to the DatabasePager, with the possibility to :
Robert Osfield
2007-12-06 17:31:00 +00:00
6c09a22957From Cedric Pinson, fixes for toggle fullscreen on gnome desktop
Robert Osfield
2007-12-06 17:28:29 +00:00
188b196ca6From Mathias Froehlich, "n examples/osgfadetext/CMakeLists.txt osgSim as dependency is missing."
Robert Osfield
2007-12-06 17:07:04 +00:00
49db32ca3fFrom Mathias Froehlich, "Add missing includes. Fails on hp-ux."
Robert Osfield
2007-12-06 17:03:47 +00:00
5b305e37b0From Mathias Froehlich, "Attached is a changed version of osgunittests.cpp. The __FUNCTION__ macro/string value is not portable. Instead the functions name is just put into the string."
Robert Osfield
2007-12-06 17:01:22 +00:00
6e095c4e60From Wojiech Leandowski, fixed the hardwiring of archive extensions to 4 charaters
Robert Osfield
2007-12-06 16:50:43 +00:00
Robert Osfield