6a00d7d356Added #define for Windows build
Robert Osfield
2010-10-06 18:29:23 +00:00
ca4802142dAdded #define GLAPIENTRY to attempt to resolve some Windows build issues
Robert Osfield
2010-10-06 17:19:01 +00:00
29bc5995e7Added #define's and local include<osg/Image> to fix Windows GL 1.1 build against
Robert Osfield
2010-10-06 16:36:30 +00:00
8a6b0f0cefFrom Jean-Sebasien Guay, fix windows compile error
Robert Osfield
2010-10-06 16:29:16 +00:00
7859a2a46dRemoved gluois.h reference
Robert Osfield
2010-10-06 15:33:43 +00:00
10eac072c2Removed usage gluos.h and redundent gluint.h
Robert Osfield
2010-10-06 15:14:01 +00:00
89f7726383Copied libutil and libtess implementations in form Mesa 7.9/src/glu into the src/osg/glu, changed extensions from .c to .cpp and got compiling as C files as part of the osg core library.
Robert Osfield
2010-10-06 14:44:52 +00:00
6df7dbf626Improved the handling of matrices in serialization so that it's more reliable, change was to use doubles for reading and writing matrices regardless of type of Matrix being serialized.
Robert Osfield
2010-10-04 15:23:19 +00:00
e6559af283From Stephan Huber, "just a follow-up: I looked at the code of osg/Referenced.cpp and notice a discrepancy in getOrCreateObserverSet. For the atomic- and mutex-codepaths the newly created observerset gets manually ref'ed, but not in the codepath used when OPENTHREADS_ATOMIC_USE_MUTEX is defined. I added the manual ref and tadaaa, the crash went away."
Robert Osfield
2010-10-04 11:29:39 +00:00
b9f0efecb1Added glMultMatrixf path for GLES1
Robert Osfield
2010-10-04 11:24:54 +00:00
b069b32c64Added checks for NULL images to prevent crashes when no valid images are created
Robert Osfield
2010-10-04 11:19:41 +00:00
f81a9eff50From Wojciech Lewandowski, "As promised I prepared a patch to expose WGL_SWAP_METHOD / PFD_SWAP_METHOD selection via GraphicsContext::Traits. Since Traits don't define any enums (I guess to be simple to use) I tried to keep it that way and have added two boolean values: swapCopy & swapExchange. It is somewhat similar approach to GDI PixelFormatDescription were both options can be present together. Feel free to replace it with enum if you find it more appropriate.
Robert Osfield
2010-10-01 18:02:24 +00:00
c294814e95
Robert Osfield
2010-10-01 17:07:27 +00:00
fbbc8824cfFrom Magnes Kessler, "Attached are some fixes for the environment variable help strings in DisplaySettings. They contain spelling fixes and an attempt to use consistent expressions throughout."
Robert Osfield
2010-10-01 15:58:49 +00:00
8f2497e21dFrom Wojciech Lewandowski,"These are our changes to DatabasePager. To check if parent PLOD is registered, I resurrected PagedLODList::containsPagedLOD() method. This method was available some time ago, but got removed and was not currently present in trunk. To add this method I had to also modify the DatabasePager header. "
Robert Osfield
2010-10-01 15:37:35 +00:00
e5bc43f04cFrom Magnus Kessler, "After a closer look at this particular issue, I used some grep and sed magic to fix all occurrences of "macro's" and "paramter". "
Robert Osfield
2010-09-30 16:57:02 +00:00
17aaa4db94From Craig Bosma, "Attached is an updated Image.cpp that fixes a very specific compatability regression that was introduced almost 2 years ago in r8834. The IVE version number was bumped to 32 because of the change in binary layout, but the guard for reading/writing the new field was checked against 31. Of course this only causes a problem (as for us) when you've produced IVE files at version 31, which no longer load (or crash) when loaded by newer OSG/IVE versions."
Robert Osfield
2010-09-30 16:31:22 +00:00
34fa992ff5From Chuck Seberino, "Here is a small optimization in osgDB/Serializer that only uses a single accessor call when retrieving serializable values during writing. This is a sizable win for some of my code since the getter() methods are non-trivial. I also removed some explicit namespace qualifiers to be consistent with the rest of the codebase."
Robert Osfield
2010-09-30 16:03:04 +00:00
0eded3efbeFrom WojciechLewandowski, Added DispaySettings::SwapMethod and support for it in GraphicsContext::Traits
Robert Osfield
2010-09-30 14:25:27 +00:00
ff68236badFrom Stephan Huber, fixed build under OSX 10.5.
Robert Osfield
2010-09-30 09:40:48 +00:00
ab1920c427From Wang Rui, "I've fixed the problem that osgx format doesn't read the Font property and wrapped string correctly. The first problem happened because the matchString() made a mistake in comparing two strings with the same start but different size. The second just needs complete rewriting of writeWrappedString() and readWrappedString() in src/osgPlugins/osg/XmlStreamOperator.h
Robert Osfield
2010-09-30 09:34:41 +00:00
47af827648Fixed Text3D's handling of character aspect ratio.
Robert Osfield
2010-09-29 13:21:34 +00:00
dab1c79127Moved handling of character aspect ratio into osgText::Style.
Robert Osfield
2010-09-29 12:45:35 +00:00
9bde24d3d2Added command line option for writing out the scene graph to file.
Robert Osfield
2010-09-29 12:38:56 +00:00
b40acacf53Moved set/getFont from Text/Text3D into TextBase
Robert Osfield
2010-09-29 11:34:55 +00:00
e942cc770aRemoved getScale() parameter from osgText::Font
Robert Osfield
2010-09-29 11:09:32 +00:00
5c3a1b3069Fixed type of numberical constant
Robert Osfield
2010-09-29 10:54:53 +00:00
5af4884558Moved Text3D across to using Style for character thickness. Quitened down debug messages in 3D text geometry creation. Improved the Text3D implementation of the new 3D text geometry.
Robert Osfield
2010-09-27 17:11:12 +00:00
f8b44c3b33Added support for osgText::Style into osgText::Text3D. Refactored Text3D implementation to use new GlyphGeometry class. Implemented GlyphGeometry backend and cleaned up Glyph3D interface.
Robert Osfield
2010-09-27 16:18:20 +00:00
759749eb0cChanged the reading of animation paths so that it's always done without using the osgDB object cache. This fixes a bug of reusing the animination path in an P3D file.
Robert Osfield
2010-09-27 09:58:07 +00:00
fdfad4848bAdded include<osg/Geode> to fix compile error
Robert Osfield
2010-09-26 11:02:03 +00:00
f6517d2f8bFrom Alexander Wiebel, "I did some spell checking in my spare time. Here come 20 files."
Robert Osfield
2010-09-24 14:53:10 +00:00
73a4e775c0From Jean-Sebastien Guay, "Changeset 10833 renames discardAllDeletedGLObjects() to discardAllGLObjects() in src/osg/GLObjects.cpp, but the declaration of the function in include/osg/GLObjects remained. So an app using an old version of OSG that called this function would now fail with a linker error instead of a compile error as it should.
Robert Osfield
2010-09-24 14:40:56 +00:00
eb3d76f291From Mikhail Izmestev, "This patch fixes operator >> used with std::istream without std::ios::skipws flag. This allow using boost::lexical_cast with osg vectors types, because boost's lexical_cast disable std::ios::skipws flag of std::istream before using operator >>. "
Robert Osfield
2010-09-24 14:38:01 +00:00
1224836664From Eric Wing, QTKit plugin for reading movies under OSX using QTKit + CoreVideo
Robert Osfield
2010-09-24 12:59:37 +00:00
c006c75615Moved Style and Bevel classes out into their own include/osgText/Style header.
Robert Osfield
2010-09-24 12:57:55 +00:00
d9a133476aRefactored the handling of readImage/writeImage/readObject/writeObject to avoid double setting of unique ID's, fixing the problem in reading/writing files with images
Robert Osfield
2010-09-23 16:12:05 +00:00
915b38dc25Added deprecated notices.
Robert Osfield
2010-09-22 09:50:07 +00:00
51391fc827Updated ChangeLog and AUTHORS file for release
Robert Osfield
2010-09-21 11:40:50 +00:00
0d347352cfFrom David Guthrie, "The cocoa version of the window for Mac OS X doesn't implement the requestWarpPointer function, but it turns out that the code from the Carbon version of the window is the same because it uses the windowing interface, so it this version, based on 2.8.3 GraphicsWindowCocoa, I copied the function over. The trunk version it also missing the function and the code looks to be very similar, so I assume it will transfer simply enough. "
Robert Osfield
2010-09-21 10:28:50 +00:00
7e8ca5ccdfFrom Per Fahlberg, "imageio was not spelled correctly when registering the plugin, attached is a fixed version of ReaderWriterImageIO.cpp."
Robert Osfield
2010-09-20 16:04:22 +00:00
5ecc2b9880From Wang Rui, reverted changes to osgPartcile that caused problems with osgparticleeffects.
Robert Osfield
2010-09-20 11:50:24 +00:00
a8c8c70fb1From Ulrich Hertlein, "attached is a fix that addresses these compiler warnings from the 64-bit OS X build:
Robert Osfield
2010-09-20 11:02:40 +00:00
c7fc64c2e8From Mathieu Marache, "This modified version of FindCOLLADA finds it correctly when installed with macports as in 'port install collada-dom'"
Robert Osfield
2010-09-17 15:41:55 +00:00
fc82c9cde8Add clamping of the maximum number of particles per frame to avoid too many particles being introduced at once when the particle system comes back on screen.
Robert Osfield
2010-09-17 15:39:53 +00:00
4d31f983f3Updated ChangeLog, AUTHORS for 2.9.9 dev release
Robert Osfield
2010-09-17 14:26:27 +00:00
4daad70d17Build fixes for when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION is disabled
Robert Osfield
2010-09-17 13:33:09 +00:00
b0db0382f5Reverted changes from Vivien Delage as there were some regressions discovered. Will need to revist this code to deal with bugs that Vivien was tackling.
Robert Osfield
2010-09-17 13:09:23 +00:00
7cc2d90725From Ulrich Hertlein, "I've added a command line switch '--testOcclusion' that enables display of other models in front and behind the outlined object."
Robert Osfield
2010-09-17 11:20:11 +00:00
d74ffd57aaFrom Magnus Kessler, "Changes to the quicktime plugin to remove unused variables and an unused static function."
Robert Osfield
2010-09-16 13:04:55 +00:00
93ad63405fFrom Alexander Wiebel, "I came across some functions in Vec* that I thought could benefit from some doxygen documentation. Additionally, I made the comment on value_type more meaningful (in my opinion)."
Robert Osfield
2010-09-16 10:33:51 +00:00
c6a1b7e97fFrom Magnus Kessler, "I'm resubmitting a slightly different version of the changes you left out for osg/Camera. The ::glName issue masked the fact that the "(..)" isn't handled well in doxygen and leads to "(." in the generated files.
Robert Osfield
2010-09-16 09:49:22 +00:00
b4fda3a6daFrom March Sciabica, "Here is the solution I coded up over the weekend. For improved performance option, I added a flag to control whether the depth writing pass is performed.
Robert Osfield
2010-09-16 09:09:43 +00:00
26a41004c2From Mathias Fielder, "i found an issue with the serializer writing shared arrays. At OutputStream::writeArray(), if the currently latest array is shared the full array content will be written. The following code snippet will reproduce this issue:
Robert Osfield
2010-09-16 08:46:38 +00:00
94c86d495cFrom Paul de Repentigny, Commented out section of code that didn't work properly
Robert Osfield
2010-09-15 13:24:37 +00:00
d606bf0ba2Fixed warning
Robert Osfield
2010-09-15 13:04:35 +00:00
5abd9ed562From Magnus Kessler, "Fix a small typo in present3D usage string"
Robert Osfield
2010-09-15 12:50:16 +00:00
cc471b1103From Magnus Kessler, "Attached are a number of files where I have tried to fix up some of the documentation. I have accumulated them over some time, but rebased onto the subversion trunk."
Robert Osfield
2010-09-15 12:00:12 +00:00
65e49cf9dbFrom Laura Cerritelli, "I modified TXPPagedLOD::traverse to prevent the terrain from inappropriately unloading the higher level of detail tiles. It wasn?t updating the frame number of the tile or the range it was traversing, causing PagedLOD::removeExpiredChildren to always consider the range expired."
Robert Osfield
2010-09-15 11:36:45 +00:00
6ac8b63419From Wang Rui, "I've fixed some pen-slips in SharedStateManager.cpp, which writing the last few examples for my to-be-finished book. I also do a minor fix to the share() method to make it work for geodes, too."
Robert Osfield
2010-09-15 11:32:51 +00:00
df7df0739aFrom Lukasz Izdebski, "I made some changes in OcclusionQueryNode file. I move declaration of classes TestResult, QueryGeometry from cpp to header file and made a void createSupportNodes() a virtual method.
Robert Osfield
2010-09-15 11:27:31 +00:00
d6fe337728Renamed file3ds and options member variables to _file3ds and _options to avoid confusion and keep the code consistent with the rest of the class/OSG.
Robert Osfield
2010-09-15 11:10:10 +00:00
7a6a226dddFrom Todd Furlong, "I made a couple of changes to the osgFX::Outline class (SVN patch attached). I had a couple of issues with it that I was trying to resolve:
Robert Osfield
2010-09-15 10:50:24 +00:00
d96e57c0c3Added https, ftp and ftps to list of supported server protocols, and add ability for curl plugin to ignore the need for a server address when .curl extension is used.
Robert Osfield
2010-09-15 10:24:59 +00:00
d044d135f5From Jan Peciva, "please, find attached improved Stencil and StencilTwoSided classes.
Robert Osfield
2010-09-15 09:56:16 +00:00
0259a340fdFrom Wang Rui, "I've changed it back to _alive, _current_size and _current_alpha, and placed them one by one for setTexCoordPointer() to use.
Robert Osfield
2010-09-15 09:24:45 +00:00
b4789863acForm Wang Rui, "An initial GLSL shader support of rendering particles. Only the POINT type is supported at present. The attached osgparticleshader.cpp will show how it works. It can also be placed in the examples folder. But I just wonder how this example co-exists with another two (osgparticle and osgparticleeffect)?
Robert Osfield
2010-09-14 15:47:29 +00:00
551d2b6479From Ulrich Hertlein, "not sure how severe this is but I believe there's a bug in Texture.cpp:applyTexImage2D_subload:
Robert Osfield
2010-09-14 13:19:55 +00:00
d55ada3790Moved GL_RED and associated GL defines that aren't defined by GLES into the include/osg/Image to aid portability.
Robert Osfield
2010-09-14 13:19:12 +00:00
687fd9362fFrom Jean-Sebastien Guay, "osgWidget::WindowManager did nothing in its keyUp event, and in particular didn't call any callbacks. Since I wanted to have callbacks on keyUp, I copied what it does on keyDown, which works for me. I could have just used keyDown and saved myself the trouble, but you know me... :-)
Robert Osfield
2010-09-09 16:49:10 +00:00
78cb15fdf8From Torben Dannhauer, "I extended the attached CMAKE module to search for the collada libraries of my VS2008 3rdParty package if no other library is found.
Robert Osfield
2010-09-09 10:44:11 +00:00
2f14255dd7From Joachim Pouderoux, "Please find attached a very small fix for the DXF reader. The bug made OSG crash with some files. Actually, itr was incremented into the loop and after the test with nlist.end(). Then, the unreferencing of itr when nlist is equals to nlist.end() caused the crash."
Robert Osfield
2010-09-09 10:17:55 +00:00
a5a7bcf165From Joachim Pouderoux, "I have added the support for wkbMultiPolygon & wkbMultiPolygon25D in the OGR plugin (it was mysteriously missing and no prevent warning messages was print)."
Robert Osfield
2010-09-09 10:14:54 +00:00
fa94700e5cFrom Tassilo Glander, "I want to submit a fix for the plugin to load .x model files (Direct X).
Robert Osfield
2010-09-09 10:09:31 +00:00
cbc43841e1From Roland Smeenk, "this submission adds a "Fast Drawable" line to the camera scene statistics. It shows the total number of sorted and unsorted drawables that use the fastpath for rendering."
Robert Osfield
2010-09-09 10:03:58 +00:00
77c35eabdeFrom Jean-Sebastien Guay, "I've added a second ctor where no argument is optional, and documented that it's meant to be used when the InteractiveImage is going to be used in a fullscreen HUD. "
Robert Osfield
2010-09-09 09:47:31 +00:00
60942d8e72Added version check for av_lockmgr_register support.
Robert Osfield
2010-09-09 09:05:33 +00:00
6f08e25c05From Nathan Monteleone and Robert Osfield,
Robert Osfield
2010-09-09 08:47:12 +00:00
6f49d85f88Cleaned up debug info, and changed Text3D across to using GL_NORMALIZE instead of GL_RESCALE_NORMAL.
Robert Osfield
2010-09-08 11:02:39 +00:00
c9bd91cc6aAdded support for honouring PrimitiveSet names in new smoothing algorithm
Robert Osfield
2010-09-08 10:46:49 +00:00
4fe88ee2e4From Jean-Sebastien Guay, build fixes for Windows
Robert Osfield
2010-09-08 08:09:01 +00:00
d1ee7bca8dRemoved files that have been moved into osgText.
Robert Osfield
2010-09-07 19:55:41 +00:00
234cb82867Moved Glyph and Glyph3D out of Font header/source file into their own header/source file.
Robert Osfield
2010-09-07 18:20:03 +00:00
50be800787Moved TextNode into osgText.
Robert Osfield
2010-09-07 18:18:35 +00:00
a6abbb545eFurther work on new 3D text support
Robert Osfield
2010-09-06 15:43:59 +00:00
32db4d6a98Added basic wiring up of TextTechnique to 3D glyph code
Robert Osfield
2010-09-03 15:03:42 +00:00
b4f3818949Removed now redundent Font3D files
Robert Osfield
2010-09-03 09:10:27 +00:00
ba10f56f86Refactored to use a typedef of Font to Font3D rather than have a separate Font3D class
Robert Osfield
2010-09-03 09:08:19 +00:00
8c3e3055e7Refactored osgText::Font so that it now supports both 2D and 3D glyphs.
Robert Osfield
2010-09-03 08:26:46 +00:00
d1e90b6878Added to Text::resizeGLObjectBuffers(uint) the follow:
Robert Osfield
2010-09-02 07:55:36 +00:00
a5d490c03fImplemented a greedy triangle associate technique to minimize the number of duplicate vertices required to produce crease angles.
Robert Osfield
2010-08-25 16:59:27 +00:00
0a429e97f7Changed --flat to --flat-shaded to avoid conflict with oiginal --flat ratio control.
Robert Osfield
2010-08-25 14:34:08 +00:00
2ee999fb6eCleaned up main and introduced --samples <num>, --flat, --smooth command line controls.
Robert Osfield
2010-08-25 11:07:30 +00:00
fd1493e14bAdded support for controlling the number of curves samples to generate on Glyph3D's. Set via Font3D::setNumberCurveSamples(num).
Robert Osfield
2010-08-25 11:06:10 +00:00
6049f67a48Implemented the shell geometry code
Robert Osfield
2010-08-24 16:08:50 +00:00
610b3ec360Added "SORT_BACK_TO_FRONT" and "SORT_FRONT_TO_BACK" RenderBin's to default prototype list
Robert Osfield
2010-08-24 16:06:31 +00:00
f3617062a0Refactored 3d text geometry creation code so that the text is all placed in one osg::Geometry.
Robert Osfield
2010-08-24 14:22:58 +00:00
7eb172277fFixed bug in handling large osg::Geometry.
Robert Osfield
2010-08-20 10:24:06 +00:00
e4d8e560b0Implemented generation of front, back and bevel geometries to complete the 3d glyphs.
Robert Osfield
2010-08-19 16:24:08 +00:00
5f63f42b12Improved the detection of problem vetices and associated triangles
Robert Osfield
2010-08-18 11:14:58 +00:00
Robert Osfield