Skip to content

Commit e9e2168

Browse files
PodeCaradoxPodeCaradox
committed
update versions
1 parent 2f0bee1 commit e9e2168

File tree

9 files changed

+99
-33
lines changed

9 files changed

+99
-33
lines changed

‎src/assets/brushes/land_brushes.data‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
"brush_grass": {
1111
"BrushEntities": [
1212
{
13-
"Name": "water_tile_0",
14-
"RandomFactor": 5
15-
},
16-
{
1713
"Name": "grass_0",
1814
"RandomFactor": 5
1915
}, {

‎src/assets/maps/showcase.map‎

46.1 KB
Binary file not shown.

‎src/assets/shaders/brush_world.wgsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn instancing_cs_brush(@builtin(global_invocation_id) global_id: vec3<u32>) {
5858
visble_tiles_cp.tiles[visible_index + 1u].Position.z -= world_utils::ZStep * 2.0;
5959
visble_tiles_cp.tiles[visible_index + 2u] = world_utils::CreateBuildingInstance(brush_tile_rotation.SingleInstances[2u], index, elevation, animation_enabled, 0u, brush_tile_data.Color, offset_object_y);
6060
visble_tiles_cp.tiles[visible_index + 3u] = world_utils::CreateElevationInstance(brush_tile_rotation.SingleInstances[3u], index, elevation, animation_enabled, 0u, brush_tile_data.Color, offset_elevation_x);
61-
61+
visble_tiles_cp.tiles[visible_index + 3u].Position.z += world_utils::ZStep;
6262
return;
6363
}
6464

‎src/assets/shaders/update_minimap.wgsl‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
//https://alejandro61299.github.io/Minimaps_Personal_Research/
2+
struct MiniMapParams {
3+
map_size: vec2<u32>,
4+
map_size_in_tiles: i32,
5+
x_offset: f32,
6+
mini_map_tile_size: vec2<f32>,
7+
minimap_image_pos: vec2<i32>,
8+
};
9+
10+
struct TileInstances
11+
{
12+
TileIndex: u32,
13+
Color: u32,//Shadow Color
14+
MiniMapColor: u32,
15+
Elevation: f32,
16+
};
17+
18+
struct TileInstancesStorage {
19+
tiles: array<TileInstances>,
20+
};
21+
22+
fn map_to_minimap_pos(pos_x: i32, pos_y: i32) -> vec2<i32> {
23+
return vec2<i32>(i32(f32(pos_x - pos_y) * params.mini_map_tile_size.x * 0.5f + params.x_offset), i32(f32(pos_x + pos_y) * params.mini_map_tile_size.y * 0.5f));
24+
}
25+
26+
fn u32ColorToVec4Color(u32_color: u32) -> vec4<f32> {
27+
// Return the color as a vec4<f32> with normalized values
28+
return vec4<f32>(f32(u32_color >> 24u), f32((u32_color >> 16u) & 0xFFu), f32((u32_color >> 8u) & 0xFFu), f32(u32_color & 0xFFu) ) / 255.0;
29+
}
30+
31+
@group(0) @binding(0) var<uniform> params: MiniMapParams;
32+
@group(1) @binding(0) var<storage, read> all_tiles : TileInstancesStorage;
33+
@group(2) @binding(0) var t_interface: texture_storage_2d<rgba8unorm, write>;
34+
35+
36+
@compute
37+
@workgroup_size(16, 16, 1)
38+
fn update_minimap(@builtin(global_invocation_id) global_id: vec3<u32>) {
39+
if (global_id.x >= u32(params.map_size.x) || global_id.y >= u32(params.map_size.y)) {
40+
return;
41+
}
42+
43+
let tile: TileInstances = all_tiles.tiles[global_id.y * params.map_size.x + global_id.x];
44+
var color: vec4<f32> = u32ColorToVec4Color(tile.MiniMapColor);
45+
let pos: vec2<i32> = map_to_minimap_pos(i32(global_id.x), i32(global_id.y));
46+
if (i32(params.mini_map_tile_size.y) > 1 && i32(params.mini_map_tile_size.x) > 1) {
47+
for (var y : i32 = 0; y < i32(params.mini_map_tile_size.y); y = y + 1) {
48+
for (var x : i32 = -i32(params.mini_map_tile_size.x); x < i32(params.mini_map_tile_size.x); x = x + 1) {
49+
textureStore(t_interface, params.minimap_image_pos + pos + vec2<i32>(x,y), srgb_to_linear(color));
50+
}
51+
}
52+
}
53+
else
54+
{
55+
56+
textureStore(t_interface, params.minimap_image_pos + pos, srgb_to_linear(color));
57+
}
58+
}
59+
60+
fn srgb_to_linear(color: vec4<f32>) -> vec4<f32> {
61+
let c = color.rgb;
62+
return vec4<f32>(
63+
mix(
64+
c / 12.92,
65+
pow((c + 0.055) / 1.055, vec3<f32>(2.4)),
66+
step(vec3<f32>(0.04045), c)
67+
),
68+
color.a
69+
);
70+
}

‎src/assets/shaders/world_utils.wgsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ struct TileData
310310
{//TODO make less bytes
311311
TileIndex: u32,//used in update and BrusPreview Buffer
312312
Color: u32,//used in BrusPreview Buffer
313-
MiniMapColor: u32,
313+
MiniMapColor: u32,//used in Update Minimap Buffer
314314
Elevation: f32,
315315
};
316316

‎src/assets/wasm/castle_sim.d.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ export interface InitOutput {
99
readonly memory: WebAssembly.Memory;
1010
readonly init_game: (a: number, b: number) => void;
1111
readonly wasm_bindgen__closure__destroy__h171e54c78a02aa44: (a: number, b: number) => void;
12-
readonly wasm_bindgen__closure__destroy__h201731ff488da402: (a: number, b: number) => void;
1312
readonly wasm_bindgen__closure__destroy__h2267c5a3a33d6ca1: (a: number, b: number) => void;
14-
readonly wasm_bindgen__convert__closures_____invoke__hcb093511f31953b8: (a: number, b: number, c: any, d: any) => void;
13+
readonly wasm_bindgen__closure__destroy__h201731ff488da402: (a: number, b: number) => void;
1514
readonly wasm_bindgen__convert__closures_____invoke__h72401b5efe02f859: (a: number, b: number, c: any) => [number, number];
15+
readonly wasm_bindgen__convert__closures_____invoke__hcb093511f31953b8: (a: number, b: number, c: any, d: any) => void;
1616
readonly wasm_bindgen__convert__closures_____invoke__h36a805dfca600d37: (a: number, b: number, c: any) => void;
1717
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3: (a: number, b: number, c: any) => void;
18-
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_3: (a: number, b: number, c: any) => void;
1918
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_4: (a: number, b: number, c: any) => void;
2019
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_5: (a: number, b: number, c: any) => void;
2120
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_6: (a: number, b: number, c: any) => void;
2221
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_7: (a: number, b: number, c: any) => void;
2322
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_8: (a: number, b: number, c: any) => void;
2423
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_9: (a: number, b: number, c: any) => void;
24+
readonly wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_10: (a: number, b: number, c: any) => void;
2525
readonly wasm_bindgen__convert__closures_____invoke__h0a4e10f01bf099b6: (a: number, b: number) => void;
2626
readonly __wbindgen_malloc: (a: number, b: number) => number;
2727
readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

‎src/assets/wasm/castle_sim.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,63 +1706,63 @@ function __wbg_get_imports() {
17061706
return ret;
17071707
},
17081708
__wbindgen_cast_0000000000000001: function(arg0, arg1) {
1709-
// Cast intrinsic for `Closure(Closure { dtor_idx: 10489, function: Function { arguments: [Externref], shim_idx: 10490, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1709+
// Cast intrinsic for `Closure(Closure { dtor_idx: 11112, function: Function { arguments: [Externref], shim_idx: 11113, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
17101710
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h171e54c78a02aa44, wasm_bindgen__convert__closures_____invoke__h36a805dfca600d37);
17111711
return ret;
17121712
},
17131713
__wbindgen_cast_0000000000000002: function(arg0, arg1) {
1714-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [Externref], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1715-
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3);
1714+
// Cast intrinsic for `Closure(Closure { dtor_idx: 71222, function: Function { arguments: [Externref], shim_idx: 71223, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
1715+
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h2267c5a3a33d6ca1, wasm_bindgen__convert__closures_____invoke__h72401b5efe02f859);
17161716
return ret;
17171717
},
17181718
__wbindgen_cast_0000000000000003: function(arg0, arg1) {
1719-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("Array<any>"), NamedExternref("ResizeObserver")], shim_idx: 6602, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1720-
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__hcb093511f31953b8);
1719+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [Externref], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1720+
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3);
17211721
return ret;
17221722
},
17231723
__wbindgen_cast_0000000000000004: function(arg0, arg1) {
1724-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1725-
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_3);
1724+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("Array<any>"), NamedExternref("ResizeObserver")], shim_idx: 7225, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1725+
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__hcb093511f31953b8);
17261726
return ret;
17271727
},
17281728
__wbindgen_cast_0000000000000005: function(arg0, arg1) {
1729-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("Event")], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1729+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
17301730
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_4);
17311731
return ret;
17321732
},
17331733
__wbindgen_cast_0000000000000006: function(arg0, arg1) {
1734-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("FocusEvent")], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1734+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("Event")], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
17351735
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_5);
17361736
return ret;
17371737
},
17381738
__wbindgen_cast_0000000000000007: function(arg0, arg1) {
1739-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("KeyboardEvent")], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1739+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("FocusEvent")], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
17401740
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_6);
17411741
return ret;
17421742
},
17431743
__wbindgen_cast_0000000000000008: function(arg0, arg1) {
1744-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("PageTransitionEvent")], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1744+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("KeyboardEvent")], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
17451745
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_7);
17461746
return ret;
17471747
},
17481748
__wbindgen_cast_0000000000000009: function(arg0, arg1) {
1749-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("PointerEvent")], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1749+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("PageTransitionEvent")], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
17501750
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_8);
17511751
return ret;
17521752
},
17531753
__wbindgen_cast_000000000000000a: function(arg0, arg1) {
1754-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [NamedExternref("WheelEvent")], shim_idx: 6604, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1754+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("PointerEvent")], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
17551755
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_9);
17561756
return ret;
17571757
},
17581758
__wbindgen_cast_000000000000000b: function(arg0, arg1) {
1759-
// Cast intrinsic for `Closure(Closure { dtor_idx: 6601, function: Function { arguments: [], shim_idx: 6611, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1760-
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h0a4e10f01bf099b6);
1759+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [NamedExternref("WheelEvent")], shim_idx: 7227, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1760+
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_10);
17611761
return ret;
17621762
},
17631763
__wbindgen_cast_000000000000000c: function(arg0, arg1) {
1764-
// Cast intrinsic for `Closure(Closure { dtor_idx: 70600, function: Function { arguments: [Externref], shim_idx: 70601, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
1765-
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h2267c5a3a33d6ca1, wasm_bindgen__convert__closures_____invoke__h72401b5efe02f859);
1764+
// Cast intrinsic for `Closure(Closure { dtor_idx: 7224, function: Function { arguments: [], shim_idx: 7234, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
1765+
const ret = makeMutClosure(arg0, arg1, wasm.wasm_bindgen__closure__destroy__h201731ff488da402, wasm_bindgen__convert__closures_____invoke__h0a4e10f01bf099b6);
17661766
return ret;
17671767
},
17681768
__wbindgen_cast_000000000000000d: function(arg0) {
@@ -1808,10 +1808,6 @@ function wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3(arg0, arg
18081808
wasm.wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3(arg0, arg1, arg2);
18091809
}
18101810

1811-
function wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_3(arg0, arg1, arg2) {
1812-
wasm.wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_3(arg0, arg1, arg2);
1813-
}
1814-
18151811
function wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_4(arg0, arg1, arg2) {
18161812
wasm.wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_4(arg0, arg1, arg2);
18171813
}
@@ -1836,6 +1832,10 @@ function wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_9(arg0, a
18361832
wasm.wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_9(arg0, arg1, arg2);
18371833
}
18381834

1835+
function wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_10(arg0, arg1, arg2) {
1836+
wasm.wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_10(arg0, arg1, arg2);
1837+
}
1838+
18391839
function wasm_bindgen__convert__closures_____invoke__h72401b5efe02f859(arg0, arg1, arg2) {
18401840
const ret = wasm.wasm_bindgen__convert__closures_____invoke__h72401b5efe02f859(arg0, arg1, arg2);
18411841
if (ret[1]) {

‎src/assets/wasm/castle_sim_bg.wasm‎

289 KB
Binary file not shown.

‎src/assets/wasm/castle_sim_bg.wasm.d.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
export const memory: WebAssembly.Memory;
44
export const init_game: (a: number, b: number) => void;
55
export const wasm_bindgen__closure__destroy__h171e54c78a02aa44: (a: number, b: number) => void;
6-
export const wasm_bindgen__closure__destroy__h201731ff488da402: (a: number, b: number) => void;
76
export const wasm_bindgen__closure__destroy__h2267c5a3a33d6ca1: (a: number, b: number) => void;
8-
export const wasm_bindgen__convert__closures_____invoke__hcb093511f31953b8: (a: number, b: number, c: any, d: any) => void;
7+
export const wasm_bindgen__closure__destroy__h201731ff488da402: (a: number, b: number) => void;
98
export const wasm_bindgen__convert__closures_____invoke__h72401b5efe02f859: (a: number, b: number, c: any) => [number, number];
9+
export const wasm_bindgen__convert__closures_____invoke__hcb093511f31953b8: (a: number, b: number, c: any, d: any) => void;
1010
export const wasm_bindgen__convert__closures_____invoke__h36a805dfca600d37: (a: number, b: number, c: any) => void;
1111
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3: (a: number, b: number, c: any) => void;
12-
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_3: (a: number, b: number, c: any) => void;
1312
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_4: (a: number, b: number, c: any) => void;
1413
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_5: (a: number, b: number, c: any) => void;
1514
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_6: (a: number, b: number, c: any) => void;
1615
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_7: (a: number, b: number, c: any) => void;
1716
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_8: (a: number, b: number, c: any) => void;
1817
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_9: (a: number, b: number, c: any) => void;
18+
export const wasm_bindgen__convert__closures_____invoke__h03b69bc391c244c3_10: (a: number, b: number, c: any) => void;
1919
export const wasm_bindgen__convert__closures_____invoke__h0a4e10f01bf099b6: (a: number, b: number) => void;
2020
export const __wbindgen_malloc: (a: number, b: number) => number;
2121
export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

0 commit comments

Comments
 (0)