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

Added new adapter methods to EventQueue to allow the time value of the

Browse Source 
event to be specified.
This commit is contained in:
Robert Osfield
2006-12-26 17:37:58 +00:00
parent 93dbfa04b7
commit 84d22f9999
2 changed files with 98 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
include/osgGA/EventQueue
View File

@@ -50,6 +50,7 @@ class OSGGA_EXPORT EventQueue : public osg::Referenced
/** Add an event to the end of the event queue.*/
void addEvent(GUIEventAdapter* event);
/** Specify if mouse coordinates should be transformed into a pre defined input range, or whether they
* should be simply based on as local coordinates to the window that generated the mouse events.*/
void setUseFixedMouseInputRange(bool useFixedMouseInputRange) { _useFixedMouseInputRange = useFixedMouseInputRange; }
@@ -57,50 +58,100 @@ class OSGGA_EXPORT EventQueue : public osg::Referenced
/** Get whether the mouse coordinates should be transformed into a pre defined input range.*/
bool getUseFixedMouseInputRange() { return _useFixedMouseInputRange; }
/** Set the mouse input range.*/
void setMouseInputRange(float xMin, float yMin, float xMax, float yMax) { getCurrentEventState()->setInputRange(xMin, yMin, xMax, yMax); }
/** Method for adapting window resize event, placing this event on the back of the event queue. */
void windowResize(int x, int y, unsigned int width, unsigned int height);
void windowResize(int x, int y, unsigned int width, unsigned int height) { windowResize(x,y,width,height,getTime()); }
/** Method for adapting window resize event, placing this event on the back of the event queue, with specified time. */
void windowResize(int x, int y, unsigned int width, unsigned int height, double time);
/** Method for adapting mouse scroll wheel events, placing this event on the back of the event queue. */
void mouseScroll(GUIEventAdapter::ScrollingMotion sm);
void mouseScroll(GUIEventAdapter::ScrollingMotion sm) { mouseScroll(sm,getTime()); }
/** Method for adapting mouse scroll wheel events, placing this event on the back of the event queue, with specified time. */
void mouseScroll(GUIEventAdapter::ScrollingMotion sm, double time);
/** Method for adapting mouse scroll wheel events, placing this event on the back of the event queue. */
void mouseScroll2D(float x, float y);
void mouseScroll2D(float x, float y) { mouseScroll2D(x, y, getTime()); }
/** Method for adapting mouse scroll wheel events, placing this event on the back of the event queue. */
void mouseScroll2D(float x, float y, double time);
/** Method for adapting pen pressure events, placing this event on the back og the event queue.*/
void penPressure(float pressure);
/** Method for adapting pen pressure events, placing this event on the back of the event queue.*/
void penPressure(float pressure) { penPressure(pressure, getTime()); }
/** Method for adapting pen proximity events, placing this event on the back og the event queue.*/
void penProximity(GUIEventAdapter::TabletPointerType pt, bool isEntering);
/** Method for adapting pen pressure events, placing this event on the back of the event queue, with specified time.*/
void penPressure(float pressure, double time);
/** Method for adapting pen proximity events, placing this event on the back of the event queue.*/
void penProximity(GUIEventAdapter::TabletPointerType pt, bool isEntering) { penProximity(pt, isEntering, getTime()); }
/** Method for adapting pen proximity events, placing this event on the back of the event queue, with specified time.*/
void penProximity(GUIEventAdapter::TabletPointerType pt, bool isEntering, double time);
/** Method for updating in response to a mouse warp. Note, just moves the mouse position without creating a new event for it.*/
void mouseWarp(float x, float y);
void mouseWarped(float x, float y);
/** Method for adapting mouse motion events, placing this event on the back of the event queue.*/
void mouseMotion(float x, float y);
void mouseMotion(float x, float y) { mouseMotion(x,y, getTime()); }
/** Method for adapting mouse motion events, placing this event on the back of the event queue, with specified time.*/
void mouseMotion(float x, float y, double time);
/** Method for adapting mouse button pressed events, placing this event on the back of the event queue.
* Button numbering is 1 for left mouse button, 2 for middle, 3 for right. */
void mouseButtonPress(float x, float y, unsigned int button);
void mouseButtonPress(float x, float y, unsigned int button) { mouseButtonPress(x, y, button, getTime()); }
/** Method for adapting mouse button pressed events, placing this event on the back of the event queue, with specified time.
* Button numbering is 1 for left mouse button, 2 for middle, 3 for right. */
void mouseButtonPress(float x, float y, unsigned int button, double time);
/** Method for adapting mouse button pressed events, placing this event on the back of the event queue.
* Button numbering is 1 for left mouse button, 2 for middle, 3 for right. */
void mouseDoubleButtonPress(float x, float y, unsigned int button);
void mouseDoubleButtonPress(float x, float y, unsigned int button) { mouseDoubleButtonPress(x, y, button, getTime()); }
/** Method for adapting mouse button pressed events, placing this event on the back of the event queue, with specified time.
* Button numbering is 1 for left mouse button, 2 for middle, 3 for right. */
void mouseDoubleButtonPress(float x, float y, unsigned int button, double time);
/** Method for adapting mouse button release events, placing this event on the back of the event queue.
* Button numbering is 1 for left mouse button, 2 for middle, 3 for right. */
void mouseButtonRelease(float x, float y, unsigned int button);
void mouseButtonRelease(float x, float y, unsigned int button) { mouseButtonRelease(x, y, button, getTime()); }
/** Method for adapting mouse button release events, placing this event on the back of the event queue, with specified time.
* Button numbering is 1 for left mouse button, 2 for middle, 3 for right. */
void mouseButtonRelease(float x, float y, unsigned int button, double time);
/** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings.*/
void keyPress(int key);
void keyPress(int key) { keyPress(key, getTime()); }
/** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings, with specified time.*/
void keyPress(int key, double time);
/** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings.*/
void keyRelease(int key);
void keyRelease(int key) { keyRelease(key, getTime()); }
/** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings, with specified time.*/
void keyRelease(int key, double time);
/** Method for adapting frame events.*/
void frame(double t);
void frame(double time);
void setStartTick(osg::Timer_t tick) { _startTick = tick; }
@@ -108,9 +159,11 @@ class OSGGA_EXPORT EventQueue : public osg::Referenced
double getTime() const { return osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); }
/** convinience method for create an event ready to fill in. Clones the getCurrentEventState() to produce a up to date event state. */
GUIEventAdapter* createEvent();
GUIEventAdapter* getCurrentEventState() { return _accumulateEventState.get(); }
const GUIEventAdapter* getCurrentEventState() const { return _accumulateEventState.get(); }

48
src/osgGA/EventQueue.cpp
View File

@@ -19,7 +19,9 @@ using namespace osgGA;
EventQueue::EventQueue(GUIEventAdapter::MouseYOrientation mouseYOrientation)
{
_useFixedMouseInputRange = false;
_startTick = osg::Timer::instance()->tick();
_startTick = osg::Timer::instance()->getStartTick();
_accumulateEventState = new GUIEventAdapter();
_accumulateEventState->setMouseYOrientation(mouseYOrientation);
}
@@ -42,8 +44,6 @@ void EventQueue::appendEvents(Events& events)
void EventQueue::addEvent(GUIEventAdapter* event)
{
event->setTime(getTime());
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_eventQueueMutex);
_eventQueue.push_back(event);
}
@@ -78,72 +78,78 @@ bool EventQueue::copyEvents(Events& events) const
}
void EventQueue::windowResize(int x, int y, unsigned int width, unsigned int height)
void EventQueue::windowResize(int x, int y, unsigned int width, unsigned int height, double time)
{
_accumulateEventState->setWindowRectangle(x, y, width, height, !_useFixedMouseInputRange);
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::RESIZE);
event->setTime(time);
addEvent(event);
}
void EventQueue::penPressure(float pressure)
void EventQueue::penPressure(float pressure, double time)
{
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::PEN_PRESSURE);
event->setPenPressure(pressure);
event->setTime(time);
addEvent(event);
}
void EventQueue::penProximity(GUIEventAdapter::TabletPointerType pt, bool isEntering)
void EventQueue::penProximity(GUIEventAdapter::TabletPointerType pt, bool isEntering, double time)
{
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType( (isEntering) ? GUIEventAdapter::PEN_PROXIMITY_ENTER : GUIEventAdapter::PEN_PROXIMITY_LEAVE);
event->setTabletPointerType(pt);
event->setTime(time);
addEvent(event);
}
void EventQueue::mouseScroll(GUIEventAdapter::ScrollingMotion sm)
void EventQueue::mouseScroll(GUIEventAdapter::ScrollingMotion sm, double time)
{
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::SCROLL);
event->setScrollingMotion(sm);
event->setTime(time);
addEvent(event);
}
void EventQueue::mouseScroll2D(float x, float y)
void EventQueue::mouseScroll2D(float x, float y, double time)
{
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::SCROLL);
event->setScrollingMotionDelta(x,y);
event->setTime(time);
addEvent(event);
}
void EventQueue::mouseWarp(float x, float y)
void EventQueue::mouseWarped(float x, float y)
{
_accumulateEventState->setX(x);
_accumulateEventState->setY(y);
}
void EventQueue::mouseMotion(float x, float y)
void EventQueue::mouseMotion(float x, float y, double time)
{
_accumulateEventState->setX(x);
_accumulateEventState->setY(y);
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(event->getButtonMask() ? GUIEventAdapter::DRAG : GUIEventAdapter::MOVE);
event->setTime(time);
addEvent(event);
}
void EventQueue::mouseButtonPress(float x, float y, unsigned int button)
void EventQueue::mouseButtonPress(float x, float y, unsigned int button, double time)
{
_accumulateEventState->setX(x);
_accumulateEventState->setY(y);
@@ -163,6 +169,7 @@ void EventQueue::mouseButtonPress(float x, float y, unsigned int button)
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::PUSH);
event->setTime(time);
switch(button)
{
@@ -180,7 +187,7 @@ void EventQueue::mouseButtonPress(float x, float y, unsigned int button)
addEvent(event);
}
void EventQueue::mouseDoubleButtonPress(float x, float y, unsigned int button)
void EventQueue::mouseDoubleButtonPress(float x, float y, unsigned int button, double time)
{
_accumulateEventState->setX(x);
_accumulateEventState->setY(y);
@@ -200,6 +207,7 @@ void EventQueue::mouseDoubleButtonPress(float x, float y, unsigned int button)
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::DOUBLECLICK);
event->setTime(time);
switch(button)
{
@@ -217,7 +225,7 @@ void EventQueue::mouseDoubleButtonPress(float x, float y, unsigned int button)
addEvent(event);
}
void EventQueue::mouseButtonRelease(float x, float y, unsigned int button)
void EventQueue::mouseButtonRelease(float x, float y, unsigned int button, double time)
{
_accumulateEventState->setX(x);
_accumulateEventState->setY(y);
@@ -237,6 +245,8 @@ void EventQueue::mouseButtonRelease(float x, float y, unsigned int button)
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::RELEASE);
event->setTime(time);
switch(button)
{
case(1):
@@ -253,7 +263,7 @@ void EventQueue::mouseButtonRelease(float x, float y, unsigned int button)
addEvent(event);
}
void EventQueue::keyPress(int key)
void EventQueue::keyPress(int key, double time)
{
switch(key)
{
@@ -287,11 +297,12 @@ void EventQueue::keyPress(int key)
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::KEYDOWN);
event->setKey(key);
event->setTime(time);
addEvent(event);
}
void EventQueue::keyRelease(int key)
void EventQueue::keyRelease(int key, double time)
{
switch(key)
{
@@ -309,15 +320,16 @@ void EventQueue::keyRelease(int key)
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::KEYUP);
event->setKey(key);
event->setTime(time);
addEvent(event);
}
void EventQueue::frame(double t)
void EventQueue::frame(double time)
{
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::FRAME);
event->setTime(t);
event->setTime(time);
addEvent(event);
}