diff options
author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-04-08 17:03:19 +0200 |
---|---|---|
committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-04-08 17:03:19 +0200 |
commit | a5feb5b00dd5715e4146e603ecf6f153f17b65f3 (patch) | |
tree | 8dd43e9b2633121827e184d59e77ce3dbd504577 | |
parent | 7a63472ea29db5d7555016d98e6a45c48fbf3157 (diff) |
Moved model files.
-rwxr-xr-x | assimp.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -32,7 +32,7 @@ class FiskPattern : public Pattern { FiskPattern() : Pattern("patterns/m1.patt") { patt_id2 = arLoadPatt("patterns/m2.patt"); - scene = importer->ReadFile("tewi.x", 0); + scene = importer->ReadFile("models/tewi.x", 0); if(scene) { std::cout << "Loaded model: " << scene->mNumMeshes << " meshes, " << scene->mNumMaterials << " materials." << std::endl; @@ -60,11 +60,11 @@ class FiskPattern : public Pattern { std::cerr << "Failed to import model." << std::endl << importer->GetErrorString() << std::endl; } - Texture* tex_face = new TextureSDL("Tewi_face_01.bmp"); - Texture* tex_hair = new TextureSDL("TEWI_Hair_01.bmp"); - Texture* tex_body = new TextureSDL("TEWI_Body_01.bmp"); - Texture* tex_hair2 = new TextureSDL("TEWI_Hair_02.bmp"); - Texture* tex_body2 = new TextureSDL("TEWI_Body_02.bmp"); + Texture* tex_face = new TextureSDL("models/tewi.x.data/Tewi_face_01.bmp"); + Texture* tex_hair = new TextureSDL("models/tewi.x.data/TEWI_Hair_01.bmp"); + Texture* tex_body = new TextureSDL("models/tewi.x.data/TEWI_Body_01.bmp"); + Texture* tex_hair2 = new TextureSDL("models/tewi.x.data/TEWI_Hair_02.bmp"); + Texture* tex_body2 = new TextureSDL("models/tewi.x.data/TEWI_Body_02.bmp"); textures = new Texture*[10]; @@ -77,7 +77,7 @@ class FiskPattern : public Pattern { textures[6] = tex_body; textures[7] = tex_body; textures[8] = tex_hair; - textures[9] = new TextureSDL("gradient.png"); + textures[9] = tex_face; patt_width = 50.0; |