Skip to content

Commit 0b3e046

Browse files
aaronfrankeaaronfranke
authored
Merge pull request #577 from nekomatata/physics-test-controllers
Add physics tests for 2D character controller
2 parents 68e095c + cdf0ed3 commit 0b3e046

19 files changed

+909
-9
lines changed

‎2d/physics_tests/assets/godot-head.png‎ renamed to ‎2d/physics_tests/assets/texture/godot-head.png‎

File renamed without changes.

‎2d/physics_tests/assets/godot-head.png.import‎ renamed to ‎2d/physics_tests/assets/texture/godot-head.png.import‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
importer="texture"
44
type="StreamTexture"
5-
path="res://.import/godot-head.png-cc6844293d74c4f45ec6c4ab08de67ee.stex"
5+
path="res://.import/godot-head.png-6a90da7ab6a8c80b4170f240c8e33e70.stex"
66
metadata={
77
"vram_texture": false
88
}
99

1010
[deps]
1111

12-
source_file="res://assets/godot-head.png"
13-
dest_files=[ "res://.import/godot-head.png-cc6844293d74c4f45ec6c4ab08de67ee.stex" ]
12+
source_file="res://assets/texture/godot-head.png"
13+
dest_files=[ "res://.import/godot-head.png-6a90da7ab6a8c80b4170f240c8e33e70.stex" ]
1414

1515
[params]
1616

‎2d/physics_tests/assets/tileset/tiles_demo.png‎

2.52 KB
Loading

‎2d/physics_tests/assets/tileset/tiles_demo.png.import‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/tiles_demo.png-4d398d5cc02bc85a2809dc13fbc9a3c2.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://assets/tileset/tiles_demo.png"
13+
dest_files=[ "res://.import/tiles_demo.png-4d398d5cc02bc85a2809dc13fbc9a3c2.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=true
24+
flags/mipmaps=false
25+
flags/anisotropic=false
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
stream=false
32+
size_limit=0
33+
detect_3d=true
34+
svg/scale=1.0

‎2d/physics_tests/assets/tileset/tileset.tres‎

Lines changed: 335 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,335 @@
1+
[gd_resource type="TileSet" load_steps=14 format=2]
2+
3+
[ext_resource path="res://assets/tileset/tiles_demo.png" type="Texture" id=1]
4+
5+
[sub_resource type="ConvexPolygonShape2D" id=1]
6+
points = PoolVector2Array( 0, 6, 32, 6, 32, 32, 0, 32 )
7+
8+
[sub_resource type="ConvexPolygonShape2D" id=2]
9+
points = PoolVector2Array( 0, 6, 28, 6, 28, 32, 0, 32 )
10+
11+
[sub_resource type="ConvexPolygonShape2D" id=3]
12+
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
13+
14+
[sub_resource type="ConvexPolygonShape2D" id=4]
15+
points = PoolVector2Array( 0, 6, 32, 6, 32, 32, 0, 32 )
16+
17+
[sub_resource type="ConvexPolygonShape2D" id=5]
18+
points = PoolVector2Array( 32, 38, 32, 64, 0, 64, 0, 6 )
19+
20+
[sub_resource type="ConvexPolygonShape2D" id=6]
21+
points = PoolVector2Array( 0, 0, 28, 0, 28, 32, 0, 32 )
22+
23+
[sub_resource type="ConvexPolygonShape2D" id=7]
24+
points = PoolVector2Array( 28, 6, 32, 6, 32, 32, 0, 32, 0, 0, 28, 0 )
25+
26+
[sub_resource type="ConvexPolygonShape2D" id=8]
27+
points = PoolVector2Array( 0, 6, 32, 6, 32, 32, 0, 32 )
28+
29+
[sub_resource type="ConvexPolygonShape2D" id=9]
30+
points = PoolVector2Array( 0, 6, 28, 6, 28, 32, 0, 32 )
31+
32+
[sub_resource type="ConvexPolygonShape2D" id=10]
33+
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
34+
35+
[sub_resource type="ConvexPolygonShape2D" id=11]
36+
points = PoolVector2Array( 0, 0, 32, 0, 32, 24, 0, 24 )
37+
38+
[sub_resource type="ConvexPolygonShape2D" id=12]
39+
points = PoolVector2Array( 0, 0, 28, 0, 28, 24, 0, 24 )
40+
41+
[resource]
42+
0/name = "ground"
43+
0/texture = ExtResource( 1 )
44+
0/tex_offset = Vector2( 0, 0 )
45+
0/modulate = Color( 0, 0, 1, 1 )
46+
0/region = Rect2( 0, 0, 32, 32 )
47+
0/tile_mode = 0
48+
0/occluder_offset = Vector2( 0, 0 )
49+
0/navigation_offset = Vector2( 0, 0 )
50+
0/shape_offset = Vector2( 0, 0 )
51+
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
52+
0/shape = SubResource( 1 )
53+
0/shape_one_way = false
54+
0/shape_one_way_margin = 1.0
55+
0/shapes = [ {
56+
"autotile_coord": Vector2( 0, 0 ),
57+
"one_way": false,
58+
"one_way_margin": 1.0,
59+
"shape": SubResource( 1 ),
60+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
61+
} ]
62+
0/z_index = 0
63+
1/name = "ground_end"
64+
1/texture = ExtResource( 1 )
65+
1/tex_offset = Vector2( 0, 0 )
66+
1/modulate = Color( 1, 1, 1, 1 )
67+
1/region = Rect2( 32, 0, 32, 32 )
68+
1/tile_mode = 0
69+
1/occluder_offset = Vector2( 0, 0 )
70+
1/navigation_offset = Vector2( 0, 0 )
71+
1/shape_offset = Vector2( 0, 0 )
72+
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
73+
1/shape = SubResource( 2 )
74+
1/shape_one_way = false
75+
1/shape_one_way_margin = 1.0
76+
1/shapes = [ {
77+
"autotile_coord": Vector2( 0, 0 ),
78+
"one_way": false,
79+
"one_way_margin": 1.0,
80+
"shape": SubResource( 2 ),
81+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
82+
} ]
83+
1/z_index = 0
84+
2/name = "slope"
85+
2/texture = ExtResource( 1 )
86+
2/tex_offset = Vector2( 0, 0 )
87+
2/modulate = Color( 1, 1, 1, 1 )
88+
2/region = Rect2( 64, 64, 32, 64 )
89+
2/tile_mode = 0
90+
2/occluder_offset = Vector2( 0, 0 )
91+
2/navigation_offset = Vector2( 0, 0 )
92+
2/shape_offset = Vector2( 0, 0 )
93+
2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
94+
2/shape = SubResource( 5 )
95+
2/shape_one_way = false
96+
2/shape_one_way_margin = 1.0
97+
2/shapes = [ {
98+
"autotile_coord": Vector2( 0, 0 ),
99+
"one_way": false,
100+
"one_way_margin": 1.0,
101+
"shape": SubResource( 5 ),
102+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
103+
} ]
104+
2/z_index = 0
105+
3/name = "wall"
106+
3/texture = ExtResource( 1 )
107+
3/tex_offset = Vector2( 0, 0 )
108+
3/modulate = Color( 1, 1, 1, 1 )
109+
3/region = Rect2( 32, 32, 32, 32 )
110+
3/tile_mode = 0
111+
3/occluder_offset = Vector2( 0, 0 )
112+
3/navigation_offset = Vector2( 0, 0 )
113+
3/shape_offset = Vector2( 0, 0 )
114+
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
115+
3/shape = SubResource( 6 )
116+
3/shape_one_way = false
117+
3/shape_one_way_margin = 1.0
118+
3/shapes = [ {
119+
"autotile_coord": Vector2( 0, 0 ),
120+
"one_way": false,
121+
"one_way_margin": 1.0,
122+
"shape": SubResource( 6 ),
123+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
124+
} ]
125+
3/z_index = 0
126+
4/name = "slope_top"
127+
4/texture = ExtResource( 1 )
128+
4/tex_offset = Vector2( 0, 0 )
129+
4/modulate = Color( 1, 1, 1, 1 )
130+
4/region = Rect2( 32, 64, 32, 32 )
131+
4/tile_mode = 0
132+
4/occluder_offset = Vector2( 0, 0 )
133+
4/navigation_offset = Vector2( 0, 0 )
134+
4/shape_offset = Vector2( 0, 0 )
135+
4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
136+
4/shape = SubResource( 7 )
137+
4/shape_one_way = false
138+
4/shape_one_way_margin = 1.0
139+
4/shapes = [ {
140+
"autotile_coord": Vector2( 0, 0 ),
141+
"one_way": false,
142+
"one_way_margin": 1.0,
143+
"shape": SubResource( 7 ),
144+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
145+
} ]
146+
4/z_index = 0
147+
5/name = "one_way"
148+
5/texture = ExtResource( 1 )
149+
5/tex_offset = Vector2( 0, 0 )
150+
5/modulate = Color( 1, 1, 1, 1 )
151+
5/region = Rect2( 64, 0, 32, 32 )
152+
5/tile_mode = 0
153+
5/occluder_offset = Vector2( 0, 0 )
154+
5/navigation_offset = Vector2( 0, 0 )
155+
5/shape_offset = Vector2( 0, 0 )
156+
5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
157+
5/shape = SubResource( 8 )
158+
5/shape_one_way = true
159+
5/shape_one_way_margin = 1.0
160+
5/shapes = [ {
161+
"autotile_coord": Vector2( 0, 0 ),
162+
"one_way": true,
163+
"one_way_margin": 1.0,
164+
"shape": SubResource( 8 ),
165+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
166+
} ]
167+
5/z_index = 0
168+
6/name = "one_way_end"
169+
6/texture = ExtResource( 1 )
170+
6/tex_offset = Vector2( 0, 0 )
171+
6/modulate = Color( 1, 1, 1, 1 )
172+
6/region = Rect2( 96, 0, 32, 32 )
173+
6/tile_mode = 0
174+
6/occluder_offset = Vector2( 0, 0 )
175+
6/navigation_offset = Vector2( 0, 0 )
176+
6/shape_offset = Vector2( 0, 0 )
177+
6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
178+
6/shape = SubResource( 9 )
179+
6/shape_one_way = true
180+
6/shape_one_way_margin = 1.0
181+
6/shapes = [ {
182+
"autotile_coord": Vector2( 0, 0 ),
183+
"one_way": true,
184+
"one_way_margin": 1.0,
185+
"shape": SubResource( 9 ),
186+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
187+
} ]
188+
6/z_index = 0
189+
7/name = "rock"
190+
7/texture = ExtResource( 1 )
191+
7/tex_offset = Vector2( 0, 0 )
192+
7/modulate = Color( 1, 1, 1, 1 )
193+
7/region = Rect2( 0, 32, 32, 32 )
194+
7/tile_mode = 0
195+
7/occluder_offset = Vector2( 0, 0 )
196+
7/navigation_offset = Vector2( 0, 0 )
197+
7/shape_offset = Vector2( 0, 0 )
198+
7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
199+
7/shape = SubResource( 10 )
200+
7/shape_one_way = false
201+
7/shape_one_way_margin = 1.0
202+
7/shapes = [ {
203+
"autotile_coord": Vector2( 0, 0 ),
204+
"one_way": false,
205+
"one_way_margin": 1.0,
206+
"shape": SubResource( 10 ),
207+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
208+
} ]
209+
7/z_index = 0
210+
8/name = "bottom"
211+
8/texture = ExtResource( 1 )
212+
8/tex_offset = Vector2( 0, 0 )
213+
8/modulate = Color( 1, 1, 1, 1 )
214+
8/region = Rect2( 192, 32, 32, 32 )
215+
8/tile_mode = 0
216+
8/occluder_offset = Vector2( 0, 0 )
217+
8/navigation_offset = Vector2( 0, 0 )
218+
8/shape_offset = Vector2( 0, 0 )
219+
8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
220+
8/shape = SubResource( 11 )
221+
8/shape_one_way = false
222+
8/shape_one_way_margin = 1.0
223+
8/shapes = [ {
224+
"autotile_coord": Vector2( 0, 0 ),
225+
"one_way": false,
226+
"one_way_margin": 1.0,
227+
"shape": SubResource( 11 ),
228+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
229+
} ]
230+
8/z_index = 0
231+
9/name = "bottom_end"
232+
9/texture = ExtResource( 1 )
233+
9/tex_offset = Vector2( 0, 0 )
234+
9/modulate = Color( 1, 1, 1, 1 )
235+
9/region = Rect2( 224, 32, 32, 32 )
236+
9/tile_mode = 0
237+
9/occluder_offset = Vector2( 0, 0 )
238+
9/navigation_offset = Vector2( 0, 0 )
239+
9/shape_offset = Vector2( 0, 0 )
240+
9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
241+
9/shape = SubResource( 12 )
242+
9/shape_one_way = false
243+
9/shape_one_way_margin = 1.0
244+
9/shapes = [ {
245+
"autotile_coord": Vector2( 0, 0 ),
246+
"one_way": false,
247+
"one_way_margin": 1.0,
248+
"shape": SubResource( 12 ),
249+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
250+
} ]
251+
9/z_index = 0
252+
10/name = "bottom_corner"
253+
10/texture = ExtResource( 1 )
254+
10/tex_offset = Vector2( 0, 0 )
255+
10/modulate = Color( 1, 1, 1, 1 )
256+
10/region = Rect2( 160, 32, 32, 32 )
257+
10/tile_mode = 0
258+
10/occluder_offset = Vector2( 0, 0 )
259+
10/navigation_offset = Vector2( 0, 0 )
260+
10/shape_offset = Vector2( 0, 0 )
261+
10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
262+
10/shape = SubResource( 3 )
263+
10/shape_one_way = false
264+
10/shape_one_way_margin = 1.0
265+
10/shapes = [ {
266+
"autotile_coord": Vector2( 0, 0 ),
267+
"one_way": false,
268+
"one_way_margin": 1.0,
269+
"shape": SubResource( 3 ),
270+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
271+
} ]
272+
10/z_index = 0
273+
11/name = "tree_trunk_0"
274+
11/texture = ExtResource( 1 )
275+
11/tex_offset = Vector2( 0, 0 )
276+
11/modulate = Color( 1, 1, 1, 1 )
277+
11/region = Rect2( 128, 64, 32, 32 )
278+
11/tile_mode = 0
279+
11/occluder_offset = Vector2( 0, 0 )
280+
11/navigation_offset = Vector2( 0, 0 )
281+
11/shape_offset = Vector2( 0, 0 )
282+
11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
283+
11/shape_one_way = false
284+
11/shape_one_way_margin = 0.0
285+
11/shapes = [ ]
286+
11/z_index = 0
287+
12/name = "tree_trunk_1"
288+
12/texture = ExtResource( 1 )
289+
12/tex_offset = Vector2( 0, 0 )
290+
12/modulate = Color( 1, 1, 1, 1 )
291+
12/region = Rect2( 128, 32, 32, 32 )
292+
12/tile_mode = 0
293+
12/occluder_offset = Vector2( 0, 0 )
294+
12/navigation_offset = Vector2( 0, 0 )
295+
12/shape_offset = Vector2( 0, 0 )
296+
12/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
297+
12/shape_one_way = false
298+
12/shape_one_way_margin = 0.0
299+
12/shapes = [ ]
300+
12/z_index = 0
301+
13/name = "tree_base"
302+
13/texture = ExtResource( 1 )
303+
13/tex_offset = Vector2( 0, 0 )
304+
13/modulate = Color( 1, 1, 1, 1 )
305+
13/region = Rect2( 128, 96, 32, 32 )
306+
13/tile_mode = 0
307+
13/occluder_offset = Vector2( 0, 0 )
308+
13/navigation_offset = Vector2( 0, 0 )
309+
13/shape_offset = Vector2( 0, 0 )
310+
13/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
311+
13/shape = SubResource( 4 )
312+
13/shape_one_way = false
313+
13/shape_one_way_margin = 1.0
314+
13/shapes = [ {
315+
"autotile_coord": Vector2( 0, 0 ),
316+
"one_way": false,
317+
"one_way_margin": 1.0,
318+
"shape": SubResource( 4 ),
319+
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
320+
} ]
321+
13/z_index = 0
322+
14/name = "tree_top"
323+
14/texture = ExtResource( 1 )
324+
14/tex_offset = Vector2( 0, 0 )
325+
14/modulate = Color( 1, 1, 1, 1 )
326+
14/region = Rect2( 128, 0, 32, 32 )
327+
14/tile_mode = 0
328+
14/occluder_offset = Vector2( 0, 0 )
329+
14/navigation_offset = Vector2( 0, 0 )
330+
14/shape_offset = Vector2( 0, 0 )
331+
14/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
332+
14/shape_one_way = false
333+
14/shape_one_way_margin = 0.0
334+
14/shapes = [ ]
335+
14/z_index = 0

0 commit comments

Comments
 (0)