kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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".

Browse Source 
Lightmapping now enabled by default.

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4026
This commit is contained in:
kearwood
2012-04-05 21:18:25 +00:00
parent ee3fbb8a8a
commit 75e42c08fd
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
KREngine/KREngine/Classes/KRCamera.cpp
View File

@@ -45,7 +45,7 @@ KRCamera::KRCamera() {
bEnableAmbient = true;
bEnableDiffuse = true;
bEnableSpecular = true;
bEnableShadowMap = false;
bEnableShadowMap = true;
bDebugSuperShiny = false;

5
KREngine/KREngine/Classes/KRModelManager.cpp
View File

@@ -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;
}

3
KREngine/KREngine/Classes/KRModelManager.h
View File

@@ -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;

9
objview/Classes/KRObjViewGLView.mm
View File

@@ -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];