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

Fixes to the handling of mouse coords after changes in the default behavior

Browse Source 
of Producer.
This commit is contained in:
Robert Osfield
2003-05-20 13:21:05 +00:00
parent 4e9724245a
commit 094e0f2e48
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgProducer/KeyboardMouseCallback.cpp
View File

@@ -1,4 +1,6 @@
#include <osg/Math>
#include <osg/Notify>
#include <osgProducer/KeyboardMouseCallback>
#include <float.h>
@@ -7,8 +9,8 @@ using namespace osgProducer;
void KeyboardMouseCallback::mouseScroll( Producer::KeyboardMouseCallback::ScrollingMotion sm )
{
osg::ref_ptr<EventAdapter> event = createEventAdapter();
event->adaptMouseScroll(getTime(), sm);
osg::ref_ptr<EventAdapter> event = createEventAdapter();
event->adaptMouseScroll(getTime(), sm);
_eventQueueMutex.lock();
_eventQueue.push_back(event);
@@ -131,6 +133,8 @@ void KeyboardMouseCallback::passiveMouseMotion( float mx, float my)
_mx = mx;
_my = my;
//std::cout << "mx="<<mx<<" my="<<my<<std::endl;
osg::ref_ptr<EventAdapter> event = createEventAdapter();
event->adaptMouseMotion(getTime(),mx,my);
@@ -185,7 +189,15 @@ EventAdapter* KeyboardMouseCallback::createEventAdapter()
}
else if (rs)
{
ea->setWindowSize(-1.0f,-1.0f,1.0f,1.0f);
//ea->setWindowSize(-1.0f,-1.0f,1.0f,1.0f);
const Producer::RenderSurface::InputRectangle &ir =
rs->getInputRectangle();
osg::notify(osg::INFO) << "RenderSurface::InputRectange left="<<ir.left()<<"\twidth="<<ir.width()<<"\tbottom="<<ir.bottom()<<"\theight="<<ir.height()<<std::endl;
ea->setWindowSize(0.0f,rs->getWindowHeight(),rs->getWindowWidth(),0.0f);
}
return ea;

2
src/osgProducer/Viewer.cpp
View File

@@ -508,6 +508,8 @@ void Viewer::requestWarpPointer(float x,float y)
{
if (_kbmcb)
{
osg::notify(osg::INFO) << "requestWarpPointer x= "<<x<<" y="<<y<<std::endl;
EventAdapter::_s_mx = x;
EventAdapter::_s_my = y;
_kbmcb->getKeyboardMouse()->positionPointer(x,y);