Web version clean up

src/Game.cpp

@@ -330,7 +330,7 @@ namespace ZL
 		params_dorm.npcsJsonPath = "resources/config2/npcs_dorm.json";
 		params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues.json";
 
-		
+
 		params_dorm.navigationJsonPaths = {
 			"resources/navigation/dorm3_bca.json",
 			"resources/navigation/dorm3_ca.json",

src/Location.cpp

@@ -120,12 +120,12 @@ namespace ZL
 		loadTriggerZones(params.triggerZonesJsonPath, CONST_ZIP_FILE);
 		loadPointLights(params.lightsJsonPath, CONST_ZIP_FILE);
 
-#ifndef EMSCRIPTEN
+//#ifndef EMSCRIPTEN
 		// Create shadow map (2048x2048, ortho size 40, near 0.1, far 100)
 		shadowMap = std::make_unique<ShadowMap>(2048, 40.0f, 0.1f, 100.0f);
 		shadowMap->setLightDirection(Eigen::Vector3f(-0.5f, -1.0f, -0.3f));
 		std::cout << "Shadow map initialized" << std::endl;
-#endif
+//#endif
 
 		setupNavigation(params.navigationJsonPaths);
 

src/dialogue/DialogueOverlay.cpp

@@ -70,7 +70,7 @@ bool DialogueOverlay::init(Renderer& renderer, const std::string& zipFile) {
     zipFilename = zipFile;
 
     textboxTexture = renderer.textureManager.LoadFromPng("resources/dialogue/textbox_bg.png", zipFile);
-    portraitFrameTexture = renderer.textureManager.LoadFromPng("resources/dialogue/portrait_frame.png", zipFile);
+    //portraitFrameTexture = renderer.textureManager.LoadFromPng("resources/dialogue/portrait_frame.png", zipFile);
     choiceMainTexture = renderer.textureManager.LoadFromPng("resources/dialogue/choice_main.png", zipFile);
     choiceOptionalTexture = renderer.textureManager.LoadFromPng("resources/dialogue/choice_optional.png", zipFile);
     choiceSelectedTexture = renderer.textureManager.LoadFromPng("resources/dialogue/choice_selected.png", zipFile);

src/dialogue/DialogueOverlay.h

@@ -50,7 +50,7 @@ private:
     std::string zipFilename;
 
     std::shared_ptr<Texture> textboxTexture;
-    std::shared_ptr<Texture> portraitFrameTexture;
+    //std::shared_ptr<Texture> portraitFrameTexture;
     std::shared_ptr<Texture> choiceMainTexture;
     std::shared_ptr<Texture> choiceOptionalTexture;
     std::shared_ptr<Texture> choiceSelectedTexture;

src/items/InteractiveObject.cpp

@@ -8,9 +8,11 @@
 
 namespace ZL {
     extern const std::string textureUniformName;
-}
 
-namespace ZL {
+#ifdef EMSCRIPTEN
+    using std::min;
+    using std::max;
+#endif
 
     void InteractiveObject::moveTo(const Eigen::Vector3f& target, float durationSec, std::function<void()> onComplete) {
         if (isAnimating) return;

src/render/TextureManager.cpp

@@ -7,6 +7,10 @@
 
 namespace ZL
 {
+#ifdef EMSCRIPTEN
+	using std::min;
+	using std::max;
+#endif
 
 	bool IsPowerOf2(size_t n) {
 		return n > 0 && (n & (n - 1)) == 0;