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::iterator model_itr = m_models.begin(); return (*model_itr).second; } + +std::map 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 getModelNames(); + std::map getModels(); + private: std::map 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 models = pModelManager->getModels(); + for(std::map::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];