Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d488161433 | ||
|
|
49a3b8a682 | ||
|
|
35420b7344 | ||
|
|
2c209da3b2 | ||
|
|
5040446ec1 | ||
|
|
269578548a | ||
|
|
90da5934d7 | ||
|
|
4aa3ed6ed8 | ||
|
|
fbae54aef0 | ||
|
|
eea672023f |
@@ -1,7 +1,8 @@
|
||||
.PHONY: shaders-vulkan shaders-d3d12 shaders-metal shaders-all toad check test help
|
||||
.PHONY: shaders-vulkan shaders-d3d12 shaders-metal shaders-all bake toad check test help
|
||||
|
||||
help:
|
||||
@echo "Targets:"
|
||||
@echo " bake Bake all characters under content/characters/"
|
||||
@echo " shaders-vulkan Compile SPIR-V into shaders/vulkan/"
|
||||
@echo " shaders-d3d12 Compile DXIL into shaders/d3d12/ (needs shadercross)"
|
||||
@echo " shaders-metal Compile MSL into shaders/metal/ (needs shadercross)"
|
||||
@@ -10,6 +11,9 @@ help:
|
||||
@echo " check Typecheck examples/toad"
|
||||
@echo " toad Run the toad example"
|
||||
|
||||
bake:
|
||||
./scripts/bake_all.sh
|
||||
|
||||
shaders-vulkan:
|
||||
./scripts/shaders_vulkan.sh
|
||||
|
||||
|
||||
+56
-17
@@ -59,7 +59,9 @@ Atlas :: struct {
|
||||
pixels: []u8,
|
||||
width: int,
|
||||
height: int,
|
||||
rects: [][4]int, // [x, y, w, h] per frame; sizes may differ across clips
|
||||
rects: [][4]int,
|
||||
source_sizes: [][2]int,
|
||||
trim_offsets: [][2]int,
|
||||
}
|
||||
|
||||
// Where one clip's frames sit inside the packed atlas frame list
|
||||
@@ -95,6 +97,8 @@ bake_character :: proc(in_dir, out_dir: string) {
|
||||
atlas := pack_atlas(frames)
|
||||
defer delete(atlas.pixels)
|
||||
defer delete(atlas.rects)
|
||||
defer delete(atlas.source_sizes)
|
||||
defer delete(atlas.trim_offsets)
|
||||
|
||||
ensure_dir(out_dir)
|
||||
|
||||
@@ -283,22 +287,56 @@ destroy_frames :: proc(frames: []^image.Image) {
|
||||
delete(frames)
|
||||
}
|
||||
|
||||
// pack_atlas packs variable-size frames with stb_rect_pack and blits them into one sheet.
|
||||
// Caller owns atlas.pixels and atlas.rects.
|
||||
opaque_bounds :: proc(img: ^image.Image, alpha_min: u8 = 1) -> (x, y, w, h: int) {
|
||||
iw, ih := int(img.width), int(img.height)
|
||||
pixels := bytes.buffer_to_bytes(&img.pixels)
|
||||
|
||||
min_x, min_y := iw, ih
|
||||
max_x, max_y := -1, -1
|
||||
|
||||
for py in 0 ..< ih {
|
||||
for px in 0 ..< iw {
|
||||
i := (py * iw + px) * 4
|
||||
a := pixels[i + 3]
|
||||
if a >= alpha_min {
|
||||
if px < min_x do min_x = px
|
||||
if py < min_y do min_y = py
|
||||
if px > max_x do max_x = px
|
||||
if py > max_y do max_y = py
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if max_x < min_x {
|
||||
return 0, 0, 1, 1
|
||||
}
|
||||
return min_x, min_y, max_x - min_x + 1, max_y - min_y + 1
|
||||
}
|
||||
|
||||
pack_atlas :: proc(frames: []^image.Image) -> Atlas {
|
||||
PADDING :: 1 // 1px gap to reduce bleeding if filtered later
|
||||
PADDING :: 1
|
||||
|
||||
pack_rects := make([]stbrp.Rect, len(frames))
|
||||
defer delete(pack_rects)
|
||||
|
||||
trims := make([][4]int, len(frames))
|
||||
defer delete(trims)
|
||||
source_sizes := make([][2]int, len(frames))
|
||||
trim_offsets := make([][2]int, len(frames))
|
||||
|
||||
total_area := 0
|
||||
max_w := 0
|
||||
max_h := 0
|
||||
for frame, i in frames {
|
||||
w := frame.width + PADDING
|
||||
h := frame.height + PADDING
|
||||
tx, ty, tw, th := opaque_bounds(frame)
|
||||
trims[i] = {tx, ty, tw, th}
|
||||
source_sizes[i] = {int(frame.width), int(frame.height)}
|
||||
trim_offsets[i] = {tx, ty}
|
||||
|
||||
w := tw + PADDING
|
||||
h := th + PADDING
|
||||
pack_rects[i] = stbrp.Rect {
|
||||
id = c.int(i), // pack_rects may reorder; id maps back to frame index
|
||||
id = c.int(i),
|
||||
w = stbrp.Coord(w),
|
||||
h = stbrp.Coord(h),
|
||||
}
|
||||
@@ -307,7 +345,6 @@ pack_atlas :: proc(frames: []^image.Image) -> Atlas {
|
||||
max_h = max(max_h, h)
|
||||
}
|
||||
|
||||
// Grow a square-ish atlas until everything fits
|
||||
side := max(max_w, max_h, int(math.ceil(math.sqrt(f64(total_area)))))
|
||||
atlas_w, atlas_h := 0, 0
|
||||
packed := false
|
||||
@@ -326,10 +363,9 @@ pack_atlas :: proc(frames: []^image.Image) -> Atlas {
|
||||
os.exit(1)
|
||||
}
|
||||
|
||||
pixels := make([]u8, atlas_w * atlas_h * 4) // transparent
|
||||
pixels := make([]u8, atlas_w * atlas_h * 4)
|
||||
rects := make([][4]int, len(frames))
|
||||
|
||||
// Blit using each rect's id (array order may have changed during packing)
|
||||
for pr in pack_rects {
|
||||
if !pr.was_packed {
|
||||
fmt.eprintfln("frame %d was not packed", pr.id)
|
||||
@@ -337,19 +373,20 @@ pack_atlas :: proc(frames: []^image.Image) -> Atlas {
|
||||
}
|
||||
idx := int(pr.id)
|
||||
frame := frames[idx]
|
||||
fw := frame.width
|
||||
fh := frame.height
|
||||
trim := trims[idx]
|
||||
tx, ty, tw, th := trim[0], trim[1], trim[2], trim[3]
|
||||
dst_x := int(pr.x)
|
||||
dst_y := int(pr.y)
|
||||
|
||||
src := bytes.buffer_to_bytes(&frame.pixels)
|
||||
for y in 0 ..< fh {
|
||||
src_row := src[y * fw * 4:(y + 1) * fw * 4]
|
||||
src_w := int(frame.width)
|
||||
for y in 0 ..< th {
|
||||
src_row := src[((ty + y) * src_w + tx) * 4:][:tw * 4]
|
||||
dst_i := ((dst_y + y) * atlas_w + dst_x) * 4
|
||||
copy(pixels[dst_i:], src_row)
|
||||
}
|
||||
|
||||
rects[idx] = {dst_x, dst_y, fw, fh}
|
||||
rects[idx] = {dst_x, dst_y, tw, th}
|
||||
}
|
||||
|
||||
fmt.printfln("packed atlas %dx%d", atlas_w, atlas_h)
|
||||
@@ -358,6 +395,8 @@ pack_atlas :: proc(frames: []^image.Image) -> Atlas {
|
||||
width = atlas_w,
|
||||
height = atlas_h,
|
||||
rects = rects,
|
||||
source_sizes = source_sizes,
|
||||
trim_offsets = trim_offsets,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -422,8 +461,8 @@ build_char_def :: proc(
|
||||
r := atlas.rects[slot]
|
||||
frame_defs[i] = Frame_Def {
|
||||
rect = r,
|
||||
source_size = {r[2], r[3]},
|
||||
trim_offset = {0, 0}, // no trimming in v1
|
||||
source_size = atlas.source_sizes[slot],
|
||||
trim_offset = atlas.trim_offsets[slot],
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 MiB After Width: | Height: | Size: 1.6 MiB |
@@ -10,588 +10,572 @@
|
||||
"clips": {
|
||||
"walk": {
|
||||
"loop": true,
|
||||
"fps": 10.00000000,
|
||||
"fps": 15.00000000,
|
||||
"frames": [
|
||||
{
|
||||
"rect": [
|
||||
0,
|
||||
0,
|
||||
268,
|
||||
326
|
||||
1253,
|
||||
630,
|
||||
204,
|
||||
311
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
9,
|
||||
14
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
269,
|
||||
1256,
|
||||
0,
|
||||
268,
|
||||
326
|
||||
218,
|
||||
314
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
9,
|
||||
10
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
538,
|
||||
0,
|
||||
268,
|
||||
326
|
||||
1458,
|
||||
630,
|
||||
231,
|
||||
310
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
9,
|
||||
8
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
807,
|
||||
0,
|
||||
268,
|
||||
326
|
||||
643,
|
||||
943,
|
||||
243,
|
||||
295
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
10,
|
||||
7
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1076,
|
||||
0,
|
||||
268,
|
||||
326
|
||||
881,
|
||||
1245,
|
||||
254,
|
||||
278
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1345,
|
||||
0,
|
||||
268,
|
||||
326
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1614,
|
||||
0,
|
||||
268,
|
||||
326
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
11,
|
||||
8
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
0,
|
||||
327,
|
||||
268,
|
||||
326
|
||||
944,
|
||||
247,
|
||||
288
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
10,
|
||||
7
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
269,
|
||||
327,
|
||||
268,
|
||||
326
|
||||
1669,
|
||||
941,
|
||||
236,
|
||||
305
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
538,
|
||||
327,
|
||||
268,
|
||||
326
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
807,
|
||||
327,
|
||||
268,
|
||||
326
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1076,
|
||||
327,
|
||||
268,
|
||||
326
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1345,
|
||||
327,
|
||||
268,
|
||||
326
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1614,
|
||||
327,
|
||||
268,
|
||||
326
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
9,
|
||||
8
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
0,
|
||||
654,
|
||||
268,
|
||||
326
|
||||
316,
|
||||
223,
|
||||
313
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
9,
|
||||
9
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
269,
|
||||
654,
|
||||
268,
|
||||
326
|
||||
1458,
|
||||
941,
|
||||
210,
|
||||
310
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
9,
|
||||
13
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
538,
|
||||
654,
|
||||
268,
|
||||
326
|
||||
224,
|
||||
316,
|
||||
211,
|
||||
313
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
11,
|
||||
11
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
807,
|
||||
654,
|
||||
268,
|
||||
326
|
||||
1032,
|
||||
630,
|
||||
220,
|
||||
311
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
13,
|
||||
7
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1032,
|
||||
942,
|
||||
228,
|
||||
302
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
16,
|
||||
4
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
0,
|
||||
0
|
||||
1233,
|
||||
237,
|
||||
286
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
18,
|
||||
2
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
643,
|
||||
1239,
|
||||
237,
|
||||
286
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
18,
|
||||
2
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
414,
|
||||
943,
|
||||
228,
|
||||
302
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
16,
|
||||
4
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1690,
|
||||
630,
|
||||
220,
|
||||
310
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
13,
|
||||
7
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
436,
|
||||
316,
|
||||
210,
|
||||
313
|
||||
],
|
||||
"source_size": [
|
||||
268,
|
||||
326
|
||||
],
|
||||
"trim_offset": [
|
||||
11,
|
||||
11
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"idle": {
|
||||
"loop": true,
|
||||
"fps": 10.00000000,
|
||||
"fps": 15.00000000,
|
||||
"frames": [
|
||||
{
|
||||
"rect": [
|
||||
1883,
|
||||
0,
|
||||
213,
|
||||
319
|
||||
414,
|
||||
630,
|
||||
205,
|
||||
312
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
6,
|
||||
7
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1883,
|
||||
320,
|
||||
213,
|
||||
319
|
||||
647,
|
||||
316,
|
||||
206,
|
||||
313
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
5,
|
||||
6
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1883,
|
||||
640,
|
||||
213,
|
||||
319
|
||||
854,
|
||||
316,
|
||||
206,
|
||||
313
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
5,
|
||||
6
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1076,
|
||||
654,
|
||||
213,
|
||||
319
|
||||
1684,
|
||||
0,
|
||||
207,
|
||||
314
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
4,
|
||||
5
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1290,
|
||||
654,
|
||||
213,
|
||||
319
|
||||
1256,
|
||||
315,
|
||||
207,
|
||||
314
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
4,
|
||||
5
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1504,
|
||||
654,
|
||||
213,
|
||||
319
|
||||
420,
|
||||
0,
|
||||
208,
|
||||
315
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
3,
|
||||
4
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1718,
|
||||
960,
|
||||
213,
|
||||
319
|
||||
1475,
|
||||
0,
|
||||
208,
|
||||
314
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
3,
|
||||
4
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1076,
|
||||
974,
|
||||
213,
|
||||
319
|
||||
629,
|
||||
0,
|
||||
208,
|
||||
315
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1290,
|
||||
974,
|
||||
213,
|
||||
319
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1504,
|
||||
974,
|
||||
213,
|
||||
319
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
3,
|
||||
3
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
0,
|
||||
981,
|
||||
213,
|
||||
319
|
||||
0,
|
||||
209,
|
||||
315
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
2,
|
||||
3
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
214,
|
||||
981,
|
||||
213,
|
||||
319
|
||||
210,
|
||||
0,
|
||||
209,
|
||||
315
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
2,
|
||||
3
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
428,
|
||||
981,
|
||||
213,
|
||||
319
|
||||
838,
|
||||
0,
|
||||
208,
|
||||
315
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
3,
|
||||
3
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
642,
|
||||
981,
|
||||
213,
|
||||
319
|
||||
1047,
|
||||
0,
|
||||
208,
|
||||
315
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
3,
|
||||
4
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
856,
|
||||
981,
|
||||
213,
|
||||
319
|
||||
1464,
|
||||
315,
|
||||
207,
|
||||
314
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
4,
|
||||
5
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1718,
|
||||
1280,
|
||||
213,
|
||||
319
|
||||
1672,
|
||||
315,
|
||||
207,
|
||||
314
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
4,
|
||||
5
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1070,
|
||||
1294,
|
||||
213,
|
||||
319
|
||||
0,
|
||||
630,
|
||||
206,
|
||||
313
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
5,
|
||||
6
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
1284,
|
||||
1294,
|
||||
213,
|
||||
319
|
||||
207,
|
||||
630,
|
||||
206,
|
||||
313
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
0,
|
||||
0
|
||||
5,
|
||||
6
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
620,
|
||||
630,
|
||||
205,
|
||||
312
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
6,
|
||||
7
|
||||
]
|
||||
},
|
||||
{
|
||||
"rect": [
|
||||
826,
|
||||
630,
|
||||
205,
|
||||
312
|
||||
],
|
||||
"source_size": [
|
||||
213,
|
||||
319
|
||||
],
|
||||
"trim_offset": [
|
||||
6,
|
||||
7
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
@@ -5,12 +5,12 @@
|
||||
"clips": {
|
||||
"idle": {
|
||||
"folder": "Idle",
|
||||
"fps": 10,
|
||||
"fps": 15,
|
||||
"loop": true
|
||||
},
|
||||
"walk": {
|
||||
"folder": "Walk",
|
||||
"fps": 10,
|
||||
"fps": 15,
|
||||
"loop": true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,232 @@
|
||||
package engine
|
||||
|
||||
import "core:testing"
|
||||
|
||||
make_test_character :: proc(allocator := context.allocator) -> Character_Data {
|
||||
data: Character_Data
|
||||
data.def.clips = make(map[string]Clip_Def, allocator)
|
||||
|
||||
idle_frames := make([]Frame_Def, 3, allocator)
|
||||
idle_frames[0] = {
|
||||
rect = {0, 0, 10, 10},
|
||||
}
|
||||
idle_frames[1] = {
|
||||
rect = {10, 0, 10, 10},
|
||||
}
|
||||
idle_frames[2] = {
|
||||
rect = {20, 0, 10, 10},
|
||||
}
|
||||
data.def.clips["idle"] = Clip_Def {
|
||||
loop = true,
|
||||
fps = 10,
|
||||
frames = idle_frames,
|
||||
}
|
||||
|
||||
once_frames := make([]Frame_Def, 3, allocator)
|
||||
once_frames[0] = {
|
||||
rect = {0, 10, 10, 10},
|
||||
}
|
||||
once_frames[1] = {
|
||||
rect = {10, 10, 10, 10},
|
||||
}
|
||||
once_frames[2] = {
|
||||
rect = {20, 10, 10, 10},
|
||||
}
|
||||
data.def.clips["once"] = Clip_Def {
|
||||
loop = false,
|
||||
fps = 10,
|
||||
frames = once_frames,
|
||||
}
|
||||
|
||||
hold_frames := make([]Frame_Def, 2, allocator)
|
||||
hold_frames[0] = {
|
||||
rect = {0, 20, 10, 10},
|
||||
}
|
||||
hold_frames[1] = {
|
||||
rect = {10, 20, 10, 10},
|
||||
}
|
||||
data.def.clips["hold"] = Clip_Def {
|
||||
loop = true,
|
||||
fps = 0,
|
||||
frames = hold_frames,
|
||||
}
|
||||
|
||||
return data
|
||||
}
|
||||
|
||||
destroy_test_character :: proc(data: ^Character_Data) {
|
||||
if data == nil do return
|
||||
keys := make([dynamic]string, context.temp_allocator)
|
||||
for key, clip in data.def.clips {
|
||||
delete(clip.frames)
|
||||
append(&keys, key)
|
||||
}
|
||||
for key in keys {
|
||||
delete_key(&data.def.clips, key)
|
||||
}
|
||||
delete(data.def.clips)
|
||||
data^ = {}
|
||||
}
|
||||
|
||||
@(test)
|
||||
character_clip_found_and_missing :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
clip, ok := character_clip(&data, "idle")
|
||||
testing.expect(t, ok)
|
||||
testing.expect_value(t, len(clip.frames), 3)
|
||||
testing.expect(t, clip.loop)
|
||||
testing.expect_value(t, clip.fps, f32(10))
|
||||
|
||||
_, ok = character_clip(&data, "missing")
|
||||
testing.expect(t, !ok)
|
||||
|
||||
data.def.clips["empty"] = Clip_Def {
|
||||
loop = true,
|
||||
fps = 10,
|
||||
frames = nil,
|
||||
}
|
||||
_, ok = character_clip(&data, "empty")
|
||||
testing.expect(t, !ok)
|
||||
}
|
||||
|
||||
@(test)
|
||||
set_sprite_clip_switch_and_guards :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
sprite := spawn_sprite(&data, {0, 0}, "idle", 0)
|
||||
testing.expect_value(t, sprite.clip, "idle")
|
||||
|
||||
sprite.frame = 2
|
||||
sprite.time = 0.05
|
||||
set_sprite_clip(&sprite, "once")
|
||||
testing.expect_value(t, sprite.clip, "once")
|
||||
testing.expect_value(t, sprite.frame, 0)
|
||||
testing.expect_value(t, sprite.time, f32(0))
|
||||
|
||||
sprite.frame = 1
|
||||
sprite.time = 0.09
|
||||
set_sprite_clip(&sprite, "once")
|
||||
testing.expect_value(t, sprite.frame, 1)
|
||||
testing.expect_value(t, sprite.time, f32(0.09))
|
||||
|
||||
set_sprite_clip(&sprite, "nope")
|
||||
testing.expect_value(t, sprite.clip, "once")
|
||||
testing.expect_value(t, sprite.frame, 1)
|
||||
testing.expect_value(t, sprite.time, f32(0.09))
|
||||
}
|
||||
|
||||
@(test)
|
||||
spawn_sprite_valid_and_invalid :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := spawn_sprite(&data, {1, 2}, "idle", 0)
|
||||
testing.expect_value(t, s.clip, "idle")
|
||||
testing.expect_value(t, s.frame, 0)
|
||||
testing.expect_value(t, s.time, f32(0))
|
||||
testing.expect_value(t, s.position, Vec2{1, 2})
|
||||
|
||||
s2 := spawn_sprite(&data, {}, "idle", 2)
|
||||
testing.expect_value(t, s2.clip, "idle")
|
||||
testing.expect_value(t, s2.frame, 2)
|
||||
|
||||
s3 := spawn_sprite(&data, {}, "idle", 99)
|
||||
testing.expect_value(t, s3.frame, 2)
|
||||
|
||||
bad := spawn_sprite(&data, {}, "missing", 0)
|
||||
testing.expect_value(t, bad.clip, "")
|
||||
testing.expect_value(t, bad.frame, 0)
|
||||
testing.expect_value(t, bad.time, f32(0))
|
||||
}
|
||||
|
||||
@(test)
|
||||
update_sprite_advances_one_frame :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := spawn_sprite(&data, {}, "idle", 0)
|
||||
update_sprite(&s, 0.1)
|
||||
testing.expect_value(t, s.frame, 1)
|
||||
testing.expect_value(t, s.time, f32(0))
|
||||
}
|
||||
|
||||
@(test)
|
||||
update_sprite_advances_multiple_frames :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := spawn_sprite(&data, {}, "idle", 0)
|
||||
update_sprite(&s, 0.25)
|
||||
testing.expect_value(t, s.frame, 2)
|
||||
testing.expect(t, s.time > 0.049 && s.time < 0.051)
|
||||
}
|
||||
|
||||
@(test)
|
||||
update_sprite_loops :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := spawn_sprite(&data, {}, "idle", 2)
|
||||
update_sprite(&s, 0.1)
|
||||
testing.expect_value(t, s.frame, 0)
|
||||
}
|
||||
|
||||
@(test)
|
||||
update_sprite_non_loop_holds_last :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := spawn_sprite(&data, {}, "once", 2)
|
||||
s.time = 0.05
|
||||
update_sprite(&s, 0.1)
|
||||
testing.expect_value(t, s.frame, 2)
|
||||
testing.expect_value(t, s.time, f32(0))
|
||||
}
|
||||
|
||||
@(test)
|
||||
update_sprite_fps_zero_holds :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := spawn_sprite(&data, {}, "hold", 0)
|
||||
update_sprite(&s, 1.0)
|
||||
testing.expect_value(t, s.frame, 0)
|
||||
}
|
||||
|
||||
@(test)
|
||||
update_sprite_dt_non_positive_noop :: proc(t: ^testing.T) {
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := spawn_sprite(&data, {}, "idle", 0)
|
||||
update_sprite(&s, 0)
|
||||
update_sprite(&s, -0.1)
|
||||
testing.expect_value(t, s.frame, 0)
|
||||
testing.expect_value(t, s.time, f32(0))
|
||||
}
|
||||
|
||||
@(test)
|
||||
update_sprite_nil_and_missing_clip_safe :: proc(t: ^testing.T) {
|
||||
update_sprite(nil, 0.1)
|
||||
|
||||
data := make_test_character()
|
||||
defer destroy_test_character(&data)
|
||||
|
||||
s := Sprite {
|
||||
data = &data,
|
||||
clip = "missing",
|
||||
frame = 0,
|
||||
time = 0,
|
||||
}
|
||||
update_sprite(&s, 0.1)
|
||||
testing.expect_value(t, s.frame, 0)
|
||||
|
||||
s2 := Sprite {
|
||||
data = nil,
|
||||
clip = "idle",
|
||||
}
|
||||
update_sprite(&s2, 0.1)
|
||||
}
|
||||
+97
-17
@@ -1,6 +1,7 @@
|
||||
package engine
|
||||
|
||||
import "core:fmt"
|
||||
import "core:mem"
|
||||
import "core:path/filepath"
|
||||
import sdl "vendor:sdl3"
|
||||
|
||||
@@ -10,7 +11,14 @@ Vertex :: struct {
|
||||
}
|
||||
|
||||
SPRITE_VERT_COUNT :: 6
|
||||
VERTEX_BUFFER_SIZE :: SPRITE_VERT_COUNT * size_of(Vertex)
|
||||
MAX_SPRITES :: 128
|
||||
SPRITE_VERTS_SIZE :: SPRITE_VERT_COUNT * size_of(Vertex)
|
||||
VERTEX_BUFFER_SIZE :: MAX_SPRITES * SPRITE_VERTS_SIZE
|
||||
|
||||
Queued_Sprite :: struct {
|
||||
texture: ^sdl.GPUTexture,
|
||||
verts: [SPRITE_VERT_COUNT]Vertex,
|
||||
}
|
||||
|
||||
App :: struct {
|
||||
window: ^sdl.Window,
|
||||
@@ -25,6 +33,8 @@ App :: struct {
|
||||
swapchain_h: u32,
|
||||
vertex_buffer: ^sdl.GPUBuffer,
|
||||
transfer_buffer: ^sdl.GPUTransferBuffer,
|
||||
draw_list: [dynamic]Queued_Sprite,
|
||||
clear_color: sdl.FColor,
|
||||
}
|
||||
|
||||
Shader_Backend :: enum {
|
||||
@@ -112,10 +122,14 @@ init :: proc(app: ^App, title: cstring, width, height: i32) -> bool {
|
||||
return false
|
||||
}
|
||||
|
||||
app.draw_list = make([dynamic]Queued_Sprite)
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
shutdown :: proc(app: ^App) {
|
||||
delete(app.draw_list)
|
||||
|
||||
if app.device != nil {
|
||||
ok := sdl.WaitForGPUIdle(app.device)
|
||||
if !ok {
|
||||
@@ -164,9 +178,13 @@ events :: proc() -> bool {
|
||||
return true
|
||||
}
|
||||
|
||||
begin_frame :: proc(app: ^App, clear: sdl.FColor = {0.12, 0.12, 0.16, 1}) {
|
||||
app.cmd = sdl.AcquireGPUCommandBuffer(app.device)
|
||||
begin_frame :: proc(app: ^App, clear_color: sdl.FColor = {0.12, 0.12, 0.16, 1}) {
|
||||
clear(&app.draw_list)
|
||||
app.clear_color = clear_color
|
||||
app.render_pass = nil
|
||||
app.swapchain_texture = nil
|
||||
|
||||
app.cmd = sdl.AcquireGPUCommandBuffer(app.device)
|
||||
if app.cmd == nil {
|
||||
fmt.eprintfln("AcquireGPUCommandBuffer failed: %s", sdl.GetError())
|
||||
return
|
||||
@@ -181,36 +199,98 @@ begin_frame :: proc(app: ^App, clear: sdl.FColor = {0.12, 0.12, 0.16, 1}) {
|
||||
)
|
||||
|
||||
if !ok || app.swapchain_texture == nil {
|
||||
app.swapchain_texture = nil
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
end_frame :: proc(app: ^App) {
|
||||
if app.cmd == nil {
|
||||
clear(&app.draw_list)
|
||||
return
|
||||
}
|
||||
|
||||
cmd := app.cmd
|
||||
defer {
|
||||
app.render_pass = nil
|
||||
app.swapchain_texture = nil
|
||||
app.cmd = nil
|
||||
clear(&app.draw_list)
|
||||
}
|
||||
|
||||
if app.swapchain_texture == nil {
|
||||
if !sdl.SubmitGPUCommandBuffer(cmd) {
|
||||
fmt.eprintfln("SubmitGPUCommandBuffer failed")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
n := len(app.draw_list)
|
||||
if n > 0 {
|
||||
map_ptr := sdl.MapGPUTransferBuffer(app.device, app.transfer_buffer, false)
|
||||
if map_ptr == nil {
|
||||
fmt.eprintfln("MapGPUTransferBuffer failed: %s", sdl.GetError())
|
||||
if !sdl.SubmitGPUCommandBuffer(cmd) {
|
||||
fmt.eprintfln("SubmitGPUCommandBuffer failed")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
for i in 0 ..< n {
|
||||
q := &app.draw_list[i]
|
||||
offset := i * SPRITE_VERTS_SIZE
|
||||
mem.copy(
|
||||
rawptr(uintptr(map_ptr) + uintptr(offset)),
|
||||
raw_data(q.verts[:]),
|
||||
SPRITE_VERTS_SIZE,
|
||||
)
|
||||
}
|
||||
sdl.UnmapGPUTransferBuffer(app.device, app.transfer_buffer)
|
||||
|
||||
copy_pass := sdl.BeginGPUCopyPass(cmd)
|
||||
src := sdl.GPUTransferBufferLocation {
|
||||
transfer_buffer = app.transfer_buffer,
|
||||
offset = 0,
|
||||
}
|
||||
dst := sdl.GPUBufferRegion {
|
||||
buffer = app.vertex_buffer,
|
||||
offset = 0,
|
||||
size = u32(n * SPRITE_VERTS_SIZE),
|
||||
}
|
||||
sdl.UploadToGPUBuffer(copy_pass, src, dst, false)
|
||||
sdl.EndGPUCopyPass(copy_pass)
|
||||
}
|
||||
|
||||
color_info := sdl.GPUColorTargetInfo {
|
||||
texture = app.swapchain_texture,
|
||||
clear_color = clear,
|
||||
clear_color = app.clear_color,
|
||||
load_op = .CLEAR,
|
||||
store_op = .STORE,
|
||||
}
|
||||
|
||||
app.render_pass = sdl.BeginGPURenderPass(app.cmd, &color_info, 1, nil)
|
||||
|
||||
app.render_pass = sdl.BeginGPURenderPass(cmd, &color_info, 1, nil)
|
||||
sdl.BindGPUGraphicsPipeline(app.render_pass, app.pipeline)
|
||||
|
||||
for q, i in app.draw_list {
|
||||
sampler_binding := sdl.GPUTextureSamplerBinding {
|
||||
texture = q.texture,
|
||||
sampler = app.sampler,
|
||||
}
|
||||
sdl.BindGPUFragmentSamplers(app.render_pass, 0, &sampler_binding, 1)
|
||||
|
||||
vb_binding := sdl.GPUBufferBinding {
|
||||
buffer = app.vertex_buffer,
|
||||
offset = u32(i * SPRITE_VERTS_SIZE),
|
||||
}
|
||||
sdl.BindGPUVertexBuffers(app.render_pass, 0, &vb_binding, 1)
|
||||
sdl.DrawGPUPrimitives(app.render_pass, SPRITE_VERT_COUNT, 1, 0, 0)
|
||||
}
|
||||
|
||||
end_frame :: proc(app: ^App) {
|
||||
if app.render_pass != nil {
|
||||
sdl.EndGPURenderPass(app.render_pass)
|
||||
app.render_pass = nil
|
||||
}
|
||||
|
||||
if app.cmd != nil {
|
||||
ok := sdl.SubmitGPUCommandBuffer(app.cmd)
|
||||
if !ok {
|
||||
if !sdl.SubmitGPUCommandBuffer(cmd) {
|
||||
fmt.eprintfln("SubmitGPUCommandBuffer failed")
|
||||
}
|
||||
app.cmd = nil
|
||||
}
|
||||
|
||||
app.swapchain_texture = nil
|
||||
}
|
||||
|
||||
load_gpu_shader :: proc(
|
||||
|
||||
@@ -170,7 +170,10 @@ load_character_data :: proc(app: ^App, character_json_path: string) -> (Characte
|
||||
sdl.EndGPUCopyPass(copy_pass)
|
||||
fence := sdl.SubmitGPUCommandBufferAndAcquireFence(cmd)
|
||||
if fence == nil {
|
||||
fmt.eprintfln("SubmitGPUCommandBufferAndAcquireFence (texture upload) failed: %s", sdl.GetError())
|
||||
fmt.eprintfln(
|
||||
"SubmitGPUCommandBufferAndAcquireFence (texture upload) failed: %s",
|
||||
sdl.GetError(),
|
||||
)
|
||||
sdl.ReleaseGPUTransferBuffer(app.device, tbuf)
|
||||
sdl.ReleaseGPUTexture(app.device, out.texture)
|
||||
return {}, false
|
||||
@@ -200,6 +203,29 @@ destroy_character_data :: proc(app: ^App, data: ^Character_Data) {
|
||||
data^ = {}
|
||||
}
|
||||
|
||||
character_clip :: proc(data: ^Character_Data, clip_name: string) -> (clip: Clip_Def, ok: bool) {
|
||||
if data == nil do return {}, false
|
||||
character, found := data.def.clips[clip_name]
|
||||
if !found || len(character.frames) == 0 do return {}, false
|
||||
return character, true
|
||||
}
|
||||
|
||||
character_frame :: proc(
|
||||
data: ^Character_Data,
|
||||
clip_name: string,
|
||||
frame_index: int,
|
||||
) -> (
|
||||
frame: Frame_Def,
|
||||
ok: bool,
|
||||
) {
|
||||
if data == nil do return {}, false
|
||||
clip, found := data.def.clips[clip_name]
|
||||
if !found || frame_index < 0 || frame_index >= len(clip.frames) {
|
||||
return {}, false
|
||||
}
|
||||
return clip.frames[frame_index], true
|
||||
}
|
||||
|
||||
character_frame_rect :: proc(
|
||||
data: ^Character_Data,
|
||||
clip_name: string,
|
||||
@@ -208,10 +234,7 @@ character_frame_rect :: proc(
|
||||
rect: [4]int,
|
||||
ok: bool,
|
||||
) {
|
||||
clip, found := data.def.clips[clip_name]
|
||||
if !found || frame_index < 0 || frame_index >= len(clip.frames) {
|
||||
return {}, false
|
||||
}
|
||||
|
||||
return clip.frames[frame_index].rect, true
|
||||
frame, found := character_frame(data, clip_name, frame_index)
|
||||
if !found do return {}, false
|
||||
return frame.rect, true
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package engine
|
||||
|
||||
import sdl "vendor:sdl3"
|
||||
|
||||
Key :: enum {
|
||||
A,
|
||||
D,
|
||||
Left,
|
||||
Right,
|
||||
}
|
||||
|
||||
key_down :: proc(key: Key) -> bool {
|
||||
keys := sdl.GetKeyboardState(nil)
|
||||
if keys == nil do return false
|
||||
|
||||
scan_code: sdl.Scancode
|
||||
switch key {
|
||||
case .A:
|
||||
scan_code = .A
|
||||
case .D:
|
||||
scan_code = .D
|
||||
case .Left:
|
||||
scan_code = .LEFT
|
||||
case .Right:
|
||||
scan_code = .RIGHT
|
||||
}
|
||||
return keys[scan_code]
|
||||
}
|
||||
+112
-67
@@ -1,6 +1,5 @@
|
||||
package engine
|
||||
|
||||
import "core:mem"
|
||||
import sdl "vendor:sdl3"
|
||||
|
||||
Vec2 :: [2]f32
|
||||
@@ -10,6 +9,8 @@ Sprite :: struct {
|
||||
position: Vec2,
|
||||
clip: string,
|
||||
frame: int,
|
||||
time: f32,
|
||||
flip_x: bool,
|
||||
}
|
||||
|
||||
spawn_sprite :: proc(
|
||||
@@ -18,13 +19,60 @@ spawn_sprite :: proc(
|
||||
clip: string = "idle",
|
||||
frame: int = 0,
|
||||
) -> Sprite {
|
||||
return Sprite{data = data, position = position, clip = clip, frame = frame}
|
||||
sprite := Sprite {
|
||||
data = data,
|
||||
position = position,
|
||||
}
|
||||
set_sprite_clip(&sprite, clip)
|
||||
if frame != 0 {
|
||||
c, ok := character_clip(sprite.data, sprite.clip)
|
||||
if ok {
|
||||
if frame < 0 {
|
||||
sprite.frame = 0
|
||||
} else if frame >= len(c.frames) {
|
||||
sprite.frame = len(c.frames) - 1
|
||||
} else {
|
||||
sprite.frame = frame
|
||||
}
|
||||
}
|
||||
}
|
||||
return sprite
|
||||
}
|
||||
|
||||
// stubbed for later
|
||||
update_sprite :: proc(sprite: ^Sprite, dt: f32) {
|
||||
_ = sprite
|
||||
_ = dt
|
||||
if sprite == nil || sprite.data == nil do return
|
||||
if dt <= 0 do return
|
||||
|
||||
clip, ok := character_clip(sprite.data, sprite.clip)
|
||||
if !ok do return
|
||||
|
||||
frame_count := len(clip.frames)
|
||||
if frame_count <= 0 do return
|
||||
|
||||
if sprite.frame < 0 do sprite.frame = 0
|
||||
if sprite.frame >= frame_count do sprite.frame = frame_count - 1
|
||||
|
||||
if clip.fps <= 0 do return
|
||||
|
||||
sprite.time += dt
|
||||
frame_duration := 1.0 / clip.fps
|
||||
|
||||
for sprite.time >= frame_duration {
|
||||
sprite.time -= frame_duration
|
||||
next := sprite.frame + 1
|
||||
|
||||
if next >= frame_count {
|
||||
if clip.loop {
|
||||
sprite.frame = 0
|
||||
} else {
|
||||
sprite.frame = frame_count - 1
|
||||
sprite.time = 0
|
||||
break
|
||||
}
|
||||
} else {
|
||||
sprite.frame = next
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
to_clip :: proc(px, py, sw, sh: f32) -> [2]f32 {
|
||||
@@ -35,43 +83,62 @@ to_clip :: proc(px, py, sw, sh: f32) -> [2]f32 {
|
||||
}
|
||||
|
||||
draw_sprite :: proc(app: ^App, sprite: ^Sprite) {
|
||||
if app.render_pass == nil || app.cmd == nil || app.swapchain_texture == nil {
|
||||
return // begin_frame may have skipped (minimized window, etc.)
|
||||
if app.cmd == nil || app.swapchain_texture == nil {
|
||||
return
|
||||
}
|
||||
if sprite == nil || sprite.data == nil || sprite.data.texture == nil {
|
||||
return
|
||||
}
|
||||
if len(app.draw_list) >= MAX_SPRITES {
|
||||
return
|
||||
}
|
||||
|
||||
rect, ok := character_frame_rect(sprite.data, sprite.clip, sprite.frame)
|
||||
frame, ok := character_frame(sprite.data, sprite.clip, sprite.frame)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
fw := f32(rect[2])
|
||||
fh := f32(rect[3])
|
||||
src_w := f32(frame.source_size[0])
|
||||
src_h := f32(frame.source_size[1])
|
||||
if src_w <= 0 do src_w = f32(frame.rect[2])
|
||||
if src_h <= 0 do src_h = f32(frame.rect[3])
|
||||
|
||||
// Feet-centered placement, same as renderer version
|
||||
x0_px := sprite.position.x - fw * 0.5
|
||||
y0_px := sprite.position.y - fh
|
||||
fw := f32(frame.rect[2])
|
||||
fh := f32(frame.rect[3])
|
||||
trim_x := f32(frame.trim_offset[0])
|
||||
trim_y := f32(frame.trim_offset[1])
|
||||
pivot := sprite.data.def.pivot
|
||||
|
||||
canvas_top := sprite.position.y - src_h * pivot[1]
|
||||
x0_px, y0_px: f32
|
||||
if sprite.flip_x {
|
||||
canvas_left := sprite.position.x - (1.0 - pivot[0]) * src_w
|
||||
x0_px = canvas_left + (src_w - trim_x - fw)
|
||||
y0_px = canvas_top + trim_y
|
||||
} else {
|
||||
canvas_left := sprite.position.x - src_w * pivot[0]
|
||||
x0_px = canvas_left + trim_x
|
||||
y0_px = canvas_top + trim_y
|
||||
}
|
||||
x1_px := x0_px + fw
|
||||
y1_px := y0_px + fh
|
||||
|
||||
sw := f32(app.swapchain_w)
|
||||
sh := f32(app.swapchain_h)
|
||||
p0 := to_clip(x0_px, y0_px, sw, sh) // top-left
|
||||
p1 := to_clip(x1_px, y0_px, sw, sh) // top-right
|
||||
p2 := to_clip(x1_px, y1_px, sw, sh) // bottom-right
|
||||
p3 := to_clip(x0_px, y1_px, sw, sh) // bottom-left
|
||||
p0 := to_clip(x0_px, y0_px, sw, sh)
|
||||
p1 := to_clip(x1_px, y0_px, sw, sh)
|
||||
p2 := to_clip(x1_px, y1_px, sw, sh)
|
||||
p3 := to_clip(x0_px, y1_px, sw, sh)
|
||||
|
||||
tex_w := f32(sprite.data.width)
|
||||
tex_h := f32(sprite.data.height)
|
||||
u0 := f32(rect[0]) / tex_w
|
||||
v0 := f32(rect[1]) / tex_h
|
||||
u1 := f32(rect[0] + rect[2]) / tex_w
|
||||
v1 := f32(rect[1] + rect[3]) / tex_h
|
||||
u0 := f32(frame.rect[0]) / tex_w
|
||||
v0 := f32(frame.rect[1]) / tex_h
|
||||
u1 := f32(frame.rect[0] + frame.rect[2]) / tex_w
|
||||
v1 := f32(frame.rect[1] + frame.rect[3]) / tex_h
|
||||
if sprite.flip_x do u0, u1 = u1, u0
|
||||
|
||||
// Two triangles: (0,1,2) and (0,2,3)
|
||||
verts := [6]Vertex {
|
||||
verts := [SPRITE_VERT_COUNT]Vertex {
|
||||
{pos = p0, uv = {u0, v0}},
|
||||
{pos = p1, uv = {u1, v0}},
|
||||
{pos = p2, uv = {u1, v1}},
|
||||
@@ -80,52 +147,30 @@ draw_sprite :: proc(app: ^App, sprite: ^Sprite) {
|
||||
{pos = p3, uv = {u0, v1}},
|
||||
}
|
||||
|
||||
map_ptr := sdl.MapGPUTransferBuffer(app.device, app.transfer_buffer, false)
|
||||
if map_ptr == nil {
|
||||
return
|
||||
}
|
||||
mem.copy(map_ptr, raw_data(verts[:]), size_of(verts))
|
||||
sdl.UnmapGPUTransferBuffer(app.device, app.transfer_buffer)
|
||||
|
||||
// IMPORTANT: SDL does not allow beginning a copy pass while a render pass
|
||||
// is active on the same command buffer. Upload on a separate command buffer.
|
||||
copy_cmd := sdl.AcquireGPUCommandBuffer(app.device)
|
||||
if copy_cmd == nil {
|
||||
return
|
||||
}
|
||||
copy_pass := sdl.BeginGPUCopyPass(copy_cmd)
|
||||
|
||||
src := sdl.GPUTransferBufferLocation {
|
||||
transfer_buffer = app.transfer_buffer,
|
||||
offset = 0,
|
||||
}
|
||||
dst := sdl.GPUBufferRegion {
|
||||
buffer = app.vertex_buffer,
|
||||
offset = 0,
|
||||
size = u32(size_of(verts)),
|
||||
}
|
||||
sdl.UploadToGPUBuffer(copy_pass, src, dst, false)
|
||||
sdl.EndGPUCopyPass(copy_pass)
|
||||
fence := sdl.SubmitGPUCommandBufferAndAcquireFence(copy_cmd)
|
||||
if fence == nil {
|
||||
return
|
||||
}
|
||||
defer sdl.ReleaseGPUFence(app.device, fence)
|
||||
if !sdl.WaitForGPUFences(app.device, true, &fence, 1) {
|
||||
return
|
||||
append(
|
||||
&app.draw_list,
|
||||
Queued_Sprite{texture = sprite.data.texture, verts = verts},
|
||||
)
|
||||
}
|
||||
|
||||
sampler_binding := sdl.GPUTextureSamplerBinding {
|
||||
texture = sprite.data.texture,
|
||||
sampler = app.sampler,
|
||||
}
|
||||
sdl.BindGPUFragmentSamplers(app.render_pass, 0, &sampler_binding, 1)
|
||||
set_sprite_clip :: proc(sprite: ^Sprite, clip: string) {
|
||||
if sprite == nil || sprite.data == nil do return
|
||||
|
||||
vb_binding := sdl.GPUBufferBinding {
|
||||
buffer = app.vertex_buffer,
|
||||
offset = 0,
|
||||
}
|
||||
sdl.BindGPUVertexBuffers(app.render_pass, 0, &vb_binding, 1)
|
||||
if sprite.clip == clip do return
|
||||
|
||||
sdl.DrawGPUPrimitives(app.render_pass, 6, 1, 0, 0)
|
||||
_, ok := character_clip(sprite.data, clip)
|
||||
if !ok do return
|
||||
|
||||
sprite.clip = clip
|
||||
sprite.frame = 0
|
||||
sprite.time = 0
|
||||
}
|
||||
|
||||
sprite_quad_origin :: proc(position: Vec2, size: Vec2, pivot: [2]f32) -> Vec2 {
|
||||
return {position.x - size.x * pivot[0], position.y - size.y * pivot[1]}
|
||||
}
|
||||
|
||||
set_sprite_flip_x :: proc(sprite: ^Sprite, flip: bool) {
|
||||
if sprite == nil do return
|
||||
sprite.flip_x = flip
|
||||
}
|
||||
|
||||
@@ -19,3 +19,17 @@ to_clip_corners :: proc(t: ^testing.T) {
|
||||
testing.expect_value(t, p[0], f32(0))
|
||||
testing.expect_value(t, p[1], f32(0))
|
||||
}
|
||||
|
||||
@(test)
|
||||
sprite_quad_origin_feet :: proc(t: ^testing.T) {
|
||||
o := sprite_quad_origin({400, 500}, {100, 200}, {0.5, 1.0})
|
||||
testing.expect_value(t, o.x, f32(350))
|
||||
testing.expect_value(t, o.y, f32(300))
|
||||
}
|
||||
|
||||
@(test)
|
||||
sprite_quad_origin_center :: proc(t: ^testing.T) {
|
||||
o := sprite_quad_origin({400, 500}, {100, 200}, {0.5, 0.5})
|
||||
testing.expect_value(t, o.x, f32(350))
|
||||
testing.expect_value(t, o.y, f32(400))
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package engine
|
||||
|
||||
import sdl "vendor:sdl3"
|
||||
|
||||
// now_seconds returns seconds since SDL init (monotonic for frame timing).
|
||||
now_seconds :: proc() -> f64 {
|
||||
return f64(sdl.GetTicksNS()) / 1_000_000_000.0
|
||||
}
|
||||
+27
-2
@@ -4,7 +4,7 @@ import eng "pkg:engine"
|
||||
|
||||
main :: proc() {
|
||||
app: eng.App
|
||||
if !eng.init(&app, "toad", 800, 600) do return
|
||||
if !eng.init(&app, "toad game", 800, 600) do return
|
||||
defer eng.shutdown(&app)
|
||||
|
||||
data, ok := eng.load_character_data(&app, "assets_baked/characters/toad/toad.char.json")
|
||||
@@ -14,10 +14,35 @@ main :: proc() {
|
||||
|
||||
toad := eng.spawn_sprite(&data, {400, 500}, "idle", 0)
|
||||
|
||||
last := eng.now_seconds()
|
||||
SPEED :: f32(200)
|
||||
|
||||
for eng.events() {
|
||||
now := eng.now_seconds()
|
||||
dt := f32(now - last)
|
||||
last = now
|
||||
|
||||
left := eng.key_down(.A) || eng.key_down(.Left)
|
||||
right := eng.key_down(.D) || eng.key_down(.Right)
|
||||
|
||||
if left || right {
|
||||
eng.set_sprite_clip(&toad, "walk")
|
||||
if left {
|
||||
toad.position.x -= SPEED * dt
|
||||
toad.flip_x = true
|
||||
}
|
||||
|
||||
if right {
|
||||
toad.position.x += SPEED * dt
|
||||
toad.flip_x = false
|
||||
}
|
||||
} else {
|
||||
eng.set_sprite_clip(&toad, "idle")
|
||||
}
|
||||
eng.update_sprite(&toad, dt)
|
||||
|
||||
eng.begin_frame(&app)
|
||||
eng.draw_sprite(&app, &toad)
|
||||
eng.end_frame(&app)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Executable
+31
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
CONTENT_ROOT="${CONTENT_ROOT:-content/characters}"
|
||||
OUT_ROOT="${OUT_ROOT:-assets_baked/characters}"
|
||||
|
||||
if [[ ! -d "$CONTENT_ROOT" ]]; then
|
||||
echo "missing content root: $CONTENT_ROOT" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
shopt -s nullglob
|
||||
manifests=("$CONTENT_ROOT"/*/manifest.json)
|
||||
if [[ ${#manifests[@]} -eq 0 ]]; then
|
||||
echo "no character manifests under $CONTENT_ROOT" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for manifest in "${manifests[@]}"; do
|
||||
char_dir="$(dirname "$manifest")"
|
||||
name="$(basename "$char_dir")"
|
||||
out_dir="$OUT_ROOT/$name"
|
||||
mkdir -p "$out_dir"
|
||||
echo "baking $name -> $out_dir"
|
||||
odin run assetbake -- "$char_dir" "$out_dir"
|
||||
done
|
||||
|
||||
echo "baked ${#manifests[@]} character(s)"
|
||||
Reference in New Issue
Block a user