Changeset 8833

Timestamp:

09/06/08 00:18:56

Author:

jeremymoles

Message:

Added methods to WindowManager? (::localXY, ::windowXY) to convert between
application window and WindowManager? coordinates. This lets us setup
CL_SCISSOR easier in the Window::update() method, although I had to also
introduce WindowManager?::setWindowSize() to accomodate this. At any rate,
being able to determine the difference between osgWidget's WindowManager? size
and the REAL application Window size is going to be very important.

Files:

• OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/examples/osgwidgetwindow/osgwidgetwindow.cpp (modified) (2 diffs)
• OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/include/osgWidget/WindowManager (modified) (3 diffs)
• OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/src/osgWidget/ViewerEventHandlers.cpp (modified) (1 diff)
• OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/src/osgWidget/Window.cpp (modified) (1 diff)
• OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/src/osgWidget/WindowManager.cpp (modified) (2 diffs)

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/examples/osgwidgetwindow/osgwidgetwindow.cpp

@@ -163 +163 @@
-        // std::cout << *box << std::endl << *boxCopy << std::endl;
-
-        // Add our event handler; is this better as a MatrixManipulator? Add a few other
-        // helpful ViewerEventHandlers.
-        viewer.addEventHandler(new osgWidget::MouseHandler(wm));
-        viewer.addEventHandler(new osgWidget::KeyboardHandler(wm));
-        viewer.addEventHandler(new osgViewer::StatsHandler());
-        viewer.addEventHandler(new osgViewer::WindowSizeHandler());
-        viewer.addEventHandler(new osgGA::StateSetManipulator(
-                viewer.getCamera()->getOrCreateStateSet()
-        ));
-
-        // Setup our OSG objects for our scene; note the use of the utility function
-        // createOrthoCamera, which is just a helper for setting up a proper viewing area.
@@ -183 +173 @@
-        osg::Node*   model  = osgDB::readNodeFile("cow.osg");
-
+        // Add our event handler; is this better as a MatrixManipulator? Add a few other
+        // helpful ViewerEventHandlers.
+        viewer.addEventHandler(new osgWidget::MouseHandler(wm));
+        viewer.addEventHandler(new osgWidget::KeyboardHandler(wm));
+        viewer.addEventHandler(new osgWidget::ResizeHandler(wm, camera, false));
+        viewer.addEventHandler(new osgViewer::StatsHandler());
+        viewer.addEventHandler(new osgViewer::WindowSizeHandler());
+        viewer.addEventHandler(new osgGA::StateSetManipulator(
+                viewer.getCamera()->getOrCreateStateSet()
+        ));
+
-        // Set our first non-UI node to be something other than the mask we created our
-        // WindowManager with to avoid picking.

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/include/osgWidget/WindowManager

@@ -92 +92 @@
-        void resizeAllWindows (bool = true);
-
+        XYCoord windowXY (double, double) const;
+        XYCoord localXY  (double, double) const;
+
-        // Methods all called by the ViewerEventHandlers::MouseHandler object, or
-        // by some customer caller of your own. Examples of this to come...
@@ -242 +245 @@
-            _height = h;
-        }
+
+        void setWindowSize(point_type w, point_type h) {
+            _windowWidth  = w;
+            _windowHeight = h;
+        }
-
-        // Wrappers around the real calls. These only pertains to mouse buttons, 
@@ -285 +293 @@
-        point_type         _width;
-        point_type         _height;
+        point_type         _windowWidth;
+        point_type         _windowHeight;
-        point_type         _zNear;
-        point_type         _zFar;

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/src/osgWidget/ViewerEventHandlers.cpp

@@ -182 +182 @@
-
-        else _camera->setProjectionMatrix(osg::Matrix::ortho2D(0.0f, w, 0.0f, h));
+
+        _wm->setSize(w, h);
-    }
-    
-
+Window
-    _wm->resizeAllWindows();
-

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/src/osgWidget/Window.cpp

@@ -373 +373 @@
-        }
-
-
+
+
+
+
-    }
-}

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/src/osgWidget/WindowManager.cpp

@@ -24 +24 @@
-_width          (width),
-_height         (height),
+_windowWidth    (width),
+_windowHeight   (height),
-_zNear          (0.0f),
-_zFar           (-1.0f),
@@ -457 +459 @@
-}
-
+// Returns the application window coordinates of the WindowManager XY position.
+XYCoord WindowManager::windowXY(double x, double y) const {
+    return XYCoord((_windowWidth / _width) * x, (_windowHeight / _height) * y);
+}
+
+// Returns the WindowManager coordinates of the application window XY position.
+XYCoord WindowManager::localXY(double x, double y) const {
+    return XYCoord((_width / _windowWidth) * x, (_height / _windowHeight) * y);
+}
+
-// This is called by a ViewerEventHandler/MouseHandler (or whatever) as the pointer moves
-// around and intersects with objects. It also resets our state data (_widget, _leftDown,