diff --git a/assets/config/input_bindings.json b/assets/config/input_bindings.json index bca35074..f824862e 100644 --- a/assets/config/input_bindings.json +++ b/assets/config/input_bindings.json @@ -2,9 +2,9 @@ "version": 2, "contexts": [ "global", + "sandbox.third_person", "engine", - "engine.console", - "sandbox.third_person" + "engine.console" ], "maps": [ { diff --git a/engine/include/Version.h b/engine/include/Version.h index 916cc0d4..4fecc319 100644 --- a/engine/include/Version.h +++ b/engine/include/Version.h @@ -1,8 +1,8 @@ #pragma once #define SIMPLEENGINE_VERSION_MAJOR 0 -#define SIMPLEENGINE_VERSION_MINOR 1 -#define SIMPLEENGINE_VERSION_PATCH 1 -#define SIMPLEENGINE_VERSION_STRING "0.1.1" -#define SIMPLEENGINE_GIT_HASH "5ecbab7" +#define SIMPLEENGINE_VERSION_MINOR 2 +#define SIMPLEENGINE_VERSION_PATCH 0 +#define SIMPLEENGINE_VERSION_STRING "0.2.0" +#define SIMPLEENGINE_GIT_HASH "6cbb60f" #define SIMPLEENGINE_BUILD_TYPE "Debug" diff --git a/scripts/setup.bat b/scripts/setup.bat index 8742f6fc..7f17d5e5 100644 --- a/scripts/setup.bat +++ b/scripts/setup.bat @@ -43,7 +43,8 @@ if defined VCVARS_PATH ( echo Build may fail until MSVC tools are installed. ) -if exist "%FILAMENT_DIR%\lib" if exist "%FILAMENT_DIR%\include" ( +call :is_filament_ready +if not errorlevel 1 ( echo. echo Filament SDK already present at "%FILAMENT_DIR%" set "REDOWNLOAD=" @@ -61,12 +62,14 @@ if exist "%FILAMENT_DIR%\lib" if exist "%FILAMENT_DIR%\include" ( echo. echo === Setup Complete === -if exist "%FILAMENT_DIR%\lib\x86_64" ( +if exist "%FILAMENT_DIR%\lib\x86_64\filament.lib" ( echo [OK] Filament SDK (x86_64) -) else if exist "%FILAMENT_DIR%\lib\arm64" ( - echo [OK] Filament SDK (arm64) ) else ( - echo [WARN] Filament SDK present, but no expected library directory was found. + if exist "%FILAMENT_DIR%\lib\arm64\filament.lib" ( + echo [OK] Filament SDK (arm64) + ) else ( + echo [WARN] Filament SDK present, but no expected library directory was found. + ) ) echo. echo To build: @@ -74,6 +77,12 @@ echo scripts\build.bat echo. exit /b 0 +:is_filament_ready +if not exist "%FILAMENT_DIR%\include\filament\Engine.h" exit /b 1 +if exist "%FILAMENT_DIR%\lib\x86_64\filament.lib" exit /b 0 +if exist "%FILAMENT_DIR%\lib\arm64\filament.lib" exit /b 0 +exit /b 1 + :download_filament echo. echo Downloading Filament SDK %FILAMENT_VERSION%... diff --git a/scripts/setup.sh b/scripts/setup.sh index 50ce104a..22f5a618 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -110,6 +110,16 @@ esac # ─── Download Filament SDK ──────────────────────────────────── +is_filament_ready() { + [ -f "$FILAMENT_DIR/include/filament/Engine.h" ] || return 1 + + if [ -f "$FILAMENT_DIR/lib/x86_64/libfilament.a" ] || [ -f "$FILAMENT_DIR/lib/arm64/libfilament.a" ]; then + return 0 + fi + + return 1 +} + download_filament() { # Determina o asset correto baseado na plataforma case "$OS" in @@ -152,7 +162,7 @@ download_filament() { } # Verifica se o Filament já está instalado -if [ -d "$FILAMENT_DIR/lib" ] && [ -d "$FILAMENT_DIR/include" ]; then +if is_filament_ready; then echo "" echo ">>> Filament SDK already present at $FILAMENT_DIR" read -p " Re-download? [y/N] " -n 1 -r