This commit is contained in:
Erwin Coumans committed 2016-05-13 22:57:41 -07:00
1 parent be7d07a193
commit 876c9e57fe
3 files changed
+2 -3

No files matched your search

+1 -1
View File
@@ -10,4 +10,4 @@ newmtl floor
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka floor_diffuse.jpg
map_Kd floor_diffuse.jpg
map_Kd checker_huge.gif
-1
View File
@@ -48,7 +48,6 @@ project "App_BulletExampleBrowser"
"main.cpp",
"ExampleEntries.cpp",
"../TinyRenderer/Bullet2TinyRenderer.cpp",
"../TinyRenderer/geometry.cpp",
"../TinyRenderer/model.cpp",
"../TinyRenderer/tgaimage.cpp",
+1 -1
View File
@@ -1082,7 +1082,7 @@ int MacOpenGLWindow::fileOpenDialog(char* filename, int maxNameLength)
NSOpenGLContext *foo = [NSOpenGLContext currentContext];
// get the url of a .txt file
NSOpenPanel * zOpenPanel = [NSOpenPanel openPanel];
NSArray * zAryOfExtensions = [NSArray arrayWithObjects:@"urdf",@"bullet",nil];
NSArray * zAryOfExtensions = [NSArray arrayWithObjects:@"urdf",@"bullet",@"obj",@"sdf",nil];
[zOpenPanel setAllowedFileTypes:zAryOfExtensions];
NSInteger zIntResult = [zOpenPanel runModal];