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

OSX Version of Kraken and importer now compiling again.

Browse Source 
Fixed bug that caused erratic mis-selection of shaders
This commit is contained in:
Kearwood Gilbert
2013-04-25 18:00:10 -07:00
parent 30f3c5b0df
commit ae00c9bf00
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
KREngine/kraken/KREngine-common.h
View File

@@ -23,21 +23,6 @@ float const D2R = PI * 2 / 360;
#include <list> #include <list>
#include <map> #include <map>
#if TARGET_OS_IPHONE
#include <unordered_map>
using std::unordered_map;
using std::unordered_multimap;
using std::hash;
#else
#include <tr1/unordered_map>
using std::tr1::unordered_map;
using std::tr1::unordered_multimap;
using std::tr1::hash;
#endif
#include <stack> #include <stack>
#include <queue> #include <queue>
@@ -87,6 +72,24 @@ using std::queue;
#define KRAKEN_USE_ARM_NEON #define KRAKEN_USE_ARM_NEON
#endif #endif
#if TARGET_OS_IPHONE
#include <unordered_map>
using std::unordered_map;
using std::unordered_multimap;
using std::hash;
#else
#include <tr1/unordered_map>
using std::tr1::unordered_map;
using std::tr1::unordered_multimap;
using std::tr1::hash;
#endif
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#include <OpenGLES/ES2/gl.h> #include <OpenGLES/ES2/gl.h>

14
KREngine/kraken/KRShaderManager.cpp
View File

@@ -73,6 +73,17 @@ KRShader *KRShaderManager::getShader(const std::string &shader_name, KRCamera *p
std::pair<std::string, std::vector<int> > key; std::pair<std::string, std::vector<int> > key;
key.first = shader_name; key.first = shader_name;
key.second.push_back(light_directional_count); key.second.push_back(light_directional_count);
key.second.push_back(light_point_count);
key.second.push_back(light_spot_count);
key.second.push_back(pCamera->settings.fog_type);
key.second.push_back(pCamera->settings.bEnablePerPixel);
key.second.push_back(bAlphaTest);
key.second.push_back(bAlphaBlend);
key.second.push_back(bDiffuseMap);
key.second.push_back(bNormalMap);
key.second.push_back(bSpecMap);
key.second.push_back(bReflectionMap);
key.second.push_back(bone_count);
key.second.push_back(bSpecMap); key.second.push_back(bSpecMap);
key.second.push_back(bReflectionMap); key.second.push_back(bReflectionMap);
key.second.push_back(bReflectionCubeMap); key.second.push_back(bReflectionCubeMap);
@@ -103,8 +114,7 @@ KRShader *KRShaderManager::getShader(const std::string &shader_name, KRCamera *p
key.second.push_back(pCamera->settings.flash_intensity * 1000.0f); key.second.push_back(pCamera->settings.flash_intensity * 1000.0f);
key.second.push_back(pCamera->settings.vignette_radius * 1000.0f); key.second.push_back(pCamera->settings.vignette_radius * 1000.0f);
key.second.push_back(pCamera->settings.vignette_falloff * 1000.0f); key.second.push_back(pCamera->settings.vignette_falloff * 1000.0f);
KRShader *pShader = m_shaders[key]; KRShader *pShader = m_shaders[key];