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

revert floor.obj test file, load it by default in TinyRenderer/main.cpp

Browse Source
This commit is contained in:
erwin coumans
2016-04-26 21:01:46 -07:00
parent 03bdcc8737
commit 40841e9078
4 changed files with 5 additions and 5 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 cube.tga map_Kd floor_diffuse.jpg

6
data/floor.obj
View File

@@ -6,9 +6,9 @@ v 1 -1 1
v -1 -1 1 v -1 -1 1
vt 0 0 vt 0 0
vt .25 0 vt 1 0
vt .25 .25 vt 1 1
vt 0 .25 vt 0 1
vn 0 1 0 vn 0 1 0
usemtl floor usemtl floor

BIN
data/floor_diffuse.tga
View File

Binary file not shown.

2
examples/TinyRenderer/main.cpp
View File

@@ -81,7 +81,7 @@ int main(int argc, char* argv[])
int textureWidth = gWidth; int textureWidth = gWidth;
int textureHeight = gHeight; int textureHeight = gHeight;
TinyRenderObjectData renderData(textureWidth, textureHeight, "african_head/african_head.obj");//floor.obj"); TinyRenderObjectData renderData(textureWidth, textureHeight, "floor.obj");