diff options
Diffstat (limited to 'LibOVR/Src/OVR_DeviceMessages.h')
| -rw-r--r-- | LibOVR/Src/OVR_DeviceMessages.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/LibOVR/Src/OVR_DeviceMessages.h b/LibOVR/Src/OVR_DeviceMessages.h index 0fe0a3c..c182404 100644 --- a/LibOVR/Src/OVR_DeviceMessages.h +++ b/LibOVR/Src/OVR_DeviceMessages.h @@ -34,7 +34,7 @@ limitations under the License. #include "Kernel/OVR_Math.h" #include "Kernel/OVR_Array.h" #include "Kernel/OVR_Color.h" - +#include "Kernel/OVR_String.h" namespace OVR { @@ -103,7 +103,7 @@ class MessageBodyFrame : public Message { public: MessageBodyFrame(DeviceBase* dev) - : Message(Message_BodyFrame, dev), Temperature(0.0f), TimeDelta(0.0f), MagCalibrated(false) + : Message(Message_BodyFrame, dev), Temperature(0.0f), TimeDelta(0.0f) { } @@ -113,8 +113,6 @@ public: float Temperature; // Temperature reading on sensor surface, in degrees Celsius. float TimeDelta; // Time passed since last Body Frame, in seconds. - bool MagCalibrated; // True if MagneticField is calibrated, false if raw - // The absolute time from the host computers perspective that the message should be // interpreted as. This is based on incoming timestamp and processed by a filter // that syncs the clocks while attempting to keep the distance between messages @@ -226,7 +224,7 @@ class MessageCameraFrame : public Message { public: MessageCameraFrame(DeviceBase* dev) - : Message(Message_CameraFrame, dev) + : Message(Message_CameraFrame, dev), CameraHandle(NULL), pFrameData(NULL) { LostFrames = 0; } @@ -253,6 +251,8 @@ public: UInt32 Width, Height; // width & height in pixels. UInt32 Format; // format of pixel, see CameraDevice::PixelFormat enum UInt32 LostFrames; // number of lost frames before this frame + String DeviceIdentifier; // identifies the device sensing the message + UInt32* CameraHandle; // Identifies the camera object associated with this frame }; // Sent when a new camera is connected @@ -261,6 +261,11 @@ class MessageCameraAdded : public Message public: MessageCameraAdded(DeviceBase* dev) : Message(Message_CameraAdded, dev) { } + + MessageCameraAdded(UInt32* cam) + : Message(Message_CameraAdded, NULL), CameraHandle(cam) { } + + UInt32* CameraHandle; // Identifies the camera object associated with this frame }; } // namespace OVR |