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

fixes

Browse Source
This commit is contained in:
Erwin Coumans
2016-05-13 22:57:41 -07:00
parent be7d07a193
commit 876c9e57fe
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/floor.mtl
View File

@@ -10,4 +10,4 @@ newmtl floor
Ks 0.0000 0.0000 0.0000 Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000 Ke 0.0000 0.0000 0.0000
map_Ka floor_diffuse.jpg map_Ka floor_diffuse.jpg
map_Kd floor_diffuse.jpg map_Kd checker_huge.gif

1
examples/ExampleBrowser/premake4.lua
View File

@@ -48,7 +48,6 @@ project "App_BulletExampleBrowser"
"main.cpp", "main.cpp",
"ExampleEntries.cpp", "ExampleEntries.cpp",
"../TinyRenderer/Bullet2TinyRenderer.cpp",
"../TinyRenderer/geometry.cpp", "../TinyRenderer/geometry.cpp",
"../TinyRenderer/model.cpp", "../TinyRenderer/model.cpp",
"../TinyRenderer/tgaimage.cpp", "../TinyRenderer/tgaimage.cpp",

2
examples/OpenGLWindow/MacOpenGLWindow.mm
View File

@@ -1082,7 +1082,7 @@ int MacOpenGLWindow::fileOpenDialog(char* filename, int maxNameLength)
NSOpenGLContext *foo = [NSOpenGLContext currentContext]; NSOpenGLContext *foo = [NSOpenGLContext currentContext];
// get the url of a .txt file // get the url of a .txt file
NSOpenPanel * zOpenPanel = [NSOpenPanel openPanel]; NSOpenPanel * zOpenPanel = [NSOpenPanel openPanel];
NSArray * zAryOfExtensions = [NSArray arrayWithObjects:@"urdf",@"bullet",nil]; NSArray * zAryOfExtensions = [NSArray arrayWithObjects:@"urdf",@"bullet",@"obj",@"sdf",nil];
[zOpenPanel setAllowedFileTypes:zAryOfExtensions]; [zOpenPanel setAllowedFileTypes:zAryOfExtensions];
NSInteger zIntResult = [zOpenPanel runModal]; NSInteger zIntResult = [zOpenPanel runModal];