Skip to content

Commit c3abbfd

Browse files
lee-orrlee-orr
committed
fix shader offsets
1 parent 77348db commit c3abbfd

File tree

5 files changed

+209
-14
lines changed

5 files changed

+209
-14
lines changed

‎assets/level_list.levels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
levels:
2-
- name: test
3-
file: test.lvl.json
42
- name: Beverley Beck
5-
file: beverley.lvl.json
3+
file: beverley.lvl.json
4+
- name: test
5+
file: test.lvl.json

‎assets/levels/test.lvl.json

Lines changed: 192 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,192 @@
1-
{"tiles":[[{"tile_type":"City","contents":"None","is_goal":false,"is_wet":false,"height":1},{"tile_type":"City","contents":"None","is_goal":true,"is_wet":false,"height":2},{"tile_type":"City","contents":"None","is_goal":false,"is_wet":false,"height":2},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":1},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0}],[{"tile_type":"City","contents":"None","is_goal":false,"is_wet":false,"height":1},{"tile_type":"City","contents":"None","is_goal":false,"is_wet":false,"height":1},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":2},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":1},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0}],[{"tile_type":"City","contents":"None","is_goal":false,"is_wet":false,"height":0},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0}],[{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":0},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":1},{"tile_type":"Land","contents":"Canal","is_goal":false,"is_wet":true,"height":2},{"tile_type":"Land","contents":"Canal","is_goal":false,"is_wet":true,"height":2}],[{"tile_type":"Land","contents":"Canal","is_goal":false,"is_wet":true,"height":1},{"tile_type":"Land","contents":"Canal","is_goal":false,"is_wet":true,"height":1},{"tile_type":"Land","contents":"Canal","is_goal":false,"is_wet":true,"height":2},{"tile_type":"Land","contents":"Canal","is_goal":false,"is_wet":true,"height":2},{"tile_type":"Land","contents":"None","is_goal":false,"is_wet":false,"height":3}]],"title":"Test Level","width":5,"height":5}
1+
{
2+
"tiles": [
3+
[
4+
{
5+
"tile_type": "City",
6+
"contents": "None",
7+
"is_goal": false,
8+
"is_wet": false,
9+
"height": 1
10+
},
11+
{
12+
"tile_type": "City",
13+
"contents": "None",
14+
"is_goal": true,
15+
"is_wet": false,
16+
"height": 2
17+
},
18+
{
19+
"tile_type": "City",
20+
"contents": "None",
21+
"is_goal": false,
22+
"is_wet": false,
23+
"height": 2
24+
},
25+
{
26+
"tile_type": "Land",
27+
"contents": "None",
28+
"is_goal": false,
29+
"is_wet": false,
30+
"height": 1
31+
},
32+
{
33+
"tile_type": "Land",
34+
"contents": "None",
35+
"is_goal": false,
36+
"is_wet": false,
37+
"height": 0
38+
}
39+
],
40+
[
41+
{
42+
"tile_type": "City",
43+
"contents": "None",
44+
"is_goal": false,
45+
"is_wet": false,
46+
"height": 1
47+
},
48+
{
49+
"tile_type": "City",
50+
"contents": "None",
51+
"is_goal": false,
52+
"is_wet": false,
53+
"height": 1
54+
},
55+
{
56+
"tile_type": "Land",
57+
"contents": "None",
58+
"is_goal": false,
59+
"is_wet": false,
60+
"height": 2
61+
},
62+
{
63+
"tile_type": "Land",
64+
"contents": "None",
65+
"is_goal": false,
66+
"is_wet": false,
67+
"height": 1
68+
},
69+
{
70+
"tile_type": "Land",
71+
"contents": "None",
72+
"is_goal": false,
73+
"is_wet": false,
74+
"height": 0
75+
}
76+
],
77+
[
78+
{
79+
"tile_type": "City",
80+
"contents": "None",
81+
"is_goal": false,
82+
"is_wet": false,
83+
"height": 0
84+
},
85+
{
86+
"tile_type": "Land",
87+
"contents": "None",
88+
"is_goal": false,
89+
"is_wet": false,
90+
"height": 0
91+
},
92+
{
93+
"tile_type": "Land",
94+
"contents": "None",
95+
"is_goal": false,
96+
"is_wet": false,
97+
"height": 0
98+
},
99+
{
100+
"tile_type": "Land",
101+
"contents": "None",
102+
"is_goal": false,
103+
"is_wet": false,
104+
"height": 0
105+
},
106+
{
107+
"tile_type": "Land",
108+
"contents": "None",
109+
"is_goal": false,
110+
"is_wet": false,
111+
"height": 0
112+
}
113+
],
114+
[
115+
{
116+
"tile_type": "Land",
117+
"contents": "None",
118+
"is_goal": false,
119+
"is_wet": false,
120+
"height": 0
121+
},
122+
{
123+
"tile_type": "Land",
124+
"contents": "None",
125+
"is_goal": false,
126+
"is_wet": false,
127+
"height": 0
128+
},
129+
{
130+
"tile_type": "Land",
131+
"contents": "None",
132+
"is_goal": false,
133+
"is_wet": false,
134+
"height": 1
135+
},
136+
{
137+
"tile_type": "Land",
138+
"contents": "Canal",
139+
"is_goal": false,
140+
"is_wet": true,
141+
"height": 2
142+
},
143+
{
144+
"tile_type": "Land",
145+
"contents": "Canal",
146+
"is_goal": false,
147+
"is_wet": true,
148+
"height": 2
149+
}
150+
],
151+
[
152+
{
153+
"tile_type": "Land",
154+
"contents": "Canal",
155+
"is_goal": false,
156+
"is_wet": true,
157+
"height": 1
158+
},
159+
{
160+
"tile_type": "Land",
161+
"contents": "Canal",
162+
"is_goal": false,
163+
"is_wet": true,
164+
"height": 1
165+
},
166+
{
167+
"tile_type": "Land",
168+
"contents": "Canal",
169+
"is_goal": false,
170+
"is_wet": true,
171+
"height": 2
172+
},
173+
{
174+
"tile_type": "Land",
175+
"contents": "Canal",
176+
"is_goal": false,
177+
"is_wet": true,
178+
"height": 2
179+
},
180+
{
181+
"tile_type": "Land",
182+
"contents": "None",
183+
"is_goal": false,
184+
"is_wet": false,
185+
"height": 3
186+
}
187+
]
188+
],
189+
"title": "Test Level",
190+
"width": 5,
191+
"height": 5
192+
}

‎assets/shaders/tile_shader.wgsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn fragment(
4343
}
4444

4545

46-
let world_position = in.world_position + vec4<f32>(settings.world_offset_and_wetness.xz, 0., 0.);
46+
let world_position = in.world_position + vec4<f32>(settings.world_offset_and_wetness.xyz, 0.);
4747
var test_position : vec3<f32> = world_position.xyz * 0.3;
4848
var overlay_1: f32 = simplex_noise_3d(test_position);
4949

‎src/game/board.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ impl Plugin for BoardPlugin {
3232
.add_system(animate_goal.run_in_state(AppState::InGame))
3333
.add_system(process_selection_events.run_in_state(AppState::InGame))
3434
.add_exit_system(AppState::InGame, clear_board);
35-
// #[cfg(feature = "dev")]
36-
// app.add_plugin(bevy_inspector_egui::quick::AssetInspectorPlugin::<
37-
// TileMaterial,
38-
// >::default());
35+
#[cfg(feature = "dev")]
36+
app.add_plugin(bevy_inspector_egui::quick::AssetInspectorPlugin::<
37+
TileMaterial,
38+
>::default());
3939
// .add_plugin(bevy_inspector_egui::quick::ResourceInspectorPlugin::<
4040
// BoardRuntimeAssets,
4141
// >::default());
@@ -419,13 +419,13 @@ fn setup_board_materials(
419419
});
420420
let tile_offset_h_material = tile_materials.add(TileMaterial {
421421
settings: InkSettings {
422-
world_offset: Vec4::new(0., 0.5, 0., 0.),
422+
world_offset: Vec4::new(0., 0., 0.5, 0.),
423423
..Default::default()
424424
},
425425
});
426426
let tile_offset_wh_material = tile_materials.add(TileMaterial {
427427
settings: InkSettings {
428-
world_offset: Vec4::new(0.5, 0.5, 0., 0.),
428+
world_offset: Vec4::new(0.5, 0., 0.5, 0.),
429429
..Default::default()
430430
},
431431
});

‎src/game/in_game_ui.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,14 @@ fn display_ui(mut commands: Commands, level: Res<Level>) {
7474
.style(ButtonStyle::Small);
7575
parent.div().padding(20.);
7676
if let Some(text) = &level.sidebar_text {
77-
parent.div().opaque().size(Size::new(Val::Px(200.),Val::Auto)).with_children(|parent| {
77+
parent
78+
.div()
79+
.opaque()
80+
.size(Size::new(Val::Px(200.), Val::Auto))
81+
.with_children(|parent| {
7882
parent.text(text).size(15.);
79-
});
80-
}
83+
});
84+
}
8185
});
8286

8387
#[cfg(feature = "dev")]

0 commit comments

Comments
 (0)