Skip to content

20241108 new #102

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.

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

Draft
wants to merge 48 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a544c63
Change gitignore to ignore devtools and .vs folder. Alao add larger t…
CodeLikeCXK Nov 8, 2024
01c10f8
Initial attempt of windows arm64 support (with vs2019 toolchain repla…
CodeLikeCXK Nov 9, 2024
4403577
Initial batch files for building windows on arm64 without changing ja…
CodeLikeCXK Nov 9, 2024
fe7e0e7
Add the missing UI shader
CodeLikeCXK Nov 9, 2024
b9d0b0e
Revert "Initial attempt of windows arm64 support (with vs2019 toolcha…
CodeLikeCXK Nov 9, 2024
43e88b5
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Nov 14, 2024
4477ec4
Lower the resolution scale for SGSR
CodeLikeCXK Nov 14, 2024
acbffb6
Merge branch '20241108_New' of https://github.com/CodeLikeCXK/DagorEn…
CodeLikeCXK Nov 14, 2024
1742648
Update build_GITest_WindowsOnArm64.cmd
CodeLikeCXK Nov 14, 2024
c5131bc
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Nov 19, 2024
9914bf3
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Nov 22, 2024
37e168a
Extra WOA added
CodeLikeCXK Nov 27, 2024
2f7f32e
Merge branch 'main' into 20241108_New
CodeLikeCXK Nov 27, 2024
6af812f
Remove a dx12 error (since the app it's running normally)
CodeLikeCXK Nov 30, 2024
6ee1a49
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 1, 2024
7cd116a
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 3, 2024
3c3fcbb
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 4, 2024
67ef4b0
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 4, 2024
ce097e3
Add batch file for OuterSpace in WOA. Also neglect one error in dx12
CodeLikeCXK Dec 4, 2024
7b0c72e
Merge branch '20241108_New' of https://github.com/CodeLikeCXK/DagorEn…
CodeLikeCXK Dec 4, 2024
c25f1f1
Merge branch '20241108_New' of https://github.com/CodeLikeCXK/DagorEn…
CodeLikeCXK Dec 4, 2024
de2f7b5
Modify setup.jam for daNetGame for compiling natively on windows arm6…
CodeLikeCXK Dec 4, 2024
5e03387
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 5, 2024
ff46938
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 5, 2024
9663326
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 7, 2024
d343d7d
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 9, 2024
1fe4389
Delete build_all.cmd
CodeLikeCXK Dec 13, 2024
7502d1d
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 13, 2024
4592cb7
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 13, 2024
eb19c49
Pipeline.cpp error neglected
CodeLikeCXK Dec 13, 2024
bde108f
Merge branch 'main' into 20241108_New
CodeLikeCXK Dec 14, 2024
2581259
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 16, 2024
5abbe74
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 21, 2024
04d33d4
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 25, 2024
2bf6dc3
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Dec 28, 2024
d9ae80b
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Jan 14, 2025
314a141
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Jan 15, 2025
f3d760a
Changes to make editor landscape tools compile on windows arm64
CodeLikeCXK Jan 21, 2025
8132929
Merge branch 'main' into 20241108_New
CodeLikeCXK Jan 21, 2025
c335adc
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Jan 21, 2025
2b1763c
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Jan 22, 2025
6e7ee7b
Add skies.selongtitude console command
CodeLikeCXK Jan 22, 2025
4eb8c8d
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Apr 9, 2025
33eb50c
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Apr 16, 2025
6aedb2e
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Apr 18, 2025
4555327
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK Apr 25, 2025
3fe4585
Merge branch 'GaijinEntertainment:main' into 20241108_New
CodeLikeCXK May 16, 2025
dff2671
Change gi option in setting for outerspace
CodeLikeCXK May 20, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
/outerSpace/fmod_project
/outerSpace/application.blk
/_output/
/devtools/
/.vs/
/prog/platform.jam
*.pyc
*.das.inl
Expand Down
49 changes: 49 additions & 0 deletions build_GITest.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
pushd prog\tools
call build_dagor_cdk_mini.cmd
if errorlevel 1 (
echo build_dagor3_cdk_mini.cmd failed, trying once more...
call build_dagor_cdk_mini.cmd
)
if errorlevel 1 (
echo failed to build CDK, stop!
exit /b 1
)
pause
popd

pushd prog\tools\dargbox
call create_vfsroms.bat
cd shaders
call compile_shaders_pc11.bat
call compile_shaders_metal.bat
call compile_shaders_spirV.bat
popd

pushd prog\samples\physTest
jam
jam -f jamfile-test-jolt
cd shaders
call compile_game_shaders-dx11.bat
call compile_game_shaders-metal.bat
call compile_game_shaders-spirv.bat
popd

pushd samples\skiesSample\prog
jam
cd shaders
call compile_shaders_dx12.bat
call compile_shaders_dx11.bat
call compile_shaders_metal.bat
call compile_shaders_spirv.bat
call compile_shaders_tools.bat
popd

pushd samples\testGI\prog
jam
cd shaders
call compile_shaders_dx12.bat
call compile_shaders_dx11.bat
call compile_shaders_metal.bat
call compile_shaders_spirv.bat
call compile_shaders_tools.bat
popd
6 changes: 6 additions & 0 deletions build_GITest_WindowsOnArm64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pushd samples\testGI\prog
jam -sPlatformArch=arm64 -sPlatformSpec=vc17
cd shaders
call compile_shaders_dx12_WOA.bat
call compile_shaders_dx11_WOA.bat
popd
7 changes: 7 additions & 0 deletions build_Physics_WindowsOnArm64 - 副本.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pushd prog\samples\physTest
jam -sPlatformArch=arm64 -sPlatformSpec=vc17
jam -sPlatformArch=arm64 -sPlatformSpec=vc17 -f jamfile-test-jolt
cd shaders
call compile_game_shaders-dx11_WOA.bat
pause
popd
6 changes: 6 additions & 0 deletions build_ShaderComplier_WindowsOnArm64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pushd prog\tools\ShaderCompiler2
jam -sPlatformArch=arm64 -sPlatformSpec=vc17
jam -sPlatformArch=arm64 -sPlatformSpec=vc17 -f jamfile-dx12
jam -sPlatformArch=arm64 -sPlatformSpec=vc17 -f jamfile-hlsl2spirv
pause
popd
58 changes: 58 additions & 0 deletions build_all_WindowsOnArm64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
pushd prog\tools
call build_dagor_cdk_mini_WindowsOnArm64.cmd
if errorlevel 1 (
echo build_dagor3_cdk_mini.cmd failed, trying once more...
call build_dagor_cdk_mini_WindowsOnArm64.cmd
)
if errorlevel 1 (
echo failed to build CDK, stop!
pause
exit /b 1
)
pause
popd

pushd prog\tools\dargbox
call create_vfsroms_WoA64.bat
cd shaders
call compile_shaders_pc11.bat
call compile_shaders_metal.bat
call compile_shaders_spirV.bat
popd

pushd prog\samples\physTest
jam -sPlatformArch=arm64 -sPlatformSpec=vc17
jam -sPlatformArch=arm64 -sPlatformSpec=vc17 -f jamfile-test-jolt
cd shaders
call compile_game_shaders-dx11_WOA.bat
popd

pushd samples\skiesSample\prog
jam -sPlatformArch=arm64 -sPlatformSpec=vc17
cd shaders
call compile_shaders_dx12_WOA.bat
call compile_shaders_dx11_WOA.bat
popd

pushd samples\testGI\prog
jam -sPlatformArch=arm64 -sPlatformSpec=vc17
cd shaders
call compile_shaders_dx12_WOA.bat
call compile_shaders_dx11_WOA.bat
popd

pushd outerSpace\prog
call build_aot_compiler_arm64.cmd
jam -sNeedDasAotCompile=yes
jam -sNeedDasAotCompile=yes -sDedicated=yes
jam -f jamfile-decrypt
call compile_all_prog_vromfs_arm64.cmd
cd shaders
call compile_shaders_dx11_WOA.bat
call compile_shaders_tools_WOA.bat
cd ..\..\develop\gui
call build_ui.cmd
popd
pushd outerSpace\prog\utils\dev_launcher
call create_vfsroms.bat
popd
9 changes: 9 additions & 0 deletions build_dngSceneViewer_WindowsOnArm64 .cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pushd samples\dngSceneViewer\prog
jam -sPlatformArch=arm64 -sPlatformSpec=vc17
pause
call compile_all_prog_vromfs_WOA.cmd
cd shaders
call compile_shaders_dx11_WOA.bat
call compile_shaders_tools_WOA.bat
pause
popd
14 changes: 14 additions & 0 deletions build_outerSpace_WindowsOnArm64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pushd outerSpace\prog
call build_aot_compiler_arm64.cmd
jam -sNeedDasAotCompile=yes -sPlatformArch=arm64 -sPlatformSpec=vc17
jam -sNeedDasAotCompile=yes -sDedicated=yes -sPlatformArch=arm64 -sPlatformSpec=vc17
jam -f jamfile-decrypt -sPlatformArch=arm64 -sPlatformSpec=vc17
call compile_all_prog_vromfs-arm64.cmd
cd shaders
call compile_shaders_dx11_WOA.bat
call compile_shaders_tools_WOA.bat
cd ..\..\develop\gui
call build_ui.cmd
popd
call create_vfsroms.bat
popd
12 changes: 12 additions & 0 deletions build_tools_x64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
pushd prog\tools
call build_dagor_cdk_mini.cmd
if errorlevel 1 (
echo build_dagor3_cdk_mini.cmd failed, trying once more...
call build_dagor_cdk_mini.cmd
)
if errorlevel 1 (
echo failed to build CDK, stop!
exit /b 1
)
pause
popd
3 changes: 3 additions & 0 deletions outerSpace/prog/build_aot_compiler_arm64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
jam -sRoot=../.. -sProjectLocation=outerSpace/prog -sTarget=outer_space-aot -sOutDir=../tools/das-aot ^
-sPlatformArch=arm64 -f../../prog/daNetGame-das-aot/jamfile -sPlatformSpec=vc17
pause
14 changes: 14 additions & 0 deletions outerSpace/prog/compile_all_prog_vromfs-arm64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pushd gameBase
call create_vfsroms-WOA.bat
popd
if ERRORLEVEL 1 goto on_error
pause

goto EOF

:on_error
echo "ERROR!!"
pause
exit /b 1

:EOF
17 changes: 17 additions & 0 deletions outerSpace/prog/gameBase/create_vfsroms-WOA.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@ECHO OFF
set /P a=...<nul

set /P a=...<nul
@ECHO ON
..\..\..\tools\dagor_cdk\windows-arm64\vromfsPacker-dev.exe mk.vromfs.blk %VROMOPT% %1 %2 %3 %4 %5 -quiet -addpath:.
@ECHO OFF
if ERRORLEVEL 1 goto on_error
goto EOF

:on_error
echo  ERROR 
if [%BUILD_URL%]==[] pause > nul
exit /b 1

:EOF
verify > nul
2 changes: 1 addition & 1 deletion outerSpace/prog/scripts/ui/settings/graphics_options.nut
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let presets = ["bareMinimum", "minimum", "low", "medium", "high", "ultra"]
let mapOptionsByPresetTable = {
["graphics/texquality"] = ["low", "low", "medium", "high", "high", "high"],
["graphics/giAlgorithm"] = ["low", "low", "medium", "medium", "high", "high"],
["graphics/giAlgorithmQuality"] = [0.0, 0.5, 0.5, 1.0, 0.5, 0.8],
["graphics/giAlgorithmQuality"] = [0.2, 0.5, 0.5, 1.0, 0.5, 0.8],
["graphics/anisotropy"] = [1, 1, 2, 4, 8, 16],
["graphics/skiesQuality"] = ["low", "low", "low", "medium", "high", "high"],
// ["graphics/aoQuality"] = ["low", "low", "low", "medium", "high", "high"],
Expand Down
4 changes: 4 additions & 0 deletions outerSpace/prog/shaders/compile_shaders_dx11_WOA.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo on
..\..\..\tools\dagor_cdk\windows-arm64\dsc2-hlsl11-dev.exe shaders_dx11.blk -q -shaderOn -nodisassembly -commentPP -codeDumpErr -maxVSF 4096 -o ..\..\..\_output\shaders\outerSpace-game~dx11 %1 %2 %3 %4 %5 %6 %7 %8 %9
pause
@echo off
5 changes: 5 additions & 0 deletions outerSpace/prog/shaders/compile_shaders_dx12_WOA.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@echo on
..\..\..tools\dagor_cdk\windows-arm64\dsc2-dx12-dev.exe .\shaders_dx12.blk -q -shaderOn -nodisassembly -commentPP -codeDumpErr -maxVSF 4096 -o ..\..\..\_output\shaders\outerSpace-game~dx12 -wx %1 %2 %3 %4 %5 %6 %7 %8 %9
if %ERRORLEVEL% NEQ 0 exit /b 1
@echo off

4 changes: 4 additions & 0 deletions outerSpace/prog/shaders/compile_shaders_tools_WOA.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
..\..\..\tools\dagor_cdk\windows-arm64\dsc2-hlsl11-dev.exe shaders_tools11.blk -q -shaderOn -nodisassembly -commentPP -codeDumpErr -maxVSF 4096 -o ..\..\..\_output\shaders\outerSpace-tools~dx11 %1 %2 %3 %4 %5 %6 %7 %8 %9
if %ERRORLEVEL% NEQ 0 exit /b 1
..\..\..\tools\dagor_cdk\windows-arm64\dsc2-hlsl11-dev.exe shaders_tools_exp.blk -q -shaderOn -relinkOnly -o ..\..\..\_output\shaders\outerSpace-tools~dx11 %1 %2 %3 %4 %5 %6 %7 %8 %9
if %ERRORLEVEL% NEQ 0 exit /b 1
11 changes: 11 additions & 0 deletions prog/daNetGame/render/skies.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,15 @@ void set_daskies_latitude(float latitude)
skies_panel.latitude = latitude;
debug("set latitude %f", latitude);
}

//20250123: Add a longtitude function
void set_daskies_longtitude(float longtitude)
{
skies_panel.longtitude = longtitude;
debug("set longtitude %f", longtitude);
}


void move_cumulus_clouds(const Point2 &amount)
{
if (!daSkies || !cloudMovementEnabled)
Expand Down Expand Up @@ -409,6 +418,8 @@ static bool skies_console_handler(const char *argv[], int argc)
console::print_d("clouds hole: %f %f", hole.x, hole.y);
}
CONSOLE_CHECK_NAME("skies", "setLatitude", 2, 2) { set_daskies_latitude(to_real(argv[1])); }
//20250123: add a setlongtitude function
CONSOLE_CHECK_NAME("skies", "setLongtitude", 2, 2) { set_daskies_longtitude(to_real(argv[1])); }
CONSOLE_CHECK_NAME("skies", "moveClouds", 3, 3) { move_skies(Point2(to_real(argv[1]), to_real(argv[2]))); }
CONSOLE_CHECK_NAME("skies", "setCloudsOrigin", 3, 3)
{
Expand Down
5 changes: 4 additions & 1 deletion prog/daNetGame/setup.jam
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@ if $(NeedDasAotCompile) = yes && $(AotCompilerBaseName) {
if ! $(jam) { Exit AotJamfile not defined for NeedDasAotCompile\=yes ; }

if $(Platform) in ps4 ps5 xboxOne scarlett android nswitch ||
$(Platform)-$(PlatformArch) in windows-x86_64 windows-arm64 { host_platform = windows ; host_arch = x86_64 ; }
#modify setting for building on native arm64 environment
#$(Platform)-$(PlatformArch) in windows-x86_64 windows-arm64 { host_platform = windows ; host_arch = x86_64 ; }
$(Platform)-$(PlatformArch) in windows-x86_64 { host_platform = windows ; host_arch = x86_64 ; }
else if $(Platform)-$(PlatformArch) in windows-arm64 { host_platform = windows ; host_arch = arm64 ; }
else if $(Platform)-$(PlatformArch) = windows-x86 { host_platform = windows ; }
else if $(Platform) in linux { host_platform = linux ; }
else if $(Platform) in macOS iOS tvOS { host_platform = macOS ; }
Expand Down
6 changes: 4 additions & 2 deletions prog/engine/drv/drv3d_DX12/pipeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1850,15 +1850,17 @@ ComputePipeline *PipelineManager::getCompute(ProgramID program)
G_ASSERTF(program.isCompute(), "getCompute called for a non compute program!");
uint32_t index = program.getIndex();
auto &pipelineGroup = computePipelines[program.getGroup()];
G_ASSERTF(pipelineGroup[index] != nullptr, "getCompute called for uninitialized compute pipeline! index was %u", index);
//just neglect the error...
//G_ASSERTF(pipelineGroup[index] != nullptr, "getCompute called for uninitialized compute pipeline! index was %u", index);
return pipelineGroup[index].get();
}

BasePipeline *PipelineManager::getGraphics(GraphicsProgramID program)
{
uint32_t index = program.getIndex();
auto &pipelineGroup = graphicsPipelines[program.getGroup()];
G_ASSERTF(pipelineGroup[index] != nullptr, "getGraphics called for uninitialized graphics pipeline! index was %u", index);
//just neglect the error...
//G_ASSERTF(pipelineGroup[index] != nullptr, "getGraphics called for uninitialized graphics pipeline! index was %u", index);
return pipelineGroup[index].get();
}

Expand Down
1 change: 1 addition & 0 deletions prog/gameLibs/landMesh/landRayTracer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ static inline bool optimize_4cache(unsigned char *verts, int vertSize, int numv,
return true;
}


#if _TARGET_PC
template <class VertIndex, class FaceIndex>
bool BaseLandRayTracer<VertIndex, FaceIndex>::build(uint32_t cellsX, uint32_t cellsY, float cellSz, const Point3 &ofs,
Expand Down
2 changes: 2 additions & 0 deletions prog/gameLibs/publicInclude/landMesh/landRayTracer.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class BaseLandRayTracer
vec4f offsetV, numCellsV, invCellSizeV;
vec4f offsetVXZ, numCellsVXZ;
bbox3f boxV;

#if _TARGET_PC
static void packVerts(Vertex *packed, const Point3 *verts, int vertCount, vec4f &scale, vec4f &ofs)
{
Expand Down Expand Up @@ -1046,6 +1047,7 @@ class BaseLandRayTracer
void load(void *dump, int sz);
void initFromDump();
void save(IGenSave &cb);

#if _TARGET_PC
bool build(uint32_t cellsX, uint32_t cellsY, float cellSz, const Point3 &ofs, const BBox3 &box, dag::ConstSpan<Mesh *> meshes,
dag::ConstSpan<Mesh *> combined_meshes, uint32_t min_grid_index, uint32_t max_grid_index, bool optimize_for_cache);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@..\..\..\..\tools\dagor_cdk\windows-arm64\dsc2-hlsl11-dev.exe ./game.dx11.blk -shaderOn -q -o ../../../../_output/shaders/physTest-game~dx11 %1
Loading