Changeset 5032 for OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp

Timestamp:

03/08/06 15:09:47 (7 years ago)

Author:

robert

Message:

Converted osgGA::GUIEventAdapter into a concrete class capable of respresenting
keyboard and mouse events.

Added osgGA::EventQueue? class to support a thread safe event queue and adaption
of keyboard and mouse events.

Removed osgProducer::EventAdapter? as GUIEventAdapter replaces it.

Adapted osgProducer and examples to work with the new changes to osgGA.

Files:

• OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp

@@ -65 +65 @@
         osg::FrameStamp  _frameStamp;
         
-        osgProducer::KeyboardMouseCallback::EventQueue _events;
+        osgGA::EventQueue::Events _events;
         
 };
@@ -296 +296 @@
         }
 
-        void write(const osgProducer::EventAdapter& event)
-        {
-            writeUInt(event._eventType);
-            writeUInt(event._key);
-            writeUInt(event._button);
-            writeFloat(event._Xmin);
-            writeFloat(event._Xmax);
-            writeFloat(event._Ymin);
-            writeFloat(event._Ymax);
-            writeFloat(event._mx);
-            writeFloat(event._my);
-            writeUInt(event._buttonMask);
-            writeUInt(event._modKeyMask);
-            writeDouble(event._time);
-        }
-
-        void read(osgProducer::EventAdapter& event)
-        {
-            event._eventType = (osgGA::GUIEventAdapter::EventType)readUInt();
-            event._key = readUInt();
-            event._button = readUInt();
-            event._Xmin = readFloat();
-            event._Xmax = readFloat();
-            event._Ymin = readFloat();
-            event._Ymax = readFloat();
-            event._mx = readFloat();
-            event._my = readFloat();
-            event._buttonMask = readUInt();
-            event._modKeyMask = readUInt();
-            event._time = readDouble();
+        void write(const osgGA::GUIEventAdapter& event)
+        {
+            writeUInt(event.getEventType());
+            writeUInt(event.getKey());
+            writeUInt(event.getButton());
+            writeFloat(event.getXmin());
+            writeFloat(event.getXmax());
+            writeFloat(event.getYmin());
+            writeFloat(event.getYmax());
+            writeFloat(event.getX());
+            writeFloat(event.getY());
+            writeUInt(event.getButtonMask());
+            writeUInt(event.getModKeyMask());
+            writeDouble(event.getTime());
+        }
+
+        void read(osgGA::GUIEventAdapter& event)
+        {
+            event.setEventType((osgGA::GUIEventAdapter::EventType)readUInt());
+            event.setKey(readUInt());
+            event.setButton(readUInt());
+            event.setXmin(readFloat());
+            event.setXmax(readFloat());
+            event.setYmin(readFloat());
+            event.setYmax(readFloat());
+            event.setX(readFloat());
+            event.setY(readFloat());
+            event.setButtonMask(readUInt());
+            event.setModKeyMask(readUInt());
+            event.setTime(readDouble());
         }
         
@@ -338 +338 @@
         
             writeUInt(cameraPacket._events.size());
-            for(unsigned int i=0;i<cameraPacket._events.size();++i)
-            {
-                write(*(cameraPacket._events[i]));
+            for(osgGA::EventQueue::Events::iterator itr = cameraPacket._events.begin();
+                itr != cameraPacket._events.end();
+                ++itr)
+            {
+                write(*(*itr));
             }
         }
@@ -361 +363 @@
             for(unsigned int i=0;i<numEvents;++i)
             {
-                osgProducer::EventAdapter* event = new osgProducer::EventAdapter;
+                osgGA::GUIEventAdapter* event = new osgGA::GUIEventAdapter;
                 read(*(event));
                 cameraPacket._events.push_back(event);