fixed rotation moving

cmake/ThirdParty.cmake

@@ -398,10 +398,8 @@ add_library(freetype_external_lib UNKNOWN IMPORTED GLOBAL)
 set_target_properties(freetype_external_lib PROPERTIES
     IMPORTED_LOCATION_DEBUG   "${_ft_debug_lib}"
     IMPORTED_LOCATION_RELEASE "${_ft_release_lib}"
-)
+    INTERFACE_INCLUDE_DIRECTORIES
-target_include_directories(freetype_external_lib INTERFACE
+        "$<IF:$<CONFIG:Debug>,${FREETYPE_BASE_DIR}-Debug/include,${FREETYPE_BASE_DIR}-Release/include>"
-    "$<IF:$<CONFIG:Debug>,${FREETYPE_BASE_DIR}-Debug/include/freetype2,${FREETYPE_BASE_DIR}-Release/include/freetype2>"
-    "$<IF:$<CONFIG:Debug>,${FREETYPE_BASE_DIR}-Debug/include,${FREETYPE_BASE_DIR}-Release/include>"
 )
 
 # ===========================================
@@ -455,8 +453,8 @@ if(NOT _have_sdl2ttf)
                 -DSDL2_LIBRARY=${_SDL2_LIB}
                 -DSDL2_INCLUDE_DIR=${SDL2_INSTALL_DIR}/include/SDL2
                 -DFREETYPE_LIBRARY=${_FT_LIB}
-                -DFREETYPE_INCLUDE_DIR=${_FT_PREFIX}/include/freetype2
+                -DFREETYPE_INCLUDE_DIR=${_FT_PREFIX}/include
-                -DFREETYPE_INCLUDE_DIRS=${_FT_PREFIX}/include/freetype2
+                -DFREETYPE_INCLUDE_DIRS=${_FT_PREFIX}/include
                 -DSDL2TTF_VENDORED=OFF
                 -DSDL2TTF_SAMPLES=OFF
             RESULT_VARIABLE _ttf_cfg_res

proj-web/CMakeLists.txt

@@ -21,60 +21,23 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/../cmake/FetchDependencies.cmake")
 set(SOURCES
     ../src/main.cpp
     ../src/Game.cpp
-    ../src/Game.h
     ../src/Environment.cpp
-    ../src/Environment.h
-    ../src/render/Renderer.cpp
-    ../src/render/Renderer.h
-    ../src/render/ShaderManager.cpp
-    ../src/render/ShaderManager.h
-    ../src/render/TextureManager.cpp
-    ../src/render/TextureManager.h
-    ../src/TextModel.cpp
-    ../src/TextModel.h
-    ../src/AudioPlayerAsync.cpp
-    ../src/AudioPlayerAsync.h
     ../src/BoneAnimatedModel.cpp
-    ../src/BoneAnimatedModel.h
+    ../src/TextModel.cpp
-    ../src/render/OpenGlExtensions.cpp
-    ../src/render/OpenGlExtensions.h
-    ../src/utils/Utils.cpp
-    ../src/utils/Utils.h
-    ../src/SparkEmitter.cpp
-    ../src/SparkEmitter.h
-	../src/planet/PlanetObject.cpp
-	../src/planet/PlanetObject.h
-	../src/planet/PlanetData.cpp
-	../src/planet/PlanetData.h
-	../src/utils/Perlin.cpp
-	../src/utils/Perlin.h
-	../src/utils/TaskManager.cpp
-	../src/utils/TaskManager.h
-	../src/planet/StoneObject.cpp
-	../src/planet/StoneObject.h
-	../src/render/FrameBuffer.cpp
-	../src/render/FrameBuffer.h
-    ../src/UiManager.cpp
-    ../src/UiManager.h
-    ../src/Projectile.h
     ../src/Projectile.cpp
-	../src/network/NetworkInterface.h
+    ../src/SparkEmitter.cpp
-	../src/network/LocalClient.h
+    ../src/UiManager.cpp
-	../src/network/LocalClient.cpp
+    ../src/render/Renderer.cpp
-	../src/network/ClientState.h
+    ../src/render/ShaderManager.cpp
-	../src/network/ClientState.cpp
+    ../src/render/TextureManager.cpp
-	../src/network/WebSocketClientBase.h
+    ../src/render/FrameBuffer.cpp
-	../src/network/WebSocketClientBase.cpp
+    ../src/render/OpenGlExtensions.cpp
-	../src/network/WebSocketClientEmscripten.h
+    ../src/utils/Utils.cpp
-	../src/network/WebSocketClientEmscripten.cpp
+    ../src/utils/TaskManager.cpp
-	../src/render/TextRenderer.h
+    ../src/utils/Perlin.cpp
-	../src/render/TextRenderer.cpp
+    ../src/planet/PlanetData.cpp
-	../src/MenuManager.h
+    ../src/planet/PlanetObject.cpp
-	../src/MenuManager.cpp
+    ../src/planet/StoneObject.cpp
-	../src/Space.h
-	../src/Space.cpp
-	../src/GameConstants.h
-	../src/GameConstants.cpp
 )
 
 add_executable(space-game001 ${SOURCES})
@@ -95,33 +58,30 @@ set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE)
 
 add_subdirectory("../thirdparty/libzip-1.11.4" libzip-build)
 
-target_link_libraries(space-game001 PRIVATE zip z websocket.js)
+# Линковка:
+# 'zip' берется из add_subdirectory
+# 'z' - это системный zlib Emscripten-а (флаг -sUSE_ZLIB=1 добавим ниже)
+target_link_libraries(space-game001 PRIVATE zip z)
 
 # Эмскриптен-флаги
 set(EMSCRIPTEN_FLAGS
     "-sUSE_SDL=2"
     "-sUSE_SDL_IMAGE=2"
     "-sUSE_LIBPNG=1"
-    "-sUSE_ZLIB=1"
+    "-sUSE_ZLIB=1"     # Добавили zlib порт
-    "-sUSE_SDL_TTF=2"
+    "-pthread"
-    #"-pthread"
+    "-sUSE_PTHREADS=1"
-    #"-sUSE_PTHREADS=1"
     "-fexceptions"
-	"-DNETWORK"
 )
 
 target_compile_options(space-game001 PRIVATE ${EMSCRIPTEN_FLAGS} "-O2")
 
-# Only loading.png and the shaders used before resources.zip is ready are preloaded.
-# resources.zip is downloaded asynchronously at runtime and served as a separate file.
 set(EMSCRIPTEN_LINK_FLAGS
     ${EMSCRIPTEN_FLAGS}
     "-O2"
-    #"-sPTHREAD_POOL_SIZE=4"
+    "-sPTHREAD_POOL_SIZE=4"
     "-sALLOW_MEMORY_GROWTH=1"
-	"-sFULL_ES3=1"
+    "--preload-file resources.zip"
-    "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/../resources/loading.png@resources/loading.png"
-    "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/../resources/shaders@resources/shaders"
 )
 
 # Применяем настройки линковки
@@ -171,8 +131,8 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/space-game001plain.html"
         DESTINATION .
 )
 
-# resources.zip is served separately and downloaded asynchronously at runtime
+# Если вам все еще нужен сам resources.zip отдельно в папке public:
-install(FILES "${RESOURCES_ZIP}" DESTINATION .)
+#install(FILES "${RESOURCES_ZIP}" DESTINATION .)
 
 add_custom_command(TARGET space-game001 POST_BUILD
     COMMAND ${CMAKE_COMMAND} --install .

proj-web/README.md

@@ -1,13 +1,7 @@
 # how to build
 
-If emsdk is not installed, you need to clone it from here: https://github.com/emscripten-core/emsdk
 
-and install:
+Activate the environment:
-```
-C:\Work\Projects\emsdk\emsdk.bat install latest
-```
-
-Then activate the environment:
 ```
 C:\Work\Projects\emsdk\emsdk.bat activate latest
 C:\Work\Projects\emsdk\emsdk_env.bat

proj-web/space-game001.html

@@ -1,2 +0,0 @@
-<!doctypehtml><html lang=en-us><head><meta charset=utf-8><meta content="text/html; charset=utf-8"http-equiv=Content-Type><title>Emscripten-Generated Code</title><style>body{font-family:arial;margin:0;padding:none}.emscripten{padding-right:0;margin-left:auto;margin-right:auto;display:block}div.emscripten{text-align:center}div.emscripten_border{border:1px solid #000}canvas.emscripten{border:0 none;background-color:#000}#emscripten_logo{display:inline-block;margin:0;padding:6px;width:265px}.spinner{height:30px;width:30px;margin:0;margin-top:20px;margin-left:20px;display:inline-block;vertical-align:top;-webkit-animation:rotation .8s linear infinite;-moz-animation:rotation .8s linear infinite;-o-animation:rotation .8s linear infinite;animation:rotation .8s linear infinite;border-left:5px solid #ebebeb;border-right:5px solid #ebebeb;border-bottom:5px solid #ebebeb;border-top:5px solid #787878;border-radius:100%;background-color:#bdd72e}@-webkit-keyframes rotation{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(360deg)}}@-moz-keyframes rotation{from{-moz-transform:rotate(0)}to{-moz-transform:rotate(360deg)}}@-o-keyframes rotation{from{-o-transform:rotate(0)}to{-o-transform:rotate(360deg)}}@keyframes rotation{from{transform:rotate(0)}to{transform:rotate(360deg)}}#status{display:inline-block;vertical-align:top;margin-top:30px;margin-left:20px;font-weight:700;color:#787878}#progress{height:20px;width:300px}#controls{display:inline-block;float:right;vertical-align:top;margin-top:30px;margin-right:20px}#output{width:100%;height:200px;margin:0 auto;margin-top:10px;border-left:0;border-right:0px;padding-left:0;padding-right:0;display:block;background-color:#000;color:#fff;font-family:'Lucida Console',Monaco,monospace;outline:0}</style></head><body><script src="https://cdn.jsdelivr.net/npm/eruda"></script>
-<script>eruda.init();</script><a href=http://emscripten.org><img id=emscripten_logo src=""></a><div class=spinner id=spinner></div><div class=emscripten id=status>Downloading...</div><span id=controls><span><input type=checkbox id=resize>Resize canvas</span> <span><input type=checkbox id=pointerLock checked>Lock/hide mouse pointer    </span><span><input type=button onclick='Module.requestFullscreen(document.getElementById("pointerLock").checked,document.getElementById("resize").checked)'value=Fullscreen></span></span><div class=emscripten><progress hidden id=progress max=100 value=0></progress></div><div class=emscripten_border><canvas class=emscripten id=canvas oncontextmenu=event.preventDefault() tabindex=-1></canvas></div><textarea id=output rows=8></textarea><script>var statusElement=document.getElementById("status"),progressElement=document.getElementById("progress"),spinnerElement=document.getElementById("spinner"),canvasElement=document.getElementById("canvas"),outputElement=document.getElementById("output");outputElement&&(outputElement.value=""),canvasElement.addEventListener("webglcontextlost",(e=>{alert("WebGL context lost. You will need to reload the page."),e.preventDefault()}),!1);var Module={print(...e){if(console.log(...e),outputElement){var t=e.join(" ");outputElement.value+=t+"\n",outputElement.scrollTop=outputElement.scrollHeight}},canvas:canvasElement,setStatus(e){if(Module.setStatus.last||(Module.setStatus.last={time:Date.now(),text:""}),e!==Module.setStatus.last.text){var t=e.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/),n=Date.now();t&&n-Module.setStatus.last.time<30||(Module.setStatus.last.time=n,Module.setStatus.last.text=e,t?(e=t[1],progressElement.value=100*parseInt(t[2]),progressElement.max=100*parseInt(t[4]),progressElement.hidden=!1,spinnerElement.hidden=!1):(progressElement.value=null,progressElement.max=null,progressElement.hidden=!0,e||(spinnerElement.style.display="none")),statusElement.innerHTML=e)}},totalDependencies:0,monitorRunDependencies(e){this.totalDependencies=Math.max(this.totalDependencies,e),Module.setStatus(e?"Preparing... ("+(this.totalDependencies-e)+"/"+this.totalDependencies+")":"All downloads complete.")}};Module.setStatus("Downloading..."),window.onerror=e=>{Module.setStatus("Exception thrown, see JavaScript console"),spinnerElement.style.display="none",Module.setStatus=e=>{e&&console.error("[post-exception status] "+e)}}</script><script async src="space-game001.js" crossorigin="anonymous"></script></body></html>

proj-web/space-game001plain.html

@@ -1,200 +1,100 @@
-<!DOCTYPE html>
+<!doctypehtml>
-<html lang="en-us">
+    <html lang=en-us>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>Sky Trek Tales</title>
-    <style>
-        body, html {
-            margin: 0; padding: 0; width: 100%; height: 100%;
-            overflow: hidden; background-color: #000;
-            position: fixed; 
-        }
-        #canvas {
-            display: block;
-            position: absolute;
-            top: 0; left: 0;
-            width: 100vw; height: 100vh;
-            border: none;
-        }
 
-        #fs-button {
+    <head>
-            position: absolute;
+        <meta charset=utf-8>
-            top: 10px; right: 10px;
+        <meta content="text/html; charset=utf-8" http-equiv=Content-Type>
-            padding: 10px;
+        <title>Space Game</title>
-            z-index: 10;
+        <style>
-            background: rgba(255,255,255,0.3);
+            body {
-            color: white; border: 1px solid white;
+                font-family: arial;
-            cursor: pointer;
+                margin: 0;
-            font-family: sans-serif;
+                overflow: hidden;
-            border-radius: 5px;
+                padding: 0;
-        }
+                min-height: 100vh;
-        #status { color: white; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); }
+                background-color: #000;
-
-        /* Nick modal */
-        #nickOverlay {
-            position: absolute;
-            inset: 0;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            background: rgba(0,0,0,0.85);
-            z-index: 9999;
-        }
-        #nickBox {
-            background: #111;
-            border: 1px solid #444;
-            padding: 24px;
-            width: 320px;
-            box-shadow: 0 8px 24px rgba(0,0,0,0.6);
-            text-align: center;
-        }
-        #nickBox h2 { margin: 0 0 12px 0; font-size: 18px; color: #eee; }
-        #nickBox input[type="text"] {
-            width: 100%;
-            padding: 10px;
-            font-size: 16px;
-            box-sizing: border-box;
-            margin-bottom: 12px;
-            border: 1px solid #333;
-            background: #000;
-            color: #fff;
-        }
-        #nickBox button {
-            padding: 10px 16px;
-            font-size: 16px;
-            background: #2a9fd6;
-            border: none;
-            color: #fff;
-            cursor: pointer;
-        }
-
-    </style>
-</head>
-<body>
-    <button id="fs-button">Fullscreen</button>
-    <div id="status">Downloading...</div>
-    <canvas id="canvas" oncontextmenu="event.preventDefault()" tabindex="-1"></canvas>
-    <div id="nickOverlay" style="display:none;">
-        <div id="nickBox">
-            <h2>Enter your nickname</h2>
-            <input id="nickInput" type="text" maxlength="32" placeholder="Player" />
-            <div>
-                <button id="nickSubmit">Start</button>
-            </div>
-        </div>
-    </div>
-
-    <script>
-        // Utility: подготовить глобальный Module до загрузки Emscripten-скрипта
-        function prepareModuleEnvironment() {
-            window.Module = window.Module || {};
-            var canvasEl = document.getElementById('canvas');
-            // Устанавливаем canvas для Emscripten, чтобы createContext не падал
-            window.Module.canvas = canvasEl;
-            // Подготовим заглушку setStatus, если ещё нет
-            window.Module.setStatus = window.Module.setStatus || function (text) {
-                var statusElement = document.getElementById("status");
-                statusElement.innerHTML = text;
-                statusElement.style.display = text ? 'block' : 'none';
-            };
-        }
-
-        // Show overlay only if no nickname saved.
-        function loadGameScript() {
-            var s = document.createElement('script');
-            s.src = 'space-game001.js';
-            s.async = true;
-            document.body.appendChild(s);
-        }
-
-        function showNickOverlay() {
-            var overlay = document.getElementById('nickOverlay');
-            overlay.style.display = 'flex';
-            var input = document.getElementById('nickInput');
-            input.focus();
-        }
-
-        function hideNickOverlay() {
-            var overlay = document.getElementById('nickOverlay');
-            overlay.style.display = 'none';
-        }
-
-        function saveNickAndStart(nick) {
-            try {
-                if (!nick || nick.trim() === '') nick = 'Player';
-                localStorage.setItem('spacegame_nick', nick);
-            } catch (e) {
-                console.warn('localStorage not available', e);
-            }
-            hideNickOverlay();
-            // перед загрузкой скрипта гарантируем, что Module.canvas задан
-            prepareModuleEnvironment();
-            loadGameScript();
-        }
-
-        document.getElementById('fs-button').addEventListener('click', function() {
-            if (!document.fullscreenElement) {
-                document.documentElement.requestFullscreen().catch(function(e) {
-                    console.error('Fullscreen error: ' + e.message);
-                });
-            } else {
-                document.exitFullscreen();
-            }
-        });
-
-        document.addEventListener('DOMContentLoaded', function() {
-            // Готовим Module сразу — даже если откроется модалка, поле canvas будет доступно для скрипта (если он загружается позже)
-            prepareModuleEnvironment();
-
-            var stored = null;
-            try {
-                stored = localStorage.getItem('spacegame_nick');
-            } catch (e) {
-                console.warn('localStorage not available', e);
             }
 
-            if (stored && stored.trim() !== '') {
+            .emscripten {
-                // Nick is present — start immediately
+                padding-right: 0;
-                loadGameScript();
+                margin-left: auto;
-            } else {
+                margin-right: auto;
-                // Show modal to request nickname before loading WASM
+                display: block
-                showNickOverlay();
-                var submit = document.getElementById('nickSubmit');
-                var input = document.getElementById('nickInput');
-
-                submit.addEventListener('click', function() {
-                    saveNickAndStart(input.value);
-                });
-
-                input.addEventListener('input', function() {
-                    // Strip any character that is not a-z, A-Z, 0-9 or space
-                    var pos = this.selectionStart;
-                    var cleaned = this.value.replace(/[^a-zA-Z0-9 ]/g, '');
-                    if (cleaned !== this.value) {
-                        this.value = cleaned;
-                        this.setSelectionRange(pos - 1, pos - 1);
-                    }
-                });
-
-                input.addEventListener('keydown', function(e) {
-                    if (e.key === 'Enter') {
-                        saveNickAndStart(input.value);
-                    }
-                });
             }
-        });
 
-        window.addEventListener("orientationchange", function() {
+            div.emscripten {
-            // Chrome на Android обновляет innerWidth/Height не мгновенно.
+                text-align: center
-            // Ждем завершения анимации поворота.
+            }
-            setTimeout(() => {
-                // В Emscripten это вызовет ваш onWindowResized в C++
-                window.dispatchEvent(new Event('resize'));
-            }, 200);
-        });
 
-    </script>
+            div.emscripten_border {
+                border: 1px solid #000
+            }
 
-</body>
+            canvas.emscripten {
-</html>
+                border: 0 none;
+                background-color: #000;
+                width: 90%;
+                height: 100vh;
+            }
+
+            @-webkit-keyframes rotation {
+                from {
+                    -webkit-transform: rotate(0)
+                }
+
+                to {
+                    -webkit-transform: rotate(360deg)
+                }
+            }
+
+            @-moz-keyframes rotation {
+                from {
+                    -moz-transform: rotate(0)
+                }
+
+                to {
+                    -moz-transform: rotate(360deg)
+                }
+            }
+
+            @-o-keyframes rotation {
+                from {
+                    -o-transform: rotate(0)
+                }
+
+                to {
+                    -o-transform: rotate(360deg)
+                }
+            }
+
+            @keyframes rotation {
+                from {
+                    transform: rotate(0)
+                }
+
+                to {
+                    transform: rotate(360deg)
+                }
+            }
+
+            #status {
+                display: none;
+            }
+
+            #progress {
+                height: 20px;
+                width: 300px
+            }
+        </style>
+    </head>
+
+    <body>
+        <div class=emscripten id=status></div>
+        <div class=emscripten><progress hidden id=progress max=100 value=0></progress></div>
+        <div class=emscripten_border><canvas class=emscripten id=canvas oncontextmenu=event.preventDefault()
+                tabindex=-1></canvas></div>
+        <script>var statusElement = document.getElementById("status"), progressElement = document.getElementById("progress"), spinnerElement = document.getElementById("spinner"), Module = { print: function () { var e = document.getElementById("output"); return e && (e.value = ""), function (t) { arguments.length > 1 && (t = Array.prototype.slice.call(arguments).join(" ")), console.log(t), e && (e.value += t + "\n", e.scrollTop = e.scrollHeight) } }(), canvas: (() => { var e = document.getElementById("canvas"); return e.addEventListener("webglcontextlost", (e => { alert("WebGL context lost. You will need to reload the page."), e.preventDefault() }), !1), e })(), setStatus: e => { if (Module.setStatus.last || (Module.setStatus.last = { time: Date.now(), text: "" }), e !== Module.setStatus.last.text) { var t = e.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/), n = Date.now(); t && n - Module.setStatus.last.time < 30 || (Module.setStatus.last.time = n, Module.setStatus.last.text = e, t ? (e = t[1], progressElement.value = 100 * parseInt(t[2]), progressElement.max = 100 * parseInt(t[4]), progressElement.hidden = !1, spinnerElement.hidden = !1) : (progressElement.value = null, progressElement.max = null, progressElement.hidden = !0, e || (spinnerElement.style.display = "none")), statusElement.innerHTML = e) } }, totalDependencies: 0, monitorRunDependencies: e => { this.totalDependencies = Math.max(this.totalDependencies, e), Module.setStatus(e ? "Preparing... (" + (this.totalDependencies - e) + "/" + this.totalDependencies + ")" : "All downloads complete.") } }; Module.setStatus("Downloading..."), window.onerror = e => { Module.setStatus("Exception thrown, see JavaScript console"), spinnerElement.style.display = "none", Module.setStatus = e => { e && console.error("[post-exception status] " + e) } }</script>
+        <script async src=space-game001.js></script>
+    </body>
+
+    </html>

proj-windows/CMakeLists.txt

@@ -18,6 +18,8 @@ add_executable(space-game001
     ../src/Environment.h
     ../src/render/Renderer.cpp
     ../src/render/Renderer.h
+    ../src/render/Camera.cpp
+    ../src/render/Camera.h
     ../src/render/ShaderManager.cpp
     ../src/render/ShaderManager.h
     ../src/render/TextureManager.cpp
@@ -57,18 +59,6 @@ add_executable(space-game001
 	../src/network/ClientState.cpp
 	../src/network/WebSocketClient.h
 	../src/network/WebSocketClient.cpp
-	../src/network/WebSocketClientBase.h
-	../src/network/WebSocketClientBase.cpp
-	../src/network/WebSocketClientEmscripten.h
-	../src/network/WebSocketClientEmscripten.cpp
-	../src/render/TextRenderer.h
-	../src/render/TextRenderer.cpp
-	../src/MenuManager.h
-	../src/MenuManager.cpp
-	../src/Space.h
-	../src/Space.cpp
-	../src/GameConstants.h
-	../src/GameConstants.cpp
 )
 
 # Установка проекта по умолчанию для Visual Studio
@@ -90,7 +80,7 @@ target_compile_definitions(space-game001 PRIVATE
     WIN32_LEAN_AND_MEAN
     PNG_ENABLED
     SDL_MAIN_HANDLED
-	NETWORK
+#	NETWORK
 #    SIMPLIFIED
 )
 

resources/config/about.json

@@ -1,256 +0,0 @@
-{
-	"root": {
-		"type": "LinearLayout",
-		"orientation": "vertical",
-		"vertical_align": "center",
-		"horizontal_align": "center",
-		"spacing": 10,
-		"x": 0,
-		"y": 0,
-		"width": "match_parent",
-		"height": "match_parent",
-		"children": [
-			{
-				"type": "StaticImage",
-				"name": "titleBtn",
-				"width": 434,
-				"height": 35,
-				"texture": "resources/main_menu/title.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "aboutSpace1",
-				"width": 434,
-				"height": 10
-			},
-			{
-				"type": "FrameLayout",
-				"spacing": 10,
-				"width": 434,
-				"height": 460,
-				"children": [
-					{
-						"type": "TextView",
-						"name": "aboutText1",
-						"width": 434,
-						"height": 30,
-						"x": -300,
-						"y": 0,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Producer: Vladislav Khorev",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 30,
-						"x": -300,
-						"y": 40,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Lead Developer: Vladislav Khorev",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 2,
-						"x": -300,
-						"y": 80,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Game Designer: Leila Bobrova",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 30,
-						"x": -300,
-						"y": 120,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Developers: ",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 150,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Vladislav Kan",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 180,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Beksultan Almazbekov",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 210,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Sergei Zotov",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 250,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "3D Artist: David \"nokken\" Im",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 290,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "UI/UX Design: Kenje Kazmatova",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 330,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Sky Trek Tales v. 0.1",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 370,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "https://fishrungames.com",
-						"fontSize": 24,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					}
-				]
-			},
-			{
-				"type": "Button",
-				"name": "aboutBackButton",
-				"width": 382,
-				"height": 56,
-				"textures": {
-					"normal": "resources/game_over/Secondarybutton.png",
-					"hover": "resources/game_over/Secondarybutton.png",
-					"pressed": "resources/game_over/Secondarybutton.png"
-				}
-			}
-		]
-	}
-}

resources/config/connecting.json

@@ -1,22 +0,0 @@
-{
-	"root": {
-		"type": "FrameLayout",
-		"x": 0,
-		"y": 0,
-		"width": "match_parent",
-		"height": "match_parent",
-		"children": [
-			{
-                "type": "StaticImage",
-                "name": "connecting",
-				"x" : 0,
-				"y" : 0,
-                "width": 488,
-                "height": 154,
-				"horizontal_gravity": "center",
-				"vertical_gravity": "center",
-                "texture": "resources/connecting.png"
-			}
-		]
-	}
-}

resources/config/connection_failed.json

@@ -1,52 +0,0 @@
-{
-	"root": {
-		"type": "FrameLayout",
-		"x": 0,
-		"y": 0,
-		"width": "match_parent",
-		"height": "match_parent",
-		"children": [
-			{
-                "type": "StaticImage",
-                "name": "connectionFailed",
-				"x" : 0,
-				"y" : 0,
-                "width": 488,
-                "height": 308,
-				"horizontal_gravity": "center",
-				"vertical_gravity": "center",
-                "texture": "resources/connection_failed.png"
-			},
-			{
-				"type": "Button",
-				"name": "connectionFailedReconnectButton",
-				"width": 382,
-				"height": 56,
-				"x" : 0,
-				"y" : -20,
-				"horizontal_gravity": "center",
-				"vertical_gravity": "center",
-				"textures": {
-					"normal": "resources/game_over/reconnect1.png",
-					"hover": "resources/game_over/reconnect2.png",
-					"pressed": "resources/game_over/reconnect3.png"
-				}
-			},
-			{
-				"type": "Button",
-				"name": "connectionFailedGoBack",
-				"width": 382,
-				"height": 56,
-				"x" : 0,
-				"y" : -86,
-				"horizontal_gravity": "center",
-				"vertical_gravity": "center",
-				"textures": {
-					"normal": "resources/game_over/Secondarybutton.png",
-					"hover": "resources/game_over/Secondarybutton.png",
-					"pressed": "resources/game_over/Secondarybutton.png"
-				}
-			}
-		]
-	}
-}

resources/config/connection_lost.json

@@ -1,52 +0,0 @@
-{
-	"root": {
-		"type": "FrameLayout",
-		"x": 0,
-		"y": 0,
-		"width": "match_parent",
-		"height": "match_parent",
-		"children": [
-			{
-                "type": "StaticImage",
-                "name": "connectionLost",
-				"x" : 0,
-				"y" : 0,
-                "width": 488,
-                "height": 308,
-				"horizontal_gravity": "center",
-				"vertical_gravity": "center",
-                "texture": "resources/connection_lost.png"
-			},
-			{
-				"type": "Button",
-				"name": "reconnectButton",
-				"width": 382,
-				"height": 56,
-				"x" : 0,
-				"y" : -20,
-				"horizontal_gravity": "center",
-				"vertical_gravity": "center",
-				"textures": {
-					"normal": "resources/game_over/reconnect1.png",
-					"hover": "resources/game_over/reconnect2.png",
-					"pressed": "resources/game_over/reconnect3.png"
-				}
-			},
-			{
-				"type": "Button",
-				"name": "exitServerButton",
-				"width": 382,
-				"height": 56,
-				"x" : 0,
-				"y" : -86,
-				"horizontal_gravity": "center",
-				"vertical_gravity": "center",
-				"textures": {
-					"normal": "resources/game_over/Secondarybutton.png",
-					"hover": "resources/game_over/Secondarybutton.png",
-					"pressed": "resources/game_over/Secondarybutton.png"
-				}
-			}
-		]
-	}
-}

resources/config/crosshair_config.json

@@ -1,21 +0,0 @@
-{
-  "enabled": true,
-
-  "referenceResolution": [1280, 720],
-
-  "color": [1.0, 1.0, 1.0],
-  "cl_crosshairalpha": 1.0,
-  "cl_crosshairthickness": 2.0,
-
-  "centerGapPx": 10.0,
-
-  "top": {
-    "lengthPx": 14.0,
-    "angleDeg": 90.0
-  },
-
-  "arms": [
-    { "lengthPx": 20.0, "angleDeg": 210.0 },
-    { "lengthPx": 20.0, "angleDeg": 330.0 }
-  ]
-}

resources/config/explosion_config.json

@@ -5,7 +5,7 @@
     "texture": "resources/spark_white.png",
     "speedRange": [10.0, 30.0],
     "zSpeedRange": [-1.0, 1.0],
-    "scaleRange": [5.0, 10.0],
+    "scaleRange": [0.5, 1.0],
     "lifeTimeRange": [200.0, 800.0],
     "emissionRate": 50.0,
     "maxParticles": 5,

resources/config/game_over.json

@@ -1,85 +1,55 @@
 {
-	"root": {
+  "root": {
-		"type": "LinearLayout",
+    "type": "LinearLayout",
-		"orientation": "vertical",
+    "orientation": "vertical",
-		"vertical_align": "center",
+    "align": "center",
-		"horizontal_align": "center",
+    "x": 0,
-		"spacing": 10,
+    "y": 0,
-		"x": 0,
+    "width": 1920,
-		"y": 0,
+    "height": 1080,
-		"width": "match_parent",
+    "background": {
-		"height": "match_parent",
+      "color": [0, 0, 0, 0.7]
-		"children": [
+    },
-			{
+    "children": [
-				"type": "Button",
+      {
-				"name": "gameOverText",
+        "type": "Button",
-				"width": 327,
+        "name": "gameOverText",
-				"height": 26,
+        "x": 350,
-				"textures": {
+        "y": 400,
-					"normal": "resources/game_over/MissionFailed.png",
+        "width": 600,
-					"hover": "resources/game_over/MissionFailed.png",
+        "height": 150,
-					"pressed": "resources/game_over/MissionFailed.png"
+        "textures": {
-				}
+          "normal": "resources/gameover.png",
-			},
+          "hover": "resources/gameover.png",
-			{
+          "pressed": "resources/gameover.png"
-				"type": "Button",
+        }
-				"name": "underlineBtn",
+      },
-				"width": 168,
+      {
-				"height": 44,
+        "type": "Button",
-				"textures": {
+        "name": "restartButton",
-					"normal": "resources/game_over/Container.png",
+        "x": 350,
-					"hover": "resources/game_over/Container.png",
+        "y": 300,
-					"pressed": "resources/game_over/Container.png"
+        "width": 300,
-				}
+        "height": 80,
-			},
+        "textures": {
-			{
+          "normal": "resources/shoot_normal.png",
-				"type": "Button",
+          "hover": "resources/shoot_normal.png",
-				"name": "finalscore",
+          "pressed": "resources/shoot_normal.png"
-				"width": 87,
+        }
-				"height": 9,
+      },
-				"textures": {
+      {
-					"normal": "resources/game_over/FinalScore.png",
+        "type": "Button",
-					"hover": "resources/game_over/FinalScore.png",
+        "name": "gameOverExitButton",
-					"pressed": "resources/game_over/FinalScore.png"
+        "x": 650,
-				}
+        "y": 300,
-			},
+        "width": 300,
-			{
+        "height": 80,
-				"type": "TextView",
+        "textures": {
-				"name": "scoreText",
+          "normal": "resources/sand2.png",
-				"width": 600,
+          "hover": "resources/sand2.png",
-				"height": 80,
+          "pressed": "resources/sand2.png"
-				"text": "0",
+        }
-				"fontSize": 36,
+      }
-				"color": [
+    ]
-					0,
+  }
-					217,
-					255,
-					1
-				],
-				"align": "center"
-			},
-			{
-				"type": "Button",
-				"name": "restartButton",
-				"width": 382,
-				"height": 56,
-				"textures": {
-					"normal": "resources/game_over/Filledbuttons.png",
-					"hover": "resources/game_over/Variant5.png",
-					"pressed": "resources/game_over/Variant6.png"
-				}
-			},
-			{
-				"type": "Button",
-				"name": "gameOverExitButton",
-				"width": 382,
-				"height": 56,
-				"textures": {
-					"normal": "resources/game_over/Secondarybutton.png",
-					"hover": "resources/game_over/Secondarybutton.png",
-					"pressed": "resources/game_over/Secondarybutton.png"
-				}
-			}
-		]
-	}
 }

resources/config/game_over_old.json

@@ -1,93 +0,0 @@
-{
-  "root": {
-    "type": "LinearLayout",
-    "orientation": "vertical",
-    "align": "center",
-    "x": 0,
-    "y": 0,
-    "width": 1920,
-    "height": 1080,
-    "background": {
-      "color": [0, 0, 0, 0.7]
-    },
-    "children": [
-      {
-        "type": "Button",
-        "name": "gameOverText",
-        "x": 476.5,
-        "y": 500,
-        "width": 327,
-        "height": 26,
-        "textures": {
-          "normal": "resources/game_over/MissionFailed.png",
-          "hover": "resources/game_over/MissionFailed.png",
-          "pressed": "resources/game_over/MissionFailed.png"
-        }
-      },
-      {
-        "type": "Button",
-        "name": "underlineBtn",
-        "x": 556,
-        "y": 465,
-        "width": 168,
-        "height": 44,
-        "textures": {
-          "normal": "resources/game_over/Container.png",
-          "hover": "resources/game_over/Container.png",
-          "pressed": "resources/game_over/Container.png"
-        }
-      },
-      {
-        "type": "Button",
-        "name": "finalscore",
-        "x": 596.5,
-        "y": 436,
-        "width": 87,
-        "height": 9,
-        "textures": {
-          "normal": "resources/game_over/FinalScore.png",
-          "hover": "resources/game_over/FinalScore.png",
-          "pressed": "resources/game_over/FinalScore.png"
-        }
-      },
-      {
-        "type": "TextView",
-        "name": "scoreText",
-        "x": 350,
-        "y": 356,
-        "width": 600,
-        "height": 80,
-        "text": "0",
-        "fontSize": 36,
-        "color": [0, 217, 255, 1],
-        "align": "center"
-      },
-      {
-        "type": "Button",
-        "name": "restartButton",
-        "x": 449,
-        "y": 308,
-        "width": 382,
-        "height": 56,
-        "textures": {
-          "normal": "resources/game_over/Filledbuttons.png",
-          "hover": "resources/game_over/Filledbuttons.png",
-          "pressed": "resources/game_over/Filledbuttons.png"
-        }
-      },
-      {
-        "type": "Button",
-        "name": "gameOverExitButton",
-        "x": 449,
-        "y": 240,
-        "width": 382,
-        "height": 56,
-        "textures": {
-          "normal": "resources/game_over/Secondarybutton.png",
-          "hover": "resources/game_over/Secondarybutton.png",
-          "pressed": "resources/game_over/Secondarybutton.png"
-        }
-      }
-    ]
-  }
-}

resources/config/main_menu.json

@@ -1,76 +0,0 @@
-{
-    "root": {
-        "type": "LinearLayout",
-        "orientation": "vertical",
-        "vertical_align": "center",
-        "horizontal_align": "center",
-        "spacing": 10,
-        "x": 0,
-        "y": 0,
-        "width": "match_parent",
-        "height": "match_parent",
-        "children": [
-            {
-                "type": "StaticImage",
-                "name": "titleBtn",
-                "width": 434,
-                "height": 35,
-                "texture": "resources/main_menu/title.png"
-            },
-            {
-                "type": "StaticImage",
-                "name": "underlineBtn",
-                "width": 168,
-                "height": 44,
-                "texture": "resources/main_menu/line.png"
-            },
-            {
-                "type": "StaticImage",
-                "name": "subtitleBtn",
-                "width": 144,
-                "height": 11,
-				"texture": "resources/main_menu/subtitle.png"
-            },
-            {
-                "type": "Button",
-                "name": "singleButton",
-                "width": 382,
-                "height": 56,
-                "textures": {
-                    "normal": "resources/main_menu/single.png",
-                    "hover": "resources/main_menu/Variant5.png",
-                    "pressed": "resources/main_menu/Variant6.png"
-                }
-            },
-            {
-                "type": "Button",
-                "name": "multiplayerButton",
-                "width": 382,
-                "height": 56,
-                "textures": {
-                    "normal": "resources/main_menu/multi.png",
-                    "hover": "resources/main_menu/Variant7.png",
-                    "pressed": "resources/main_menu/Variant8.png"
-                }
-            },
-			            {
-                "type": "Button",
-                "name": "aboutButton",
-                "width": 382,
-                "height": 56,
-                "textures": {
-                    "normal": "resources/main_menu/about.png",
-                    "hover": "resources/main_menu/about_hover.png",
-                    "pressed": "resources/main_menu/about_pressed.png"
-                }
-            },
-            {
-                "type": "StaticImage",
-                "name": "versionLabel",
-                "width": 81,
-                "height": 9,
-                "texture": "resources/main_menu/version.png"
-            }
-        ]
-    }
-}

resources/config/multiplayer_menu.json

@@ -1,158 +0,0 @@
-{
-	"root": {
-	  "type": "LinearLayout",
-	  "x": 0,
-	  "y": 0,
-	  "width": 1280,
-	  "height": 720,
-	  "children": [
-		{
-			"type": "Button",
-			"name": "langButton",
-			"x": 1100,
-			"y": 580,
-			"width": 142,
-			"height": 96,
-			"textures": {
-			  "normal": "resources/main_menu/lang.png",
-			  "hover": "resources/main_menu/lang.png",
-			  "pressed": "resources/main_menu/lang.png"
-			}
-		  },
-		  {
-			"type": "Button",
-			"name": "titleBtn",
-			"x": 512,
-			"y": 500,
-			"width": 254,
-			"height": 35,
-			"textures": {
-			  "normal": "resources/multiplayer_menu/title.png",
-			  "hover": "resources/multiplayer_menu/title.png",
-			  "pressed": "resources/multiplayer_menu/title.png"
-			}
-		  },
-		  {
-			"type": "Button",
-			"name": "subtitle",
-			"x": 596.5,
-			"y": 470,
-			"width": 87,
-			"height": 11,
-			"textures": {
-			  "normal": "resources/multiplayer_menu/JoinServer.png",
-			  "hover": "resources/multiplayer_menu/JoinServer.png",
-			  "pressed": "resources/multiplayer_menu/JoinServer.png"
-			}
-		  },
-		  {
-			"type": "Button",
-			"name": "subtitleBtn",
-			"x": 450,
-			"y": 445,
-			"width": 94,
-			"height": 9,
-			"textures": {
-			  "normal": "resources/multiplayer_menu/ServerName.png",
-			  "hover": "resources/multiplayer_menu/ServerName.png",
-			  "pressed": "resources/multiplayer_menu/ServerName.png"
-			}
-		  },
-		{
-		  "type": "TextField",
-		  "name": "serverInputField",
-		  "x": 449,
-		  "y": 390,
-		  "width": 382,
-		  "height": 56,
-		  "placeholder": "Enter server name or IP",
-		  "fontPath": "resources/fonts/DroidSans.ttf",
-		  "fontSize": 16,
-		  "maxLength": 256,
-		  "color": [122, 156, 198, 1],
-		  "placeholderColor": [122, 156, 198, 1],
-		  "backgroundColor": [15, 29, 51, 1],
-		  "borderColor": [15, 29, 51, 1]
-		},
-		{
-			"type": "Button",
-			"name": "connectButton",
-			"x": 449,
-			"y": 350,
-			"width": 382,
-			"height": 56,
-			"textures": {
-			  "normal": "resources/multiplayer_menu/Filledbuttons.png",
-			  "hover": "resources/multiplayer_menu/Filledbuttons.png",
-			  "pressed": "resources/multiplayer_menu/Filledbuttons.png"
-			}
-		  },
-
-			{
-			  "type": "Button",
-			  "name": "backButton",
-			  "x": 449,
-			  "y": 280,
-			  "width": 382,
-			  "height": 56,
-			  "textures": {
-				"normal": "resources/multiplayer_menu/Backbutton.png",
-				"hover": "resources/multiplayer_menu/Backbutton.png",
-				"pressed": "resources/multiplayer_menu/Backbutton.png"
-			  }
-			},
-			{
-				"type": "Button",
-				"name": "AvailableServers",
-				"x": 450,
-				"y": 240,
-				"width": 139,
-				"height": 9,
-				"textures": {
-				  "normal": "resources/multiplayer_menu/AvailableServers.png",
-				  "hover": "resources/multiplayer_menu/AvailableServers.png",
-				  "pressed": "resources/multiplayer_menu/AvailableServers.png"
-				}
-			  },
-			  {
-				"type": "Button",
-				"name": "SerButton",
-				"x": 436.5,
-				"y": 170,
-				"width": 407,
-				"height": 62,
-				"textures": {
-				  "normal": "resources/multiplayer_menu/Button.png",
-				  "hover": "resources/multiplayer_menu/Button.png",
-				  "pressed": "resources/multiplayer_menu/Button.png"
-				}
-			  },
-			  {
-				"type": "Button",
-				"name": "SerButton2",
-				"x": 436.5,
-				"y": 88,
-				"width": 407,
-				"height": 62,
-				"textures": {
-				  "normal": "resources/multiplayer_menu/Button2.png",
-				  "hover": "resources/multiplayer_menu/Button2.png",
-				  "pressed": "resources/multiplayer_menu/Button2.png"
-				}
-			  },
-			  {
-				"type": "Button",
-				"name": "SerButton3",
-				"x": 436.5,
-				"y": 6,
-				"width": 407,
-				"height": 62,
-				"textures": {
-				  "normal": "resources/multiplayer_menu/Button3.png",
-				  "hover": "resources/multiplayer_menu/Button3.png",
-				  "pressed": "resources/multiplayer_menu/Button3.png"
-				}
-			  }
-		  ]
-	}
-  }

resources/config/ship_selection_menu.json

@@ -1,66 +0,0 @@
-{
-	"root": {
-		"type": "LinearLayout",
-		"orientation": "vertical",
-		"vertical_align": "center",
-		"horizontal_align": "center",
-		"spacing": 10,
-		"x": 0,
-		"y": 0,
-		"width": "match_parent",
-		"height": "match_parent",
-		"children": [
-			{
-				"type": "StaticImage",
-				"name": "titleBtn",
-				"width": 266,
-				"height": 66,
-				"texture": "resources/select_your_ship.png"
-			},
-			{
-				"type": "LinearLayout",
-				"orientation": "horizontal",
-				"vertical_align": "center",
-				"horizontal_align": "center",
-				"spacing": 10,
-				"width": "match_parent",
-				"height": 260,
-				"children": [
-					{
-						"type": "Button",
-						"name": "spaceshipButton",
-						"width": 256,
-						"height": 256,
-						"textures": {
-							"normal": "resources/multiplayer_menu/ship_fighter.png",
-							"hover": "resources/multiplayer_menu/ship_fighter_pressed.png",
-							"pressed": "resources/multiplayer_menu/ship_fighter_pressed.png"
-						}
-					},
-					{
-						"type": "Button",
-						"name": "cargoshipButton",
-						"width": 256,
-						"height": 256,
-						"textures": {
-							"normal": "resources/multiplayer_menu/ship_cargo.png",
-							"hover": "resources/multiplayer_menu/ship_cargo_pressed.png",
-							"pressed": "resources/multiplayer_menu/ship_cargo_pressed.png"
-						}
-					}
-				]
-			},
-			{
-				"type": "Button",
-				"name": "backButton",
-				"width": 382,
-				"height": 56,
-				"textures": {
-					"normal": "resources/multiplayer_menu/Backbutton.png",
-					"hover": "resources/multiplayer_menu/Backbutton.png",
-					"pressed": "resources/multiplayer_menu/Backbutton.png"
-				}
-			}
-		]
-	}
-}

resources/config/spark_config.json

@@ -1,14 +1,22 @@
 {
-    "emissionRate": 1.2,
+    "emissionRate": 100.0,
-    "maxParticles": 400,
+    "maxParticles": 200,
     "particleSize": 0.3,
     "biasX": 0.3,
     "emissionPoints": [
+        {
+            "position": [-1.3, 0, 0.0]
+        },
+        {
+            "position": [1.3, 0.0, 0.0]
+        }
     ],
     "speedRange": [0.5, 2.0],
     "zSpeedRange": [1.0, 3.0],
     "scaleRange": [0.8, 1.2],
-    "lifeTimeRange": [300.0, 500.0],
+    "lifeTimeRange": [600.0, 1400.0],
     "texture": "resources/spark.png",
-    "shaderProgramName": "spark"
+    "shaderProgramName": "default",
+    "vertexShader": "resources/shaders/spark.vertex",
+    "fragmentShader": "resources/shaders/spark.fragment"
 }

resources/config/spark_config_cargo.json

@@ -1,20 +0,0 @@
-{
-    "emissionRate": 1.2,
-    "maxParticles": 400,
-    "particleSize": 0.3,
-    "biasX": 0.3,
-    "emissionPoints": [
-        {
-            "position": [0.0, 2.8, -3.5]
-        },
-        {
-            "position": [0.0, 1.5, -3.5]
-        }
-    ],
-    "speedRange": [0.5, 2.0],
-    "zSpeedRange": [1.0, 3.0],
-    "scaleRange": [0.8, 1.2],
-    "lifeTimeRange": [600.0, 1400.0],
-    "texture": "resources/spark.png",
-    "shaderProgramName": "spark"
-}

resources/config/spark_projectile_config.json

@@ -2,14 +2,14 @@
     "emissionPoints": [
       { "position": [0.0, 0.0, 0.0] }
     ],
-    "texture": "resources/spark2.png",
+    "texture": "resources/spark_white.png",
-    "speedRange": [5.0, 10.0],
+    "speedRange": [10.0, 30.0],
     "zSpeedRange": [-1.0, 1.0],
-    "scaleRange": [0.5, 2.0],
+    "scaleRange": [0.5, 1.0],
     "lifeTimeRange": [200.0, 800.0],
-    "emissionRate": 30.0,
+    "emissionRate": 50.0,
-    "maxParticles": 150,
+    "maxParticles": 10,
-    "particleSize": 1.0,
+    "particleSize": 0.09,
     "biasX": 0.1,
     "shaderProgramName": "default"
   }

resources/config/ui.json

@@ -1,163 +1,169 @@
 {
 	"root": {
-		"type": "FrameLayout",
+	  "type": "FrameLayout",
-		"x": 0,
+	  "x": 0,
-		"y": 0,
+	  "y": 0,
-		"width": "match_parent",
+	  "width": 1280,
-		"height": "match_parent",
+	  "height": 720,
-		"children": [
+	  "children": [
+		{
+		  "type": "FrameLayout",
+		  "name": "leftPanel",
+		  "x": 100,
+		  "y": 100,
+		  "width": 320,
+		  "height": 400,
+		  "children": [
 			{
-				"type": "TextView",
+			  "type": "LinearLayout",
-				"name": "gameScoreText",
+			  "name": "mainButtons",
-				"x": 0,
+			  "orientation": "vertical",
-				"y": 30,
+			  "spacing": 10,
-				"width": 200,
+			  "x": 0,
-				"height": 60,
+			  "y": 0,
-				"horizontal_gravity": "left",
+			  "width": 300,
-				"vertical_gravity": "top",
+			  "height": 300,
-				"text": "Score: 0",
+			  "children": [
-				"fontSize": 36,
+				{
-				"color": [
+				  "type": "Button",
-					0,
+				  "name": "playButton",
-					217,
+				  "x": -1000,
-					255,
+				  "y": 500,
-					1
+				  "width": 200,
-				],
+				  "height": 50,
-				"centered": false
+				  "animations": {
-			},
+					"buttonsExit": {
-			{
+					  "repeat": false,
-				"type": "Button",
+					  "steps": [
-				"name": "showPlayersButton",
+						{
-				"x": 0,
+						  "type": "move",
-				"y": 100,
+						  "to": [
-				"width": 150,
+							-400,
-				"height": 150,
+							0
-				"horizontal_gravity": "left",
+						  ],
-				"vertical_gravity": "top",
+						  "duration": 1.0,
-				"textures": {
+						  "easing": "easein"
-					"normal": "resources/button_players.png",
+						}
-					"hover": "resources/button_players.png",
+					  ]
-					"pressed": "resources/button_players.png",
+					}
-					"disabled": "resources/button_players_disabled.png"
+				  },
-				}
+				  "textures": {
-			},
+					"normal": "./resources/sand2.png",
-			{
+					"hover": "./resources/sand2.png",
-				"type": "Button",
+					"pressed": "./resources/sand2.png"
-				"name": "inverseMouseButton",
+				  }
-				"x": 0,
+				},
-				"y": 100,
+				{
-				"width": 150,
+				  "type": "Button",
-				"height": 150,
+				  "name": "settingsButton",
-				"border" : 20,
+				  "x": -1000,
-				"horizontal_gravity": "right",
+				  "y": 400,
-				"vertical_gravity": "top",
+				  "width": 200,
-				"textures": {
+				  "height": 50,
-					"normal": "resources/button_invmouse.png",
+				  "animations": {
-					"hover": "resources/button_invmouse.png",
+					"buttonsExit": {
-					"pressed": "resources/button_invmouse_pressed.png",
+					  "repeat": false,
-					"disabled": "resources/button_invmouse.png"
+					  "steps": [
-				}
+						{
-			},
+						  "type": "wait",
-			{
+						  "duration": 0.5
-				"type": "Button",
+						},
-				"name": "infoButton",
+						{
-				"x": 0,
+						  "type": "move",
-				"y": 250,
+						  "to": [
-				"width": 150,
+							-400,
-				"height": 150,
+							0
-				"border" : 20,
+						  ],
-				"horizontal_gravity": "left",
+						  "duration": 1.0,
-				"vertical_gravity": "top",
+						  "easing": "easein"
-				"textures": {
+						}
-					"normal": "resources/button_info.png",
+					  ]
-					"hover": "resources/button_info.png",
+					}
-					"pressed": "resources/button_info_pressed.png",
+				  },
-					"disabled": "resources/button_info.png"
+				  "textures": {
-				}
+					"normal": "./resources/sand2.png",
-			},
+					"hover": "./resources/sand2.png",
-			{
+					"pressed": "./resources/sand2.png"
-				"type": "Button",
+				  }
-				"name": "shootButton",
+				},
-				"x": 0,
+				{
-				"y": 0,
+				  "type": "Button",
-				"width": 150,
+				  "name": "exitButton",
-				"height": 150,
+				  "x": -1000,
-				"horizontal_gravity": "right",
+				  "y": 300,
-				"vertical_gravity": "bottom",
+				  "width": 200,
-				"textures": {
+				  "height": 50,
-					"normal": "resources/fire.png",
+				  "animations": {
-					"hover": "resources/fire.png",
+					"buttonsExit": {
-					"pressed": "resources/fire2.png",
+					  "repeat": false,
-					"disabled": "resources/fire_disabled.png"
+					  "steps": [
-				}
+						{
-			},
+						  "type": "wait",
-			{
+						  "duration": 1.0
-				"type": "Button",
+						},
-				"name": "shootButton2",
+						{
-				"x": 0,
+						  "type": "move",
-				"y": 0,
+						  "to": [
-				"width": 150,
+							-400,
-				"height": 150,
+							0
-				"horizontal_gravity": "left",
+						  ],
-				"vertical_gravity": "bottom",
+						  "duration": 1.0,
-				"textures": {
+						  "easing": "easein"
-					"normal": "resources/fire.png",
+						}
-					"hover": "resources/fire.png",
+					  ]
-					"pressed": "resources/fire2.png",
+					},
-					"disabled": "resources/fire_disabled.png"
+					"bgScroll": {
-				}
+					  "repeat": true,
-			},
+					  "steps": [
-			{
+						{
-				"type": "Button",
+						  "type": "move",
-				"name": "minusButton",
+						  "to": [
-				"x": -20,
+							1280,
-				"y": 110,
+							0
-				"width": 150,
+						  ],
-				"height": 150,
+						  "duration": 5.0,
-				"border" : 20,
+						  "easing": "linear"
-				"horizontal_gravity": "right",
+						}
-				"vertical_gravity": "bottom",
+					  ]
-				"textures": {
+					}
-					"normal": "resources/button_minus.png",
+				  },
-					"hover": "resources/button_minus.png",
+				  "textures": {
-					"pressed": "resources/button_minus_pressed.png",
+					"normal": "./resources/sand2.png",
-					"disabled" : "resources/button_minus_disabled.png"
+					"hover": "./resources/sand2.png",
-				}
+					"pressed": "./resources/sand2.png"
-			},
+				  }
-			{
-				"type": "Button",
-				"name": "plusButton",
-				"x": -20,
-				"y": 220,
-				"width": 150,
-				"height": 150,
-				"border" : 20,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "bottom",
-				"textures": {
-					"normal": "resources/button_plus.png",
-					"hover": "resources/button_plus.png",
-					"pressed": "resources/button_plus_pressed.png",
-					"disabled" : "resources/button_plus_disabled.png"
-				}
-			},
-			{
-				"type": "Button",
-				"name": "takeButton",
-				"x": -20,
-				"y": 320,
-				"width": 150,
-				"height": 150,
-				"border" : 20,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "bottom",
-				"textures": {
-					"normal": "resources/button_take.png",
-					"hover": "resources/button_take.png",
-					"pressed": "resources/button_take_pressed.png",
-					"disabled" : "resources/button_take_disabled.png"
 				}
+			  ]
 			}
-		]
+		  ]
+		},
+		{
+			"type": "Slider",
+			"name": "velocitySlider",
+			"x": 1140,
+			"y": 100,
+			"width": 50,
+			"height": 500,
+			"value": 0.0,
+			"orientation": "vertical",
+			"textures": {
+				"track": "resources/velocitySliderTexture.png",
+				"knob": "resources/velocitySliderButton.png"
+			}
+		},
+		{
+				  "type": "Button",
+				  "name": "shootButton",
+				  "x": 1115,
+				  "y": 0,
+				  "width": 100,
+				  "height": 100,
+				  "textures": {
+					  "normal": "resources/shoot_normal.png",
+					  "hover": "resources/shoot_hover.png",
+					  "pressed": "resources/shoot_pressed.png"
+				  }
+			  }
+	  ]
 	}
-}
+  }

resources/config/ui_old.json

@@ -1,194 +0,0 @@
-{
-	"root": {
-	  "type": "FrameLayout",
-	  "x": 0,
-	  "y": 0,
-	  "width": 1280,
-	  "height": 720,
-	  "children": [
-		{
-		  "type": "FrameLayout",
-		  "name": "leftPanel",
-		  "x": 100,
-		  "y": 100,
-		  "width": 320,
-		  "height": 400,
-		  "children": [
-			{
-			  "type": "LinearLayout",
-			  "name": "mainButtons",
-			  "orientation": "vertical",
-			  "spacing": 10,
-			  "x": 0,
-			  "y": 0,
-			  "width": 300,
-			  "height": 300,
-			  "children": [
-				{
-				  "type": "Button",
-				  "name": "playButton",
-				  "x": -1000,
-				  "y": 500,
-				  "width": 200,
-				  "height": 50,
-				  "animations": {
-					"buttonsExit": {
-					  "repeat": false,
-					  "steps": [
-						{
-						  "type": "move",
-						  "to": [
-							-400,
-							0
-						  ],
-						  "duration": 1.0,
-						  "easing": "easein"
-						}
-					  ]
-					}
-				  },
-				  "textures": {
-					"normal": "./resources/sand2.png",
-					"hover": "./resources/sand2.png",
-					"pressed": "./resources/sand2.png"
-				  }
-				},
-				{
-				  "type": "Button",
-				  "name": "settingsButton",
-				  "x": -1000,
-				  "y": 400,
-				  "width": 200,
-				  "height": 50,
-				  "animations": {
-					"buttonsExit": {
-					  "repeat": false,
-					  "steps": [
-						{
-						  "type": "wait",
-						  "duration": 0.5
-						},
-						{
-						  "type": "move",
-						  "to": [
-							-400,
-							0
-						  ],
-						  "duration": 1.0,
-						  "easing": "easein"
-						}
-					  ]
-					}
-				  },
-				  "textures": {
-					"normal": "./resources/sand2.png",
-					"hover": "./resources/sand2.png",
-					"pressed": "./resources/sand2.png"
-				  }
-				},
-				{
-				  "type": "Button",
-				  "name": "exitButton",
-				  "x": -1000,
-				  "y": 300,
-				  "width": 200,
-				  "height": 50,
-				  "animations": {
-					"buttonsExit": {
-					  "repeat": false,
-					  "steps": [
-						{
-						  "type": "wait",
-						  "duration": 1.0
-						},
-						{
-						  "type": "move",
-						  "to": [
-							-400,
-							0
-						  ],
-						  "duration": 1.0,
-						  "easing": "easein"
-						}
-					  ]
-					},
-					"bgScroll": {
-					  "repeat": true,
-					  "steps": [
-						{
-						  "type": "move",
-						  "to": [
-							1280,
-							0
-						  ],
-						  "duration": 5.0,
-						  "easing": "linear"
-						}
-					  ]
-					}
-				  },
-				  "textures": {
-					"normal": "./resources/sand2.png",
-					"hover": "./resources/sand2.png",
-					"pressed": "./resources/sand2.png"
-				  }
-				}
-			  ]
-			}
-		  ]
-		},
-		{
-			"type": "Slider",
-			"name": "velocitySlider",
-			"x": 1140,
-			"y": 300,
-			"width": 50,
-			"height": 300,
-			"value": 0.0,
-			"orientation": "vertical",
-			"textures": {
-				"track": "resources/velocitySliderTexture.png",
-				"knob": "resources/velocitySliderButton.png"
-			}
-		},
-		{
-				  "type": "Button",
-				  "name": "shootButton",
-				  "x": 100,
-				  "y": 100,
-				  "width": 100,
-				  "height": 100,
-				  "textures": {
-					  "normal": "resources/shoot_normal.png",
-					  "hover": "resources/shoot_hover.png",
-					  "pressed": "resources/shoot_pressed.png"
-				  }
-		},
-		{
-				  "type": "Button",
-				  "name": "shootButton2",
-				  "x": 1000,
-				  "y": 100,
-				  "width": 100,
-				  "height": 100,
-				  "textures": {
-					  "normal": "resources/shoot_normal.png",
-					  "hover": "resources/shoot_hover.png",
-					  "pressed": "resources/shoot_pressed.png"
-				  }
-		},
-		{
-			"type": "TextView",
-			"name": "velocityText",
-			"x": 10,
-			"y": 10,
-			"width": 200,
-			"height": 40,
-			"text": "Velocity: 0",
-			"fontSize": 24,
-			"color": [1.0, 1.0, 1.0, 1.0],
-			"centered": false
-		}
-	  ]
-	}
-  }

resources/config/ui_with_help.json

@@ -1,163 +0,0 @@
-{
-	"root": {
-		"type": "FrameLayout",
-		"x": 0,
-		"y": 0,
-		"width": "match_parent",
-		"height": "match_parent",
-		"children": [
-			{
-				"type": "StaticImage",
-				"name": "showPlayersButton_help",
-				"x": 0,
-				"y": 100,
-				"width": 150,
-				"height": 150,
-				"horizontal_gravity": "left",
-				"vertical_gravity": "top",
-				"texture": "resources/button_players.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "infoButton_help",
-				"x": 0,
-				"y": 250,
-				"width": 150,
-				"height": 150,
-				"border" : 20,
-				"horizontal_gravity": "left",
-				"vertical_gravity": "top",
-				"texture":"resources/button_info.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "infoButtonTopLeft_help",
-				"x": 0,
-				"y": 0,
-				"width": 300,
-				"height": 400,
-				"border" : 0,
-				"horizontal_gravity": "left",
-				"vertical_gravity": "top",
-				"texture": "resources/help_top_left.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "inverseMouseButton_help",
-				"x": 0,
-				"y": 100,
-				"width": 150,
-				"height": 150,
-				"border" : 20,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "top",
-				"texture": "resources/button_invmouse.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "infoButtonTopRight_help",
-				"x": 0,
-				"y": 0,
-				"width": 300,
-				"height": 230,
-				"border" : 0,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "top",
-				"texture": "resources/help_top_right.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "infoButtonBottomLeft_help",
-				"x": 0,
-				"y": 0,
-				"width": 300,
-				"height": 200,
-				"border" : 0,
-				"horizontal_gravity": "left",
-				"vertical_gravity": "bottom",
-				"texture": "resources/help_bottom_left.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "shootButton_help",
-				"x": 0,
-				"y": 0,
-				"width": 150,
-				"height": 150,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "bottom",
-				"texture": "resources/fire.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "shootButton2_help",
-				"x": 0,
-				"y": 0,
-				"width": 150,
-				"height": 150,
-				"horizontal_gravity": "left",
-				"vertical_gravity": "bottom",
-				"texture": "resources/fire.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "minusButton_help",
-				"x": -20,
-				"y": 110,
-				"width": 150,
-				"height": 150,
-				"border" : 20,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "bottom",
-				"texture": "resources/button_minus.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "plusButton_help",
-				"x": -20,
-				"y": 220,
-				"width": 150,
-				"height": 150,
-				"border" : 20,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "bottom",
-				"texture": "resources/button_plus.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "takeButton_help",
-				"x": -20,
-				"y": 320,
-				"width": 150,
-				"height": 150,
-				"border" : 20,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "bottom",
-				"texture": "resources/button_take.png"
-			},
-			{
-				"type": "StaticImage",
-				"name": "infoButtonBottomRight_help",
-				"x": 0,
-				"y": 0,
-				"width": 300,
-				"height": 450,
-				"border" : 0,
-				"horizontal_gravity": "right",
-				"vertical_gravity": "bottom",
-				"texture": "resources/help_bottom_right.png"
-			},
-			{
-				"type": "Button",
-				"name": "infoButtonUnderlying_help",
-				"x": 0,
-				"y": 0,
-				"width": "match_parent",
-				"height": "match_parent",
-				"border" : 0,
-				"textures": {
-				}
-			}
-		]
-	}
-}