Changeset 6815 for OpenSceneGraph/trunk/examples/osgviewerWX/osgviewerWX.cpp

Timestamp:

06/02/07 17:31:21 (6 years ago)

Author:

robert

Message:

Added osgViewer::GraphicsWindowEmbedded? and ported GLUT, SDL and WX examples across from SimpleViewer? to Viewer.

Files:

• OpenSceneGraph/trunk/examples/osgviewerWX/osgviewerWX.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/examples/osgviewerWX/osgviewerWX.cpp

@@ -11 +11 @@
 
 #include "osgviewerWX.h"
+
+
+#include <osgViewer/StatsHandler>
 #include <osgGA/TrackballManipulator>
 #include <osgDB/ReadFile>
@@ -25 +28 @@
     // create osg canvas
     //    - initialize
-    SimpleViewerWX *viewerWindow = new SimpleViewerWX(frame, wxID_ANY, wxDefaultPosition,
-        wxSize(200, 200), wxSUNKEN_BORDER);
+    
+
+    int width = 800;
+    int height = 600;
+
+    GraphicsWindowWX* gw = new GraphicsWindowWX(frame, wxID_ANY, wxDefaultPosition,
+                                                wxSize(width, height), wxSUNKEN_BORDER);
+    
+    
+    osgViewer::Viewer *viewer = new osgViewer::Viewer;
+    viewer->getCamera()->setGraphicsContext(gw);
+    viewer->getCamera()->setViewport(0,0,width,height);
+    viewer->addEventHandler(new osgViewer::StatsHandler);
+    viewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
         
     // load the scene.
@@ -34 +49 @@
         return false;
     }
-    viewerWindow->setSceneData(loadedModel.get());
-    viewerWindow->setCameraManipulator(new osgGA::TrackballManipulator);
-
-    frame->SetSimpleViewer(viewerWindow);
+    
+    viewer->setSceneData(loadedModel.get());
+    viewer->setCameraManipulator(new osgGA::TrackballManipulator);
+
+    frame->SetViewer(viewer);
 
     /* Show the frame */
@@ -56 +72 @@
     : wxFrame(frame, wxID_ANY, title, pos, size, style)
 {
-    _viewerWindow = NULL;
-}
-
-void MainFrame::SetSimpleViewer(SimpleViewerWX *viewer)
-{
-    _viewerWindow = viewer;
+}
+
+void MainFrame::SetViewer(osgViewer::Viewer *viewer)
+{
+    _viewer = viewer;
 }
 
 void MainFrame::OnIdle(wxIdleEvent &event)
 {
-    _viewerWindow->render();
+    _viewer->frame();
+    
     event.RequestMore();
 }
@@ -85 +101 @@
     // default cursor to standard
     _oldCursor = *wxSTANDARD_CURSOR;
+    
+    _traits = new GraphicsContext::Traits;
+    _traits->x = pos.x;
+    _traits->y = pos.y;
+    _traits->width = size.x;
+    _traits->height = size.y;
+
+    init();
+    
+}
+
+void GraphicsWindowWX::init()
+{
+    if (valid())
+    {
+        setState( new osg::State );
+        getState()->setGraphicsContext(this);
+
+        if (_traits.valid() && _traits->sharedContext)
+        {
+            getState()->setContextID( _traits->sharedContext->getState()->getContextID() );
+            incrementContextIDUsageCount( getState()->getContextID() );   
+        }
+        else
+        {
+            getState()->setContextID( osg::GraphicsContext::createNewContextID() );
+        }
+    }
 }
 
@@ -108 +152 @@
     // update the window dimensions, in case the window has been resized.
     getEventQueue()->windowResize(0, 0, width, height);
+    resized(0,0,width,height);
 }
 
@@ -117 +162 @@
 void GraphicsWindowWX::OnKeyDown(wxKeyEvent &event)
 {
+#if 1
+    int key = event.GetUnicodeKey();
+#else
     int key = event.GetKeyCode();
-    getEventQueue()->keyPress(key);
+#endif
+    getEventQueue()->keyPress(key);    
 
     // propagate event
@@ -126 +175 @@
 void GraphicsWindowWX::OnKeyUp(wxKeyEvent &event)
 {
+#if 1
+    int key = event.GetUnicodeKey();
+#else
     int key = event.GetKeyCode();
+#endif
     getEventQueue()->keyRelease(key);