From: LockedLunatic <locked.lunatic@aon.at>
Date: Tue, 14 Apr 2015 16:47:45 +0000 (+0200)
Subject: nt
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=abc13475675f618b4e913add52c76f410764304c;p=cgue_weave.git

nt
---

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index 6f6bc1e..db73c03 100644
--- a/Weave/Game.cpp
+++ b/Weave/Game.cpp
@@ -85,7 +85,7 @@ Game::Game() : playing(true)
 	tmp_Scene->addObject(new SceneObject(shader1, translate(vec3(1.f, 0.f, 1.f)), "cow/cow.dae", "model_cow.jpg"));
 	//tmp_Scene->addObject(new SceneObject(shader1, translate(vec3(-1.f, 2.f, -2.f)), "../models/box/box.dae", "../Textures/sky_withstars.png"));
 	//tmp_Scene->addObject(new SceneObject(shader1, translate(vec3(1.f, 3.f, -2.f)), "../models/cow/cow.dae", "../models/cow/texture.jpg"));
-	//import("level_test.dae", tmp_Scene, shader1);
+	import("level_test.dae", tmp_Scene, shader1);
 }
 
 
@@ -177,7 +177,7 @@ bool Game::import(const string& path, Scene* scene, Shader* shader)
 {
 	Assimp::Importer importer;
 
-	const aiScene* file = importer.ReadFile("../models/" + path, aiProcess_GenUVCoords | aiProcess_Triangulate | aiProcess_JoinIdenticalVertices);
+	const aiScene* file = importer.ReadFile("../models/" + path, aiProcess_PreTransformVertices | aiProcess_GenUVCoords | aiProcess_Triangulate | aiProcess_JoinIdenticalVertices);			//aiProcess_PreTransformVertices
 	if (!file)
 	{
 		Message::error("The file " + path + " couldn't be read.\n" + importer.GetErrorString());
diff --git a/models/level_test.dae b/models/level_test.dae
index 9178317..6e7d41a 100644
--- a/models/level_test.dae
+++ b/models/level_test.dae
@@ -5,8 +5,8 @@
       <author>Blender User</author>
       <authoring_tool>Blender 2.70.0 commit date:2014-04-10, commit time:11:49, hash:f93bc76</authoring_tool>
     </contributor>
-    <created>2015-04-13T18:07:00</created>
-    <modified>2015-04-13T18:07:00</modified>
+    <created>2015-04-14T02:48:40</created>
+    <modified>2015-04-14T02:48:40</modified>
     <unit name="meter" meter="1"/>
     <up_axis>Z_UP</up_axis>
   </asset>