From 60af7de2d3c7b976f4ec66a7790ccfd2ca9cb4cb Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 13 Jun 2007 21:15:04 +0000 Subject: [PATCH] Updated wrapers, changelog, README and AUTHORS files for 1.9.9 release --- AUTHORS.txt | 18 +- ChangeLog | 484 ++++++++++++++++++ README.txt | 4 +- .../osgViewer/ViewerEventHandlers.cpp | 420 ++++++++++++++- 4 files changed, 894 insertions(+), 32 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index aa13a2665..4767e99ef 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,4 +1,4 @@ -OpenSceneGraph Library 1.9.8 +OpenSceneGraph Library 1.9.9 264 Contributors: @@ -14,32 +14,33 @@ Geoff Michel Farshid Lashkari Paul Martz Bob Kuehne -Eric Sokolowsky -Ulrich Hertlein -Tree Stephan Huber +Ulrich Hertlein +Eric Sokolowsky +Tree Mike Wittman Luigi Calori Trajce Nikolov Pavel Moloshtan +Martin Lavery Tom Jolley Norman Vine Alberto Farre Ruben Lopez Randall Hopper Roger James +Olaf Flebbe Gideon May Don Tidrow Romano José Magacho da Silva -Olaf Flebbe Michael Gronager Colin McDonald Chris Hanson Daniel Sjölie +Per Fahlberg Mathias Fröhlich Joran Jessurun Anré Garneau -Per Fahlberg Frederic Marmond David Fries Boris Bralo @@ -47,6 +48,7 @@ Yefei He Sondra Iverson Rune Schmidt Jensen Neil Salter +Jason Daly Jason Beverage David Spilling David Callu @@ -68,7 +70,6 @@ Ravi Mathur Michael Platings Loic Dachary Joseph Steel -Jason Daly David Guthrie Corbin Holtz Toshiyuki Takahei @@ -80,7 +81,6 @@ Romano Magacho Paul de Repentigny Nikolaus Hanekamp Michael Hartman -Martin Lavery Leandro Motta Barros Laurens Voerman Carlo Camporesi @@ -88,6 +88,7 @@ Bruce Clay Brad Colbert Brad Christiansen Alberto Barbati +Vladimir Shabanov Uwe Woessner Sohey Yamamoto Serge Lages @@ -159,7 +160,6 @@ Wang Lam Walter J. Altice Volker Walkiewicz Vladimir Vukicevic -Vladimir Shabanov Vlad Danciu Vincent Vivanloc Vasily Radostev diff --git a/ChangeLog b/ChangeLog index 17c24a8ac..7aa7bb135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,487 @@ +2007-06-13 11:09 +0000 [r6957] robert: + + * Added OSG_SCREEN and OSG_WINDOW env var checking in the + Viewer::realize() + +2007-06-13 10:45 +0000 [r6956] robert: + + * Updated wrappers + +2007-06-13 10:38 +0000 [r6955] robert: + + * Added osgViewer::View::setUpViewInWindow(...) method and command + line option into osgViewer::Viewer to allow you to specify the + window dimentions and screen for the window on startup. + +2007-06-13 10:31 +0000 [r6954] robert: + + * From Martin Lavery, osgShadow plugin added to Xcode project. + +2007-06-13 10:12 +0000 [r6953] robert: + + * Fixed versioning + +2007-06-13 09:56 +0000 [r6952] robert: + + * Removed ParallelSplitShadowMap as its currently a non op. + +2007-06-13 08:56 +0000 [r6951] robert: + + * Added -lrt in for SunOS build + +2007-06-12 19:46 +0000 [r6950] robert: + + * Updated wrappers + +2007-06-12 18:58 +0000 [r6948-6949] robert: + + * Added StatsHandler + + * Refactored the dome correction code to support movie flipping. + +2007-06-12 16:55 +0000 [r6947] robert: + + * Added Image::g/setOrigin to help movie plugins tell applications + that the imagery is not the usual OpenGL BOTTOM_LEFT orientation, + but with the origin TOP_LEFT. This allows geometry setup code to + flip the t tex coord to render the movie the correct way up. + +2007-06-12 15:57 +0000 [r6946] robert: + + * Added in QT4 keyboard event adaption + +2007-06-12 15:52 +0000 [r6945] robert: + + * UPdated wrappers + +2007-06-12 15:38 +0000 [r6944] robert: + + * From Stephan Huber, "while porting my own code to the new + osgViewer I discover more and more bugs in the + Carbon-implementation of GraphicsWindow, so here's another fix + for setWindowDecorationImplementation, now updates the + titlebar-height, and fixes some display-issues when switching the + decoration on/off. " + +2007-06-12 15:32 +0000 [r6943] robert: + + * Moved the className, libraryName and isSameAs into public. + +2007-06-12 14:43 +0000 [r6942] robert: + + * Changed _data to _movieData to avoid possible confusion + +2007-06-12 14:20 +0000 [r6941] robert: + + * From Martin Lavery and Robert Osfield, Updated examples to use a + variation of the MIT License + +2007-06-12 11:31 +0000 [r6940] robert: + + * From Martin Lavery, fix to Xcode Resources + +2007-06-12 10:37 +0000 [r6939] robert: + + * From Martin Lavery, Fix of OpenSceneGraph-Data linking + +2007-06-12 10:19 +0000 [r6938] robert: + + * Build fixes for QT4 + +2007-06-12 09:55 +0000 [r6937] robert: + + * Changed the throw dection time to 0.02 + +2007-06-12 08:30 +0000 [r6934-6936] robert: + + * Work in progress on perspective view dependant codes + + * Added screen number, and flip support into dome correction codes. + + * From Stephan Huber, "the computation of the windowtitlebar-height + was wrong, attached you'll find a fixed version for + GraphicsWindowCarbon.cpp " + +2007-06-10 20:46 +0000 [r6933] robert: + + * Added support for specifying external overlay file. + +2007-06-10 20:12 +0000 [r6932] robert: + + * Updated wrappers + +2007-06-10 19:53 +0000 [r6931] robert: + + * From Stephan Huber and Robert Osfield, Stephan: "attached you'll + find some modifications to the GraphicsWindow-class and their + platform-dependant implementations. The problem: + setWindowRectangle and setWindowDecoration do not update the + traits-object, so, if you call setWindowRectangle on a + not-realized-window it will open with another size when realized + later. getWindowRectangle reports possible wrong sizes if + setWindowRectangle called before. My solution: split the + implementation in two parts: GraphicsWindow::setWindowRectangle + will update its traits-object and call afterwards the virtual + method setWindowRectangleImplementation (which is implemented by + the derived platformspecific classess). For setWindowDecoration I + am useing a similar mechanism. I hope you'll find the submission + useful, the Win32 and X11 changes are not tested but should + work." Changes to this made by Robert are call of resized in + setWindowRectangle instead of setting of Traits, and use of a + bool return type. + +2007-06-10 19:22 +0000 [r6930] robert: + + * From Vladimir Shabanov, "osg::Image::isImageTranslucent() now + handles GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, + GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, + GL_UNSIGNED_INT_10_10_10_2, GL_UNSIGNED_INT_2_10_10_10_REV and + GL_HALF_FLOAT_NV pixel formats." + +2007-06-10 19:18 +0000 [r6929] robert: + + * From Vladimir Shabanov, "DDS plugin now works with these formats: + R3G3B2, R5G6B5, A1R5G5B5, X1R5G5B5, A4R4G4B4, X4R4G4B4, R8G8B8 + (now without swaping of red and blue), A8R8G8B8 (also w/o + swapping), X8R8G8B8, A8B8G8R8, X8B8G8R8, A2R10G10B10, + A2B10G10R10, L4A4 (not work on my machine), L16A16, L16, + A16B16G16R16, A16B16G16R16F, Q16W16V16U16, R32F, R16F and + A32B32G32R32F. And these ones are correctly detected, but prints + "unsupported" using osg::notify(osg::WARN) and are not loaded: + A8R3G3B2, G16R16, G16R16F, G32R32F and CxV8U8. Also added + checking of not supported DDPF_BUMPDUDV (V8U8, V16U16, Q8W8U8L8, + A2W10U10V10 etc.) and DDPF_BUMPLUMINANCE (L6V5U5, X8L8V8U8, etc.) + pixel formats. Mipmap handling is slightly modified and now + support all additional formats. " + +2007-06-10 18:17 +0000 [r6928] robert: + + * From Olaf Flebbe, "support current zlib and libpng library names + for win32 3rdParty builds." + +2007-06-10 09:51 +0000 [r6927] robert: + + * Improved the set up of static build, added freetype plugin to + plugins that support static usage + +2007-06-09 19:18 +0000 [r6926] robert: + + * Added default file in case no file arguments are provided. + Changed to use standard ThreadingHandler by default. + +2007-06-09 17:58 +0000 [r6925] robert: + + * Improved the detection of throwing of the mouse. + +2007-06-09 10:18 +0000 [r6924] robert: + + * Updated wrappers + +2007-06-09 10:07 +0000 [r6922-6923] robert: + + * Removed the command line parameters form the examples that now + have a default file built into them. + + * Added DisplaySettings to osg::Camera, and support into osg::View + for initializing the Camera to the DisplaySettings + ScreenWidth/Height/Distance. Added support for dual screen + horizontal split stereo. + +2007-06-08 20:11 +0000 [r6921] robert: + + * Added debug code path that prints out font details. + +2007-06-08 16:47 +0000 [r6919] robert: + + * From Eric Wing, interface files + +2007-06-08 16:05 +0000 [r6917-6918] robert: + + * Removed empty directory + + * Removed empty directory + +2007-06-08 15:37 +0000 [r6916] robert: + + * From Martin Lavery and Robert Osfield, added fallbacks for when + now command line args are provided. + +2007-06-08 15:29 +0000 [r6914] robert: + + * Added fallback for when no command line args are provied. + +2007-06-08 15:11 +0000 [r6913] robert: + + * Added default file when no command line options are supplied. + +2007-06-08 15:06 +0000 [r6911-6912] robert: + + * Added fallback for when no command line args are passed in. + + * From Martin Lavery, Linking of example Data files for the Xcode + Projects + +2007-06-08 12:16 +0000 [r6908-6910] robert: + + * Removed command line args for examples ported across to not need + them. + + * Added default command line arg + + * Added default file load to avoid the need for command line + option. + +2007-06-08 11:04 +0000 [r6907] robert: + + * From Stephan Huber, "attached you'll find a new + GraphicsWindowCarbon-header and .cpp, the changes I made: + put a + warning in the console if a nonexistant screen is requested + add + getters for the aglcontext and pixelformat -- I need access to + them in my own code. " + +2007-06-08 10:58 +0000 [r6906] robert: + + * From Jason Daly, "We have a few OpenFlight files that used to + display properly with the old loader, but appear very, very wrong + with the new one. I traced the problem to the handling of the + palette override flags in the external reference records. The + current behavior for handling the palette override flags for + external references has different offsets for different + OpenFlight version (2 bytes for 14.2-15.1 and 4 bytes for 15.2 + and later). However, I believe this behavior is incorrect. I know + that the original 14.2 OpenFlight spec (dated April 1995) + specifies 2 bytes between the filename and the override flags, + and the 15.4 and later specs specify 4 bytes. However, I also + found a 14.2.4 OpenFlight spec (dated January 1996) that changes + the specification to 4 bytes. Also, the databases in question + were created using an old IRIX version of MultiGen II, which + wrote OpenFlight 14.2 files natively. These files also have 4 + bytes between the filename and flags. Furthermore, these + databases have always worked properly under earlier versions of + OSG, under Performer, and in every MultiGen product we've used. + This leads me to believe that the original 14.2 spec was + incorrect (the 14.2.4 spec corrected this error), and there + should be 4 bytes between the filename and flags for all + OpenFlight files version 14.2 and later. The attached fix + modifies the OpenFlight loader to behave in this way." + +2007-06-08 10:43 +0000 [r6903-6905] robert: + + * From Eric Wing, build fix + + * From Eric Wing, build fix + + * Updated wrappers + +2007-06-08 10:22 +0000 [r6902] robert: + + * From Jason Daly, "This changes the handling of textures in the + OpenFlight loader. Currently, if the texture attribute file + doesn't explicitly specify an internal format, the loader will + force it to use GL_RGB, which keeps translucent textures (eg. + GL_RGBA textures) from showing up properly. This patch changes + the default behavior to simply use the image's format instead of + forcing a particular format." + +2007-06-08 10:16 +0000 [r6901] robert: + + * From Eric Wing, "So, something strange happened to the repo and + some of this project's files got messed up, most notiably the Nib + and also the Localized strings file. I didn't notice the latter + until now so Martin is missing this file. Anyway, the attached + tar contains all new versions of all the necessary files. There + are cleanups and fixes to a lot of things. Martin did a good job + porting the thing to osg::Viewer so most of the code changes I + made address other areas. Two things I noticed in the new port + you might want to consider as feedback. First, there might be a + bug with osgViewer when the view size goes to 0. If you play with + the splitviews in this program and shrink the view until it is + closed, and then re-expand it, the model doesn't come back, not + even after a home() call. SimpleViewer didn't have this problem. + Second, a more minor thing, this program has a + take-screenshot--and-copy-to-clipboard feature via Cmd-C (or Menu + item). I achieve this by using osg::Camera to render to an FBO + and then copy the contents to Cocoa. To insert the camera, I + manipulate the scenegraph so I can get the camera node in and + out. I end up calling setSceneData at the end of eveything to + restore everything to the original state before I started mucking + with the scenegraph. This unfortunately, triggers a home() reset. + So in this particular case, it make Copy look like it's changing + the scene. The old SimpleViewer had the same problem, but I was + able to work around it by directly invoking the underlying + SceneView's setSceneData so the home() mechanism was bypassed. + The viewer design seems to protect this data more carefully so + the bypass trick won't work. My feedback is that maybe a flag or + extra parameter can be introduced so a reset is not triggered if + not desired. I have checked in a ton of Xcode fixes for the + entire build process in general so once this piece gets checked + in, hopefully everything will build cleanly." + +2007-06-08 10:11 +0000 [r6900] robert: + + * From Mike Wittman, "This change to genwrapper and + osgIntrospection gives access to the declaring file for a given + type via the new member function + osgIntrospection::Type::getDeclaringFile. This information is + useful in order to know what header to include when + auto-generating wrappers for a given type. During the C# wrapper + generator development I've been keeping the declaring file + configuration state up-to-date manually with changes to OSG, and + it's proven to require substantial effort. So it would be + extremely valuable to get this change in before 2.0 to reduce + maintenance during the lifetime of the release. It'll also be + equally useful to others looking to create wrapper generators + using osgIntrospection. This is a fairly simple change and was + tested with a fresh rebuild of the entire suite of osgWrapper + libraries, so it should be relatively low risk (fingers + crossed)." + +2007-06-08 09:45 +0000 [r6899] robert: + + * Added clean up of the view before destruction of the window + +2007-06-08 09:17 +0000 [r6898] robert: + + * Added const get*Matrix() methods + +2007-06-08 05:03 +0000 [r6897] ewing: + + * Changed the version to 2.0.0 in the Info.plist in anticipation of + the official release. I don't know what the OpenThreads version + number will be, so that has been left alone. + +2007-06-08 04:57 +0000 [r6896] ewing: + + * Lots of various fixes to Xcode project. - Adding missing header + files and making sure they are marked public. - Support to copy + headers in Viewer/api into the proper location in framework - + Internalized OpenThreads build so cross-project dependency is not + needed. Can now delete copy of OpenThreads project. Frameworks + use native Xcode linking mechanism. Plugins/Examples still use + explicit -framework OpenThreads. Could potentially be problem is + old OpenThreads is on the system. This can be changed to use + native mechanism too, but requires some patience because it is + tedious to change. - Lots of fixes to osgViewerCocoa (something + got messed up pretty badly...files are missing from repo). + Another submission will need to readd these files back. + +2007-06-07 21:43 +0000 [r6895] shuber: + + * Stephan Huber: fixed deploy-build for osgViewer + +2007-06-07 21:07 +0000 [r6894] robert: + + * Updated wrappers + +2007-06-07 20:26 +0000 [r6893] robert: + + * Commented out the Scene Stats entry as its not implemented yet. + +2007-06-07 20:22 +0000 [r6892] robert: + + * From Martin Lavery, StatsHandler added to the ViewerCocoa example + +2007-06-07 13:49 +0000 [r6890-6891] robert: + + * From Martin Lavery, update of *.nib files + + * From Martin Lavery, update of *.nib files + +2007-06-07 13:44 +0000 [r6889] robert: + + * From Martin Lavery, update of *.nib files + +2007-06-07 13:31 +0000 [r6888] robert: + + * From Martin Lavery, update of *.nib files + +2007-06-07 13:25 +0000 [r6887] robert: + + * From Martin Lavery, update of *.nib files + +2007-06-07 12:55 +0000 [r6886] robert: + + * From Martin Lavery, port of ViewerCocoa and updates to Xcode + projects + +2007-06-07 12:47 +0000 [r6884-6885] robert: + + * Removed the old SimpleView version of the Cocoa example + + * Removed now not need SimpleViewer + +2007-06-07 12:23 +0000 [r6883] robert: + + * Added automatic stopping of animation when home() is called + +2007-06-07 12:05 +0000 [r6882] robert: + + * From Per Fahlberg, "To get the pfb (Performer) plugin to compile + I had to remove some of the libraries listed under + TARGET_EXTERNAL_LIBRARIES. The removed libraries are not needed + when linking the plugin, they are loaded during runtime by + Performer. The modified file is attached." + +2007-06-07 11:19 +0000 [r6881] robert: + + * Introduced a destruct method to help clean up the Registry. + +2007-06-07 11:06 +0000 [r6879-6880] robert: + + * Revert the signOrZero cade path in the getRotate() to fix bugs. + + * Added support for using quat_scaled sx sy sz for testing getting + quats from scaled matrices. Removed broken Matrixd/quat test + +2007-06-07 09:58 +0000 [r6878] robert: + + * Added View::home() method and updated wrappers + +2007-06-07 09:24 +0000 [r6877] robert: + + * Removed redundent files + +2007-06-07 08:52 +0000 [r6876] robert: + + * Updated wrappers + +2007-06-06 21:57 +0000 [r6873] robert: + + * Updated ChangeLog, AUTHORES and README to 1.9.8 release + +2007-06-06 21:43 +0000 [r6872] robert: + + * Updated version numbers for release + +2007-06-06 17:01 +0000 [r6866] robert: + + * Revert the setting of SingleThreaded under Windows in + suggestBestThreadingModel() + +2007-06-06 16:27 +0000 [r6865] robert: + + * Added #include + +2007-06-06 16:23 +0000 [r6864] robert: + + * Fixed includes + +2007-06-06 15:22 +0000 [r6863] robert: + + * From Ulrich Hertlein, "on my MacOS X/cmake setup the zlib plugin + isn't built by default. This may be because zlib.h is installed + in /opt/local/include on my system (courtesy of DarwinPorts). + I've added a CMakeModule to look for zlib.h and the library in + various places. The files are attached." + +2007-06-06 14:51 +0000 [r6862] robert: + + * Fixed includes + +2007-06-06 13:45 +0000 [r6861] robert: + + * From Martin Lavery, Updates to Xcode project + 2007-06-06 11:34 +0000 [r6860] robert: * From Roger James, "These fix a couple of problems in the ac3d diff --git a/README.txt b/README.txt index 229fda9f9..952d5f4c7 100644 --- a/README.txt +++ b/README.txt @@ -10,11 +10,11 @@ For the impatient, read the simplified build notes below. Robert Osfield. Project Lead. -6th June 2007. +13th June 2007. -- -Notes for 1.9.8 release +Notes for 1.9.9 release ======================= The OpenThreads/include and /src directories have now been merged diff --git a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp index 5b05794e9..8883c301f 100644 --- a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp @@ -10,6 +10,10 @@ #include #include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -20,12 +24,131 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osgViewer::StatsHandler::StatsType) +BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) I_DeclaringFile("osgViewer/ViewerEventHandlers"); - I_EnumLabel(osgViewer::StatsHandler::NO_STATS); - I_EnumLabel(osgViewer::StatsHandler::FRAME_RATE); - I_EnumLabel(osgViewer::StatsHandler::VIEWER_STATS); - I_EnumLabel(osgViewer::StatsHandler::LAST); + I_BaseType(osgGA::GUIEventHandler); + I_ConstructorWithDefaults1(IN, osg::ApplicationUsage *, au, 0, + Properties::NON_EXPLICIT, + ____HelpHandler__osg_ApplicationUsage_P1, + "", + ""); + I_Method1(void, setApplicationUsage, IN, osg::ApplicationUsage *, au, + Properties::NON_VIRTUAL, + __void__setApplicationUsage__osg_ApplicationUsage_P1, + "", + ""); + I_Method0(osg::ApplicationUsage *, getApplicationUsage, + Properties::NON_VIRTUAL, + __osg_ApplicationUsage_P1__getApplicationUsage, + "", + ""); + I_Method0(const osg::ApplicationUsage *, getApplicationUsage, + Properties::NON_VIRTUAL, + __C5_osg_ApplicationUsage_P1__getApplicationUsage, + "", + ""); + I_Method1(void, setKeyEventTogglesOnScreenHelp, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventTogglesOnScreenHelp__int, + "", + ""); + I_Method0(int, getKeyEventTogglesOnScreenHelp, + Properties::NON_VIRTUAL, + __int__getKeyEventTogglesOnScreenHelp, + "", + ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method0(osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __osg_Camera_P1__getCamera, + "", + ""); + I_Method0(const osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __C5_osg_Camera_P1__getCamera, + "", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_ProtectedMethod1(void, setUpHUDCamera, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpHUDCamera__osgViewer_Viewer_P1, + "", + ""); + I_ProtectedMethod1(void, setUpScene, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpScene__osgViewer_Viewer_P1, + "", + ""); + I_SimpleProperty(osg::ApplicationUsage *, ApplicationUsage, + __osg_ApplicationUsage_P1__getApplicationUsage, + __void__setApplicationUsage__osg_ApplicationUsage_P1); + I_SimpleProperty(osg::Camera *, Camera, + __osg_Camera_P1__getCamera, + 0); + I_SimpleProperty(int, KeyEventTogglesOnScreenHelp, + __int__getKeyEventTogglesOnScreenHelp, + __void__setKeyEventTogglesOnScreenHelp__int); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgViewer::RecordCameraPathHandler) + I_DeclaringFile("osgViewer/ViewerEventHandlers"); + I_BaseType(osgGA::GUIEventHandler); + I_ConstructorWithDefaults1(IN, const std::string &, filename, "saved_animation.path", + Properties::NON_EXPLICIT, + ____RecordCameraPathHandler__C5_std_string_R1, + "", + ""); + I_Method1(void, setKeyEventToggleRecord, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventToggleRecord__int, + "", + ""); + I_Method0(int, getKeyEventToggleRecord, + Properties::NON_VIRTUAL, + __int__getKeyEventToggleRecord, + "", + ""); + I_Method1(void, setKeyEventTogglePlayback, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventTogglePlayback__int, + "", + ""); + I_Method0(int, getKeyEventTogglePlayback, + Properties::NON_VIRTUAL, + __int__getKeyEventTogglePlayback, + "", + ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_SimpleProperty(int, KeyEventTogglePlayback, + __int__getKeyEventTogglePlayback, + __void__setKeyEventTogglePlayback__int); + I_SimpleProperty(int, KeyEventToggleRecord, + __int__getKeyEventToggleRecord, + __void__setKeyEventToggleRecord__int); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgViewer::StatsHandler::StatsType) @@ -36,31 +159,286 @@ BEGIN_ENUM_REFLECTOR(osgViewer::StatsHandler::StatsType) I_EnumLabel(osgViewer::StatsHandler::LAST); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgViewer::ThreadingHandler) +BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) I_DeclaringFile("osgViewer/ViewerEventHandlers"); + I_BaseType(osgGA::GUIEventHandler); + I_Constructor0(____StatsHandler, + "", + ""); + I_Method1(void, setKeyEventTogglesOnScreenStats, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventTogglesOnScreenStats__int, + "", + ""); + I_Method0(int, getKeyEventTogglesOnScreenStats, + Properties::NON_VIRTUAL, + __int__getKeyEventTogglesOnScreenStats, + "", + ""); + I_Method1(void, setKeyEventPrintsOutStats, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventPrintsOutStats__int, + "", + ""); + I_Method0(int, getKeyEventPrintsOutStats, + Properties::NON_VIRTUAL, + __int__getKeyEventPrintsOutStats, + "", + ""); + I_Method0(double, getBlockMultiplier, + Properties::NON_VIRTUAL, + __double__getBlockMultiplier, + "", + ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method0(osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __osg_Camera_P1__getCamera, + "", + ""); + I_Method0(const osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __C5_osg_Camera_P1__getCamera, + "", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_ProtectedMethod1(void, setUpHUDCamera, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpHUDCamera__osgViewer_Viewer_P1, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createGeometry, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numBlocks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createGeometry__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createFrameMarkers, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numBlocks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createFrameMarkers__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createTick, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numTicks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createTick__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod7(osg::Node *, createCameraStats, IN, const std::string &, font, IN, osg::Vec3 &, pos, IN, float, startBlocks, IN, bool, aquireGPUStats, IN, float, characterSize, IN, osg::Stats *, viewerStats, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Node_P1__createCameraStats__C5_std_string_R1__osg_Vec3_R1__float__bool__float__osg_Stats_P1__osg_Camera_P1, + "", + ""); + I_ProtectedMethod1(void, setUpScene, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpScene__osgViewer_Viewer_P1, + "", + ""); + I_ProtectedMethod0(void, updateThreadingModelText, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateThreadingModelText, + "", + ""); + I_SimpleProperty(double, BlockMultiplier, + __double__getBlockMultiplier, + 0); + I_SimpleProperty(osg::Camera *, Camera, + __osg_Camera_P1__getCamera, + 0); + I_SimpleProperty(int, KeyEventPrintsOutStats, + __int__getKeyEventPrintsOutStats, + __void__setKeyEventPrintsOutStats__int); + I_SimpleProperty(int, KeyEventTogglesOnScreenStats, + __int__getKeyEventTogglesOnScreenStats, + __void__setKeyEventTogglesOnScreenStats__int); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgViewer::ThreadingHandler) + I_DeclaringFile("osgViewer/ViewerEventHandlers"); + I_BaseType(osgGA::GUIEventHandler); I_Constructor0(____ThreadingHandler, "", ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_Method1(void, setKeyEventChangeThreadingModel, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventChangeThreadingModel__int, + "", + ""); + I_Method0(int, getKeyEventChangeThreadingModel, + Properties::NON_VIRTUAL, + __int__getKeyEventChangeThreadingModel, + "", + ""); + I_Method1(void, setChangeThreadingModel, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setChangeThreadingModel__bool, + "", + ""); + I_Method0(bool, getChangeThreadingModel, + Properties::NON_VIRTUAL, + __bool__getChangeThreadingModel, + "", + ""); + I_Method1(void, setKeyEventChangeEndBarrierPosition, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventChangeEndBarrierPosition__int, + "", + ""); + I_Method0(int, getKeyEventChangeEndBarrierPosition, + Properties::NON_VIRTUAL, + __int__getKeyEventChangeEndBarrierPosition, + "", + ""); + I_Method1(void, setChangeEndBarrierPosition, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setChangeEndBarrierPosition__bool, + "", + ""); + I_Method0(bool, getChangeEndBarrierPosition, + Properties::NON_VIRTUAL, + __bool__getChangeEndBarrierPosition, + "", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_SimpleProperty(bool, ChangeEndBarrierPosition, + __bool__getChangeEndBarrierPosition, + __void__setChangeEndBarrierPosition__bool); + I_SimpleProperty(bool, ChangeThreadingModel, + __bool__getChangeThreadingModel, + __void__setChangeThreadingModel__bool); + I_SimpleProperty(int, KeyEventChangeEndBarrierPosition, + __int__getKeyEventChangeEndBarrierPosition, + __void__setKeyEventChangeEndBarrierPosition__int); + I_SimpleProperty(int, KeyEventChangeThreadingModel, + __int__getKeyEventChangeThreadingModel, + __void__setKeyEventChangeThreadingModel__int); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgViewer::ThreadingHandler) - I_DeclaringFile("osgViewer/ViewerEventHandlers"); - I_Constructor0(____ThreadingHandler, - "", - ""); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osgViewer::WindowSizeHandler) - I_DeclaringFile("osgViewer/ViewerEventHandlers"); - I_Constructor0(____WindowSizeHandler, - "", - ""); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osgViewer::WindowSizeHandler) +BEGIN_OBJECT_REFLECTOR(osgViewer::WindowSizeHandler) I_DeclaringFile("osgViewer/ViewerEventHandlers"); + I_BaseType(osgGA::GUIEventHandler); I_Constructor0(____WindowSizeHandler, "", ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_Method1(void, setKeyEventToggleFullscreen, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventToggleFullscreen__int, + "", + ""); + I_Method0(int, getKeyEventToggleFullscreen, + Properties::NON_VIRTUAL, + __int__getKeyEventToggleFullscreen, + "", + ""); + I_Method1(void, setToggleFullscreen, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setToggleFullscreen__bool, + "", + ""); + I_Method0(bool, getToggleFullscreen, + Properties::NON_VIRTUAL, + __bool__getToggleFullscreen, + "", + ""); + I_Method1(void, setKeyEventWindowedResolutionUp, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventWindowedResolutionUp__int, + "", + ""); + I_Method0(int, getKeyEventWindowedResolutionUp, + Properties::NON_VIRTUAL, + __int__getKeyEventWindowedResolutionUp, + "", + ""); + I_Method1(void, setKeyEventWindowedResolutionDown, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventWindowedResolutionDown__int, + "", + ""); + I_Method0(int, getKeyEventWindowedResolutionDown, + Properties::NON_VIRTUAL, + __int__getKeyEventWindowedResolutionDown, + "", + ""); + I_Method1(void, setChangeWindowedResolution, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setChangeWindowedResolution__bool, + "", + ""); + I_Method0(bool, getChangeWindowedResolution, + Properties::NON_VIRTUAL, + __bool__getChangeWindowedResolution, + "", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_ProtectedMethod1(void, toggleFullscreen, IN, osgViewer::GraphicsWindow *, window, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__toggleFullscreen__osgViewer_GraphicsWindow_P1, + "", + ""); + I_ProtectedMethod2(void, changeWindowedResolution, IN, osgViewer::GraphicsWindow *, window, IN, bool, increase, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__changeWindowedResolution__osgViewer_GraphicsWindow_P1__bool, + "", + ""); + I_ProtectedMethod4(unsigned int, getNearestResolution, IN, int, screenWidth, IN, int, screenHeight, IN, int, width, IN, int, height, + Properties::NON_VIRTUAL, + Properties::CONST, + __unsigned_int__getNearestResolution__int__int__int__int, + "", + ""); + I_SimpleProperty(bool, ChangeWindowedResolution, + __bool__getChangeWindowedResolution, + __void__setChangeWindowedResolution__bool); + I_SimpleProperty(int, KeyEventToggleFullscreen, + __int__getKeyEventToggleFullscreen, + __void__setKeyEventToggleFullscreen__int); + I_SimpleProperty(int, KeyEventWindowedResolutionDown, + __int__getKeyEventWindowedResolutionDown, + __void__setKeyEventWindowedResolutionDown__int); + I_SimpleProperty(int, KeyEventWindowedResolutionUp, + __int__getKeyEventWindowedResolutionUp, + __void__setKeyEventWindowedResolutionUp__int); + I_SimpleProperty(bool, ToggleFullscreen, + __bool__getToggleFullscreen, + __void__setToggleFullscreen__bool); END_REFLECTOR