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

expose number of instances

Browse Source 
export 'getKeyboardCallback' for chaining
This commit is contained in:
erwin coumans
2013-03-14 12:53:03 -07:00
parent 0aa7c97874
commit 5784d6ce0b
11 changed files with 203 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
btgui/OpenGLWindow/GLInstanceRendererInternalData.h
View File

@@ -13,7 +13,8 @@ struct GLInstanceRendererInternalData
btAlignedObjectArray<GLfloat> m_instance_scale_ptr;
int m_vboSize;
GLuint m_vbo;
GLuint m_vbo;
int m_totalNumInstances;
};
#endif //GL_INSTANCE_RENDERER_INTERNAL_DATA_H

2
btgui/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -564,7 +564,7 @@ void GLInstancingRenderer::writeTransforms()
totalNumInstances+=gfxObj->m_numGraphicsInstances;
}
m_data->m_totalNumInstances = totalNumInstances;
for (int k=0;k<m_graphicsInstances.size();k++)
{

2
btgui/OpenGLWindow/Win32OpenGLWindow.cpp
View File

@@ -59,7 +59,7 @@ void Win32OpenGLWindow::enableOpenGL()
printGLString("Version", GL_VERSION);
printGLString("Vendor", GL_VENDOR);
printGLString("Renderer", GL_RENDERER);
printGLString("Extensions", GL_EXTENSIONS);
//printGLString("Extensions", GL_EXTENSIONS);
}

5
btgui/OpenGLWindow/Win32Window.cpp
View File

@@ -671,5 +671,10 @@ void Win32Window::setKeyboardCallback( btKeyboardCallback keyboardCallback)
}
btKeyboardCallback Win32Window::getKeyboardCallback()
{
return m_data->m_keyboardCallback;
}

2
btgui/OpenGLWindow/Win32Window.h
View File

@@ -70,6 +70,8 @@ public:
virtual void setWheelCallback(btWheelCallback wheelCallback);
virtual void setKeyboardCallback( btKeyboardCallback keyboardCallback);
virtual btKeyboardCallback getKeyboardCallback();
virtual void setRenderCallback( btRenderCallback renderCallback);
virtual void setWindowTitle(const char* title);

1
btgui/OpenGLWindow/btgWindowInterface.h
View File

@@ -96,6 +96,7 @@ class btgWindowInterface
virtual void setResizeCallback(btResizeCallback resizeCallback)=0;
virtual void setWheelCallback(btWheelCallback wheelCallback)=0;
virtual void setKeyboardCallback( btKeyboardCallback keyboardCallback)=0;
virtual btKeyboardCallback getKeyboardCallback()=0;
virtual void setRenderCallback( btRenderCallback renderCallback) = 0;