Skip to content
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

[WEATHER] Update weather system/levels (af3 + AN) #105

Merged
merged 24 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
32b5613
Added af3 weather configs.
Neloreck May 15, 2024
55e0b91
Log more details related to npc sounds.
Neloreck May 15, 2024
250f200
Add resolving logs for dialog_ registrators.
Neloreck May 15, 2024
4d745d7
New utils added / remove unused utils.
Neloreck May 15, 2024
cb36bd5
Add new variant of weather system based on af3.
Neloreck May 16, 2024
706ecf3
Update xrf resources module.
Neloreck May 16, 2024
5158dcc
Corrected circular loops. Define ltx schemes for some weather configs.
Neloreck May 16, 2024
36244bb
Updated submodule with xrf utils.
Neloreck May 16, 2024
86cc62f
Weather schemes for [default].
Neloreck May 16, 2024
9f15124
Fix ternary condition.
Neloreck May 17, 2024
69d4cdd
Cross-platform path read for ini mock.
Neloreck May 17, 2024
cd1321c
Add tracing logs for debug of CI failure.
Neloreck May 17, 2024
65da2b7
Update resources module to include AN assets.
Neloreck May 17, 2024
b118ff0
Trace more path variants.
Neloreck May 17, 2024
abb1e37
Update normalize path util.
Neloreck May 17, 2024
6f2bc04
Tests for generic level utils.
Neloreck May 17, 2024
f403bcb
Add weather_dof tests.
Neloreck May 17, 2024
6ea1048
Simplification and renaming.
Neloreck May 17, 2024
9cfdc3b
Removed storms functionality.
Neloreck May 28, 2024
d6c227a
Add atmosfear default configs / correct shader presets switching.
Neloreck May 29, 2024
e34aafd
Smaller plane distance for better performance.
Neloreck May 29, 2024
1141275
Tests update.
Neloreck May 29, 2024
b22d912
Reformat LTX.
Neloreck May 29, 2024
4f0c22a
Update xrf tools.
Neloreck May 29, 2024
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: 1 addition & 1 deletion cli/bin
6 changes: 3 additions & 3 deletions cli/link/link.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { replaceFunctionMock } from "@/fixtures/jest";
jest.mock("fs/promises");
jest.mock("#/utils/fs/get_game_paths");

jest.mock("#/globals/paths", () => ({
jest.mock("#/globals", () => ({
TARGET_GAME_LINK_DIR: "game-path",
TARGET_LOGS_LINK_DIR: "logs-path",
TARGET_GAME_DATA_DIR: "target-gamedata-path",
Expand Down Expand Up @@ -41,7 +41,7 @@ describe("unlinkFolders util", () => {

expect(fsp.symlink).toHaveBeenCalledTimes(3);
expect(fsp.symlink).toHaveBeenCalledWith("root-path", "game-path", "junction");
expect(fsp.symlink).toHaveBeenCalledWith("root-path", "game-path", "junction");
expect(fsp.symlink).toHaveBeenCalledWith("target-gamedata-path", "gamedata-path", "junction");
expect(fsp.symlink).toHaveBeenCalledWith("logs-path", "logs-path", "junction");
});

Expand All @@ -58,7 +58,7 @@ describe("unlinkFolders util", () => {

expect(fsp.symlink).toHaveBeenCalledTimes(3);
expect(fsp.symlink).toHaveBeenCalledWith("root-path", "game-path", "junction");
expect(fsp.symlink).toHaveBeenCalledWith("root-path", "game-path", "junction");
expect(fsp.symlink).toHaveBeenCalledWith("target-gamedata-path", "gamedata-path", "junction");
expect(fsp.symlink).toHaveBeenCalledWith("logs-path", "logs-path", "junction");
});

Expand Down
8 changes: 2 additions & 6 deletions cli/utils/fs/normalize_parameter_path.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ import * as path from "path";

/**
* Normalize path received from outside.
* If it is windows relative path, replace path separators.
* Replace path separators from windows to current OS.
*/
export function normalizeParameterPath(externalPath: string): string {
if (externalPath.startsWith(".\\") || externalPath.startsWith("..\\")) {
return externalPath.replace(/\\/g, path.sep);
} else {
return externalPath;
}
return externalPath.replace(/\\/g, path.sep);
}
6 changes: 3 additions & 3 deletions src/engine/configs/$scheme/environment.scheme.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ strict = true
blend_down_time = u32
blend_rise_time = u32
blend_time = f32
flare_opacity = tuple:f32,f32,f32,f32,f32,f32
flare_position = tuple:f32,f32,f32,f32,f32,f32
flare_radius = tuple:f32,f32,f32,f32,f32,f32
flare_opacity = f32[]
flare_position = f32[]
flare_radius = f32[]
flare_shader = string
flare_textures = string
flares = enum:on,off
Expand Down
159 changes: 159 additions & 0 deletions src/engine/configs/environment/ambient_channels/backgrounds.ltx
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
[zaton_bkg_morning]
$scheme = $sound_channel
max_distance = 55.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\zat_bkg_morning

[zaton_bkg_day]
$scheme = $sound_channel
max_distance = 61.000000
min_distance = 60.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\zat_bkg_day

[zaton_bkg_evening]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\zat_bkg_evening

[zaton_bkg_night]
$scheme = $sound_channel
max_distance = 41.000000
min_distance = 40.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\zat_bkg_night

[zaton_bkg_tuman]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\zat_bkg_tuman

[jupiter_bkg_morning]
$scheme = $sound_channel
max_distance = 55.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\jup_bkg_morning

[jupiter_bkg_day]
$scheme = $sound_channel
max_distance = 61.000000
min_distance = 60.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\jup_bkg_day

[jupiter_bkg_evening]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\jup_bkg_evening

[jupiter_bkg_night]
$scheme = $sound_channel
max_distance = 41.000000
min_distance = 40.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\jup_bkg_night

[jupiter_bkg_tuman]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\jup_bkg_tuman

[pripyat_bkg_day]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\pri_bkg_day

[pripyat_bkg_tuman]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\pri_bkg_tuman

[pripyat_bkg_night]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\pri_bkg_night

[pripyat_bkg_evening]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\pri_bkg_evening

[pripyat_bkg_morning]
$scheme = $sound_channel
max_distance = 51.000000
min_distance = 50.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\background\pri_bkg_morning

[ugrnd_bkg_1]
$scheme = $sound_channel
max_distance = 31.000000
min_distance = 30.000000
period0 = 0
period1 = 0
period2 = 1
period3 = 1
sounds = ambient\background\underground_bkg_1
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
[blowout_impacts]
$scheme = $sound_channel
max_distance = 25.000000
min_distance = 10.000000
period0 = 5000
period1 = 10000
period2 = 5000
period3 = 10000
sounds = ambient\blowout\blowout_boom_01, ambient\blowout\blowout_boom_02, ambient\blowout\blowout_boom_03

[blowout_rumble]
$scheme = $sound_channel
max_distance = 20.000000
min_distance = 10.000000
period0 = 5000
period1 = 10000
period2 = 5000
period3 = 10000
sounds = ambient\blowout\blowout_ambient_rumble_01, ambient\blowout\blowout_ambient_rumble_02, ambient\blowout\blowout_ambient_rumble_03, ambient\blowout\blowout_ambient_rumble_04

[blowout_ambient]
$scheme = $sound_channel
max_distance = 30.000000
min_distance = 10.000000
period0 = 5000
period1 = 10000
period2 = 5000
period3 = 10000
sounds = ambient\blowout\blowout_amb_01, ambient\blowout\blowout_amb_02, ambient\blowout\blowout_amb_03, ambient\blowout\blowout_amb_04, ambient\blowout\blowout_amb_05, ambient\blowout\blowout_amb_06, ambient\blowout\blowout_amb_07, ambient\blowout\blowout_amb_08

[blowout_flare]
$scheme = $sound_channel
max_distance = 35.000000
min_distance = 25.000000
period0 = 5000
period1 = 10000
period2 = 5000
period3 = 10000
sounds = ambient\blowout\blowout_flare_01, ambient\blowout\blowout_flare_02, ambient\blowout\blowout_flare_03, ambient\blowout\blowout_flare_04

[blowout_wind]
$scheme = $sound_channel
max_distance = 20.000000
min_distance = 10.000000
period0 = 5000
period1 = 10000
period2 = 5000
period3 = 10000
sounds = ambient\blowout\blowout_wind_01, ambient\blowout\blowout_wind_02, ambient\blowout\blowout_wind_03

[blowout_background]
$scheme = $sound_channel
max_distance = 31.000000
min_distance = 30.000000
period0 = 0
period1 = 0
period2 = 0
period3 = 0
sounds = ambient\blowout\blowout_bkgrnd
Loading
Loading