From 75e42c08fd9bf9cf870668b6b5ef090d26915026 Mon Sep 17 00:00:00 2001
From: kearwood <none@none>
Date: Thu, 5 Apr 2012 21:18:25 +0000
Subject: [PATCH] KRObjView now automatically loads any models it finds in the
 "Documents" folder and assigns light maps that have the same name as the
 model appended with "_lightmap". Lightmapping now enabled by default.

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4026
---
 KREngine/KREngine/Classes/KRCamera.cpp       | 2 +-
 KREngine/KREngine/Classes/KRModelManager.cpp | 5 +++++
 KREngine/KREngine/Classes/KRModelManager.h   | 3 +++
 objview/Classes/KRObjViewGLView.mm           | 9 ++++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/KREngine/KREngine/Classes/KRCamera.cpp b/KREngine/KREngine/Classes/KRCamera.cpp
index 16db21b..1d44269 100644
--- a/KREngine/KREngine/Classes/KRCamera.cpp
+++ b/KREngine/KREngine/Classes/KRCamera.cpp
@@ -45,7 +45,7 @@ KRCamera::KRCamera() {
     bEnableAmbient = true;
     bEnableDiffuse = true;
     bEnableSpecular = true;
-    bEnableShadowMap = false;
+    bEnableShadowMap = true;
     bDebugSuperShiny = false;
     
     
diff --git a/KREngine/KREngine/Classes/KRModelManager.cpp b/KREngine/KREngine/Classes/KRModelManager.cpp
index 7c1d030..9a19f39 100644
--- a/KREngine/KREngine/Classes/KRModelManager.cpp
+++ b/KREngine/KREngine/Classes/KRModelManager.cpp
@@ -56,3 +56,8 @@ KRModel *KRModelManager::getFirstModel() {
     static std::map<std::string, KRModel *>::iterator model_itr = m_models.begin();
     return (*model_itr).second;
 }
+
+std::map<std::string, KRModel *> KRModelManager::getModels() {
+    return m_models;
+}
+
diff --git a/KREngine/KREngine/Classes/KRModelManager.h b/KREngine/KREngine/Classes/KRModelManager.h
index 22a33c3..711768d 100644
--- a/KREngine/KREngine/Classes/KRModelManager.h
+++ b/KREngine/KREngine/Classes/KRModelManager.h
@@ -49,6 +49,9 @@ public:
     KRModel *getModel(const char *szName);
     KRModel *getFirstModel();
     
+    std::vector<std::string> getModelNames();
+    std::map<std::string, KRModel *> getModels();
+    
 private:
     std::map<std::string, KRModel *> m_models;
     KRMaterialManager *m_pMaterialManager;
diff --git a/objview/Classes/KRObjViewGLView.mm b/objview/Classes/KRObjViewGLView.mm
index 8145d06..7352f16 100644
--- a/objview/Classes/KRObjViewGLView.mm
+++ b/objview/Classes/KRObjViewGLView.mm
@@ -127,7 +127,14 @@
     //m_scene.addInstance(pModelManager->getModel("fachwerkhaus12"), KRMat4());
     //m_scene.addInstance(pModelManager->getModel("ballroom"), KRMat4());
     //m_scene.addInstance(pModelManager->getModel("HoganCombined"), KRMat4());
-    m_scene.addInstance(pModelManager->getModel("polySurface12848"), KRMat4(), "PillarLightmap2k");
+    //m_scene.addInstance(pModelManager->getModel("polySurface12848"), KRMat4(), "PillarLightmap2k");
+    std::map<std::string, KRModel *> models = pModelManager->getModels();
+    for(std::map<std::string, KRModel *>::iterator itr=models.begin(); itr != models.end(); itr++) {
+        std::string lightmap = (*itr).first;
+        lightmap.append("_lightmap");
+        m_scene.addInstance((*itr).second, KRMat4(), lightmap);
+        
+    }
     
     [renderEngine setNearZ: 25.0];
     [renderEngine setFarZ: 5000.0];