From 29c364b28f31bbd86627c4d9b9825362b26522bc Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Wed, 12 Mar 2014 22:07:24 +0100 Subject: [PATCH 1/2] Plane fixed. --- Escape-the-Dawn/plane.obj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Escape-the-Dawn/plane.obj b/Escape-the-Dawn/plane.obj index 8eedd09..82c648c 100644 --- a/Escape-the-Dawn/plane.obj +++ b/Escape-the-Dawn/plane.obj @@ -11,7 +11,7 @@ vt 0.999900 0.000100 vt 0.000100 0.999900 vt 0.999900 0.999900 vn 0.000000 1.000000 0.000000 -usemtl Material.004 +usemtl Material.001 s off f 2/1/1 1/2/1 4/3/1 f 1/2/1 3/4/1 4/3/1 From fef9c1f751fa0d13ef9d221fb14316b328ad0f15 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Wed, 12 Mar 2014 22:40:54 +0100 Subject: [PATCH 2/2] OBJ loader correct path for textures --- Escape-the-Dawn/OBJ.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Escape-the-Dawn/OBJ.cpp b/Escape-the-Dawn/OBJ.cpp index df3ece7..82b3901 100644 --- a/Escape-the-Dawn/OBJ.cpp +++ b/Escape-the-Dawn/OBJ.cpp @@ -218,7 +218,9 @@ void OBJ::ParseMaterial() // Texture file // TODO: if (prefix == "map_Ka" || prefix == "map_Kd") { - ss >> currentMaterial->TextureFile; + std::string textureFile; + ss >> textureFile; + currentMaterial->TextureFile = (m_MaterialPath.branch_path() / textureFile).string(); continue; } }