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

From Alok Priyadashi, "The attached patch fixes

Browse Source 
- compile errors on windows when compiled with UNICODE flag
- warnings for duplicate WIN32_LEAN_AND_MEAN. I think this should
better fixed by adding WIN32_LEAN_AND_MEAN to vcproj preprocessor
list."
This commit is contained in:
Robert Osfield
2010-04-22 16:01:38 +00:00
parent 25bc487763
commit f67942cf03
10 changed files with 114 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osgWrappers/introspection/osgViewer/GraphicsWindow.cpp
View File

@@ -157,11 +157,21 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow)
__void__setCursor__MouseCursor,
"Set mouse cursor to a specific shape. ",
"");
I_Method1(void, setSyncToVBlank, IN, bool, on,
Properties::VIRTUAL,
__void__setSyncToVBlank__bool,
"Create a new mouse cursor from the usual bitmap data. ",
"Set sync-to-vblank. ");
I_Method0(bool, getSyncToVBlank,
Properties::NON_VIRTUAL,
__bool__getSyncToVBlank,
"",
"");
I_Method0(bool, valid,
Properties::VIRTUAL,
__bool__valid,
"Create a new mouse cursor from the usual bitmap data. ",
"Return whether a valid and usable GraphicsContext has been created. ");
"Return whether a valid and usable GraphicsContext has been created. ",
"");
I_Method0(bool, realizeImplementation,
Properties::VIRTUAL,
__bool__realizeImplementation,
@@ -223,6 +233,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow)
I_SimpleProperty(osgGA::EventQueue *, EventQueue,
__osgGA_EventQueue_P1__getEventQueue,
__void__setEventQueue__osgGA_EventQueue_P1);
I_SimpleProperty(bool, SyncToVBlank,
__bool__getSyncToVBlank,
__void__setSyncToVBlank__bool);
I_SimpleProperty(bool, WindowDecoration,
__bool__getWindowDecoration,
__void__setWindowDecoration__bool);
@@ -269,8 +282,8 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindowEmbedded)
I_Method0(bool, valid,
Properties::VIRTUAL,
__bool__valid,
"Create a new mouse cursor from the usual bitmap data. ",
"Return whether a valid and usable GraphicsContext has been created. ");
"Return whether a valid and usable GraphicsContext has been created. ",
"");
I_Method0(bool, realizeImplementation,
Properties::VIRTUAL,
__bool__realizeImplementation,

13
src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp
View File

@@ -444,6 +444,16 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler)
__int__getKeyEventPrintsOutStats,
"",
"");
I_Method1(void, setKeyEventToggleVSync, IN, int, key,
Properties::NON_VIRTUAL,
__void__setKeyEventToggleVSync__int,
"",
"");
I_Method0(int, getKeyEventToggleVSync,
Properties::NON_VIRTUAL,
__int__getKeyEventToggleVSync,
"",
"");
I_Method0(double, getBlockMultiplier,
Properties::NON_VIRTUAL,
__double__getBlockMultiplier,
@@ -531,6 +541,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler)
I_SimpleProperty(int, KeyEventPrintsOutStats,
__int__getKeyEventPrintsOutStats,
__void__setKeyEventPrintsOutStats__int);
I_SimpleProperty(int, KeyEventToggleVSync,
__int__getKeyEventToggleVSync,
__void__setKeyEventToggleVSync__int);
I_SimpleProperty(int, KeyEventTogglesOnScreenStats,
__int__getKeyEventTogglesOnScreenStats,
__void__setKeyEventTogglesOnScreenStats__int);