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

added Samurai Monastry wavefront .obj

Browse Source 
added alternative batching kernel (slow)
tweaked controls a bit
added command-line options --selected_demo=<int> and --new_batching
started looking into parallel 3d sap
This commit is contained in:
erwin coumans
2013-03-23 23:00:50 -07:00
parent 11d934b63a
commit 68062bdfbd
18 changed files with 333195 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
btgui/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -129,10 +129,10 @@ struct InternalDataRenderer : public GLInstanceRendererInternalData
} else
{
//m_cameraDistance -= deltay*0.1;
btVector3 fwd = m_cameraTargetPosition-m_cameraPosition;
fwd.normalize();
m_cameraTargetPosition += fwd*deltay*0.1;
m_cameraDistance -= deltay*0.1;
//btVector3 fwd = m_cameraTargetPosition-m_cameraPosition;
//fwd.normalize();
//m_cameraTargetPosition += fwd*deltay*0.1;
}
} else
{

2
btgui/OpenGLWindow/GLInstancingRenderer.h
View File

@@ -44,7 +44,7 @@ class GLInstancingRenderer
public:
GLInstancingRenderer(int m_maxObjectCapacity, int maxShapeCapacityInBytes = 10*1024*1024);
GLInstancingRenderer(int m_maxObjectCapacity, int maxShapeCapacityInBytes = 56*1024*1024);
virtual ~GLInstancingRenderer();
void init();