Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add modifier support for Mac

Browse Source
This commit is contained in:
Erwin Coumans
2013-07-18 17:29:27 -07:00
parent 41d0ade9d8
commit 0399b55e1c
3 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Demos3/GpuDemos/GpuDemo.h
View File

@@ -42,9 +42,16 @@ public:
:useOpenCL(true), :useOpenCL(true),
preferredOpenCLPlatformIndex(-1), preferredOpenCLPlatformIndex(-1),
preferredOpenCLDeviceIndex(-1), preferredOpenCLDeviceIndex(-1),
#ifdef __APPLE__
arraySizeX(10),
arraySizeY(10),
arraySizeZ(10),
#else
arraySizeX(30), arraySizeX(30),
arraySizeY(30), arraySizeY(30),
arraySizeZ(30), arraySizeZ(30),
#endif
m_useConcaveMesh(false), m_useConcaveMesh(false),
gapX(14.3), gapX(14.3),
gapY(14.0), gapY(14.0),

2
btgui/OpenGLWindow/MacOpenGLWindow.h
View File

@@ -10,7 +10,7 @@ class MacOpenGLWindow : public b3gWindowInterface
struct MacOpenGLWindowInternalData* m_internalData; struct MacOpenGLWindowInternalData* m_internalData;
float m_mouseX; float m_mouseX;
float m_mouseY; float m_mouseY;
int m_modifierFlags;
b3MouseButtonCallback m_mouseButtonCallback; b3MouseButtonCallback m_mouseButtonCallback;
b3MouseMoveCallback m_mouseMoveCallback; b3MouseMoveCallback m_mouseMoveCallback;

57
btgui/OpenGLWindow/MacOpenGLWindow.mm
View File

@@ -199,6 +199,7 @@ MacOpenGLWindow::MacOpenGLWindow()
:m_internalData(0), :m_internalData(0),
m_mouseX(0), m_mouseX(0),
m_mouseY(0), m_mouseY(0),
m_modifierFlags(0),
m_mouseMoveCallback(0), m_mouseMoveCallback(0),
m_mouseButtonCallback(0), m_mouseButtonCallback(0),
m_wheelCallback(0), m_wheelCallback(0),
@@ -660,7 +661,9 @@ int getAsciiCodeFromVirtualKeycode(int virtualKeyCode)
case kVK_PageDown :{keycode = B3G_PAGE_DOWN;break;} case kVK_PageDown :{keycode = B3G_PAGE_DOWN;break;}
case kVK_End :{keycode = B3G_END;break;} case kVK_End :{keycode = B3G_END;break;}
case kVK_Home :{keycode = B3G_HOME;break;} case kVK_Home :{keycode = B3G_HOME;break;}
case kVK_Control: {keycode = B3G_CONTROL;break;}
case kVK_Option: {keycode = B3G_ALT;break;}
case kVK_ANSI_RightBracket : {keycode = ']'; break;} case kVK_ANSI_RightBracket : {keycode = ']'; break;}
case kVK_ANSI_LeftBracket : {keycode = '['; break;} case kVK_ANSI_LeftBracket : {keycode = '['; break;}
case kVK_ANSI_Quote : {keycode = '\''; break;} case kVK_ANSI_Quote : {keycode = '\''; break;}
@@ -725,11 +728,47 @@ void MacOpenGLWindow::startRendering()
//NSShiftKeyMask = 1 << 17, //NSShiftKeyMask = 1 << 17,
//NSControlKeyMask //NSControlKeyMask
if ([event modifierFlags] & NSAlternateKeyMask)
if ([event type] == NSFlagsChanged)
{ {
printf("!"); int modifiers = [event modifierFlags];
if (m_keyboardCallback)
{
if ((modifiers & NSShiftKeyMask))
{
m_keyboardCallback(B3G_SHIFT,1);
}else
{
if (m_modifierFlags&NSShiftKeyMask)
{
m_keyboardCallback(B3G_SHIFT,0);
}
}
if (modifiers & NSControlKeyMask)
{
m_keyboardCallback(B3G_CONTROL,1);
} else
{
if (m_modifierFlags&NSControlKeyMask)
{
m_keyboardCallback(B3G_CONTROL,0);
}
}
if (modifiers & NSAlternateKeyMask)
{
m_keyboardCallback(B3G_ALT,1);
} else
{
if (m_modifierFlags&NSAlternateKeyMask)
{
m_keyboardCallback(B3G_ALT,0);
}
}
//handle NSCommandKeyMask
}
m_modifierFlags=modifiers;
} }
if ([event type] == NSKeyUp) if ([event type] == NSKeyUp)
{ {
handledEvent = true; handledEvent = true;
@@ -778,7 +817,7 @@ void MacOpenGLWindow::startRendering()
if (m_mouseButtonCallback) if (m_mouseButtonCallback)
{ {
(*m_mouseButtonCallback)(0,0,m_mouseX,m_mouseY); (*m_mouseButtonCallback)(0,0,m_mouseX,m_mouseY);
handledEvent = true; //handledEvent = true;
} }
} }
@@ -796,7 +835,7 @@ void MacOpenGLWindow::startRendering()
// printf("mouse coord = %f, %f\n",mouseX,mouseY); // printf("mouse coord = %f, %f\n",mouseX,mouseY);
if (m_mouseButtonCallback) if (m_mouseButtonCallback)
{ {
handledEvent = true; //handledEvent = true;
(*m_mouseButtonCallback)(0,1,m_mouseX,m_mouseY); (*m_mouseButtonCallback)(0,1,m_mouseX,m_mouseY);
} }
} }
@@ -815,7 +854,7 @@ void MacOpenGLWindow::startRendering()
// printf("mouse coord = %f, %f\n",mouseX,mouseY); // printf("mouse coord = %f, %f\n",mouseX,mouseY);
if (m_mouseButtonCallback) if (m_mouseButtonCallback)
{ {
handledEvent = true; //handledEvent = true;
(*m_mouseButtonCallback)(2,1,m_mouseX,m_mouseY); (*m_mouseButtonCallback)(2,1,m_mouseX,m_mouseY);
} }
} }
@@ -850,7 +889,7 @@ void MacOpenGLWindow::startRendering()
// printf("mouse coord = %f, %f\n",m_mouseX,m_mouseY); // printf("mouse coord = %f, %f\n",m_mouseX,m_mouseY);
if (m_mouseMoveCallback) if (m_mouseMoveCallback)
{ {
handledEvent = true; //handledEvent = true;
(*m_mouseMoveCallback)(m_mouseX,m_mouseY); (*m_mouseMoveCallback)(m_mouseX,m_mouseY);
} }
} }
@@ -867,7 +906,7 @@ void MacOpenGLWindow::startRendering()
if (m_mouseMoveCallback) if (m_mouseMoveCallback)
{ {
handledEvent = true; //handledEvent = true;
(*m_mouseMoveCallback)(m_mouseX,m_mouseY); (*m_mouseMoveCallback)(m_mouseX,m_mouseY);
} }