works on browser

.gitignore

@@ -397,4 +397,6 @@ images.zip
 script.py
 
 jumpingbird.*
+jumpingbird.data
 build
+build-emcmake

Game.cpp

@@ -38,10 +38,16 @@ void Game::setup() {
 
     // Initialize renderer
 
-    renderer.shaderManager.AddShaderFromFiles("default", "./default.vertex", "./default.fragment");
-    std::cout << "Hello 1.5" << std::endl;
-    // renderer.shaderManager.AddShaderFromFiles("defaultColor", "./defaultColor.vertex", "./defaultColor.fragment");
-    // renderer.shaderManager.AddShaderFromFiles("defaultHideCam", "./defaultHideCam.vertex", "./defaultHideCam.fragment");
+#ifdef EMSCRIPTEN
+    renderer.shaderManager.AddShaderFromFiles("default", "./default.vertex", "./default_web.fragment");
+    renderer.shaderManager.AddShaderFromFiles("defaultColor", "./defaultColor.vertex", "./defaultColor_web.fragment");
+    renderer.shaderManager.AddShaderFromFiles("defaultHideCam", "./defaultHideCam.vertex", "./defaultHideCam_web.fragment");
+#else
+    renderer.shaderManager.AddShaderFromFiles("default", "./default.vertex", "./default_desktop.fragment");
+    renderer.shaderManager.AddShaderFromFiles("defaultColor", "./defaultColor.vertex", "./defaultColor_desktop.fragment");
+    renderer.shaderManager.AddShaderFromFiles("defaultHideCam", "./defaultHideCam.vertex", "./defaultHideCam_desktop.fragment");
+#endif
+
 
     // Initialize game objects
     std::cout << "Hello 2" << std::endl;

GameObjectManager.cpp

@@ -37,9 +37,9 @@ void GameObjectManager::initialize() {
 
             current_room_index = 0;
             objects_in_inventory = 0;
-	bearName = "";
-  current_room_index = 0;
-  objects_in_inventory = 0;
+	        bearName = "";
+            current_room_index = 0;
+            objects_in_inventory = 0;
 
             //coneTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp24("./conus.bmp"));
 

Readme.md

@@ -62,7 +62,7 @@ emcmake cmake ..
 emcc main.cpp Game.cpp Environment.cpp GameObjectManager.cpp BoneAnimatedModel.cpp GameWorld.cpp InputManager.cpp Inventory.cpp ObjLoader.cpp QuestScripts.cpp RenderSystem.cpp  Math.cpp Physics.cpp Renderer.cpp TextModel.cpp  ShaderManager.cpp TextureManager.cpp Utils.cpp OpenGlExtensions.cpp -O2 -std=c++14 -IC:\Users\ASUS\Desktop\fishrungame2\ZeptoLabTest1\thirdparty\libzip-1.11.3\build-emcmake\install\include -LC:\Users\ASUS\Desktop\fishrungame2\ZeptoLabTest1\thirdparty\libzip-1.11.3\build-emcmake\install\lib -lzip -sTOTAL_MEMORY=33554432 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS="[""png""]" -sUSE_SDL=2 --preload-file background.bmp --preload-file bird.bmp32 --preload-file default.fragment --preload-file default.vertex --preload-file game_over.bmp32 --preload-file pipe.bmp32 -o jumpingbird.html
 
 
-emcc main.cpp Game.cpp Environment.cpp GameObjectManager.cpp BoneAnimatedModel.cpp GameWorld.cpp InputManager.cpp Inventory.cpp ObjLoader.cpp QuestScripts.cpp RenderSystem.cpp Math.cpp Physics.cpp Renderer.cpp TextModel.cpp ShaderManager.cpp TextureManager.cpp Utils.cpp OpenGlExtensions.cpp -O2 -std=c++14 -pthread -sUSE_PTHREADS=1 -sPTHREAD_POOL_SIZE=4 -I./thirdparty/libzip-1.11.3/build-emcmake/install/include -I./thirdparty/zlib-1.3.1/install/include -L./thirdparty/libzip-1.11.3/build-emcmake/install/lib -L./thirdparty/zlib-1.3.1/install/lib -lzip -lz -sTOTAL_MEMORY=33554432 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS='["png"]' -sUSE_SDL=2 --preload-file background.bmp --preload-file bird.bmp32 --preload-file default.fragment --preload-file default.vertex --preload-file game_over.bmp32 --preload-file pipe.bmp32 --preload-file loading.bmp -o jumpingbird.html
+emcc main.cpp Game.cpp Environment.cpp GameObjectManager.cpp BoneAnimatedModel.cpp GameWorld.cpp InputManager.cpp Inventory.cpp ObjLoader.cpp QuestScripts.cpp RenderSystem.cpp Math.cpp Physics.cpp Renderer.cpp TextModel.cpp ShaderManager.cpp TextureManager.cpp Utils.cpp OpenGlExtensions.cpp -O2 -std=c++14 -pthread -sUSE_PTHREADS=1 -sPTHREAD_POOL_SIZE=4 -sTOTAL_MEMORY=4294967296 -sINITIAL_MEMORY=3221225472 -sMAXIMUM_MEMORY=4294967296 -sALLOW_MEMORY_GROWTH=1 -I./thirdparty/libzip-1.11.3/build-emcmake/install/include -I./thirdparty/zlib-1.3.1/install/include -L./thirdparty/libzip-1.11.3/build-emcmake/install/lib -L./thirdparty/zlib-1.3.1/install/lib -lzip -lz -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS='["png"]' -sUSE_SDL=2 --preload-file background.bmp --preload-file bird.bmp32 --preload-file default.vertex --preload-file default_web.fragment --preload-file defaultColor.vertex --preload-file defaultColor_web.fragment --preload-file defaultHideCam.vertex --preload-file defaultHideCam_web.fragment --preload-file game_over.bmp32 --preload-file pipe.bmp32 --preload-file loading.bmp --preload-file cube001.txt --preload-file door.txt --preload-file idleviola_uv010.txt --preload-file lighter.txt --preload-file lock.txt --preload-file oneroom001.txt --preload-file secondroom001.txt --preload-file seconroom.bmp --preload-file thirdroom1.txt --preload-file walkviola_uv010.txt --preload-file car.txt --preload-file battery_dialog.bmp --preload-file final_bad.bmp --preload-file final_dialog.bmp --preload-file viola.bmp --preload-file final_good.bmp --preload-file monster001.bmp32 --preload-file monster002.bmp32 --preload-file hand.bmp32 --preload-file temno.bmp --preload-file DefaultMaterial_Base_color_1001.bmp --preload-file Material.001_Base_color_1001_5.bmp --preload-file Material_Base_color_1001-_2_.bmp --preload-file Material_Base_color_1001-_3.bmp --preload-file Material_Base_color_1001_4.bmp --preload-file Material_Base_color_1001.bmp --preload-file base_Base_color_1001.bmp --preload-file next_dialog.bmp --preload-file door.bmp --preload-file textures/inventory_objects/cubic_T_icon.bmp32 --preload-file textures/inventory_objects/cubic_M_icon.bmp32 --preload-file textures/inventory_objects/cubic_O_icon.bmp32 --preload-file textures/inventory_objects/battery.bmp32 --preload-file textures/mesh_1.txt --preload-file textures/mesh_first_room.txt --preload-file textures/mesh-of-first-room-with-roof.txt --preload-file textures/mesh-of-first-room-without-roof.txt --preload-file photo.bmp -o jumpingbird.html
 
 emrun --no_browser --port 8080 .
 ```
@@ -72,7 +72,7 @@ Code: MIT
 
 Art: CC-BY
 
-# Cmake Run
+# Cmake Run Linux
 Run using cmakelist
 make -j$(nproc) -C build #Компилируем
 ./build/sdl_app #Запускаем

ShaderManager.cpp

@@ -43,7 +43,7 @@ namespace ZL {
 		{
 			throw std::runtime_error("Failed to compile vertex shader code!");
 		}
-		std::cout << "IM here" << std::endl;
+		
 		if (!fragmentShaderCompiled)
 		{	
 			throw std::runtime_error("Failed to compile fragment shader code!");

Utils.cpp

@@ -32,8 +32,9 @@ namespace ZL
 		file.seekg(0, std::ios::beg);
 
 		std::vector<char> vec;
+		std::cout << "started reserving" + filename << std::endl; 
 		vec.reserve(fileSize);
-
+		std::cout << "ended reserving" << std::endl; 
 		vec.insert(vec.begin(),
 			std::istream_iterator<char>(file),
 			std::istream_iterator<char>());

defaultColor_web.fragment

@@ -0,0 +1,9 @@
+precision mediump float;
+varying vec3 color;
+
+void main() 
+{
+	//gl_FragColor = vec4(color, 1.0);
+	gl_FragColor = vec4(1.0, 1.0, 0.5, 1.0);
+	
+}

defaultHideCam_web.fragment

@@ -0,0 +1,36 @@
+precision mediump float;
+
+uniform sampler2D Texture;
+varying vec2 texCoord;
+varying vec3 vWorldPos;
+
+uniform vec3 eyePos;    // Позиция камеры
+uniform vec3 targetPos; // Цель камеры
+
+void main() 
+{
+
+	vec4 color;
+	
+	vec3 dirToCamera = normalize(eyePos - targetPos);
+    vec3 dirToVertex = normalize(vWorldPos - targetPos);
+	
+	float dotProduct = dot(dirToCamera, dirToVertex);
+	
+	float distanceX = abs(vWorldPos.x);
+	float distanceZ = abs(vWorldPos.z);
+	
+	//float distanceToCamera = length(vWorldPos - targetPos);
+	
+	if ((distanceX > 380.0 || distanceZ > 380.0) && (dotProduct > 0.0) && vWorldPos.y > 10.0)
+	{
+		//color.rgba = vec4(1,0,0,1);
+		discard;
+    }
+	else
+	{
+		color.rgb = texture2D(Texture, texCoord).rgb;
+		color.a = 1.0;
+	}
+	gl_FragColor = color;
+}

default_web.fragment

@@ -0,0 +1,12 @@
+precision mediump float;
+uniform sampler2D Texture;
+varying vec2 texCoord;
+
+void main() 
+{
+	vec4 color = texture2D(Texture,texCoord).rgba;
+    //gl_FragColor = vec4(color.rgb*0.1 + vec3(0.9, 0.9, 0.9), 1.0);
+	
+	gl_FragColor = color;
+	
+}