Porting to web

src/render/ShaderManager.cpp

@@ -44,11 +44,19 @@ namespace ZL {
 
 		if (!vertexShaderCompiled)
 		{
+#ifdef EMSCRIPTEN
+			std::cout << "Failed to compile vertex shader code!" << std::endl;
+			std::cout << infoLog << std::endl;
+#endif
 			throw std::runtime_error("Failed to compile vertex shader code!");
 		}
 		
 		if (!fragmentShaderCompiled)
 		{	
+#ifdef EMSCRIPTEN
+			std::cout << "Failed to compile fragment shader code!" << std::endl;
+			std::cout << infoLog2 << std::endl;
+#endif
 			throw std::runtime_error("Failed to compile fragment shader code!");
 		}
 
@@ -67,6 +75,10 @@ namespace ZL {
 		
 		if (!programLinked)
 		{
+#ifdef EMSCRIPTEN
+			std::cout << "Failed to link shader program!" << std::endl;
+			std::cout << infoLog << std::endl;
+#endif
 			shaderProgram = 0;
 			throw std::runtime_error("Failed to link shader program!");
 		}
@@ -202,7 +214,7 @@ namespace ZL {
 
 
 	ShaderSetter::ShaderSetter(ShaderManager& inShaderManager, const std::string& shaderName)
-		: shaderManager(shaderManager)
+		: shaderManager(inShaderManager)
 	{
 		shaderManager.PushShader(shaderName);
 	}

src/render/TextureManager.h

@@ -27,7 +27,11 @@ namespace ZL
 		};
 
 		BitSize bitSize;
+#ifdef SIMPLIFIED	
+		MipmapType mipmap = NONE; // Ïî óìîë÷àíèþ âêëþ÷åíî
+#else
 		MipmapType mipmap = GENERATE; // Ïî óìîë÷àíèþ âêëþ÷åíî
+#endif
 	};
 	class Texture
 	{