diff --git a/data/floor.mtl b/data/floor.mtl index 8a67048e1..b59e224d2 100644 --- a/data/floor.mtl +++ b/data/floor.mtl @@ -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 diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua index 181e93b87..8b05b1eda 100644 --- a/examples/ExampleBrowser/premake4.lua +++ b/examples/ExampleBrowser/premake4.lua @@ -48,7 +48,6 @@ project "App_BulletExampleBrowser" "main.cpp", "ExampleEntries.cpp", - "../TinyRenderer/Bullet2TinyRenderer.cpp", "../TinyRenderer/geometry.cpp", "../TinyRenderer/model.cpp", "../TinyRenderer/tgaimage.cpp", diff --git a/examples/OpenGLWindow/MacOpenGLWindow.mm b/examples/OpenGLWindow/MacOpenGLWindow.mm index d247f95b0..301608cca 100644 --- a/examples/OpenGLWindow/MacOpenGLWindow.mm +++ b/examples/OpenGLWindow/MacOpenGLWindow.mm @@ -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];