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

linux fixes

Browse Source
This commit is contained in:
Erwin Coumans (Google)
2016-05-04 00:17:39 -07:00
parent 8360e2e66d
commit 194009f46e
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/OpenGLWindow/X11OpenGLWindow.cpp
View File

@@ -1076,6 +1076,20 @@ b3KeyboardCallback X11OpenGLWindow::getKeyboardCallback()
return m_data->m_keyboardCallback; return m_data->m_keyboardCallback;
} }
int X11OpenGLWindow::getWidth() const
{
if (m_data)
return m_data->m_glWidth;
return 0;
}
int X11OpenGLWindow::getHeight() const
{
if (m_data)
return m_data->m_glHeight;
return 0;
}
#include <stdio.h> #include <stdio.h>
int X11OpenGLWindow::fileOpenDialog(char* filename, int maxNameLength) int X11OpenGLWindow::fileOpenDialog(char* filename, int maxNameLength)

7
examples/OpenGLWindow/X11OpenGLWindow.h
View File

@@ -54,7 +54,7 @@ public:
virtual void setResizeCallback(b3ResizeCallback resizeCallback); virtual void setResizeCallback(b3ResizeCallback resizeCallback);
virtual void setWheelCallback(b3WheelCallback wheelCallback); virtual void setWheelCallback(b3WheelCallback wheelCallback);
virtual void setKeyboardCallback( b3KeyboardCallback keyboardCallback); virtual void setKeyboardCallback( b3KeyboardCallback keyboardCallback);
virtual b3MouseMoveCallback getMouseMoveCallback(); virtual b3MouseMoveCallback getMouseMoveCallback();
virtual b3MouseButtonCallback getMouseButtonCallback(); virtual b3MouseButtonCallback getMouseButtonCallback();
virtual b3ResizeCallback getResizeCallback(); virtual b3ResizeCallback getResizeCallback();
@@ -65,9 +65,14 @@ public:
virtual void setWindowTitle(const char* title); virtual void setWindowTitle(const char* title);
virtual int getWidth() const;
virtual int getHeight() const;
int fileOpenDialog(char* filename, int maxNameLength); int fileOpenDialog(char* filename, int maxNameLength);
}; };
#endif #endif