From a5feb5b00dd5715e4146e603ecf6f153f17b65f3 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Thu, 8 Apr 2010 17:03:19 +0200 Subject: Moved model files. --- assimp.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'assimp.cpp') diff --git a/assimp.cpp b/assimp.cpp index 828baf3..4b124b9 100755 --- a/assimp.cpp +++ b/assimp.cpp @@ -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; -- cgit v1.2.3