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
This commit is contained in:
Kearwood Gilbert
2013-04-25 17:23:36 -07:00
parent 09d6998d3d
commit 30f3c5b0df
31 changed files with 94 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
KREngine/kraken/KRShaderManager.h
View File

@@ -67,11 +67,11 @@ public:
long getShaderHandlesUsed();
private:
//std::unordered_map<std::string, KRShader *> m_shaders;
//unordered_map<std::string, KRShader *> m_shaders;
std::map<std::pair<std::string, std::vector<int> >, KRShader *> m_shaders;
std::unordered_map<std::string, std::string> m_fragShaderSource;
std::unordered_map<std::string, std::string> m_vertShaderSource;
unordered_map<std::string, std::string> m_fragShaderSource;
unordered_map<std::string, std::string> m_vertShaderSource;
KRShader *m_pShader;
char m_szCurrentShaderKey[256];