Skip to content

Fix setup script filament check #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Raphalsk050 merged 1 commit into from
Feb 15, 2026
Merged

Fix setup script filament check #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/config/input_bindings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"version": 2,
"contexts": [
"global",
"sandbox.third_person",
"engine",
"engine.console",
"sandbox.third_person"
"engine.console"
],
"maps": [
{
Expand Down
8 changes: 4 additions & 4 deletions engine/include/Version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
19 changes: 14 additions & 5 deletions scripts/setup.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="
Expand All @@ -61,19 +62,27 @@ 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:
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%...
Expand Down
12 changes: 11 additions & 1 deletion scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading