diff --git a/data/floor.mtl b/data/floor.mtl index 966cc66cc..8a67048e1 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 cube.tga + map_Kd floor_diffuse.jpg diff --git a/data/floor.obj b/data/floor.obj index 176c05363..42e145867 100644 --- a/data/floor.obj +++ b/data/floor.obj @@ -6,9 +6,9 @@ v 1 -1 1 v -1 -1 1 vt 0 0 -vt .25 0 -vt .25 .25 -vt 0 .25 +vt 1 0 +vt 1 1 +vt 0 1 vn 0 1 0 usemtl floor diff --git a/data/floor_diffuse.tga b/data/floor_diffuse.tga index cf5e31f92..7bb70dd10 100644 Binary files a/data/floor_diffuse.tga and b/data/floor_diffuse.tga differ diff --git a/examples/TinyRenderer/main.cpp b/examples/TinyRenderer/main.cpp index 7a9de8fef..65a3352f6 100644 --- a/examples/TinyRenderer/main.cpp +++ b/examples/TinyRenderer/main.cpp @@ -81,7 +81,7 @@ int main(int argc, char* argv[]) int textureWidth = gWidth; int textureHeight = gHeight; - TinyRenderObjectData renderData(textureWidth, textureHeight, "african_head/african_head.obj");//floor.obj"); + TinyRenderObjectData renderData(textureWidth, textureHeight, "floor.obj");