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

Added a viewer.sync to the end of all the demos.

Browse Source 
Removed the Win32 remapping of keycodes from the osgProducer::EventAdapter.
This commit is contained in:
Robert Osfield
2003-03-25 10:05:09 +00:00
parent 05681b8eda
commit 35e0ba12bc
34 changed files with 199 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/osganimate/osganimate.cpp
View File

@@ -257,6 +257,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgbillboard/osgbillboard.cpp
View File

@@ -220,5 +220,8 @@ int main( int argc, char **argv )
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgcallback/osgcallback.cpp
View File

@@ -196,6 +196,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgclip/osgclip.cpp
View File

@@ -196,6 +196,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

4
examples/osgcluster/osgcluster.cpp
View File

@@ -222,7 +222,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
// if we are master clean up by telling all slaves that we're going down.
if (viewerMode==MASTER)

3
examples/osgcopy/osgcopy.cpp
View File

@@ -240,6 +240,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgcubemap/osgcubemap.cpp
View File

@@ -135,6 +135,9 @@ int main(int argc, char *argv[])
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osggeodemo/osggeodemo.cpp
View File

@@ -180,6 +180,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osggeometry/osggeometry.cpp
View File

@@ -703,6 +703,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osghangglide/osghangglide.cpp
View File

@@ -162,6 +162,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osghud/osghud.cpp
View File

@@ -181,5 +181,8 @@ int main( int argc, char **argv )
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

4
examples/osgimpostor/osgimpostor.cpp
View File

@@ -9,10 +9,6 @@
#include <osgDB/ReadFile>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgProducer/Viewer>
#include "TestManipulator.h"

5
examples/osgkeyboard/osgkeyboard.cpp
View File

@@ -327,8 +327,9 @@ int main( int argc, char **argv )
viewer.frame();
}
//viewer.sync();
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osglight/osglight.cpp
View File

@@ -371,6 +371,9 @@ int main( int argc, char **argv )
// fire off the cull and draw traversals of the scene.
viewer.frame();
// wait for all cull and draw threads to complete before exit.
viewer.sync();
}

3
examples/osglightpoint/osglightpoint.cpp
View File

@@ -184,6 +184,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osglogo/osglogo.cpp
View File

@@ -460,6 +460,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgmultitexture/osgmultitexture.cpp
View File

@@ -107,6 +107,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

2
examples/osgoccluder/osgoccluder.cpp
View File

@@ -369,7 +369,7 @@ int main( int argc, char **argv )
}
//viewer.sync();
viewer.sync();
return 0;
}

7
examples/osgparticle/osgparticle.cpp
View File

@@ -385,7 +385,9 @@ int main(int argc, char **argv)
viewer.setSceneData(root);
// create the windows and run the threads.
viewer.realize(Producer::CameraGroup::ThreadPerCamera);
// viewer.realize(Producer::CameraGroup::ThreadPerCamera);
// run single threaded since osgParticle still writes during cull.
viewer.realize(Producer::CameraGroup::SingleThreaded);
while( !viewer.done() )
{
@@ -400,6 +402,9 @@ int main(int argc, char **argv)
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

7
examples/osgpbuffer/osgpbuffer.cpp
View File

@@ -10,10 +10,6 @@
#include <osg/Billboard>
#include <osg/Material>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgUtil/TransformCallback>
#include <osgUtil/SmoothingVisitor>
@@ -663,6 +659,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
delete g_pPixelBuffer;

3
examples/osgprerender/osgprerender.cpp
View File

@@ -439,6 +439,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgreflect/osgreflect.cpp
View File

@@ -403,6 +403,9 @@ int main( int argc, char **argv )
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

7
examples/osgscribe/osgscribe.cpp
View File

@@ -9,10 +9,6 @@
#include <osgDB/Registry>
#include <osgDB/ReadFile>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgProducer/Viewer>
#include <osgUtil/Optimizer>
@@ -124,6 +120,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

5
examples/osgsequence/osgsequence.cpp
View File

@@ -6,8 +6,6 @@
#include <osgDB/ReadFile>
#include <osgGA/TrackballManipulator>
#include <osgProducer/Viewer>
@@ -196,6 +194,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

8
examples/osgshadowtexture/osgshadowtexture.cpp
View File

@@ -11,11 +11,6 @@
#include <osgDB/Registry>
#include <osgDB/ReadFile>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgProducer/Viewer>
@@ -235,6 +230,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

5
examples/osgshape/osgshape.cpp
View File

@@ -3,8 +3,6 @@
#include <osg/Material>
#include <osg/Texture2D>
#include <osgGA/TrackballManipulator>
#include <osgProducer/Viewer>
#include <osgDB/ReadFile>
@@ -138,6 +136,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgstereoimage/osgstereoimage.cpp
View File

@@ -467,6 +467,9 @@ int main( int argc, char **argv )
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

5
examples/osgteapot/osgteapot.cpp
View File

@@ -4,8 +4,6 @@
#include <osgDB/ReadFile>
#include <osgGA/TrackballManipulator>
#include <osgProducer/Viewer>
@@ -369,6 +367,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

3
examples/osgtext/osgtext.cpp
View File

@@ -534,6 +534,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

7
examples/osgtexture1D/osgtexture1D.cpp
View File

@@ -3,10 +3,6 @@
#include <osg/TexGen>
#include <osg/Material>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgDB/Registry>
#include <osgDB/ReadFile>
@@ -214,6 +210,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
}
else
{

7
examples/osgtexture2D/osgtexture2D.cpp
View File

@@ -6,10 +6,6 @@
#include <osg/DrawPixels>
#include <osg/Geode>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgDB/Registry>
#include <osgDB/ReadFile>
@@ -454,6 +450,9 @@ int main( int argc, char **argv )
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
}
else
{

7
examples/osgtexture3D/osgtexture3D.cpp
View File

@@ -5,10 +5,6 @@
#include <osg/TexGen>
#include <osg/Geode>
#include <osgGA/TrackballManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/DriveManipulator>
#include <osgDB/Registry>
#include <osgDB/ReadFile>
@@ -283,6 +279,9 @@ int main( int argc, char **argv )
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
}
return 0;

5
examples/osgvertexprogram/osgvertexprogram.cpp
View File

@@ -19,8 +19,6 @@
#include <osgDB/Registry>
#include <osgDB/ReadFile>
#include <osgGA/TrackballManipulator>
#include <osgUtil/SmoothingVisitor>
#include <osgUtil/Optimizer>
@@ -419,6 +417,9 @@ int main(int argc, char *argv[])
viewer.frame();
}
// wait for all cull and draw threads to complete before exit.
viewer.sync();
return 0;
}

198
src/osgProducer/EventAdapter.cpp
View File

@@ -191,114 +191,120 @@ bool EventAdapter::initKeySymbolMap()
{
#ifdef WIN32
/*
// not mapped yet as I can't see an
// obvious mapping to X11/osgGA::GUIEventAdapter::KeySymbol.
s_keySymbolMap[VK_CAPITAL] = ;
s_keySymbolMap[VK_CONVERT] = ;
s_keySymbolMap[VK_NONCONVERT] = ;
s_keySymbolMap[VK_ACCEPT] = ;
s_keySymbolMap[VK_SNAPSHOT] = ;
s_keySymbolMap[VK_LWIN] = ;
s_keySymbolMap[VK_RWIN] = ;
s_keySymbolMap[VK_APPS] = ;
#if 0
s_keySymbolMap[VK_ATTN] = ;
s_keySymbolMap[VK_CRSEL] = ;
s_keySymbolMap[VK_EXSEL] = ;
s_keySymbolMap[VK_EREOF] = ;
s_keySymbolMap[VK_PLAY] = ;
s_keySymbolMap[VK_ZOOM] = ;
s_keySymbolMap[VK_NONAME] = ;
s_keySymbolMap[VK_PA1] = ;
*/
/*
// not mapped yet as I can't see an
// obvious mapping to X11/osgGA::GUIEventAdapter::KeySymbol.
s_keySymbolMap[VK_CAPITAL] = ;
s_keySymbolMap[VK_CONVERT] = ;
s_keySymbolMap[VK_NONCONVERT] = ;
s_keySymbolMap[VK_ACCEPT] = ;
s_keySymbolMap[VK_SNAPSHOT] = ;
// mapped to osgGA::GUIEventAdapter::KeySymbol
s_keySymbolMap[VK_CANCEL] = KEY_Cancel;
s_keySymbolMap[VK_LWIN] = ;
s_keySymbolMap[VK_RWIN] = ;
s_keySymbolMap[VK_APPS] = ;
s_keySymbolMap[VK_BACK] = KEY_BackSpace;
s_keySymbolMap[VK_TAB] = KEY_Tab;
s_keySymbolMap[VK_ATTN] = ;
s_keySymbolMap[VK_CRSEL] = ;
s_keySymbolMap[VK_EXSEL] = ;
s_keySymbolMap[VK_EREOF] = ;
s_keySymbolMap[VK_PLAY] = ;
s_keySymbolMap[VK_ZOOM] = ;
s_keySymbolMap[VK_NONAME] = ;
s_keySymbolMap[VK_PA1] = ;
*/
s_keySymbolMap[VK_CLEAR] = KEY_Clear;
s_keySymbolMap[VK_RETURN] = KEY_Return;
// mapped to osgGA::GUIEventAdapter::KeySymbol
s_keySymbolMap[VK_CANCEL] = KEY_Cancel;
s_keySymbolMap[VK_SHIFT] = KEY_Shift_Lock;
s_keySymbolMap[VK_CONTROL] = KEY_Control_L;
s_keySymbolMap[VK_MENU] = KEY_Menu;
s_keySymbolMap[VK_PAUSE ] = KEY_Pause;
s_keySymbolMap[VK_BACK] = KEY_BackSpace;
s_keySymbolMap[VK_TAB] = KEY_Tab;
s_keySymbolMap[VK_ESCAPE] = KEY_Escape;
s_keySymbolMap[VK_CLEAR] = KEY_Clear;
s_keySymbolMap[VK_RETURN] = KEY_Return;
s_keySymbolMap[VK_MODECHANGE] = KEY_Mode_switch;
s_keySymbolMap[VK_SHIFT] = KEY_Shift_Lock;
s_keySymbolMap[VK_CONTROL] = KEY_Control_L;
s_keySymbolMap[VK_MENU] = KEY_Menu;
s_keySymbolMap[VK_PAUSE ] = KEY_Pause;
s_keySymbolMap[VK_SPACE] = KEY_Space;
s_keySymbolMap[VK_PRIOR] = KEY_Prior;
s_keySymbolMap[VK_NEXT] = KEY_Next;
s_keySymbolMap[VK_END] = KEY_End;
s_keySymbolMap[VK_HOME] = KEY_Home;
s_keySymbolMap[VK_LEFT] = KEY_Left;
s_keySymbolMap[VK_UP] = KEY_Up;
s_keySymbolMap[VK_RIGHT] = KEY_Right;
s_keySymbolMap[VK_DOWN] = KEY_Down;
s_keySymbolMap[VK_SELECT] = KEY_Select;
s_keySymbolMap[VK_PRINT] = KEY_Print;
s_keySymbolMap[VK_EXECUTE] = KEY_Execute;
s_keySymbolMap[VK_INSERT] = KEY_Insert;
s_keySymbolMap[VK_DELETE] = KEY_Delete;
s_keySymbolMap[VK_HELP] = KEY_Help;
s_keySymbolMap[VK_ESCAPE] = KEY_Escape;
s_keySymbolMap[VK_NUMPAD0] = KEY_KP_0;
s_keySymbolMap[VK_NUMPAD1] = KEY_KP_1;
s_keySymbolMap[VK_NUMPAD2] = KEY_KP_2;
s_keySymbolMap[VK_NUMPAD3] = KEY_KP_3;
s_keySymbolMap[VK_NUMPAD4] = KEY_KP_4;
s_keySymbolMap[VK_NUMPAD5] = KEY_KP_5;
s_keySymbolMap[VK_NUMPAD6] = KEY_KP_6;
s_keySymbolMap[VK_NUMPAD7] = KEY_KP_7;
s_keySymbolMap[VK_NUMPAD8] = KEY_KP_8;
s_keySymbolMap[VK_NUMPAD9] = KEY_KP_9;
s_keySymbolMap[VK_MULTIPLY] = KEY_KP_Multiply;
s_keySymbolMap[VK_ADD] = KEY_KP_Add;
s_keySymbolMap[VK_SEPARATOR] = KEY_KP_Separator;
s_keySymbolMap[VK_SUBTRACT] = KEY_KP_Subtract;
s_keySymbolMap[VK_DECIMAL] = KEY_KP_Decimal;
s_keySymbolMap[VK_DIVIDE] = KEY_KP_Divide;
s_keySymbolMap[VK_F1] = KEY_F1;
s_keySymbolMap[VK_F2] = KEY_F2;
s_keySymbolMap[VK_F3] = KEY_F3;
s_keySymbolMap[VK_F4] = KEY_F4;
s_keySymbolMap[VK_F5] = KEY_F5;
s_keySymbolMap[VK_F6] = KEY_F6;
s_keySymbolMap[VK_F7] = KEY_F7;
s_keySymbolMap[VK_F8] = KEY_F8;
s_keySymbolMap[VK_F9] = KEY_F9;
s_keySymbolMap[VK_F10] = KEY_F10;
s_keySymbolMap[VK_F11] = KEY_F11;
s_keySymbolMap[VK_F12] = KEY_F12;
s_keySymbolMap[VK_F13] = KEY_F13;
s_keySymbolMap[VK_F14] = KEY_F14;
s_keySymbolMap[VK_F15] = KEY_F15;
s_keySymbolMap[VK_F16] = KEY_F16;
s_keySymbolMap[VK_F17] = KEY_F17;
s_keySymbolMap[VK_F18] = KEY_F18;
s_keySymbolMap[VK_F19] = KEY_F19;
s_keySymbolMap[VK_F20] = KEY_F20;
s_keySymbolMap[VK_F21] = KEY_F21;
s_keySymbolMap[VK_F22] = KEY_F22;
s_keySymbolMap[VK_F23] = KEY_F23;
s_keySymbolMap[VK_F24] = KEY_F24;
s_keySymbolMap[VK_MODECHANGE] = KEY_Mode_switch;
s_keySymbolMap[VK_NUMLOCK] = KEY_Num_Lock;
s_keySymbolMap[VK_SCROLL] = KEY_Scroll_Lock;
s_keySymbolMap[VK_SPACE] = KEY_Space;
s_keySymbolMap[VK_PRIOR] = KEY_Prior;
s_keySymbolMap[VK_NEXT] = KEY_Next;
s_keySymbolMap[VK_END] = KEY_End;
s_keySymbolMap[VK_HOME] = KEY_Home;
s_keySymbolMap[VK_LEFT] = KEY_Left;
s_keySymbolMap[VK_UP] = KEY_Up;
s_keySymbolMap[VK_RIGHT] = KEY_Right;
s_keySymbolMap[VK_DOWN] = KEY_Down;
s_keySymbolMap[VK_SELECT] = KEY_Select;
s_keySymbolMap[VK_PRINT] = KEY_Print;
s_keySymbolMap[VK_EXECUTE] = KEY_Execute;
s_keySymbolMap[VK_INSERT] = KEY_Insert;
s_keySymbolMap[VK_DELETE] = KEY_Delete;
s_keySymbolMap[VK_HELP] = KEY_Help;
s_keySymbolMap[VK_LSHIFT] = KEY_Shift_L;
s_keySymbolMap[VK_RSHIFT] = KEY_Shift_R;
s_keySymbolMap[VK_LCONTROL] = KEY_Control_L;
s_keySymbolMap[VK_RCONTROL] = KEY_Control_R;
s_keySymbolMap[VK_LMENU] = KEY_Menu;
s_keySymbolMap[VK_RMENU] = KEY_Menu;
s_keySymbolMap[VK_OEM_CLEAR] = KEY_Clear;
s_keySymbolMap[VK_NUMPAD0] = KEY_KP_0;
s_keySymbolMap[VK_NUMPAD1] = KEY_KP_1;
s_keySymbolMap[VK_NUMPAD2] = KEY_KP_2;
s_keySymbolMap[VK_NUMPAD3] = KEY_KP_3;
s_keySymbolMap[VK_NUMPAD4] = KEY_KP_4;
s_keySymbolMap[VK_NUMPAD5] = KEY_KP_5;
s_keySymbolMap[VK_NUMPAD6] = KEY_KP_6;
s_keySymbolMap[VK_NUMPAD7] = KEY_KP_7;
s_keySymbolMap[VK_NUMPAD8] = KEY_KP_8;
s_keySymbolMap[VK_NUMPAD9] = KEY_KP_9;
s_keySymbolMap[VK_MULTIPLY] = KEY_KP_Multiply;
s_keySymbolMap[VK_ADD] = KEY_KP_Add;
s_keySymbolMap[VK_SEPARATOR] = KEY_KP_Separator;
s_keySymbolMap[VK_SUBTRACT] = KEY_KP_Subtract;
s_keySymbolMap[VK_DECIMAL] = KEY_KP_Decimal;
s_keySymbolMap[VK_DIVIDE] = KEY_KP_Divide;
s_keySymbolMap[VK_F1] = KEY_F1;
s_keySymbolMap[VK_F2] = KEY_F2;
s_keySymbolMap[VK_F3] = KEY_F3;
s_keySymbolMap[VK_F4] = KEY_F4;
s_keySymbolMap[VK_F5] = KEY_F5;
s_keySymbolMap[VK_F6] = KEY_F6;
s_keySymbolMap[VK_F7] = KEY_F7;
s_keySymbolMap[VK_F8] = KEY_F8;
s_keySymbolMap[VK_F9] = KEY_F9;
s_keySymbolMap[VK_F10] = KEY_F10;
s_keySymbolMap[VK_F11] = KEY_F11;
s_keySymbolMap[VK_F12] = KEY_F12;
s_keySymbolMap[VK_F13] = KEY_F13;
s_keySymbolMap[VK_F14] = KEY_F14;
s_keySymbolMap[VK_F15] = KEY_F15;
s_keySymbolMap[VK_F16] = KEY_F16;
s_keySymbolMap[VK_F17] = KEY_F17;
s_keySymbolMap[VK_F18] = KEY_F18;
s_keySymbolMap[VK_F19] = KEY_F19;
s_keySymbolMap[VK_F20] = KEY_F20;
s_keySymbolMap[VK_F21] = KEY_F21;
s_keySymbolMap[VK_F22] = KEY_F22;
s_keySymbolMap[VK_F23] = KEY_F23;
s_keySymbolMap[VK_F24] = KEY_F24;
s_keySymbolMap[VK_NUMLOCK] = KEY_Num_Lock;
s_keySymbolMap[VK_SCROLL] = KEY_Scroll_Lock;
s_keySymbolMap[VK_LSHIFT] = KEY_Shift_L;
s_keySymbolMap[VK_RSHIFT] = KEY_Shift_R;
s_keySymbolMap[VK_LCONTROL] = KEY_Control_L;
s_keySymbolMap[VK_RCONTROL] = KEY_Control_R;
s_keySymbolMap[VK_LMENU] = KEY_Menu;
s_keySymbolMap[VK_RMENU] = KEY_Menu;
s_keySymbolMap[VK_OEM_CLEAR] = KEY_Clear;
#endif
#else
// no mapping required for non windows (i.e. X11 based)