Merge branch 'master' of https://github.com/erwincoumans/bullet3
This commit is contained in:
@@ -83,16 +83,12 @@ int main(int argc, char* argv[])
|
||||
int textureWidth = gWidth;
|
||||
int textureHeight = gHeight;
|
||||
|
||||
TGAImage rgbColorBuffer(textureWidth,textureHeight,TGAImage::RGB);
|
||||
b3AlignedObjectArray<float> depthBuffer;
|
||||
depthBuffer.resize(textureWidth*textureHeight);
|
||||
|
||||
TinyRenderObjectData renderData(textureWidth, textureHeight,rgbColorBuffer,depthBuffer);//, "african_head/african_head.obj");//floor.obj");
|
||||
TinyRenderObjectData renderData(textureWidth, textureHeight);//, "african_head/african_head.obj");//floor.obj");
|
||||
|
||||
//renderData.loadModel("african_head/african_head.obj");
|
||||
renderData.loadModel("floor.obj");
|
||||
//renderData.loadModel("floor.obj");
|
||||
|
||||
//renderData.createCube(1,1,1);
|
||||
renderData.createCube(1,1,1);
|
||||
|
||||
|
||||
myArgs.GetCmdLineArgument("mp4_file",gVideoFileName);
|
||||
|
||||
Reference in New Issue
Block a user