diff --git a/.gitignore b/.gitignore index 606cf1a..8cf1d06 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ tools/godot/ build/ captures/ *.log +__pycache__/ diff --git a/CLAUDE.md b/CLAUDE.md index 2371758..4fb61cf 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -46,6 +46,8 @@ continuity. | `make soak-selfcheck` | About a minute: tampers with one client's world and checks the soak's comparison catches it and only it. | | `make server-package-check` | Builds the server image with `packaging/docker/compose.yaml`, waits for it to be healthy, checks it is non-root and read-only, joins it with a headless client and stops it with SIGTERM (N7, about 1.5 min). Needs Docker. See `packaging/README.md`. | | `make models` | Rebuilds every item model (`assets/models/items/*.obj`, with grip data in `.json`) and icon (`assets/icons/items/*.png`) from `tools/models/items.py` in headless Blender on the CPU. Materials are named after `Palette` colours; `ItemModels` paints them. | +| `make art` | Rebuilds every generated model: the player figure (`make figure`: `assets/models/figure/`, from `tools/models/figure.py`, about 3 s) and the items with their icons (`make models`). | +| `make figure-captures` | Renders the player figure in every movement state, every action, and close up holding a carbine (`captures/figure_*.png`, about 1.5 min). Needs Docker. Look at them. | | `make item-captures` | Renders items held in a row, over the shoulder, lying on the ground and the four tiers (`captures/items_*.png`, about 3 min). Needs Docker. Look at them. | | `make audio` | Regenerates every sound and the score's layers in `assets/audio/` from `tools/audio/` (about 6 s), with `manifest.json`. Commit the WAVs it changes. | | `make audio-check` | Checks each file in `assets/audio/` matches its manifest hash and its loudness target, and the mix order (tide loudest). Also run by `test_audio_assets`, which regenerates everything and compares. | diff --git a/Makefile b/Makefile index fb5270e..b9fb3c4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Tidewall build entry points. Everything runs headless with the repo-local engine. GODOT := tools/godot.sh -.PHONY: models item-captures audio audio-check check import parse test test-selfcheck smoke capture-test terrain-capture binaries verify-engine bot-matches match match-captures client-check client-captures hud-captures style-captures menu-captures chart-captures discovery-check fuzz soak soak-selfcheck server-package-check +.PHONY: art figure figure-captures models item-captures audio audio-check check import parse test test-selfcheck smoke capture-test terrain-capture binaries verify-engine bot-matches match match-captures client-check client-captures hud-captures style-captures menu-captures chart-captures discovery-check fuzz soak soak-selfcheck server-package-check ## A8: regenerates every sound in assets/audio/ from tools/audio/ (about 6 s). audio: import @@ -16,6 +16,19 @@ models: @nice -n 15 blender --background --factory-startup --python tools/models/items.py @$(GODOT) --import --quit >/dev/null 2>&1 || true +## A2 and A4: every generated model, the player figure and the items with their icons. +art: figure models + +## A2: the player figure's parts (assets/models/figure/), about 3 s. +figure: + @nice -n 15 blender --background --factory-startup --python tools/models/figure.py >/dev/null + @$(GODOT) --import --quit >/dev/null 2>&1 || true + +## A2: the figure in every movement state, every action, and close up +## (captures/figure_*.png, about 1.5 min). Needs Docker. Look at them. +figure-captures: import + @for stage in states actions close; do tools/capture.sh figure_$$stage captures/figure_$$stage.png; done + ## A4: items held in the hand, over the shoulder, lying on the ground and by tier ## (captures/items_*.png, about 3 min). Needs Docker. Look at them. item-captures: import diff --git a/assets/PROVENANCE.md b/assets/PROVENANCE.md index 80c4d50..e67ae71 100644 --- a/assets/PROVENANCE.md +++ b/assets/PROVENANCE.md @@ -27,6 +27,7 @@ file and compares hashes). Files are mono 16-bit PCM at 22,050 Hz. Licence: see |---|---|---| | `models/items/.obj`, `.mtl`, `.json` | `tools/models/items.py` | Built from primitives (boxes, cylinders, cones, spheres, tori) in headless Blender (`blender --background --factory-startup --python tools/models/items.py`). Materials are named after `Palette` colours, and the client paints them from `src/client/style/palette.gd`. The JSON holds the grip, the left hand's support point and the bounds. | | `icons/items/.png` | `tools/models/items.py` | The same model rendered at 128 px with Cycles on the CPU, colours read from `palette.gd`. | +| `models/figure/.obj`, `.mtl`, `figure.json` | `tools/models/figure.py` | The player figure, built from primitives in headless Blender (`make art`), one rigid part per limb with its origin at its joint. Materials are `Palette` names, plus `COAT` and `COAT_DARK` for the player's own oilskin. The animations aren't files: `src/client/entities/figure_poses.gd` holds them as key poses written by hand. | OBJ, not glTF: the Debian Blender's glTF exporter needs numpy, which the build machine doesn't have. Blender isn't part of `make check`, so these files are checked diff --git a/assets/models/figure/figure.json b/assets/models/figure/figure.json new file mode 100644 index 0000000..1b42b6c --- /dev/null +++ b/assets/models/figure/figure.json @@ -0,0 +1,127 @@ +{ + "generator": "tools/models/figure.py", + "hand_l": [ + 0.24, + 0.86, + 0.03 + ], + "hand_r": [ + -0.24, + 0.86, + 0.03 + ], + "height": 1.8, + "joints": { + "elbow_l": [ + 0.235, + 1.14, + 0.0 + ], + "elbow_r": [ + -0.235, + 1.14, + 0.0 + ], + "hip_l": [ + 0.11, + 0.9, + 0.0 + ], + "hip_r": [ + -0.11, + 0.9, + 0.0 + ], + "hips": [ + 0.0, + 0.92, + 0.0 + ], + "knee_l": [ + 0.11, + 0.49, + 0.0 + ], + "knee_r": [ + -0.11, + 0.49, + 0.0 + ], + "neck": [ + 0.0, + 1.5, + 0.0 + ], + "sail": [ + 0.0, + 1.46, + -0.2 + ], + "shoulder_l": [ + 0.225, + 1.42, + 0.0 + ], + "shoulder_r": [ + -0.225, + 1.42, + 0.0 + ], + "waist": [ + 0.0, + 1.02, + 0.0 + ] + }, + "parts": { + "forearm_l": { + "joint": "elbow_l", + "parent": "shoulder_l" + }, + "forearm_r": { + "joint": "elbow_r", + "parent": "shoulder_r" + }, + "head": { + "joint": "neck", + "parent": "waist" + }, + "pelvis": { + "joint": "hips", + "parent": null + }, + "sail": { + "joint": "sail", + "parent": null + }, + "shin_l": { + "joint": "knee_l", + "parent": "hip_l" + }, + "shin_r": { + "joint": "knee_r", + "parent": "hip_r" + }, + "thigh_l": { + "joint": "hip_l", + "parent": "hips" + }, + "thigh_r": { + "joint": "hip_r", + "parent": "hips" + }, + "torso": { + "joint": "waist", + "parent": "hips" + }, + "upper_arm_l": { + "joint": "shoulder_l", + "parent": "waist" + }, + "upper_arm_r": { + "joint": "shoulder_r", + "parent": "waist" + } + }, + "triangles_before_bevel": 1484 +} diff --git a/assets/models/figure/forearm_l.mtl b/assets/models/figure/forearm_l.mtl new file mode 100644 index 0000000..2dc5fed --- /dev/null +++ b/assets/models/figure/forearm_l.mtl @@ -0,0 +1,32 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl COAT +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.710566 0.393123 0.021981 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl COAT_DARK +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.341419 0.191800 0.012546 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl SKIN +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.507079 0.295700 0.178868 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/forearm_l.obj b/assets/models/figure/forearm_l.obj new file mode 100644 index 0000000..902134f --- /dev/null +++ b/assets/models/figure/forearm_l.obj @@ -0,0 +1,311 @@ +# Blender 4.3.2 +# www.blender.org +mtllib forearm_l.mtl +o Cone.007 +v 0.001000 -0.200000 -0.060000 +v 0.001000 -0.000000 -0.054000 +v 0.043426 -0.200000 -0.042426 +v 0.039184 -0.000000 -0.038184 +v 0.061000 -0.200000 0.000000 +v 0.055000 -0.000000 0.000000 +v 0.043426 -0.200000 0.042426 +v 0.039184 -0.000000 0.038184 +v 0.001000 -0.200000 0.060000 +v 0.001000 -0.000000 0.054000 +v -0.041426 -0.200000 0.042426 +v -0.037184 -0.000000 0.038184 +v -0.059000 -0.200000 0.000000 +v -0.053000 -0.000000 0.000000 +v -0.041426 -0.200000 -0.042426 +v -0.037184 -0.000000 -0.038184 +vn 0.3825 0.0277 -0.9235 +vn 0.9235 0.0277 -0.3825 +vn 0.9235 0.0277 0.3825 +vn 0.3825 0.0277 0.9235 +vn -0.3825 0.0277 0.9235 +vn -0.9235 0.0277 0.3825 +vn -0.0000 1.0000 -0.0000 +vn -0.9235 0.0277 -0.3825 +vn -0.3825 0.0277 -0.9235 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 +o Cylinder.005 +v 0.001000 -0.235000 -0.064000 +v 0.001000 -0.185000 -0.064000 +v 0.046255 -0.235000 -0.045255 +v 0.046255 -0.185000 -0.045255 +v 0.065000 -0.235000 0.000000 +v 0.065000 -0.185000 0.000000 +v 0.046255 -0.235000 0.045255 +v 0.046255 -0.185000 0.045255 +v 0.001000 -0.235000 0.064000 +v 0.001000 -0.185000 0.064000 +v -0.044255 -0.235000 0.045255 +v -0.044255 -0.185000 0.045255 +v -0.063000 -0.235000 0.000000 +v -0.063000 -0.185000 0.000000 +v -0.044255 -0.235000 -0.045255 +v -0.044255 -0.185000 -0.045255 +vn 0.3827 -0.0000 -0.9239 +vn 0.9239 -0.0000 -0.3827 +vn 0.9239 -0.0000 0.3827 +vn 0.3827 -0.0000 0.9239 +vn -0.3827 -0.0000 0.9239 +vn -0.9239 -0.0000 0.3827 +vn -0.0000 1.0000 -0.0000 +vn -0.9239 -0.0000 -0.3827 +vn -0.3827 -0.0000 -0.9239 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT_DARK +f 18//11 19//11 17//11 +f 20//12 21//12 19//12 +f 22//13 23//13 21//13 +f 24//14 25//14 23//14 +f 26//15 27//15 25//15 +f 28//16 29//16 27//16 +f 30//17 26//17 22//17 +f 30//18 31//18 29//18 +f 32//19 17//19 31//19 +f 23//20 27//20 31//20 +f 18//11 20//11 19//11 +f 20//12 22//12 21//12 +f 22//13 24//13 23//13 +f 24//14 26//14 25//14 +f 26//15 28//15 27//15 +f 28//16 30//16 29//16 +f 22//17 20//17 18//17 +f 18//17 32//17 30//17 +f 30//17 28//17 26//17 +f 26//17 24//17 22//17 +f 22//17 18//17 30//17 +f 30//18 32//18 31//18 +f 32//19 18//19 17//19 +f 31//20 17//20 19//20 +f 19//20 21//20 23//20 +f 23//20 25//20 27//20 +f 27//20 29//20 31//20 +f 31//20 19//20 23//20 +o Cube.012 +v -0.019000 -0.330000 0.042500 +v -0.019000 -0.315000 0.057500 +v -0.034000 -0.315000 0.042500 +v -0.019000 -0.245000 0.057500 +v -0.019000 -0.230000 0.042500 +v -0.034000 -0.245000 0.042500 +v -0.019000 -0.330000 -0.012500 +v -0.034000 -0.315000 -0.012500 +v -0.019000 -0.315000 -0.027500 +v -0.019000 -0.230000 -0.012500 +v -0.019000 -0.245000 -0.027500 +v -0.034000 -0.245000 -0.012500 +v 0.021000 -0.330000 0.042500 +v 0.036000 -0.315000 0.042500 +v 0.021000 -0.315000 0.057500 +v 0.021000 -0.230000 0.042500 +v 0.021000 -0.245000 0.057500 +v 0.036000 -0.245000 0.042500 +v 0.021000 -0.330000 -0.012500 +v 0.021000 -0.315000 -0.027500 +v 0.036000 -0.315000 -0.012500 +v 0.021000 -0.230000 -0.012500 +v 0.036000 -0.245000 -0.012500 +v 0.021000 -0.245000 -0.027500 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5773 -0.5774 0.5774 +vn -0.5774 0.5774 0.5774 +vn -0.5774 -0.5774 -0.5774 +vn -0.5774 0.5774 -0.5774 +vn 0.5773 -0.5774 0.5774 +vn 0.5774 0.5774 0.5773 +vn 0.5774 -0.5774 -0.5773 +vn 0.5774 0.5774 -0.5773 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl SKIN +f 49//21 34//21 47//21 +f 55//22 46//22 53//22 +f 42//23 48//23 54//23 +f 38//24 40//24 35//24 +f 43//25 52//25 41//25 +f 33//26 34//26 35//26 +f 36//27 37//27 38//27 +f 39//28 40//28 41//28 +f 42//29 43//29 44//29 +f 45//30 46//30 47//30 +f 48//31 49//31 50//31 +f 51//32 52//32 53//32 +f 54//33 55//33 56//33 +f 33//34 40//34 39//34 +f 36//35 35//35 34//35 +f 42//36 38//36 37//36 +f 41//37 44//37 43//37 +f 39//38 52//38 51//38 +f 54//39 43//39 42//39 +f 53//40 56//40 55//40 +f 51//41 46//41 45//41 +f 48//42 55//42 54//42 +f 47//43 50//43 49//43 +f 45//44 34//44 33//44 +f 37//45 49//45 48//45 +f 51//46 33//46 39//46 +f 49//21 36//21 34//21 +f 55//22 50//22 46//22 +f 42//23 37//23 48//23 +f 38//24 44//24 40//24 +f 43//25 56//25 52//25 +f 33//34 35//34 40//34 +f 36//35 38//35 35//35 +f 42//36 44//36 38//36 +f 41//37 40//37 44//37 +f 39//38 41//38 52//38 +f 54//39 56//39 43//39 +f 53//40 52//40 56//40 +f 51//41 53//41 46//41 +f 48//42 50//42 55//42 +f 47//43 46//43 50//43 +f 45//44 47//44 34//44 +f 37//45 36//45 49//45 +f 51//46 45//46 33//46 +o Cube.013 +v -0.035500 -0.280000 0.066500 +v -0.035500 -0.274000 0.072500 +v -0.041500 -0.274000 0.066500 +v -0.035500 -0.236000 0.072500 +v -0.035500 -0.230000 0.066500 +v -0.041500 -0.236000 0.066500 +v -0.035500 -0.280000 0.043500 +v -0.041500 -0.274000 0.043500 +v -0.035500 -0.274000 0.037500 +v -0.035500 -0.230000 0.043500 +v -0.035500 -0.236000 0.037500 +v -0.041500 -0.236000 0.043500 +v -0.022500 -0.280000 0.066500 +v -0.016500 -0.274000 0.066500 +v -0.022500 -0.274000 0.072500 +v -0.022500 -0.230000 0.066500 +v -0.022500 -0.236000 0.072500 +v -0.016500 -0.236000 0.066500 +v -0.022500 -0.280000 0.043500 +v -0.022500 -0.274000 0.037500 +v -0.016500 -0.274000 0.043500 +v -0.022500 -0.230000 0.043500 +v -0.016500 -0.236000 0.043500 +v -0.022500 -0.236000 0.037500 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5773 -0.5774 0.5774 +vn -0.5773 0.5774 0.5774 +vn -0.5773 -0.5774 -0.5774 +vn -0.5773 0.5774 -0.5774 +vn 0.5773 -0.5774 0.5774 +vn 0.5773 0.5774 0.5774 +vn 0.5773 -0.5774 -0.5774 +vn 0.5773 0.5774 -0.5774 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl SKIN +f 73//47 58//47 71//47 +f 79//48 70//48 77//48 +f 66//49 72//49 78//49 +f 62//50 64//50 59//50 +f 67//51 76//51 65//51 +f 57//52 58//52 59//52 +f 60//53 61//53 62//53 +f 63//54 64//54 65//54 +f 66//55 67//55 68//55 +f 69//56 70//56 71//56 +f 72//57 73//57 74//57 +f 75//58 76//58 77//58 +f 78//59 79//59 80//59 +f 57//60 64//60 63//60 +f 60//61 59//61 58//61 +f 66//62 62//62 61//62 +f 65//63 68//63 67//63 +f 63//64 76//64 75//64 +f 78//65 67//65 66//65 +f 77//66 80//66 79//66 +f 75//67 70//67 69//67 +f 72//68 79//68 78//68 +f 71//69 74//69 73//69 +f 69//70 58//70 57//70 +f 61//71 73//71 72//71 +f 75//72 57//72 63//72 +f 73//47 60//47 58//47 +f 79//48 74//48 70//48 +f 66//49 61//49 72//49 +f 62//50 68//50 64//50 +f 67//51 80//51 76//51 +f 57//60 59//60 64//60 +f 60//61 62//61 59//61 +f 66//62 68//62 62//62 +f 65//63 64//63 68//63 +f 63//64 65//64 76//64 +f 78//65 80//65 67//65 +f 77//66 76//66 80//66 +f 75//67 77//67 70//67 +f 72//68 74//68 79//68 +f 71//69 70//69 74//69 +f 69//70 71//70 58//70 +f 61//71 60//71 73//71 +f 75//72 69//72 57//72 diff --git a/assets/models/figure/forearm_l.obj.import b/assets/models/figure/forearm_l.obj.import new file mode 100644 index 0000000..8bbc8ba --- /dev/null +++ b/assets/models/figure/forearm_l.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://c8ppn61h445le" +path="res://.godot/imported/forearm_l.obj-b007f2eb34a144a9ea004246f5700889.mesh" + +[deps] + +files=["res://.godot/imported/forearm_l.obj-b007f2eb34a144a9ea004246f5700889.mesh"] + +source_file="res://assets/models/figure/forearm_l.obj" +dest_files=["res://.godot/imported/forearm_l.obj-b007f2eb34a144a9ea004246f5700889.mesh", "res://.godot/imported/forearm_l.obj-b007f2eb34a144a9ea004246f5700889.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/forearm_r.mtl b/assets/models/figure/forearm_r.mtl new file mode 100644 index 0000000..2dc5fed --- /dev/null +++ b/assets/models/figure/forearm_r.mtl @@ -0,0 +1,32 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl COAT +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.710566 0.393123 0.021981 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl COAT_DARK +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.341419 0.191800 0.012546 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl SKIN +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.507079 0.295700 0.178868 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/forearm_r.obj b/assets/models/figure/forearm_r.obj new file mode 100644 index 0000000..669a252 --- /dev/null +++ b/assets/models/figure/forearm_r.obj @@ -0,0 +1,311 @@ +# Blender 4.3.2 +# www.blender.org +mtllib forearm_r.mtl +o Cone.006 +v -0.001000 -0.200000 -0.060000 +v -0.001000 -0.000000 -0.054000 +v 0.041426 -0.200000 -0.042426 +v 0.037184 -0.000000 -0.038184 +v 0.059000 -0.200000 0.000000 +v 0.053000 -0.000000 0.000000 +v 0.041426 -0.200000 0.042426 +v 0.037184 -0.000000 0.038184 +v -0.001000 -0.200000 0.060000 +v -0.001000 -0.000000 0.054000 +v -0.043426 -0.200000 0.042426 +v -0.039184 -0.000000 0.038184 +v -0.061000 -0.200000 0.000000 +v -0.055000 -0.000000 0.000000 +v -0.043426 -0.200000 -0.042426 +v -0.039184 -0.000000 -0.038184 +vn 0.3825 0.0277 -0.9235 +vn 0.9235 0.0277 -0.3825 +vn 0.9235 0.0277 0.3825 +vn 0.3825 0.0277 0.9235 +vn -0.3825 0.0277 0.9235 +vn -0.9235 0.0277 0.3825 +vn -0.0000 1.0000 -0.0000 +vn -0.9235 0.0277 -0.3825 +vn -0.3825 0.0277 -0.9235 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 +o Cylinder.004 +v -0.001000 -0.235000 -0.064000 +v -0.001000 -0.185000 -0.064000 +v 0.044255 -0.235000 -0.045255 +v 0.044255 -0.185000 -0.045255 +v 0.063000 -0.235000 0.000000 +v 0.063000 -0.185000 0.000000 +v 0.044255 -0.235000 0.045255 +v 0.044255 -0.185000 0.045255 +v -0.001000 -0.235000 0.064000 +v -0.001000 -0.185000 0.064000 +v -0.046255 -0.235000 0.045255 +v -0.046255 -0.185000 0.045255 +v -0.065000 -0.235000 0.000000 +v -0.065000 -0.185000 0.000000 +v -0.046255 -0.235000 -0.045255 +v -0.046255 -0.185000 -0.045255 +vn 0.3827 -0.0000 -0.9239 +vn 0.9239 -0.0000 -0.3827 +vn 0.9239 -0.0000 0.3827 +vn 0.3827 -0.0000 0.9239 +vn -0.3827 -0.0000 0.9239 +vn -0.9239 -0.0000 0.3827 +vn -0.0000 1.0000 -0.0000 +vn -0.9239 -0.0000 -0.3827 +vn -0.3827 -0.0000 -0.9239 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT_DARK +f 18//11 19//11 17//11 +f 20//12 21//12 19//12 +f 22//13 23//13 21//13 +f 24//14 25//14 23//14 +f 26//15 27//15 25//15 +f 28//16 29//16 27//16 +f 30//17 26//17 22//17 +f 30//18 31//18 29//18 +f 32//19 17//19 31//19 +f 23//20 27//20 31//20 +f 18//11 20//11 19//11 +f 20//12 22//12 21//12 +f 22//13 24//13 23//13 +f 24//14 26//14 25//14 +f 26//15 28//15 27//15 +f 28//16 30//16 29//16 +f 22//17 20//17 18//17 +f 18//17 32//17 30//17 +f 30//17 28//17 26//17 +f 26//17 24//17 22//17 +f 22//17 18//17 30//17 +f 30//18 32//18 31//18 +f 32//19 18//19 17//19 +f 31//20 17//20 19//20 +f 19//20 21//20 23//20 +f 23//20 25//20 27//20 +f 27//20 29//20 31//20 +f 31//20 19//20 23//20 +o Cube.010 +v -0.021000 -0.330000 0.042500 +v -0.021000 -0.315000 0.057500 +v -0.036000 -0.315000 0.042500 +v -0.021000 -0.245000 0.057500 +v -0.021000 -0.230000 0.042500 +v -0.036000 -0.245000 0.042500 +v -0.021000 -0.330000 -0.012500 +v -0.036000 -0.315000 -0.012500 +v -0.021000 -0.315000 -0.027500 +v -0.021000 -0.230000 -0.012500 +v -0.021000 -0.245000 -0.027500 +v -0.036000 -0.245000 -0.012500 +v 0.019000 -0.330000 0.042500 +v 0.034000 -0.315000 0.042500 +v 0.019000 -0.315000 0.057500 +v 0.019000 -0.230000 0.042500 +v 0.019000 -0.245000 0.057500 +v 0.034000 -0.245000 0.042500 +v 0.019000 -0.330000 -0.012500 +v 0.019000 -0.315000 -0.027500 +v 0.034000 -0.315000 -0.012500 +v 0.019000 -0.230000 -0.012500 +v 0.034000 -0.245000 -0.012500 +v 0.019000 -0.245000 -0.027500 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5773 -0.5774 0.5774 +vn -0.5774 0.5774 0.5773 +vn -0.5774 -0.5774 -0.5773 +vn -0.5774 0.5774 -0.5773 +vn 0.5773 -0.5774 0.5774 +vn 0.5774 0.5774 0.5774 +vn 0.5774 -0.5774 -0.5774 +vn 0.5774 0.5774 -0.5774 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl SKIN +f 49//21 34//21 47//21 +f 55//22 46//22 53//22 +f 42//23 48//23 54//23 +f 38//24 40//24 35//24 +f 43//25 52//25 41//25 +f 33//26 34//26 35//26 +f 36//27 37//27 38//27 +f 39//28 40//28 41//28 +f 42//29 43//29 44//29 +f 45//30 46//30 47//30 +f 48//31 49//31 50//31 +f 51//32 52//32 53//32 +f 54//33 55//33 56//33 +f 33//34 40//34 39//34 +f 36//35 35//35 34//35 +f 42//36 38//36 37//36 +f 41//37 44//37 43//37 +f 39//38 52//38 51//38 +f 54//39 43//39 42//39 +f 53//40 56//40 55//40 +f 51//41 46//41 45//41 +f 48//42 55//42 54//42 +f 47//43 50//43 49//43 +f 45//44 34//44 33//44 +f 37//45 49//45 48//45 +f 51//46 33//46 39//46 +f 49//21 36//21 34//21 +f 55//22 50//22 46//22 +f 42//23 37//23 48//23 +f 38//24 44//24 40//24 +f 43//25 56//25 52//25 +f 33//34 35//34 40//34 +f 36//35 38//35 35//35 +f 42//36 44//36 38//36 +f 41//37 40//37 44//37 +f 39//38 41//38 52//38 +f 54//39 56//39 43//39 +f 53//40 52//40 56//40 +f 51//41 53//41 46//41 +f 48//42 50//42 55//42 +f 47//43 46//43 50//43 +f 45//44 47//44 34//44 +f 37//45 36//45 49//45 +f 51//46 45//46 33//46 +o Cube.011 +v 0.022500 -0.280000 0.066500 +v 0.022500 -0.274000 0.072500 +v 0.016500 -0.274000 0.066500 +v 0.022500 -0.236000 0.072500 +v 0.022500 -0.230000 0.066500 +v 0.016500 -0.236000 0.066500 +v 0.022500 -0.280000 0.043500 +v 0.016500 -0.274000 0.043500 +v 0.022500 -0.274000 0.037500 +v 0.022500 -0.230000 0.043500 +v 0.022500 -0.236000 0.037500 +v 0.016500 -0.236000 0.043500 +v 0.035500 -0.280000 0.066500 +v 0.041500 -0.274000 0.066500 +v 0.035500 -0.274000 0.072500 +v 0.035500 -0.230000 0.066500 +v 0.035500 -0.236000 0.072500 +v 0.041500 -0.236000 0.066500 +v 0.035500 -0.280000 0.043500 +v 0.035500 -0.274000 0.037500 +v 0.041500 -0.274000 0.043500 +v 0.035500 -0.230000 0.043500 +v 0.041500 -0.236000 0.043500 +v 0.035500 -0.236000 0.037500 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5773 -0.5774 0.5774 +vn -0.5773 0.5774 0.5774 +vn -0.5773 -0.5774 -0.5774 +vn -0.5773 0.5774 -0.5774 +vn 0.5773 -0.5774 0.5774 +vn 0.5773 0.5774 0.5774 +vn 0.5773 -0.5774 -0.5774 +vn 0.5773 0.5774 -0.5774 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl SKIN +f 73//47 58//47 71//47 +f 79//48 70//48 77//48 +f 66//49 72//49 78//49 +f 62//50 64//50 59//50 +f 67//51 76//51 65//51 +f 57//52 58//52 59//52 +f 60//53 61//53 62//53 +f 63//54 64//54 65//54 +f 66//55 67//55 68//55 +f 69//56 70//56 71//56 +f 72//57 73//57 74//57 +f 75//58 76//58 77//58 +f 78//59 79//59 80//59 +f 57//60 64//60 63//60 +f 60//61 59//61 58//61 +f 66//62 62//62 61//62 +f 65//63 68//63 67//63 +f 63//64 76//64 75//64 +f 78//65 67//65 66//65 +f 77//66 80//66 79//66 +f 75//67 70//67 69//67 +f 72//68 79//68 78//68 +f 71//69 74//69 73//69 +f 69//70 58//70 57//70 +f 61//71 73//71 72//71 +f 75//72 57//72 63//72 +f 73//47 60//47 58//47 +f 79//48 74//48 70//48 +f 66//49 61//49 72//49 +f 62//50 68//50 64//50 +f 67//51 80//51 76//51 +f 57//60 59//60 64//60 +f 60//61 62//61 59//61 +f 66//62 68//62 62//62 +f 65//63 64//63 68//63 +f 63//64 65//64 76//64 +f 78//65 80//65 67//65 +f 77//66 76//66 80//66 +f 75//67 77//67 70//67 +f 72//68 74//68 79//68 +f 71//69 70//69 74//69 +f 69//70 71//70 58//70 +f 61//71 60//71 73//71 +f 75//72 69//72 57//72 diff --git a/assets/models/figure/forearm_r.obj.import b/assets/models/figure/forearm_r.obj.import new file mode 100644 index 0000000..d7f0e0b --- /dev/null +++ b/assets/models/figure/forearm_r.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://cd5wh1wea6bm2" +path="res://.godot/imported/forearm_r.obj-f2f6af5a5aac591ff079da3eb8a0e08f.mesh" + +[deps] + +files=["res://.godot/imported/forearm_r.obj-f2f6af5a5aac591ff079da3eb8a0e08f.mesh"] + +source_file="res://assets/models/figure/forearm_r.obj" +dest_files=["res://.godot/imported/forearm_r.obj-f2f6af5a5aac591ff079da3eb8a0e08f.mesh", "res://.godot/imported/forearm_r.obj-f2f6af5a5aac591ff079da3eb8a0e08f.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/head.mtl b/assets/models/figure/head.mtl new file mode 100644 index 0000000..ca1de75 --- /dev/null +++ b/assets/models/figure/head.mtl @@ -0,0 +1,52 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl BARK +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.132868 0.073239 0.039682 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl COAT +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.710566 0.393123 0.021981 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl COAT_DARK +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.341419 0.191800 0.012546 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl INK +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.021981 0.015325 0.011645 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl SKIN +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.507079 0.295700 0.178868 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/head.obj b/assets/models/figure/head.obj new file mode 100644 index 0000000..6722214 --- /dev/null +++ b/assets/models/figure/head.obj @@ -0,0 +1,686 @@ +# Blender 4.3.2 +# www.blender.org +mtllib head.mtl +o Cylinder.002 +v 0.000000 -0.020000 -0.055000 +v 0.000000 0.080000 -0.055000 +v 0.038891 -0.020000 -0.038891 +v 0.038891 0.080000 -0.038891 +v 0.055000 -0.020000 0.000000 +v 0.055000 0.080000 0.000000 +v 0.038891 -0.020000 0.038891 +v 0.038891 0.080000 0.038891 +v 0.000000 -0.020000 0.055000 +v 0.000000 0.080000 0.055000 +v -0.038891 -0.020000 0.038891 +v -0.038891 0.080000 0.038891 +v -0.055000 -0.020000 0.000000 +v -0.055000 0.080000 0.000000 +v -0.038891 -0.020000 -0.038891 +v -0.038891 0.080000 -0.038891 +vn 0.3827 -0.0000 -0.9239 +vn 0.9239 -0.0000 -0.3827 +vn 0.9239 -0.0000 0.3827 +vn 0.3827 -0.0000 0.9239 +vn -0.3827 -0.0000 0.9239 +vn -0.9239 -0.0000 0.3827 +vn -0.0000 1.0000 -0.0000 +vn -0.9239 -0.0000 -0.3827 +vn -0.3827 -0.0000 -0.9239 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl SKIN +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 +o Sphere +v 0.033798 0.234593 -0.036518 +v 0.058539 0.192500 -0.070572 +v 0.067595 0.135000 -0.083037 +v 0.058539 0.077500 -0.070572 +v 0.033798 0.035407 -0.036518 +v 0.054686 0.234593 -0.007768 +v 0.094719 0.192500 -0.020776 +v 0.109371 0.135000 -0.025537 +v 0.094719 0.077500 -0.020776 +v 0.054686 0.035407 -0.007768 +v 0.054686 0.234593 0.027768 +v 0.094719 0.192500 0.040776 +v 0.109371 0.135000 0.045537 +v 0.094719 0.077500 0.040776 +v 0.054686 0.035407 0.027768 +v 0.033798 0.234593 0.056518 +v 0.058539 0.192500 0.090572 +v 0.067595 0.135000 0.103037 +v 0.058539 0.077500 0.090572 +v 0.033798 0.035407 0.056518 +v 0.000000 0.234593 0.067500 +v 0.000000 0.192500 0.109593 +v 0.000000 0.135000 0.125000 +v 0.000000 0.077500 0.109593 +v 0.000000 0.035407 0.067500 +v -0.033798 0.234593 0.056518 +v -0.058539 0.192500 0.090572 +v -0.067595 0.135000 0.103037 +v -0.058539 0.077500 0.090572 +v -0.033798 0.035407 0.056518 +v 0.000000 0.250000 0.010000 +v -0.054686 0.234593 0.027768 +v -0.094719 0.192500 0.040776 +v -0.109371 0.135000 0.045537 +v -0.094719 0.077500 0.040776 +v -0.054686 0.035407 0.027768 +v 0.000000 0.020000 0.010000 +v -0.054686 0.234593 -0.007768 +v -0.094719 0.192500 -0.020776 +v -0.109371 0.135000 -0.025537 +v -0.094719 0.077500 -0.020776 +v -0.054686 0.035407 -0.007768 +v -0.033798 0.234593 -0.036518 +v -0.058539 0.192500 -0.070572 +v -0.067595 0.135000 -0.083037 +v -0.058539 0.077500 -0.070572 +v -0.033798 0.035407 -0.036518 +v -0.000000 0.234593 -0.047500 +v -0.000000 0.192500 -0.089593 +v -0.000000 0.135000 -0.105000 +v -0.000000 0.077500 -0.089593 +v -0.000000 0.035407 -0.047500 +vn 0.2239 0.6892 -0.6892 +vn 0.2239 -0.6892 -0.6892 +vn 0.2994 0.2469 -0.9216 +vn 0.0838 0.9625 -0.2579 +vn 0.0838 -0.9625 -0.2579 +vn 0.2994 -0.2469 -0.9216 +vn 0.5862 -0.6892 -0.4259 +vn 0.7840 0.2469 -0.5696 +vn 0.2194 0.9625 -0.1594 +vn 0.2194 -0.9625 -0.1594 +vn 0.7840 -0.2469 -0.5696 +vn 0.5862 0.6892 -0.4259 +vn 0.7246 -0.6892 -0.0000 +vn 0.9690 0.2469 -0.0000 +vn 0.2712 0.9625 -0.0000 +vn 0.2712 -0.9625 -0.0000 +vn 0.9690 -0.2469 -0.0000 +vn 0.7246 0.6892 -0.0000 +vn 0.7840 0.2469 0.5696 +vn 0.2194 0.9625 0.1594 +vn 0.2194 -0.9625 0.1594 +vn 0.7840 -0.2469 0.5696 +vn 0.5862 0.6892 0.4259 +vn 0.5862 -0.6892 0.4259 +vn 0.0838 0.9625 0.2579 +vn 0.0838 -0.9625 0.2579 +vn 0.2994 -0.2469 0.9216 +vn 0.2239 0.6892 0.6892 +vn 0.2239 -0.6892 0.6892 +vn 0.2994 0.2469 0.9216 +vn -0.0838 -0.9625 0.2579 +vn -0.2994 -0.2469 0.9216 +vn -0.2239 0.6892 0.6892 +vn -0.2239 -0.6892 0.6892 +vn -0.2994 0.2469 0.9216 +vn -0.0838 0.9625 0.2579 +vn -0.2194 -0.9625 0.1594 +vn -0.7840 -0.2469 0.5696 +vn -0.5862 0.6892 0.4259 +vn -0.5862 -0.6892 0.4259 +vn -0.7840 0.2469 0.5696 +vn -0.2194 0.9625 0.1594 +vn -0.2712 -0.9625 -0.0000 +vn -0.9690 -0.2469 -0.0000 +vn -0.7246 0.6892 -0.0000 +vn -0.7246 -0.6892 -0.0000 +vn -0.9690 0.2469 -0.0000 +vn -0.2712 0.9625 -0.0000 +vn -0.7840 -0.2469 -0.5696 +vn -0.5862 0.6892 -0.4259 +vn -0.5862 -0.6892 -0.4259 +vn -0.7840 0.2469 -0.5696 +vn -0.2194 0.9625 -0.1594 +vn -0.2194 -0.9625 -0.1594 +vn -0.2239 0.6892 -0.6892 +vn -0.2239 -0.6892 -0.6892 +vn -0.2994 0.2469 -0.9216 +vn -0.0838 0.9625 -0.2579 +vn -0.0838 -0.9625 -0.2579 +vn -0.2994 -0.2469 -0.9216 +s 0 +usemtl SKIN +f 64//11 18//11 65//11 +f 68//12 20//12 21//12 +f 65//13 19//13 66//13 +f 64//14 47//14 17//14 +f 53//15 68//15 21//15 +f 66//16 20//16 67//16 +f 20//17 26//17 21//17 +f 18//18 24//18 19//18 +f 17//19 47//19 22//19 +f 53//20 21//20 26//20 +f 20//21 24//21 25//21 +f 18//22 22//22 23//22 +f 25//23 31//23 26//23 +f 23//24 29//24 24//24 +f 22//25 47//25 27//25 +f 53//26 26//26 31//26 +f 25//27 29//27 30//27 +f 22//28 28//28 23//28 +f 29//29 33//29 34//29 +f 27//30 47//30 32//30 +f 53//31 31//31 36//31 +f 30//32 34//32 35//32 +f 28//33 32//33 33//33 +f 30//34 36//34 31//34 +f 32//35 47//35 37//35 +f 53//36 36//36 41//36 +f 35//37 39//37 40//37 +f 33//38 37//38 38//38 +f 35//39 41//39 36//39 +f 34//40 38//40 39//40 +f 53//41 41//41 46//41 +f 39//42 45//42 40//42 +f 37//43 43//43 38//43 +f 41//44 45//44 46//44 +f 38//45 44//45 39//45 +f 37//46 47//46 42//46 +f 53//47 46//47 52//47 +f 44//48 51//48 45//48 +f 43//49 48//49 49//49 +f 45//50 52//50 46//50 +f 43//51 50//51 44//51 +f 42//52 47//52 48//52 +f 53//53 52//53 58//53 +f 50//54 57//54 51//54 +f 48//55 55//55 49//55 +f 52//56 57//56 58//56 +f 50//57 55//57 56//57 +f 48//58 47//58 54//58 +f 56//59 62//59 57//59 +f 54//60 60//60 55//60 +f 58//61 62//61 63//61 +f 56//62 60//62 61//62 +f 54//63 47//63 59//63 +f 53//64 58//64 63//64 +f 59//65 65//65 60//65 +f 63//66 67//66 68//66 +f 61//67 65//67 66//67 +f 59//68 47//68 64//68 +f 53//69 63//69 68//69 +f 61//70 67//70 62//70 +f 64//11 17//11 18//11 +f 68//12 67//12 20//12 +f 65//13 18//13 19//13 +f 66//16 19//16 20//16 +f 20//17 25//17 26//17 +f 18//18 23//18 24//18 +f 20//21 19//21 24//21 +f 18//22 17//22 22//22 +f 25//23 30//23 31//23 +f 23//24 28//24 29//24 +f 25//27 24//27 29//27 +f 22//28 27//28 28//28 +f 29//29 28//29 33//29 +f 30//32 29//32 34//32 +f 28//33 27//33 32//33 +f 30//34 35//34 36//34 +f 35//37 34//37 39//37 +f 33//38 32//38 37//38 +f 35//39 40//39 41//39 +f 34//40 33//40 38//40 +f 39//42 44//42 45//42 +f 37//43 42//43 43//43 +f 41//44 40//44 45//44 +f 38//45 43//45 44//45 +f 44//48 50//48 51//48 +f 43//49 42//49 48//49 +f 45//50 51//50 52//50 +f 43//51 49//51 50//51 +f 50//54 56//54 57//54 +f 48//55 54//55 55//55 +f 52//56 51//56 57//56 +f 50//57 49//57 55//57 +f 56//59 61//59 62//59 +f 54//60 59//60 60//60 +f 58//61 57//61 62//61 +f 56//62 55//62 60//62 +f 59//65 64//65 65//65 +f 63//66 62//66 67//66 +f 61//67 60//67 65//67 +f 61//70 66//70 67//70 +o Cube.006 +v -0.010000 0.102775 0.135431 +v -0.010000 0.106831 0.141223 +v -0.015000 0.107699 0.136299 +v -0.010000 0.146223 0.148169 +v -0.010000 0.152015 0.144113 +v -0.015000 0.147091 0.143245 +v -0.010000 0.107985 0.105887 +v -0.015000 0.112909 0.106755 +v -0.010000 0.113777 0.101831 +v -0.010000 0.157225 0.114569 +v -0.010000 0.153169 0.108777 +v -0.015000 0.152301 0.113701 +v 0.010000 0.102775 0.135431 +v 0.015000 0.107699 0.136299 +v 0.010000 0.106831 0.141223 +v 0.010000 0.152015 0.144113 +v 0.010000 0.146223 0.148169 +v 0.015000 0.147091 0.143245 +v 0.010000 0.107985 0.105887 +v 0.010000 0.113777 0.101831 +v 0.015000 0.112909 0.106755 +v 0.010000 0.157225 0.114569 +v 0.015000 0.152301 0.113701 +v 0.010000 0.153169 0.108777 +vn -0.0000 -0.1736 0.9848 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 0.9848 0.1736 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 0.1736 -0.9848 +vn -0.5773 -0.6688 0.4683 +vn -0.5774 0.4683 0.6688 +vn -0.5774 -0.4683 -0.6688 +vn -0.5773 0.6688 -0.4683 +vn 0.5773 -0.6688 0.4683 +vn 0.5774 0.4683 0.6688 +vn 0.5774 -0.4683 -0.6688 +vn 0.5773 0.6688 -0.4683 +vn -0.7071 -0.6964 -0.1228 +vn -0.7071 -0.1228 0.6964 +vn -0.7071 0.6964 0.1228 +vn -0.7071 0.1228 -0.6964 +vn -0.0000 -0.5736 -0.8191 +vn -0.0000 0.8191 -0.5736 +vn 0.7071 0.1228 -0.6964 +vn 0.7071 -0.6964 -0.1228 +vn 0.7071 0.6964 0.1228 +vn 0.7071 -0.1228 0.6964 +vn -0.0000 -0.8191 0.5736 +vn -0.0000 0.5736 0.8191 +vn -0.0000 -0.9848 -0.1736 +vn -0.7071 -0.6963 -0.1228 +vn -0.0000 -0.5736 -0.8192 +vn -0.0000 0.5736 0.8192 +s 0 +usemtl SKIN +f 85//71 70//71 83//71 +f 91//72 82//72 89//72 +f 78//73 84//73 90//73 +f 71//74 80//74 76//74 +f 79//75 88//75 77//75 +f 69//76 70//76 71//76 +f 72//77 73//77 74//77 +f 75//78 76//78 77//78 +f 78//79 79//79 80//79 +f 81//80 82//80 83//80 +f 84//81 85//81 86//81 +f 87//82 88//82 89//82 +f 90//83 91//83 92//83 +f 75//84 71//84 76//84 +f 70//85 74//85 71//85 +f 78//86 74//86 73//86 +f 79//87 76//87 80//87 +f 75//88 88//88 87//88 +f 90//89 79//89 78//89 +f 89//90 92//90 91//90 +f 87//91 82//91 81//91 +f 90//92 86//92 91//92 +f 83//93 86//93 85//93 +f 81//94 70//94 69//94 +f 73//95 85//95 84//95 +f 75//96 81//96 69//96 +f 85//71 72//71 70//71 +f 91//72 86//72 82//72 +f 78//73 73//73 84//73 +f 71//74 74//74 80//74 +f 79//75 92//75 88//75 +f 75//97 69//97 71//97 +f 70//85 72//85 74//85 +f 78//86 80//86 74//86 +f 79//87 77//87 76//87 +f 75//98 77//98 88//98 +f 90//89 92//89 79//89 +f 89//90 88//90 92//90 +f 87//91 89//91 82//91 +f 90//92 84//92 86//92 +f 83//93 82//93 86//93 +f 81//94 83//94 70//94 +f 73//99 72//99 85//99 +f 75//96 87//96 81//96 +o Cube.007 +v -0.058000 0.157000 0.113000 +v -0.058000 0.173000 0.113000 +v -0.058000 0.157000 0.103000 +v -0.058000 0.173000 0.103000 +v -0.032000 0.157000 0.113000 +v -0.032000 0.173000 0.113000 +v -0.032000 0.157000 0.103000 +v -0.032000 0.173000 0.103000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +s 0 +usemtl INK +f 94//100 95//100 93//100 +f 96//101 99//101 95//101 +f 100//102 97//102 99//102 +f 98//103 93//103 97//103 +f 99//104 93//104 95//104 +f 96//105 98//105 100//105 +f 94//100 96//100 95//100 +f 96//101 100//101 99//101 +f 100//102 98//102 97//102 +f 98//103 94//103 93//103 +f 99//104 97//104 93//104 +f 96//105 94//105 98//105 +o Cube.008 +v 0.032000 0.157000 0.113000 +v 0.032000 0.173000 0.113000 +v 0.032000 0.157000 0.103000 +v 0.032000 0.173000 0.103000 +v 0.058000 0.157000 0.113000 +v 0.058000 0.173000 0.113000 +v 0.058000 0.157000 0.103000 +v 0.058000 0.173000 0.103000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +s 0 +usemtl INK +f 102//106 103//106 101//106 +f 104//107 107//107 103//107 +f 108//108 105//108 107//108 +f 106//109 101//109 105//109 +f 107//110 101//110 103//110 +f 104//111 106//111 108//111 +f 102//106 104//106 103//106 +f 104//107 108//107 107//107 +f 108//108 106//108 105//108 +f 106//109 102//109 101//109 +f 107//110 105//110 101//110 +f 104//111 102//111 106//111 +o Cube.009 +v -0.075000 0.015000 0.100000 +v -0.075000 0.025000 0.110000 +v -0.085000 0.025000 0.100000 +v -0.075000 0.095000 0.110000 +v -0.075000 0.105000 0.100000 +v -0.085000 0.095000 0.100000 +v -0.075000 0.015000 0.040000 +v -0.085000 0.025000 0.040000 +v -0.075000 0.025000 0.030000 +v -0.075000 0.105000 0.040000 +v -0.075000 0.095000 0.030000 +v -0.085000 0.095000 0.040000 +v 0.075000 0.015000 0.100000 +v 0.085000 0.025000 0.100000 +v 0.075000 0.025000 0.110000 +v 0.075000 0.105000 0.100000 +v 0.075000 0.095000 0.110000 +v 0.085000 0.095000 0.100000 +v 0.075000 0.015000 0.040000 +v 0.075000 0.025000 0.030000 +v 0.085000 0.025000 0.040000 +v 0.075000 0.105000 0.040000 +v 0.085000 0.095000 0.040000 +v 0.075000 0.095000 0.030000 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5773 -0.5774 0.5773 +vn -0.5773 0.5774 0.5774 +vn -0.5774 -0.5774 -0.5774 +vn -0.5773 0.5774 -0.5774 +vn 0.5773 -0.5774 0.5773 +vn 0.5773 0.5774 0.5774 +vn 0.5773 -0.5774 -0.5774 +vn 0.5773 0.5774 -0.5774 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl BARK +f 125//112 110//112 123//112 +f 131//113 122//113 129//113 +f 118//114 124//114 130//114 +f 114//115 116//115 111//115 +f 119//116 128//116 117//116 +f 109//117 110//117 111//117 +f 112//118 113//118 114//118 +f 115//119 116//119 117//119 +f 118//120 119//120 120//120 +f 121//121 122//121 123//121 +f 124//122 125//122 126//122 +f 127//123 128//123 129//123 +f 130//124 131//124 132//124 +f 109//125 116//125 115//125 +f 112//126 111//126 110//126 +f 118//127 114//127 113//127 +f 117//128 120//128 119//128 +f 115//129 128//129 127//129 +f 130//130 119//130 118//130 +f 129//131 132//131 131//131 +f 127//132 122//132 121//132 +f 124//133 131//133 130//133 +f 123//134 126//134 125//134 +f 121//135 110//135 109//135 +f 113//136 125//136 124//136 +f 127//137 109//137 115//137 +f 125//112 112//112 110//112 +f 131//113 126//113 122//113 +f 118//114 113//114 124//114 +f 114//115 120//115 116//115 +f 119//116 132//116 128//116 +f 109//125 111//125 116//125 +f 112//126 114//126 111//126 +f 118//127 120//127 114//127 +f 117//128 116//128 120//128 +f 115//129 117//129 128//129 +f 130//130 132//130 119//130 +f 129//131 128//131 132//131 +f 127//132 129//132 122//132 +f 124//133 126//133 131//133 +f 123//134 122//134 126//134 +f 121//135 123//135 110//135 +f 113//136 112//136 125//136 +f 127//137 121//137 109//137 +o Cone.003 +v 0.000000 0.180000 -0.133000 +v 0.000000 0.290000 -0.105000 +v 0.075237 0.180000 -0.108554 +v 0.058779 0.290000 -0.085902 +v 0.121735 0.180000 -0.044554 +v 0.095106 0.290000 -0.035902 +v 0.121735 0.180000 0.034554 +v 0.095106 0.290000 0.025902 +v 0.075237 0.180000 0.098554 +v 0.058779 0.290000 0.075902 +v 0.000000 0.180000 0.123000 +v 0.000000 0.290000 0.095000 +v -0.075237 0.180000 0.098554 +v -0.058779 0.290000 0.075902 +v -0.121735 0.180000 0.034554 +v -0.095106 0.290000 0.025902 +v -0.121735 0.180000 -0.044554 +v -0.095106 0.290000 -0.035902 +v -0.075237 0.180000 -0.108554 +v -0.058779 0.290000 -0.085902 +vn 0.3003 0.2353 -0.9244 +vn 0.7863 0.2353 -0.5713 +vn 0.9719 0.2353 -0.0000 +vn 0.7863 0.2353 0.5713 +vn 0.3003 0.2353 0.9244 +vn -0.3003 0.2353 0.9244 +vn -0.7863 0.2353 0.5713 +vn -0.9719 0.2353 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -0.7863 0.2353 -0.5713 +vn -0.3003 0.2353 -0.9244 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT +f 134//138 135//138 133//138 +f 135//139 138//139 137//139 +f 138//140 139//140 137//140 +f 139//141 142//141 141//141 +f 142//142 143//142 141//142 +f 144//143 145//143 143//143 +f 145//144 148//144 147//144 +f 148//145 149//145 147//145 +f 150//146 142//146 138//146 +f 149//147 152//147 151//147 +f 152//148 133//148 151//148 +f 139//149 147//149 151//149 +f 134//138 136//138 135//138 +f 135//139 136//139 138//139 +f 138//140 140//140 139//140 +f 139//141 140//141 142//141 +f 142//142 144//142 143//142 +f 144//143 146//143 145//143 +f 145//144 146//144 148//144 +f 148//145 150//145 149//145 +f 138//146 136//146 134//146 +f 134//146 152//146 150//146 +f 150//146 148//146 146//146 +f 146//146 144//146 142//146 +f 142//146 140//146 138//146 +f 138//146 134//146 150//146 +f 150//146 146//146 142//146 +f 149//147 150//147 152//147 +f 152//148 134//148 133//148 +f 151//149 133//149 135//149 +f 135//149 137//149 139//149 +f 139//149 141//149 143//149 +f 143//149 145//149 147//149 +f 147//149 149//149 151//149 +f 151//149 135//149 139//149 +f 139//149 143//149 147//149 +o Cylinder.003 +v 0.000000 0.140965 -0.284275 +v 0.000000 0.162695 -0.287717 +v 0.100000 0.146079 -0.251988 +v 0.100000 0.167808 -0.255429 +v 0.173205 0.160050 -0.163777 +v 0.173205 0.181780 -0.167219 +v 0.200000 0.179135 -0.043279 +v 0.200000 0.200865 -0.046721 +v 0.173205 0.198220 0.077219 +v 0.173205 0.219950 0.073777 +v 0.100000 0.212192 0.165429 +v 0.100000 0.233921 0.161988 +v 0.000000 0.217305 0.197717 +v 0.000000 0.239035 0.194275 +v -0.100000 0.212192 0.165429 +v -0.100000 0.233921 0.161988 +v -0.173205 0.198220 0.077219 +v -0.173205 0.219950 0.073777 +v -0.200000 0.179135 -0.043279 +v -0.200000 0.200865 -0.046721 +v -0.173205 0.160050 -0.163777 +v -0.173205 0.181780 -0.167219 +v -0.100000 0.146079 -0.251988 +v -0.100000 0.167808 -0.255429 +vn 0.3107 -0.1487 -0.9388 +vn 0.7734 -0.0992 -0.6261 +vn 0.9767 -0.0336 -0.2119 +vn 0.9767 0.0336 0.2119 +vn 0.7734 0.0992 0.6261 +vn 0.3107 0.1487 0.9388 +vn -0.3107 0.1487 0.9388 +vn -0.7734 0.0992 0.6261 +vn -0.9767 0.0336 0.2119 +vn -0.9767 -0.0336 -0.2119 +vn -0.0000 0.9877 -0.1564 +vn -0.7734 -0.0992 -0.6261 +vn -0.3107 -0.1487 -0.9388 +vn -0.0000 -0.9877 0.1564 +s 0 +usemtl COAT_DARK +f 154//150 155//150 153//150 +f 156//151 157//151 155//151 +f 158//152 159//152 157//152 +f 160//153 161//153 159//153 +f 162//154 163//154 161//154 +f 164//155 165//155 163//155 +f 166//156 167//156 165//156 +f 168//157 169//157 167//157 +f 170//158 171//158 169//158 +f 172//159 173//159 171//159 +f 174//160 166//160 158//160 +f 174//161 175//161 173//161 +f 176//162 153//162 175//162 +f 159//163 167//163 175//163 +f 154//150 156//150 155//150 +f 156//151 158//151 157//151 +f 158//152 160//152 159//152 +f 160//153 162//153 161//153 +f 162//154 164//154 163//154 +f 164//155 166//155 165//155 +f 166//156 168//156 167//156 +f 168//157 170//157 169//157 +f 170//158 172//158 171//158 +f 172//159 174//159 173//159 +f 158//160 156//160 154//160 +f 154//160 176//160 174//160 +f 174//160 172//160 170//160 +f 170//160 168//160 166//160 +f 166//160 164//160 162//160 +f 162//160 160//160 158//160 +f 158//160 154//160 174//160 +f 174//160 170//160 166//160 +f 166//160 162//160 158//160 +f 174//161 176//161 175//161 +f 176//162 154//162 153//162 +f 175//163 153//163 155//163 +f 155//163 157//163 159//163 +f 159//163 161//163 163//163 +f 163//163 165//163 167//163 +f 167//163 169//163 171//163 +f 171//163 173//163 175//163 +f 175//163 155//163 159//163 +f 159//163 163//163 167//163 +f 167//163 171//163 175//163 diff --git a/assets/models/figure/head.obj.import b/assets/models/figure/head.obj.import new file mode 100644 index 0000000..33e24f2 --- /dev/null +++ b/assets/models/figure/head.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://bbrat862f36a2" +path="res://.godot/imported/head.obj-4d98f64c6083770c5a0f7d052207d80c.mesh" + +[deps] + +files=["res://.godot/imported/head.obj-4d98f64c6083770c5a0f7d052207d80c.mesh"] + +source_file="res://assets/models/figure/head.obj" +dest_files=["res://.godot/imported/head.obj-4d98f64c6083770c5a0f7d052207d80c.mesh", "res://.godot/imported/head.obj-4d98f64c6083770c5a0f7d052207d80c.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/pelvis.mtl b/assets/models/figure/pelvis.mtl new file mode 100644 index 0000000..d49a970 --- /dev/null +++ b/assets/models/figure/pelvis.mtl @@ -0,0 +1,32 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl COAT +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.710566 0.393123 0.021981 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl GILT +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.848088 0.603827 0.147319 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl TAR +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.030074 0.021981 0.015325 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/pelvis.obj b/assets/models/figure/pelvis.obj new file mode 100644 index 0000000..fdab235 --- /dev/null +++ b/assets/models/figure/pelvis.obj @@ -0,0 +1,146 @@ +# Blender 4.3.2 +# www.blender.org +mtllib pelvis.mtl +o Cone +v 0.000000 -0.250000 -0.180000 +v 0.000000 0.090000 -0.147600 +v 0.176777 -0.250000 -0.127279 +v 0.144957 0.090000 -0.104369 +v 0.250000 -0.250000 0.000000 +v 0.205000 0.090000 0.000000 +v 0.176777 -0.250000 0.127279 +v 0.144957 0.090000 0.104369 +v 0.000000 -0.250000 0.180000 +v 0.000000 0.090000 0.147600 +v -0.176777 -0.250000 0.127279 +v -0.144957 0.090000 0.104369 +v -0.250000 -0.250000 0.000000 +v -0.205000 0.090000 0.000000 +v -0.176777 -0.250000 -0.127279 +v -0.144957 0.090000 -0.104369 +vn 0.2846 0.0909 -0.9543 +vn 0.8611 0.1140 -0.4954 +vn 0.8611 0.1140 0.4954 +vn 0.2846 0.0909 0.9543 +vn -0.2846 0.0909 0.9543 +vn -0.8611 0.1140 0.4954 +vn -0.0000 1.0000 -0.0000 +vn -0.8611 0.1140 -0.4954 +vn -0.2846 0.0909 -0.9543 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 +o Cylinder +v 0.000000 0.055000 -0.155400 +v 0.000000 0.105000 -0.155400 +v 0.148492 0.055000 -0.109884 +v 0.148492 0.105000 -0.109884 +v 0.210000 0.055000 0.000000 +v 0.210000 0.105000 0.000000 +v 0.148492 0.055000 0.109884 +v 0.148492 0.105000 0.109884 +v 0.000000 0.055000 0.155400 +v 0.000000 0.105000 0.155400 +v -0.148492 0.055000 0.109884 +v -0.148492 0.105000 0.109884 +v -0.210000 0.055000 0.000000 +v -0.210000 0.105000 0.000000 +v -0.148492 0.055000 -0.109884 +v -0.148492 0.105000 -0.109884 +vn 0.2931 -0.0000 -0.9561 +vn 0.8726 -0.0000 -0.4884 +vn 0.8726 -0.0000 0.4884 +vn 0.2931 -0.0000 0.9561 +vn -0.2931 -0.0000 0.9561 +vn -0.8726 -0.0000 0.4884 +vn -0.0000 1.0000 -0.0000 +vn -0.8726 -0.0000 -0.4884 +vn -0.2931 -0.0000 -0.9561 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR +f 18//11 19//11 17//11 +f 20//12 21//12 19//12 +f 22//13 23//13 21//13 +f 24//14 25//14 23//14 +f 26//15 27//15 25//15 +f 28//16 29//16 27//16 +f 30//17 26//17 22//17 +f 30//18 31//18 29//18 +f 32//19 17//19 31//19 +f 23//20 27//20 31//20 +f 18//11 20//11 19//11 +f 20//12 22//12 21//12 +f 22//13 24//13 23//13 +f 24//14 26//14 25//14 +f 26//15 28//15 27//15 +f 28//16 30//16 29//16 +f 22//17 20//17 18//17 +f 18//17 32//17 30//17 +f 30//17 28//17 26//17 +f 26//17 24//17 22//17 +f 22//17 18//17 30//17 +f 30//18 32//18 31//18 +f 32//19 18//19 17//19 +f 31//20 17//20 19//20 +f 19//20 21//20 23//20 +f 23//20 25//20 27//20 +f 27//20 29//20 31//20 +f 31//20 19//20 23//20 +o Cube +v -0.035000 0.055000 0.165000 +v -0.035000 0.105000 0.165000 +v -0.035000 0.055000 0.145000 +v -0.035000 0.105000 0.145000 +v 0.035000 0.055000 0.165000 +v 0.035000 0.105000 0.165000 +v 0.035000 0.055000 0.145000 +v 0.035000 0.105000 0.145000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +s 0 +usemtl GILT +f 34//21 35//21 33//21 +f 36//22 39//22 35//22 +f 40//23 37//23 39//23 +f 38//24 33//24 37//24 +f 39//25 33//25 35//25 +f 36//26 38//26 40//26 +f 34//21 36//21 35//21 +f 36//22 40//22 39//22 +f 40//23 38//23 37//23 +f 38//24 34//24 33//24 +f 39//25 37//25 33//25 +f 36//26 34//26 38//26 diff --git a/assets/models/figure/pelvis.obj.import b/assets/models/figure/pelvis.obj.import new file mode 100644 index 0000000..2e05eb0 --- /dev/null +++ b/assets/models/figure/pelvis.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://bs44rlv3hxcp8" +path="res://.godot/imported/pelvis.obj-6e5e3d72826e1f5c18043768f330ccf4.mesh" + +[deps] + +files=["res://.godot/imported/pelvis.obj-6e5e3d72826e1f5c18043768f330ccf4.mesh"] + +source_file="res://assets/models/figure/pelvis.obj" +dest_files=["res://.godot/imported/pelvis.obj-6e5e3d72826e1f5c18043768f330ccf4.mesh", "res://.godot/imported/pelvis.obj-6e5e3d72826e1f5c18043768f330ccf4.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/sail.mtl b/assets/models/figure/sail.mtl new file mode 100644 index 0000000..969431a --- /dev/null +++ b/assets/models/figure/sail.mtl @@ -0,0 +1,42 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl CANVAS +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.673860 0.603827 0.420033 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl OCHRE_RED +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.273838 0.059254 0.033105 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl PLANK +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.214041 0.170645 0.112805 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl TAR +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.030074 0.021981 0.015325 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/sail.obj b/assets/models/figure/sail.obj new file mode 100644 index 0000000..cc4f830 --- /dev/null +++ b/assets/models/figure/sail.obj @@ -0,0 +1,403 @@ +# Blender 4.3.2 +# www.blender.org +mtllib sail.mtl +o Cube.016 +v -1.381481 0.666489 0.399653 +v -1.379823 0.678313 0.400861 +v -1.196113 0.725052 -0.427819 +v -1.194456 0.736876 -0.426611 +v -0.125544 0.463124 0.666611 +v -0.123887 0.474948 0.667819 +v 0.059823 0.521687 -0.160861 +v 0.061481 0.533511 -0.159653 +vn -0.9661 0.1564 -0.2054 +vn 0.2181 0.0689 -0.9735 +vn 0.9661 -0.1564 0.2054 +vn -0.2181 -0.0689 0.9735 +vn -0.1381 -0.9853 -0.1007 +vn 0.1381 0.9853 0.1007 +s 0 +usemtl CANVAS +f 2//1 3//1 1//1 +f 4//2 7//2 3//2 +f 8//3 5//3 7//3 +f 6//4 1//4 5//4 +f 7//5 1//5 3//5 +f 4//6 6//6 8//6 +f 2//1 4//1 3//1 +f 4//2 8//2 7//2 +f 8//3 6//3 5//3 +f 6//4 2//4 1//4 +f 7//5 5//5 1//5 +f 4//6 2//6 6//6 +o Cube.017 +v -1.213853 0.686845 0.034393 +v -1.211643 0.702609 0.036004 +v -1.187683 0.695112 -0.082426 +v -1.185473 0.710877 -0.080816 +v -0.054527 0.499123 0.280816 +v -0.052317 0.514888 0.282426 +v -0.028357 0.507391 0.163996 +v -0.026147 0.523156 0.165607 +vn -0.9661 0.1564 -0.2054 +vn 0.2181 0.0689 -0.9735 +vn 0.9661 -0.1564 0.2054 +vn -0.2181 -0.0689 0.9735 +vn -0.1381 -0.9853 -0.1007 +vn 0.1381 0.9853 0.1007 +s 0 +usemtl OCHRE_RED +f 10//7 11//7 9//7 +f 12//8 15//8 11//8 +f 16//9 13//9 15//9 +f 14//10 9//10 13//10 +f 15//11 9//11 11//11 +f 12//12 14//12 16//12 +f 10//7 12//7 11//7 +f 12//8 16//8 15//8 +f 16//9 14//9 13//9 +f 14//10 10//10 9//10 +f 15//11 13//11 9//11 +f 12//12 10//12 14//12 +o Cylinder.010 +v -1.312793 0.746375 0.370798 +v 0.001110 0.533625 0.650076 +v -1.317523 0.729268 0.380016 +v -0.003620 0.516517 0.659295 +v -1.321681 0.729268 0.399579 +v -0.007778 0.516517 0.678858 +v -1.321110 0.746375 0.409924 +v -0.007207 0.533625 0.689202 +v -1.316380 0.763483 0.400706 +v -0.002477 0.550732 0.679984 +v -1.312222 0.763483 0.381143 +v 0.001681 0.550732 0.660421 +vn 0.1035 -0.4938 -0.8634 +vn -0.1530 -0.9877 -0.0325 +vn -0.2566 -0.4938 0.8308 +vn -0.1035 0.4938 0.8634 +vn 0.9661 -0.1564 0.2054 +vn 0.1530 0.9877 0.0325 +vn 0.2566 0.4938 -0.8308 +vn -0.9661 0.1564 -0.2054 +s 0 +usemtl PLANK +f 18//13 19//13 17//13 +f 20//14 21//14 19//14 +f 22//15 23//15 21//15 +f 24//16 25//16 23//16 +f 18//17 26//17 22//17 +f 26//18 27//18 25//18 +f 28//19 17//19 27//19 +f 19//20 23//20 27//20 +f 18//13 20//13 19//13 +f 20//14 22//14 21//14 +f 22//15 24//15 23//15 +f 24//16 26//16 25//16 +f 22//17 20//17 18//17 +f 18//17 28//17 26//17 +f 26//17 24//17 22//17 +f 26//18 28//18 27//18 +f 28//19 18//19 17//19 +f 27//20 17//20 19//20 +f 19//20 21//20 23//20 +f 23//20 25//20 27//20 +o Cylinder.011 +v -0.145000 0.051532 0.073000 +v -0.455000 0.588468 0.073000 +v -0.138938 0.055032 0.080000 +v -0.448938 0.591968 0.080000 +v -0.145000 0.051532 0.087000 +v -0.455000 0.588468 0.087000 +v -0.151062 0.048032 0.080000 +v -0.461062 0.584968 0.080000 +vn 0.6124 0.3536 -0.7071 +vn 0.6124 0.3536 0.7071 +vn -0.5000 0.8660 -0.0000 +vn -0.6124 -0.3536 0.7071 +vn -0.6124 -0.3536 -0.7071 +vn 0.5000 -0.8660 -0.0000 +s 0 +usemtl TAR +f 30//21 31//21 29//21 +f 32//22 33//22 31//22 +f 30//23 34//23 32//23 +f 34//24 35//24 33//24 +f 36//25 29//25 35//25 +f 31//26 35//26 29//26 +f 30//21 32//21 31//21 +f 32//22 34//22 33//22 +f 30//23 36//23 34//23 +f 34//24 36//24 35//24 +f 36//25 30//25 29//25 +f 31//26 33//26 35//26 +o Cube.018 +v 0.125544 0.463124 0.666611 +v 0.123887 0.474948 0.667819 +v -0.059823 0.521687 -0.160861 +v -0.061481 0.533511 -0.159653 +v 1.381481 0.666489 0.399653 +v 1.379823 0.678313 0.400861 +v 1.196113 0.725052 -0.427819 +v 1.194456 0.736876 -0.426611 +vn -0.9661 -0.1564 0.2054 +vn -0.2181 0.0689 -0.9735 +vn 0.9661 0.1564 -0.2054 +vn 0.2181 -0.0689 0.9735 +vn 0.1381 -0.9853 -0.1007 +vn -0.1381 0.9853 0.1007 +s 0 +usemtl CANVAS +f 38//27 39//27 37//27 +f 40//28 43//28 39//28 +f 44//29 41//29 43//29 +f 42//30 37//30 41//30 +f 43//31 37//31 39//31 +f 40//32 42//32 44//32 +f 38//27 40//27 39//27 +f 40//28 44//28 43//28 +f 44//29 42//29 41//29 +f 42//30 38//30 37//30 +f 43//31 41//31 37//31 +f 40//32 38//32 42//32 +o Cube.019 +v 0.054527 0.499123 0.280816 +v 0.052317 0.514888 0.282426 +v 0.028357 0.507391 0.163996 +v 0.026147 0.523156 0.165607 +v 1.213853 0.686845 0.034393 +v 1.211643 0.702609 0.036004 +v 1.187683 0.695112 -0.082426 +v 1.185473 0.710877 -0.080816 +vn -0.9661 -0.1564 0.2054 +vn -0.2181 0.0689 -0.9735 +vn 0.9661 0.1564 -0.2054 +vn 0.2181 -0.0689 0.9735 +vn 0.1381 -0.9853 -0.1007 +vn -0.1381 0.9853 0.1007 +s 0 +usemtl OCHRE_RED +f 46//33 47//33 45//33 +f 48//34 51//34 47//34 +f 52//35 49//35 51//35 +f 50//36 45//36 49//36 +f 51//37 45//37 47//37 +f 48//38 50//38 52//38 +f 46//33 48//33 47//33 +f 48//34 52//34 51//34 +f 52//35 50//35 49//35 +f 50//36 46//36 45//36 +f 51//37 49//37 45//37 +f 48//38 46//38 50//38 +o Cylinder.012 +v -0.001110 0.533624 0.650076 +v 1.312793 0.746375 0.370798 +v 0.003620 0.516517 0.659295 +v 1.317523 0.729268 0.380016 +v 0.007778 0.516517 0.678858 +v 1.321681 0.729268 0.399579 +v 0.007207 0.533624 0.689202 +v 1.321110 0.746375 0.409924 +v 0.002477 0.550732 0.679984 +v 1.316380 0.763483 0.400706 +v -0.001681 0.550732 0.660421 +v 1.312222 0.763483 0.381143 +vn -0.1035 -0.4938 -0.8634 +vn 0.1530 -0.9877 -0.0325 +vn 0.2566 -0.4938 0.8308 +vn 0.1035 0.4938 0.8634 +vn 0.9661 0.1564 -0.2054 +vn -0.1530 0.9877 0.0325 +vn -0.2566 0.4938 -0.8308 +vn -0.9661 -0.1564 0.2054 +s 0 +usemtl PLANK +f 54//39 55//39 53//39 +f 56//40 57//40 55//40 +f 58//41 59//41 57//41 +f 60//42 61//42 59//42 +f 54//43 62//43 58//43 +f 62//44 63//44 61//44 +f 64//45 53//45 63//45 +f 55//46 59//46 63//46 +f 54//39 56//39 55//39 +f 56//40 58//40 57//40 +f 58//41 60//41 59//41 +f 60//42 62//42 61//42 +f 58//43 56//43 54//43 +f 54//43 64//43 62//43 +f 62//43 60//43 58//43 +f 62//44 64//44 63//44 +f 64//45 54//45 53//45 +f 63//46 53//46 55//46 +f 55//46 57//46 59//46 +f 59//46 61//46 63//46 +o Cylinder.013 +v 0.145000 0.051532 0.073000 +v 0.455000 0.588468 0.073000 +v 0.151062 0.048032 0.080000 +v 0.461062 0.584968 0.080000 +v 0.145000 0.051532 0.087000 +v 0.455000 0.588468 0.087000 +v 0.138938 0.055032 0.080000 +v 0.448938 0.591968 0.080000 +vn 0.6124 -0.3536 -0.7071 +vn 0.6124 -0.3536 0.7071 +vn 0.5000 0.8660 -0.0000 +vn -0.6124 0.3536 0.7071 +vn -0.6124 0.3536 -0.7071 +vn -0.5000 -0.8660 -0.0000 +s 0 +usemtl TAR +f 66//47 67//47 65//47 +f 68//48 69//48 67//48 +f 66//49 70//49 68//49 +f 70//50 71//50 69//50 +f 72//51 65//51 71//51 +f 67//52 71//52 65//52 +f 66//47 68//47 67//47 +f 68//48 70//48 69//48 +f 66//49 72//49 70//49 +f 70//50 72//50 71//50 +f 72//51 66//51 65//51 +f 67//52 69//52 71//52 +o Cylinder.014 +v 0.000000 0.644000 -0.375000 +v 0.000000 0.644000 0.575000 +v 0.020785 0.632000 -0.375000 +v 0.020785 0.632000 0.575000 +v 0.020785 0.608000 -0.375000 +v 0.020785 0.608000 0.575000 +v 0.000000 0.596000 -0.375000 +v 0.000000 0.596000 0.575000 +v -0.020785 0.608000 -0.375000 +v -0.020785 0.608000 0.575000 +v -0.020785 0.632000 -0.375000 +v -0.020785 0.632000 0.575000 +vn 0.5000 0.8660 -0.0000 +vn 1.0000 -0.0000 -0.0000 +vn 0.5000 -0.8660 -0.0000 +vn -0.5000 -0.8660 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.5000 0.8660 -0.0000 +vn -0.0000 -0.0000 -1.0000 +s 0 +usemtl PLANK +f 74//53 75//53 73//53 +f 76//54 77//54 75//54 +f 78//55 79//55 77//55 +f 80//56 81//56 79//56 +f 74//57 82//57 78//57 +f 82//58 83//58 81//58 +f 84//59 73//59 83//59 +f 75//60 79//60 83//60 +f 74//53 76//53 75//53 +f 76//54 78//54 77//54 +f 78//55 80//55 79//55 +f 80//56 82//56 81//56 +f 78//57 76//57 74//57 +f 74//57 84//57 82//57 +f 82//57 80//57 78//57 +f 82//58 84//58 83//58 +f 84//59 74//59 73//59 +f 83//60 73//60 75//60 +f 75//60 77//60 79//60 +f 79//60 81//60 83//60 +o Cube.020 +v -0.172000 0.015000 0.017000 +v -0.172000 0.023000 0.025000 +v -0.180000 0.023000 0.017000 +v -0.172000 0.057000 0.025000 +v -0.172000 0.065000 0.017000 +v -0.180000 0.057000 0.017000 +v -0.172000 0.015000 -0.017000 +v -0.180000 0.023000 -0.017000 +v -0.172000 0.023000 -0.025000 +v -0.172000 0.065000 -0.017000 +v -0.172000 0.057000 -0.025000 +v -0.180000 0.057000 -0.017000 +v 0.172000 0.015000 0.017000 +v 0.180000 0.023000 0.017000 +v 0.172000 0.023000 0.025000 +v 0.172000 0.065000 0.017000 +v 0.172000 0.057000 0.025000 +v 0.180000 0.057000 0.017000 +v 0.172000 0.015000 -0.017000 +v 0.172000 0.023000 -0.025000 +v 0.180000 0.023000 -0.017000 +v 0.172000 0.065000 -0.017000 +v 0.180000 0.057000 -0.017000 +v 0.172000 0.057000 -0.025000 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5773 -0.5774 0.5774 +vn -0.5773 0.5774 0.5774 +vn -0.5773 -0.5774 -0.5774 +vn -0.5773 0.5774 -0.5774 +vn 0.5773 -0.5774 0.5774 +vn 0.5773 0.5774 0.5774 +vn 0.5773 -0.5774 -0.5774 +vn 0.5773 0.5774 -0.5774 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl PLANK +f 101//61 86//61 99//61 +f 107//62 98//62 105//62 +f 94//63 100//63 106//63 +f 90//64 92//64 87//64 +f 95//65 104//65 93//65 +f 85//66 86//66 87//66 +f 88//67 89//67 90//67 +f 91//68 92//68 93//68 +f 94//69 95//69 96//69 +f 97//70 98//70 99//70 +f 100//71 101//71 102//71 +f 103//72 104//72 105//72 +f 106//73 107//73 108//73 +f 85//74 92//74 91//74 +f 88//75 87//75 86//75 +f 94//76 90//76 89//76 +f 93//77 96//77 95//77 +f 91//78 104//78 103//78 +f 106//79 95//79 94//79 +f 105//80 108//80 107//80 +f 103//81 98//81 97//81 +f 100//82 107//82 106//82 +f 99//83 102//83 101//83 +f 97//84 86//84 85//84 +f 89//85 101//85 100//85 +f 103//86 85//86 91//86 +f 101//61 88//61 86//61 +f 107//62 102//62 98//62 +f 94//63 89//63 100//63 +f 90//64 96//64 92//64 +f 95//65 108//65 104//65 +f 85//74 87//74 92//74 +f 88//75 90//75 87//75 +f 94//76 96//76 90//76 +f 93//77 92//77 96//77 +f 91//78 93//78 104//78 +f 106//79 108//79 95//79 +f 105//80 104//80 108//80 +f 103//81 105//81 98//81 +f 100//82 102//82 107//82 +f 99//83 98//83 102//83 +f 97//84 99//84 86//84 +f 89//85 88//85 101//85 +f 103//86 97//86 85//86 diff --git a/assets/models/figure/sail.obj.import b/assets/models/figure/sail.obj.import new file mode 100644 index 0000000..e53efe4 --- /dev/null +++ b/assets/models/figure/sail.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://cmwcbx8b5c2wy" +path="res://.godot/imported/sail.obj-9ec564119fbf133a360d00ce1c1821f4.mesh" + +[deps] + +files=["res://.godot/imported/sail.obj-9ec564119fbf133a360d00ce1c1821f4.mesh"] + +source_file="res://assets/models/figure/sail.obj" +dest_files=["res://.godot/imported/sail.obj-9ec564119fbf133a360d00ce1c1821f4.mesh", "res://.godot/imported/sail.obj-9ec564119fbf133a360d00ce1c1821f4.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/shin_l.mtl b/assets/models/figure/shin_l.mtl new file mode 100644 index 0000000..d1fb86d --- /dev/null +++ b/assets/models/figure/shin_l.mtl @@ -0,0 +1,22 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl TAR +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.030074 0.021981 0.015325 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl TAR_WEATHERED +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.078288 0.054972 0.039682 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/shin_l.obj b/assets/models/figure/shin_l.obj new file mode 100644 index 0000000..729ca10 --- /dev/null +++ b/assets/models/figure/shin_l.obj @@ -0,0 +1,271 @@ +# Blender 4.3.2 +# www.blender.org +mtllib shin_l.mtl +o Cylinder.008 +v -0.000000 -0.220000 -0.070000 +v -0.000000 -0.000000 -0.070000 +v 0.049497 -0.220000 -0.049497 +v 0.049497 -0.000000 -0.049497 +v 0.070000 -0.220000 0.000000 +v 0.070000 -0.000000 0.000000 +v 0.049497 -0.220000 0.049497 +v 0.049497 -0.000000 0.049497 +v -0.000000 -0.220000 0.070000 +v -0.000000 -0.000000 0.070000 +v -0.049497 -0.220000 0.049497 +v -0.049497 -0.000000 0.049497 +v -0.070000 -0.220000 0.000000 +v -0.070000 -0.000000 0.000000 +v -0.049497 -0.220000 -0.049497 +v -0.049497 -0.000000 -0.049497 +vn 0.3827 -0.0000 -0.9239 +vn 0.9239 -0.0000 -0.3827 +vn 0.9239 -0.0000 0.3827 +vn 0.3827 -0.0000 0.9239 +vn -0.3827 -0.0000 0.9239 +vn -0.9239 -0.0000 0.3827 +vn -0.0000 1.0000 -0.0000 +vn -0.9239 -0.0000 -0.3827 +vn -0.3827 -0.0000 -0.9239 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 +o Cone.011 +v -0.000000 -0.460000 -0.086000 +v -0.000000 -0.200000 -0.080000 +v 0.060811 -0.460000 -0.060811 +v 0.056569 -0.200000 -0.056569 +v 0.086000 -0.460000 0.000000 +v 0.080000 -0.200000 0.000000 +v 0.060811 -0.460000 0.060811 +v 0.056569 -0.200000 0.056569 +v -0.000000 -0.460000 0.086000 +v -0.000000 -0.200000 0.080000 +v -0.060811 -0.460000 0.060811 +v -0.056569 -0.200000 0.056569 +v -0.086000 -0.460000 0.000000 +v -0.080000 -0.200000 0.000000 +v -0.060811 -0.460000 -0.060811 +v -0.056569 -0.200000 -0.056569 +vn 0.3826 0.0213 -0.9237 +vn 0.9237 0.0213 -0.3826 +vn 0.9237 0.0213 0.3826 +vn 0.3826 0.0213 0.9237 +vn -0.3826 0.0213 0.9237 +vn -0.9237 0.0213 0.3826 +vn -0.0000 1.0000 -0.0000 +vn -0.9237 0.0213 -0.3826 +vn -0.3826 0.0213 -0.9237 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR_WEATHERED +f 18//11 19//11 17//11 +f 19//12 22//12 21//12 +f 22//13 23//13 21//13 +f 23//14 26//14 25//14 +f 26//15 27//15 25//15 +f 27//16 30//16 29//16 +f 30//17 26//17 22//17 +f 30//18 31//18 29//18 +f 31//19 18//19 17//19 +f 23//20 27//20 31//20 +f 18//11 20//11 19//11 +f 19//12 20//12 22//12 +f 22//13 24//13 23//13 +f 23//14 24//14 26//14 +f 26//15 28//15 27//15 +f 27//16 28//16 30//16 +f 22//17 20//17 18//17 +f 18//17 32//17 30//17 +f 30//17 28//17 26//17 +f 26//17 24//17 22//17 +f 22//17 18//17 30//17 +f 30//18 32//18 31//18 +f 31//19 32//19 18//19 +f 31//20 17//20 19//20 +f 19//20 21//20 23//20 +f 23//20 25//20 27//20 +f 27//20 29//20 31//20 +f 31//20 19//20 23//20 +o Cylinder.009 +v -0.000000 -0.215000 -0.094000 +v -0.000000 -0.165000 -0.094000 +v 0.066468 -0.215000 -0.066468 +v 0.066468 -0.165000 -0.066468 +v 0.094000 -0.215000 0.000000 +v 0.094000 -0.165000 0.000000 +v 0.066468 -0.215000 0.066468 +v 0.066468 -0.165000 0.066468 +v -0.000000 -0.215000 0.094000 +v -0.000000 -0.165000 0.094000 +v -0.066468 -0.215000 0.066468 +v -0.066468 -0.165000 0.066468 +v -0.094000 -0.215000 0.000000 +v -0.094000 -0.165000 0.000000 +v -0.066468 -0.215000 -0.066468 +v -0.066468 -0.165000 -0.066468 +vn 0.3827 -0.0000 -0.9239 +vn 0.9239 -0.0000 -0.3827 +vn 0.9239 -0.0000 0.3827 +vn 0.3827 -0.0000 0.9239 +vn -0.3827 -0.0000 0.9239 +vn -0.9239 -0.0000 0.3827 +vn -0.0000 1.0000 -0.0000 +vn -0.9239 -0.0000 -0.3827 +vn -0.3827 -0.0000 -0.9239 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR +f 34//21 35//21 33//21 +f 36//22 37//22 35//22 +f 38//23 39//23 37//23 +f 40//24 41//24 39//24 +f 42//25 43//25 41//25 +f 44//26 45//26 43//26 +f 46//27 42//27 38//27 +f 46//28 47//28 45//28 +f 48//29 33//29 47//29 +f 39//30 43//30 47//30 +f 34//21 36//21 35//21 +f 36//22 38//22 37//22 +f 38//23 40//23 39//23 +f 40//24 42//24 41//24 +f 42//25 44//25 43//25 +f 44//26 46//26 45//26 +f 38//27 36//27 34//27 +f 34//27 48//27 46//27 +f 46//27 44//27 42//27 +f 42//27 40//27 38//27 +f 38//27 34//27 46//27 +f 46//28 48//28 47//28 +f 48//29 34//29 33//29 +f 47//30 33//30 35//30 +f 35//30 37//30 39//30 +f 39//30 41//30 43//30 +f 43//30 45//30 47//30 +f 47//30 35//30 39//30 +o Cube.015 +v -0.045000 -0.490000 0.155000 +v -0.045000 -0.470000 0.175000 +v -0.065000 -0.470000 0.155000 +v -0.045000 -0.430000 0.175000 +v -0.045000 -0.410000 0.155000 +v -0.065000 -0.430000 0.155000 +v -0.045000 -0.490000 -0.055000 +v -0.065000 -0.470000 -0.055000 +v -0.045000 -0.470000 -0.075000 +v -0.045000 -0.410000 -0.055000 +v -0.045000 -0.430000 -0.075000 +v -0.065000 -0.430000 -0.055000 +v 0.045000 -0.490000 0.155000 +v 0.065000 -0.470000 0.155000 +v 0.045000 -0.470000 0.175000 +v 0.045000 -0.410000 0.155000 +v 0.045000 -0.430000 0.175000 +v 0.065000 -0.430000 0.155000 +v 0.045000 -0.490000 -0.055000 +v 0.045000 -0.470000 -0.075000 +v 0.065000 -0.470000 -0.055000 +v 0.045000 -0.410000 -0.055000 +v 0.065000 -0.430000 -0.055000 +v 0.045000 -0.430000 -0.075000 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5774 -0.5773 0.5774 +vn -0.5774 0.5773 0.5774 +vn -0.5774 -0.5774 -0.5774 +vn -0.5774 0.5774 -0.5774 +vn 0.5774 -0.5773 0.5774 +vn 0.5774 0.5773 0.5774 +vn 0.5774 -0.5774 -0.5774 +vn 0.5774 0.5774 -0.5774 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR_WEATHERED +f 65//31 50//31 63//31 +f 71//32 62//32 69//32 +f 58//33 64//33 70//33 +f 54//34 56//34 51//34 +f 59//35 68//35 57//35 +f 49//36 50//36 51//36 +f 52//37 53//37 54//37 +f 55//38 56//38 57//38 +f 58//39 59//39 60//39 +f 61//40 62//40 63//40 +f 64//41 65//41 66//41 +f 67//42 68//42 69//42 +f 70//43 71//43 72//43 +f 49//44 56//44 55//44 +f 52//45 51//45 50//45 +f 58//46 54//46 53//46 +f 57//47 60//47 59//47 +f 55//48 68//48 67//48 +f 70//49 59//49 58//49 +f 69//50 72//50 71//50 +f 67//51 62//51 61//51 +f 64//52 71//52 70//52 +f 63//53 66//53 65//53 +f 61//54 50//54 49//54 +f 53//55 65//55 64//55 +f 67//56 49//56 55//56 +f 65//31 52//31 50//31 +f 71//32 66//32 62//32 +f 58//33 53//33 64//33 +f 54//34 60//34 56//34 +f 59//35 72//35 68//35 +f 49//44 51//44 56//44 +f 52//45 54//45 51//45 +f 58//46 60//46 54//46 +f 57//47 56//47 60//47 +f 55//48 57//48 68//48 +f 70//49 72//49 59//49 +f 69//50 68//50 72//50 +f 67//51 69//51 62//51 +f 64//52 66//52 71//52 +f 63//53 62//53 66//53 +f 61//54 63//54 50//54 +f 53//55 52//55 65//55 +f 67//56 61//56 49//56 diff --git a/assets/models/figure/shin_l.obj.import b/assets/models/figure/shin_l.obj.import new file mode 100644 index 0000000..39b82b1 --- /dev/null +++ b/assets/models/figure/shin_l.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://dagex2nbyxv03" +path="res://.godot/imported/shin_l.obj-9b8df467cdec127ccc43fab0375fbd00.mesh" + +[deps] + +files=["res://.godot/imported/shin_l.obj-9b8df467cdec127ccc43fab0375fbd00.mesh"] + +source_file="res://assets/models/figure/shin_l.obj" +dest_files=["res://.godot/imported/shin_l.obj-9b8df467cdec127ccc43fab0375fbd00.mesh", "res://.godot/imported/shin_l.obj-9b8df467cdec127ccc43fab0375fbd00.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/shin_r.mtl b/assets/models/figure/shin_r.mtl new file mode 100644 index 0000000..d1fb86d --- /dev/null +++ b/assets/models/figure/shin_r.mtl @@ -0,0 +1,22 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl TAR +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.030074 0.021981 0.015325 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl TAR_WEATHERED +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.078288 0.054972 0.039682 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/shin_r.obj b/assets/models/figure/shin_r.obj new file mode 100644 index 0000000..392beac --- /dev/null +++ b/assets/models/figure/shin_r.obj @@ -0,0 +1,271 @@ +# Blender 4.3.2 +# www.blender.org +mtllib shin_r.mtl +o Cylinder.006 +v 0.000000 -0.220000 -0.070000 +v 0.000000 -0.000000 -0.070000 +v 0.049497 -0.220000 -0.049497 +v 0.049497 -0.000000 -0.049497 +v 0.070000 -0.220000 0.000000 +v 0.070000 -0.000000 0.000000 +v 0.049497 -0.220000 0.049497 +v 0.049497 -0.000000 0.049497 +v 0.000000 -0.220000 0.070000 +v 0.000000 -0.000000 0.070000 +v -0.049497 -0.220000 0.049497 +v -0.049497 -0.000000 0.049497 +v -0.070000 -0.220000 0.000000 +v -0.070000 -0.000000 0.000000 +v -0.049497 -0.220000 -0.049497 +v -0.049497 -0.000000 -0.049497 +vn 0.3827 -0.0000 -0.9239 +vn 0.9239 -0.0000 -0.3827 +vn 0.9239 -0.0000 0.3827 +vn 0.3827 -0.0000 0.9239 +vn -0.3827 -0.0000 0.9239 +vn -0.9239 -0.0000 0.3827 +vn -0.0000 1.0000 -0.0000 +vn -0.9239 -0.0000 -0.3827 +vn -0.3827 -0.0000 -0.9239 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 +o Cone.010 +v 0.000000 -0.460000 -0.086000 +v 0.000000 -0.200000 -0.080000 +v 0.060811 -0.460000 -0.060811 +v 0.056569 -0.200000 -0.056569 +v 0.086000 -0.460000 0.000000 +v 0.080000 -0.200000 0.000000 +v 0.060811 -0.460000 0.060811 +v 0.056569 -0.200000 0.056569 +v 0.000000 -0.460000 0.086000 +v 0.000000 -0.200000 0.080000 +v -0.060811 -0.460000 0.060811 +v -0.056569 -0.200000 0.056569 +v -0.086000 -0.460000 0.000000 +v -0.080000 -0.200000 0.000000 +v -0.060811 -0.460000 -0.060811 +v -0.056569 -0.200000 -0.056569 +vn 0.3826 0.0213 -0.9237 +vn 0.9237 0.0213 -0.3826 +vn 0.9237 0.0213 0.3826 +vn 0.3826 0.0213 0.9237 +vn -0.3826 0.0213 0.9237 +vn -0.9237 0.0213 0.3826 +vn -0.0000 1.0000 -0.0000 +vn -0.9237 0.0213 -0.3826 +vn -0.3826 0.0213 -0.9237 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR_WEATHERED +f 18//11 19//11 17//11 +f 19//12 22//12 21//12 +f 22//13 23//13 21//13 +f 23//14 26//14 25//14 +f 26//15 27//15 25//15 +f 27//16 30//16 29//16 +f 30//17 26//17 22//17 +f 30//18 31//18 29//18 +f 31//19 18//19 17//19 +f 23//20 27//20 31//20 +f 18//11 20//11 19//11 +f 19//12 20//12 22//12 +f 22//13 24//13 23//13 +f 23//14 24//14 26//14 +f 26//15 28//15 27//15 +f 27//16 28//16 30//16 +f 22//17 20//17 18//17 +f 18//17 32//17 30//17 +f 30//17 28//17 26//17 +f 26//17 24//17 22//17 +f 22//17 18//17 30//17 +f 30//18 32//18 31//18 +f 31//19 32//19 18//19 +f 31//20 17//20 19//20 +f 19//20 21//20 23//20 +f 23//20 25//20 27//20 +f 27//20 29//20 31//20 +f 31//20 19//20 23//20 +o Cylinder.007 +v 0.000000 -0.215000 -0.094000 +v 0.000000 -0.165000 -0.094000 +v 0.066468 -0.215000 -0.066468 +v 0.066468 -0.165000 -0.066468 +v 0.094000 -0.215000 0.000000 +v 0.094000 -0.165000 0.000000 +v 0.066468 -0.215000 0.066468 +v 0.066468 -0.165000 0.066468 +v 0.000000 -0.215000 0.094000 +v 0.000000 -0.165000 0.094000 +v -0.066468 -0.215000 0.066468 +v -0.066468 -0.165000 0.066468 +v -0.094000 -0.215000 0.000000 +v -0.094000 -0.165000 0.000000 +v -0.066468 -0.215000 -0.066468 +v -0.066468 -0.165000 -0.066468 +vn 0.3827 -0.0000 -0.9239 +vn 0.9239 -0.0000 -0.3827 +vn 0.9239 -0.0000 0.3827 +vn 0.3827 -0.0000 0.9239 +vn -0.3827 -0.0000 0.9239 +vn -0.9239 -0.0000 0.3827 +vn -0.0000 1.0000 -0.0000 +vn -0.9239 -0.0000 -0.3827 +vn -0.3827 -0.0000 -0.9239 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR +f 34//21 35//21 33//21 +f 36//22 37//22 35//22 +f 38//23 39//23 37//23 +f 40//24 41//24 39//24 +f 42//25 43//25 41//25 +f 44//26 45//26 43//26 +f 46//27 42//27 38//27 +f 46//28 47//28 45//28 +f 48//29 33//29 47//29 +f 39//30 43//30 47//30 +f 34//21 36//21 35//21 +f 36//22 38//22 37//22 +f 38//23 40//23 39//23 +f 40//24 42//24 41//24 +f 42//25 44//25 43//25 +f 44//26 46//26 45//26 +f 38//27 36//27 34//27 +f 34//27 48//27 46//27 +f 46//27 44//27 42//27 +f 42//27 40//27 38//27 +f 38//27 34//27 46//27 +f 46//28 48//28 47//28 +f 48//29 34//29 33//29 +f 47//30 33//30 35//30 +f 35//30 37//30 39//30 +f 39//30 41//30 43//30 +f 43//30 45//30 47//30 +f 47//30 35//30 39//30 +o Cube.014 +v -0.045000 -0.490000 0.155000 +v -0.045000 -0.470000 0.175000 +v -0.065000 -0.470000 0.155000 +v -0.045000 -0.430000 0.175000 +v -0.045000 -0.410000 0.155000 +v -0.065000 -0.430000 0.155000 +v -0.045000 -0.490000 -0.055000 +v -0.065000 -0.470000 -0.055000 +v -0.045000 -0.470000 -0.075000 +v -0.045000 -0.410000 -0.055000 +v -0.045000 -0.430000 -0.075000 +v -0.065000 -0.430000 -0.055000 +v 0.045000 -0.490000 0.155000 +v 0.065000 -0.470000 0.155000 +v 0.045000 -0.470000 0.175000 +v 0.045000 -0.410000 0.155000 +v 0.045000 -0.430000 0.175000 +v 0.065000 -0.430000 0.155000 +v 0.045000 -0.490000 -0.055000 +v 0.045000 -0.470000 -0.075000 +v 0.065000 -0.470000 -0.055000 +v 0.045000 -0.410000 -0.055000 +v 0.065000 -0.430000 -0.055000 +v 0.045000 -0.430000 -0.075000 +vn -0.0000 -0.0000 1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.5774 -0.5773 0.5774 +vn -0.5774 0.5773 0.5774 +vn -0.5774 -0.5774 -0.5774 +vn -0.5774 0.5774 -0.5774 +vn 0.5774 -0.5773 0.5774 +vn 0.5774 0.5773 0.5774 +vn 0.5774 -0.5774 -0.5774 +vn 0.5774 0.5774 -0.5774 +vn -0.7071 -0.7071 -0.0000 +vn -0.7071 -0.0000 0.7071 +vn -0.7071 0.7071 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 0.7071 -0.7071 +vn 0.7071 -0.0000 -0.7071 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 -0.7071 0.7071 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR_WEATHERED +f 65//31 50//31 63//31 +f 71//32 62//32 69//32 +f 58//33 64//33 70//33 +f 54//34 56//34 51//34 +f 59//35 68//35 57//35 +f 49//36 50//36 51//36 +f 52//37 53//37 54//37 +f 55//38 56//38 57//38 +f 58//39 59//39 60//39 +f 61//40 62//40 63//40 +f 64//41 65//41 66//41 +f 67//42 68//42 69//42 +f 70//43 71//43 72//43 +f 49//44 56//44 55//44 +f 52//45 51//45 50//45 +f 58//46 54//46 53//46 +f 57//47 60//47 59//47 +f 55//48 68//48 67//48 +f 70//49 59//49 58//49 +f 69//50 72//50 71//50 +f 67//51 62//51 61//51 +f 64//52 71//52 70//52 +f 63//53 66//53 65//53 +f 61//54 50//54 49//54 +f 53//55 65//55 64//55 +f 67//56 49//56 55//56 +f 65//31 52//31 50//31 +f 71//32 66//32 62//32 +f 58//33 53//33 64//33 +f 54//34 60//34 56//34 +f 59//35 72//35 68//35 +f 49//44 51//44 56//44 +f 52//45 54//45 51//45 +f 58//46 60//46 54//46 +f 57//47 56//47 60//47 +f 55//48 57//48 68//48 +f 70//49 72//49 59//49 +f 69//50 68//50 72//50 +f 67//51 69//51 62//51 +f 64//52 66//52 71//52 +f 63//53 62//53 66//53 +f 61//54 63//54 50//54 +f 53//55 52//55 65//55 +f 67//56 61//56 49//56 diff --git a/assets/models/figure/shin_r.obj.import b/assets/models/figure/shin_r.obj.import new file mode 100644 index 0000000..774776f --- /dev/null +++ b/assets/models/figure/shin_r.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://bfrk4krl2bskq" +path="res://.godot/imported/shin_r.obj-cb2aab52517261ce74f513b964905750.mesh" + +[deps] + +files=["res://.godot/imported/shin_r.obj-cb2aab52517261ce74f513b964905750.mesh"] + +source_file="res://assets/models/figure/shin_r.obj" +dest_files=["res://.godot/imported/shin_r.obj-cb2aab52517261ce74f513b964905750.mesh", "res://.godot/imported/shin_r.obj-cb2aab52517261ce74f513b964905750.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/thigh_l.mtl b/assets/models/figure/thigh_l.mtl new file mode 100644 index 0000000..ecfef27 --- /dev/null +++ b/assets/models/figure/thigh_l.mtl @@ -0,0 +1,12 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl TAR +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.030074 0.021981 0.015325 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/thigh_l.obj b/assets/models/figure/thigh_l.obj new file mode 100644 index 0000000..6233b45 --- /dev/null +++ b/assets/models/figure/thigh_l.obj @@ -0,0 +1,60 @@ +# Blender 4.3.2 +# www.blender.org +mtllib thigh_l.mtl +o Cone.009 +v -0.000000 -0.410000 -0.085000 +v -0.000000 0.010000 -0.075000 +v 0.060104 -0.410000 -0.060104 +v 0.053033 0.010000 -0.053033 +v 0.085000 -0.410000 0.000000 +v 0.075000 0.010000 0.000000 +v 0.060104 -0.410000 0.060104 +v 0.053033 0.010000 0.053033 +v -0.000000 -0.410000 0.085000 +v -0.000000 0.010000 0.075000 +v -0.060104 -0.410000 0.060104 +v -0.053033 0.010000 0.053033 +v -0.085000 -0.410000 0.000000 +v -0.075000 0.010000 0.000000 +v -0.060104 -0.410000 -0.060104 +v -0.053033 0.010000 -0.053033 +vn 0.3826 0.0220 -0.9237 +vn 0.9237 0.0220 -0.3826 +vn 0.9237 0.0220 0.3826 +vn 0.3826 0.0220 0.9237 +vn -0.3826 0.0220 0.9237 +vn -0.9237 0.0220 0.3826 +vn -0.0000 1.0000 -0.0000 +vn -0.9237 0.0220 -0.3826 +vn -0.3826 0.0220 -0.9237 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 diff --git a/assets/models/figure/thigh_l.obj.import b/assets/models/figure/thigh_l.obj.import new file mode 100644 index 0000000..fac012c --- /dev/null +++ b/assets/models/figure/thigh_l.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://87rkgc0g7x12" +path="res://.godot/imported/thigh_l.obj-1f332283cb36c7e8be7a24a9deca0e71.mesh" + +[deps] + +files=["res://.godot/imported/thigh_l.obj-1f332283cb36c7e8be7a24a9deca0e71.mesh"] + +source_file="res://assets/models/figure/thigh_l.obj" +dest_files=["res://.godot/imported/thigh_l.obj-1f332283cb36c7e8be7a24a9deca0e71.mesh", "res://.godot/imported/thigh_l.obj-1f332283cb36c7e8be7a24a9deca0e71.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/thigh_r.mtl b/assets/models/figure/thigh_r.mtl new file mode 100644 index 0000000..ecfef27 --- /dev/null +++ b/assets/models/figure/thigh_r.mtl @@ -0,0 +1,12 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl TAR +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.030074 0.021981 0.015325 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/thigh_r.obj b/assets/models/figure/thigh_r.obj new file mode 100644 index 0000000..870e530 --- /dev/null +++ b/assets/models/figure/thigh_r.obj @@ -0,0 +1,60 @@ +# Blender 4.3.2 +# www.blender.org +mtllib thigh_r.mtl +o Cone.008 +v 0.000000 -0.410000 -0.085000 +v 0.000000 0.010000 -0.075000 +v 0.060104 -0.410000 -0.060104 +v 0.053033 0.010000 -0.053033 +v 0.085000 -0.410000 0.000000 +v 0.075000 0.010000 0.000000 +v 0.060104 -0.410000 0.060104 +v 0.053033 0.010000 0.053033 +v 0.000000 -0.410000 0.085000 +v 0.000000 0.010000 0.075000 +v -0.060104 -0.410000 0.060104 +v -0.053033 0.010000 0.053033 +v -0.085000 -0.410000 0.000000 +v -0.075000 0.010000 0.000000 +v -0.060104 -0.410000 -0.060104 +v -0.053033 0.010000 -0.053033 +vn 0.3826 0.0220 -0.9237 +vn 0.9237 0.0220 -0.3826 +vn 0.9237 0.0220 0.3826 +vn 0.3826 0.0220 0.9237 +vn -0.3826 0.0220 0.9237 +vn -0.9237 0.0220 0.3826 +vn -0.0000 1.0000 -0.0000 +vn -0.9237 0.0220 -0.3826 +vn -0.3826 0.0220 -0.9237 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl TAR +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 diff --git a/assets/models/figure/thigh_r.obj.import b/assets/models/figure/thigh_r.obj.import new file mode 100644 index 0000000..d39866d --- /dev/null +++ b/assets/models/figure/thigh_r.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://bdluefuduuy7c" +path="res://.godot/imported/thigh_r.obj-adfcfccac0b418ba4f67ca3dfcfa0553.mesh" + +[deps] + +files=["res://.godot/imported/thigh_r.obj-adfcfccac0b418ba4f67ca3dfcfa0553.mesh"] + +source_file="res://assets/models/figure/thigh_r.obj" +dest_files=["res://.godot/imported/thigh_r.obj-adfcfccac0b418ba4f67ca3dfcfa0553.mesh", "res://.godot/imported/thigh_r.obj-adfcfccac0b418ba4f67ca3dfcfa0553.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/torso.mtl b/assets/models/figure/torso.mtl new file mode 100644 index 0000000..8bb7c5a --- /dev/null +++ b/assets/models/figure/torso.mtl @@ -0,0 +1,52 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl BARK +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.132868 0.073239 0.039682 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl COAT +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.710566 0.393123 0.021981 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl COAT_DARK +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.341419 0.191800 0.012546 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl TANNED_SAIL +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.342392 0.162647 0.063724 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 + +newmtl TAR +Ns 39.999996 +Ka 1.000000 1.000000 1.000000 +Kd 0.030074 0.021981 0.015325 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/torso.obj b/assets/models/figure/torso.obj new file mode 100644 index 0000000..b629804 --- /dev/null +++ b/assets/models/figure/torso.obj @@ -0,0 +1,885 @@ +# Blender 4.3.2 +# www.blender.org +mtllib torso.mtl +o Cone.001 +v 0.000000 0.000000 -0.139400 +v 0.000000 0.460000 -0.159800 +v 0.144957 0.000000 -0.098571 +v 0.166170 0.460000 -0.112996 +v 0.205000 0.000000 0.000000 +v 0.235000 0.460000 0.000000 +v 0.144957 0.000000 0.098571 +v 0.166170 0.460000 0.112996 +v 0.000000 0.000000 0.139400 +v 0.000000 0.460000 0.159800 +v -0.144957 0.000000 0.098571 +v -0.166170 0.460000 0.112996 +v -0.205000 0.000000 0.000000 +v -0.235000 0.460000 0.000000 +v -0.144957 0.000000 -0.098571 +v -0.166170 0.460000 -0.112996 +vn 0.2709 -0.0426 -0.9617 +vn 0.8527 -0.0556 -0.5194 +vn 0.8527 -0.0556 0.5194 +vn 0.2709 -0.0426 0.9617 +vn -0.2709 -0.0426 0.9617 +vn -0.8527 -0.0556 0.5194 +vn -0.0000 1.0000 -0.0000 +vn -0.8527 -0.0556 -0.5194 +vn -0.2709 -0.0426 -0.9617 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT +f 2//1 3//1 1//1 +f 4//2 5//2 3//2 +f 6//3 7//3 5//3 +f 8//4 9//4 7//4 +f 10//5 11//5 9//5 +f 12//6 13//6 11//6 +f 14//7 10//7 6//7 +f 14//8 15//8 13//8 +f 16//9 1//9 15//9 +f 7//10 11//10 15//10 +f 2//1 4//1 3//1 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 8//4 10//4 9//4 +f 10//5 12//5 11//5 +f 12//6 14//6 13//6 +f 6//7 4//7 2//7 +f 2//7 16//7 14//7 +f 14//7 12//7 10//7 +f 10//7 8//7 6//7 +f 6//7 2//7 14//7 +f 14//8 16//8 15//8 +f 16//9 2//9 1//9 +f 15//10 1//10 3//10 +f 3//10 5//10 7//10 +f 7//10 9//10 11//10 +f 11//10 13//10 15//10 +f 15//10 3//10 7//10 +o Cube.001 +v -0.015000 0.010000 0.164000 +v -0.015000 0.450000 0.164000 +v -0.015000 0.010000 0.152000 +v -0.015000 0.450000 0.152000 +v 0.015000 0.010000 0.164000 +v 0.015000 0.450000 0.164000 +v 0.015000 0.010000 0.152000 +v 0.015000 0.450000 0.152000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +s 0 +usemtl COAT_DARK +f 18//11 19//11 17//11 +f 20//12 23//12 19//12 +f 24//13 21//13 23//13 +f 22//14 17//14 21//14 +f 23//15 17//15 19//15 +f 20//16 22//16 24//16 +f 18//11 20//11 19//11 +f 20//12 24//12 23//12 +f 24//13 22//13 21//13 +f 22//14 18//14 17//14 +f 23//15 21//15 17//15 +f 20//16 18//16 22//16 +o Cube.002 +v -0.030000 0.092000 0.176000 +v -0.030000 0.108000 0.176000 +v -0.030000 0.092000 0.156000 +v -0.030000 0.108000 0.156000 +v 0.030000 0.092000 0.176000 +v 0.030000 0.108000 0.176000 +v 0.030000 0.092000 0.156000 +v 0.030000 0.108000 0.156000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +s 0 +usemtl BARK +f 26//17 27//17 25//17 +f 28//18 31//18 27//18 +f 32//19 29//19 31//19 +f 30//20 25//20 29//20 +f 31//21 25//21 27//21 +f 28//22 30//22 32//22 +f 26//17 28//17 27//17 +f 28//18 32//18 31//18 +f 32//19 30//19 29//19 +f 30//20 26//20 25//20 +f 31//21 29//21 25//21 +f 28//22 26//22 30//22 +o Cube.003 +v -0.030000 0.212000 0.176000 +v -0.030000 0.228000 0.176000 +v -0.030000 0.212000 0.156000 +v -0.030000 0.228000 0.156000 +v 0.030000 0.212000 0.176000 +v 0.030000 0.228000 0.176000 +v 0.030000 0.212000 0.156000 +v 0.030000 0.228000 0.156000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +s 0 +usemtl BARK +f 34//23 35//23 33//23 +f 36//24 39//24 35//24 +f 40//25 37//25 39//25 +f 38//26 33//26 37//26 +f 39//27 33//27 35//27 +f 36//28 38//28 40//28 +f 34//23 36//23 35//23 +f 36//24 40//24 39//24 +f 40//25 38//25 37//25 +f 38//26 34//26 33//26 +f 39//27 37//27 33//27 +f 36//28 34//28 38//28 +o Cube.004 +v -0.030000 0.332000 0.176000 +v -0.030000 0.348000 0.176000 +v -0.030000 0.332000 0.156000 +v -0.030000 0.348000 0.156000 +v 0.030000 0.332000 0.176000 +v 0.030000 0.348000 0.176000 +v 0.030000 0.332000 0.156000 +v 0.030000 0.348000 0.156000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +s 0 +usemtl BARK +f 42//29 43//29 41//29 +f 44//30 47//30 43//30 +f 48//31 45//31 47//31 +f 46//32 41//32 45//32 +f 47//33 41//33 43//33 +f 44//34 46//34 48//34 +f 42//29 44//29 43//29 +f 44//30 48//30 47//30 +f 48//31 46//31 45//31 +f 46//32 42//32 41//32 +f 47//33 45//33 41//33 +f 44//34 42//34 46//34 +o Cone.002 +v 0.000000 0.430000 -0.140000 +v 0.000000 0.510000 -0.160000 +v 0.091924 0.430000 -0.101924 +v 0.106066 0.510000 -0.116066 +v 0.130000 0.430000 -0.010000 +v 0.150000 0.510000 -0.010000 +v 0.091924 0.430000 0.081924 +v 0.106066 0.510000 0.096066 +v 0.000000 0.430000 0.120000 +v 0.000000 0.510000 0.140000 +v -0.091924 0.430000 0.081924 +v -0.106066 0.510000 0.096066 +v -0.130000 0.430000 -0.010000 +v -0.150000 0.510000 -0.010000 +v -0.091924 0.430000 -0.101924 +v -0.106066 0.510000 -0.116066 +vn 0.3729 -0.2250 -0.9002 +vn 0.9002 -0.2250 -0.3729 +vn 0.9002 -0.2250 0.3729 +vn 0.3729 -0.2250 0.9002 +vn -0.3729 -0.2250 0.9002 +vn -0.9002 -0.2250 0.3729 +vn -0.0000 1.0000 -0.0000 +vn -0.9002 -0.2250 -0.3729 +vn -0.3729 -0.2250 -0.9002 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT_DARK +f 50//35 51//35 49//35 +f 51//36 54//36 53//36 +f 54//37 55//37 53//37 +f 55//38 58//38 57//38 +f 58//39 59//39 57//39 +f 59//40 62//40 61//40 +f 62//41 58//41 54//41 +f 62//42 63//42 61//42 +f 63//43 50//43 49//43 +f 55//44 59//44 63//44 +f 50//35 52//35 51//35 +f 51//36 52//36 54//36 +f 54//37 56//37 55//37 +f 55//38 56//38 58//38 +f 58//39 60//39 59//39 +f 59//40 60//40 62//40 +f 54//41 52//41 50//41 +f 50//41 64//41 62//41 +f 62//41 60//41 58//41 +f 58//41 56//41 54//41 +f 54//41 50//41 62//41 +f 62//42 64//42 63//42 +f 63//43 64//43 50//43 +f 63//44 49//44 51//44 +f 51//44 53//44 55//44 +f 55//44 57//44 59//44 +f 59//44 61//44 63//44 +f 63//44 51//44 55//44 +o Cylinder.001 +v -0.210000 0.360000 -0.285000 +v 0.210000 0.360000 -0.285000 +v -0.210000 0.306967 -0.263033 +v 0.210000 0.306967 -0.263033 +v -0.210000 0.285000 -0.210000 +v 0.210000 0.285000 -0.210000 +v -0.210000 0.306967 -0.156967 +v 0.210000 0.306967 -0.156967 +v -0.210000 0.360000 -0.135000 +v 0.210000 0.360000 -0.135000 +v -0.210000 0.413033 -0.156967 +v 0.210000 0.413033 -0.156967 +v -0.210000 0.435000 -0.210000 +v 0.210000 0.435000 -0.210000 +v -0.210000 0.413033 -0.263033 +v 0.210000 0.413033 -0.263033 +vn -0.0000 -0.3827 -0.9239 +vn -0.0000 -0.9239 -0.3827 +vn -0.0000 -0.9239 0.3827 +vn -0.0000 -0.3827 0.9239 +vn -0.0000 0.3827 0.9239 +vn -0.0000 0.9239 0.3827 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 0.9239 -0.3827 +vn -0.0000 0.3827 -0.9239 +vn -1.0000 -0.0000 -0.0000 +s 0 +usemtl TANNED_SAIL +f 66//45 67//45 65//45 +f 68//46 69//46 67//46 +f 70//47 71//47 69//47 +f 72//48 73//48 71//48 +f 74//49 75//49 73//49 +f 76//50 77//50 75//50 +f 78//51 74//51 70//51 +f 78//52 79//52 77//52 +f 80//53 65//53 79//53 +f 71//54 75//54 79//54 +f 66//45 68//45 67//45 +f 68//46 70//46 69//46 +f 70//47 72//47 71//47 +f 72//48 74//48 73//48 +f 74//49 76//49 75//49 +f 76//50 78//50 77//50 +f 70//51 68//51 66//51 +f 66//51 80//51 78//51 +f 78//51 76//51 74//51 +f 74//51 72//51 70//51 +f 70//51 66//51 78//51 +f 78//52 80//52 79//52 +f 80//53 66//53 65//53 +f 79//54 65//54 67//54 +f 67//54 69//54 71//54 +f 71//54 73//54 75//54 +f 75//54 77//54 79//54 +f 79//54 67//54 71//54 +o Torus +v -0.130000 0.272000 -0.210000 +v -0.120489 0.278910 -0.210000 +v -0.124122 0.290090 -0.210000 +v -0.135878 0.290090 -0.210000 +v -0.139511 0.278910 -0.210000 +v -0.130000 0.280715 -0.248182 +v -0.120489 0.286940 -0.245184 +v -0.124122 0.297013 -0.240333 +v -0.135878 0.297013 -0.240333 +v -0.139511 0.286940 -0.245184 +v -0.130000 0.305133 -0.278801 +v -0.120489 0.309441 -0.273399 +v -0.124122 0.316412 -0.264658 +v -0.135878 0.316412 -0.264658 +v -0.139511 0.309441 -0.273399 +v -0.130000 0.340418 -0.295794 +v -0.120489 0.341956 -0.289057 +v -0.124122 0.344444 -0.278157 +v -0.135878 0.344444 -0.278157 +v -0.139511 0.341956 -0.289057 +v -0.130000 0.379582 -0.295794 +v -0.120489 0.378044 -0.289057 +v -0.124122 0.375556 -0.278157 +v -0.135878 0.375556 -0.278157 +v -0.139511 0.378044 -0.289057 +v -0.130000 0.414867 -0.278801 +v -0.120489 0.410559 -0.273399 +v -0.124122 0.403588 -0.264658 +v -0.135878 0.403588 -0.264658 +v -0.139511 0.410559 -0.273399 +v -0.130000 0.439285 -0.248182 +v -0.120489 0.433060 -0.245184 +v -0.124122 0.422987 -0.240333 +v -0.135878 0.422987 -0.240333 +v -0.139511 0.433060 -0.245184 +v -0.130000 0.448000 -0.210000 +v -0.120489 0.441090 -0.210000 +v -0.124122 0.429910 -0.210000 +v -0.135878 0.429910 -0.210000 +v -0.139511 0.441090 -0.210000 +v -0.130000 0.439285 -0.171818 +v -0.120489 0.433060 -0.174816 +v -0.124122 0.422987 -0.179667 +v -0.135878 0.422987 -0.179667 +v -0.139511 0.433060 -0.174816 +v -0.130000 0.414867 -0.141199 +v -0.120489 0.410559 -0.146601 +v -0.124122 0.403588 -0.155342 +v -0.135878 0.403588 -0.155342 +v -0.139511 0.410559 -0.146601 +v -0.130000 0.379582 -0.124206 +v -0.120489 0.378044 -0.130943 +v -0.124122 0.375556 -0.141843 +v -0.135878 0.375556 -0.141843 +v -0.139511 0.378044 -0.130943 +v -0.130000 0.340418 -0.124206 +v -0.120489 0.341956 -0.130943 +v -0.124122 0.344444 -0.141843 +v -0.135878 0.344444 -0.141843 +v -0.139511 0.341956 -0.130943 +v -0.130000 0.305133 -0.141199 +v -0.120489 0.309441 -0.146601 +v -0.124122 0.316412 -0.155342 +v -0.135878 0.316412 -0.155342 +v -0.139511 0.309441 -0.146601 +v -0.130000 0.280715 -0.171818 +v -0.120489 0.286940 -0.174816 +v -0.124122 0.297013 -0.179667 +v -0.135878 0.297013 -0.179667 +v -0.139511 0.286940 -0.174816 +vn 0.5780 -0.7956 -0.1816 +vn 0.9487 0.3083 0.0704 +vn -0.0000 0.9749 0.2225 +vn -0.9487 0.3083 0.0704 +vn -0.5780 -0.7956 -0.1816 +vn 0.5780 -0.6380 -0.5088 +vn 0.9487 0.2472 0.1971 +vn -0.0000 0.7818 0.6235 +vn -0.9487 0.2472 0.1971 +vn -0.5780 -0.6380 -0.5088 +vn 0.5780 -0.3541 -0.7352 +vn 0.9487 0.1372 0.2849 +vn -0.0000 0.4339 0.9010 +vn -0.9487 0.1372 0.2849 +vn -0.5780 -0.3541 -0.7352 +vn 0.5780 -0.0000 -0.8160 +vn 0.9487 -0.0000 0.3162 +vn -0.0000 -0.0000 1.0000 +vn -0.9487 -0.0000 0.3162 +vn -0.5780 -0.0000 -0.8160 +vn 0.5780 0.3541 -0.7352 +vn 0.9487 -0.1372 0.2849 +vn -0.0000 -0.4339 0.9010 +vn -0.9487 -0.1372 0.2849 +vn -0.5780 0.3541 -0.7352 +vn 0.5780 0.6380 -0.5088 +vn 0.9487 -0.2472 0.1971 +vn -0.0000 -0.7818 0.6235 +vn -0.9487 -0.2472 0.1971 +vn -0.5780 0.6380 -0.5088 +vn 0.5780 0.7956 -0.1816 +vn 0.9487 -0.3083 0.0704 +vn -0.0000 -0.9749 0.2225 +vn -0.9487 -0.3083 0.0704 +vn -0.5780 0.7956 -0.1816 +vn 0.5780 0.7956 0.1816 +vn 0.9487 -0.3083 -0.0704 +vn -0.0000 -0.9749 -0.2225 +vn -0.9487 -0.3083 -0.0704 +vn -0.5780 0.7956 0.1816 +vn 0.5780 0.6380 0.5088 +vn 0.9487 -0.2472 -0.1971 +vn -0.0000 -0.7818 -0.6235 +vn -0.9487 -0.2472 -0.1971 +vn -0.5780 0.6380 0.5088 +vn 0.5780 0.3541 0.7352 +vn 0.9487 -0.1372 -0.2849 +vn -0.0000 -0.4339 -0.9010 +vn -0.9487 -0.1372 -0.2849 +vn -0.5780 0.3541 0.7352 +vn 0.5780 -0.0000 0.8160 +vn 0.9487 -0.0000 -0.3162 +vn -0.0000 -0.0000 -1.0000 +vn -0.9487 -0.0000 -0.3162 +vn -0.5780 -0.0000 0.8160 +vn 0.5780 -0.3541 0.7352 +vn 0.9487 0.1372 -0.2849 +vn -0.0000 0.4339 -0.9010 +vn -0.9487 0.1372 -0.2849 +vn -0.5780 -0.3541 0.7352 +vn 0.5780 -0.6380 0.5088 +vn 0.9487 0.2472 -0.1971 +vn -0.0000 0.7818 -0.6235 +vn -0.9487 0.2472 -0.1971 +vn -0.5780 -0.6380 0.5088 +vn 0.5780 -0.7956 0.1816 +vn 0.9487 0.3083 -0.0704 +vn -0.0000 0.9749 -0.2225 +vn -0.9487 0.3083 -0.0704 +vn -0.5780 -0.7956 0.1816 +s 0 +usemtl TAR +f 86//55 82//55 81//55 +f 87//56 83//56 82//56 +f 88//57 84//57 83//57 +f 89//58 85//58 84//58 +f 85//59 86//59 81//59 +f 91//60 87//60 86//60 +f 87//61 93//61 88//61 +f 93//62 89//62 88//62 +f 94//63 90//63 89//63 +f 95//64 86//64 90//64 +f 96//65 92//65 91//65 +f 97//66 93//66 92//66 +f 98//67 94//67 93//67 +f 99//68 95//68 94//68 +f 100//69 91//69 95//69 +f 101//70 97//70 96//70 +f 102//71 98//71 97//71 +f 103//72 99//72 98//72 +f 104//73 100//73 99//73 +f 105//74 96//74 100//74 +f 101//75 107//75 102//75 +f 107//76 103//76 102//76 +f 108//77 104//77 103//77 +f 109//78 105//78 104//78 +f 110//79 101//79 105//79 +f 111//80 107//80 106//80 +f 112//81 108//81 107//81 +f 113//82 109//82 108//82 +f 114//83 110//83 109//83 +f 115//84 106//84 110//84 +f 116//85 112//85 111//85 +f 117//86 113//86 112//86 +f 118//87 114//87 113//87 +f 119//88 115//88 114//88 +f 120//89 111//89 115//89 +f 121//90 117//90 116//90 +f 122//91 118//91 117//91 +f 123//92 119//92 118//92 +f 124//93 120//93 119//93 +f 125//94 116//94 120//94 +f 126//95 122//95 121//95 +f 127//96 123//96 122//96 +f 128//97 124//97 123//97 +f 129//98 125//98 124//98 +f 130//99 121//99 125//99 +f 131//100 127//100 126//100 +f 132//101 128//101 127//101 +f 133//102 129//102 128//102 +f 134//103 130//103 129//103 +f 135//104 126//104 130//104 +f 136//105 132//105 131//105 +f 137//106 133//106 132//106 +f 138//107 134//107 133//107 +f 139//108 135//108 134//108 +f 140//109 131//109 135//109 +f 136//110 142//110 137//110 +f 142//111 138//111 137//111 +f 143//112 139//112 138//112 +f 144//113 140//113 139//113 +f 145//114 136//114 140//114 +f 146//115 142//115 141//115 +f 147//116 143//116 142//116 +f 148//117 144//117 143//117 +f 144//118 150//118 145//118 +f 150//119 141//119 145//119 +f 81//120 147//120 146//120 +f 147//121 83//121 148//121 +f 83//122 149//122 148//122 +f 84//123 150//123 149//123 +f 85//124 146//124 150//124 +f 86//55 87//55 82//55 +f 87//56 88//56 83//56 +f 88//57 89//57 84//57 +f 89//58 90//58 85//58 +f 85//59 90//59 86//59 +f 91//60 92//60 87//60 +f 87//61 92//61 93//61 +f 93//62 94//62 89//62 +f 94//63 95//63 90//63 +f 95//64 91//64 86//64 +f 96//65 97//65 92//65 +f 97//66 98//66 93//66 +f 98//67 99//67 94//67 +f 99//68 100//68 95//68 +f 100//69 96//69 91//69 +f 101//70 102//70 97//70 +f 102//71 103//71 98//71 +f 103//72 104//72 99//72 +f 104//73 105//73 100//73 +f 105//74 101//74 96//74 +f 101//75 106//75 107//75 +f 107//76 108//76 103//76 +f 108//77 109//77 104//77 +f 109//78 110//78 105//78 +f 110//79 106//79 101//79 +f 111//80 112//80 107//80 +f 112//81 113//81 108//81 +f 113//82 114//82 109//82 +f 114//83 115//83 110//83 +f 115//84 111//84 106//84 +f 116//85 117//85 112//85 +f 117//86 118//86 113//86 +f 118//87 119//87 114//87 +f 119//88 120//88 115//88 +f 120//89 116//89 111//89 +f 121//90 122//90 117//90 +f 122//91 123//91 118//91 +f 123//92 124//92 119//92 +f 124//93 125//93 120//93 +f 125//94 121//94 116//94 +f 126//95 127//95 122//95 +f 127//96 128//96 123//96 +f 128//97 129//97 124//97 +f 129//98 130//98 125//98 +f 130//99 126//99 121//99 +f 131//100 132//100 127//100 +f 132//101 133//101 128//101 +f 133//102 134//102 129//102 +f 134//103 135//103 130//103 +f 135//104 131//104 126//104 +f 136//105 137//105 132//105 +f 137//106 138//106 133//106 +f 138//107 139//107 134//107 +f 139//108 140//108 135//108 +f 140//109 136//109 131//109 +f 136//110 141//110 142//110 +f 142//111 143//111 138//111 +f 143//112 144//112 139//112 +f 144//113 145//113 140//113 +f 145//114 141//114 136//114 +f 146//115 147//115 142//115 +f 147//116 148//116 143//116 +f 148//117 149//117 144//117 +f 144//118 149//118 150//118 +f 150//119 146//119 141//119 +f 81//120 82//120 147//120 +f 147//121 82//121 83//121 +f 83//122 84//122 149//122 +f 84//123 85//123 150//123 +f 85//124 81//124 146//124 +o Torus.001 +v 0.130000 0.272000 -0.210000 +v 0.139511 0.278910 -0.210000 +v 0.135878 0.290090 -0.210000 +v 0.124122 0.290090 -0.210000 +v 0.120489 0.278910 -0.210000 +v 0.130000 0.280715 -0.248182 +v 0.139511 0.286940 -0.245184 +v 0.135878 0.297013 -0.240333 +v 0.124122 0.297013 -0.240333 +v 0.120489 0.286940 -0.245184 +v 0.130000 0.305133 -0.278801 +v 0.139511 0.309441 -0.273399 +v 0.135878 0.316412 -0.264658 +v 0.124122 0.316412 -0.264658 +v 0.120489 0.309441 -0.273399 +v 0.130000 0.340418 -0.295794 +v 0.139511 0.341956 -0.289057 +v 0.135878 0.344444 -0.278157 +v 0.124122 0.344444 -0.278157 +v 0.120489 0.341956 -0.289057 +v 0.130000 0.379582 -0.295794 +v 0.139511 0.378044 -0.289057 +v 0.135878 0.375556 -0.278157 +v 0.124122 0.375556 -0.278157 +v 0.120489 0.378044 -0.289057 +v 0.130000 0.414867 -0.278801 +v 0.139511 0.410559 -0.273399 +v 0.135878 0.403588 -0.264658 +v 0.124122 0.403588 -0.264658 +v 0.120489 0.410559 -0.273399 +v 0.130000 0.439285 -0.248182 +v 0.139511 0.433060 -0.245184 +v 0.135878 0.422987 -0.240333 +v 0.124122 0.422987 -0.240333 +v 0.120489 0.433060 -0.245184 +v 0.130000 0.448000 -0.210000 +v 0.139511 0.441090 -0.210000 +v 0.135878 0.429910 -0.210000 +v 0.124122 0.429910 -0.210000 +v 0.120489 0.441090 -0.210000 +v 0.130000 0.439285 -0.171818 +v 0.139511 0.433060 -0.174816 +v 0.135878 0.422987 -0.179667 +v 0.124122 0.422987 -0.179667 +v 0.120489 0.433060 -0.174816 +v 0.130000 0.414867 -0.141199 +v 0.139511 0.410559 -0.146601 +v 0.135878 0.403588 -0.155342 +v 0.124122 0.403588 -0.155342 +v 0.120489 0.410559 -0.146601 +v 0.130000 0.379582 -0.124206 +v 0.139511 0.378044 -0.130943 +v 0.135878 0.375556 -0.141843 +v 0.124122 0.375556 -0.141843 +v 0.120489 0.378044 -0.130943 +v 0.130000 0.340418 -0.124206 +v 0.139511 0.341956 -0.130943 +v 0.135878 0.344444 -0.141843 +v 0.124122 0.344444 -0.141843 +v 0.120489 0.341956 -0.130943 +v 0.130000 0.305133 -0.141199 +v 0.139511 0.309441 -0.146601 +v 0.135878 0.316412 -0.155342 +v 0.124122 0.316412 -0.155342 +v 0.120489 0.309441 -0.146601 +v 0.130000 0.280715 -0.171818 +v 0.139511 0.286940 -0.174816 +v 0.135878 0.297013 -0.179667 +v 0.124122 0.297013 -0.179667 +v 0.120489 0.286940 -0.174816 +vn 0.5780 -0.7956 -0.1816 +vn 0.9487 0.3083 0.0704 +vn -0.0000 0.9749 0.2225 +vn -0.9487 0.3083 0.0704 +vn -0.5780 -0.7956 -0.1816 +vn 0.5780 -0.6380 -0.5088 +vn 0.9487 0.2472 0.1971 +vn -0.0000 0.7818 0.6235 +vn -0.9487 0.2472 0.1971 +vn -0.5780 -0.6380 -0.5088 +vn 0.5780 -0.3541 -0.7352 +vn 0.9487 0.1372 0.2849 +vn -0.0000 0.4339 0.9010 +vn -0.9487 0.1372 0.2849 +vn -0.5780 -0.3541 -0.7352 +vn 0.5780 -0.0000 -0.8160 +vn 0.9487 -0.0000 0.3162 +vn -0.0000 -0.0000 1.0000 +vn -0.9487 -0.0000 0.3162 +vn -0.5780 -0.0000 -0.8160 +vn 0.5780 0.3541 -0.7352 +vn 0.9487 -0.1372 0.2849 +vn -0.0000 -0.4339 0.9010 +vn -0.9487 -0.1372 0.2849 +vn -0.5780 0.3541 -0.7352 +vn 0.5780 0.6380 -0.5088 +vn 0.9487 -0.2472 0.1971 +vn -0.0000 -0.7818 0.6235 +vn -0.9487 -0.2472 0.1971 +vn -0.5780 0.6380 -0.5088 +vn 0.5780 0.7956 -0.1816 +vn 0.9487 -0.3083 0.0704 +vn -0.0000 -0.9749 0.2225 +vn -0.9487 -0.3083 0.0704 +vn -0.5780 0.7956 -0.1816 +vn 0.5780 0.7956 0.1816 +vn 0.9487 -0.3083 -0.0704 +vn -0.0000 -0.9749 -0.2225 +vn -0.9487 -0.3083 -0.0704 +vn -0.5780 0.7956 0.1816 +vn 0.5780 0.6380 0.5088 +vn 0.9487 -0.2472 -0.1971 +vn -0.0000 -0.7818 -0.6235 +vn -0.9487 -0.2472 -0.1971 +vn -0.5780 0.6380 0.5088 +vn 0.5780 0.3541 0.7352 +vn 0.9487 -0.1372 -0.2849 +vn -0.0000 -0.4339 -0.9010 +vn -0.9487 -0.1372 -0.2849 +vn -0.5780 0.3541 0.7352 +vn 0.5780 -0.0000 0.8160 +vn 0.9487 -0.0000 -0.3162 +vn -0.0000 -0.0000 -1.0000 +vn -0.9487 -0.0000 -0.3162 +vn -0.5780 -0.0000 0.8160 +vn 0.5780 -0.3541 0.7352 +vn 0.9487 0.1372 -0.2849 +vn -0.0000 0.4339 -0.9010 +vn -0.9487 0.1372 -0.2849 +vn -0.5780 -0.3541 0.7352 +vn 0.5780 -0.6380 0.5088 +vn 0.9487 0.2472 -0.1971 +vn -0.0000 0.7818 -0.6235 +vn -0.9487 0.2472 -0.1971 +vn -0.5780 -0.6380 0.5088 +vn 0.5780 -0.7956 0.1816 +vn 0.9487 0.3083 -0.0704 +vn -0.0000 0.9749 -0.2225 +vn -0.9487 0.3083 -0.0704 +vn -0.5780 -0.7956 0.1816 +s 0 +usemtl TAR +f 156//125 152//125 151//125 +f 157//126 153//126 152//126 +f 158//127 154//127 153//127 +f 159//128 155//128 154//128 +f 155//129 156//129 151//129 +f 161//130 157//130 156//130 +f 157//131 163//131 158//131 +f 163//132 159//132 158//132 +f 164//133 160//133 159//133 +f 165//134 156//134 160//134 +f 166//135 162//135 161//135 +f 167//136 163//136 162//136 +f 168//137 164//137 163//137 +f 169//138 165//138 164//138 +f 170//139 161//139 165//139 +f 171//140 167//140 166//140 +f 172//141 168//141 167//141 +f 173//142 169//142 168//142 +f 174//143 170//143 169//143 +f 175//144 166//144 170//144 +f 171//145 177//145 172//145 +f 177//146 173//146 172//146 +f 178//147 174//147 173//147 +f 179//148 175//148 174//148 +f 180//149 171//149 175//149 +f 181//150 177//150 176//150 +f 182//151 178//151 177//151 +f 183//152 179//152 178//152 +f 184//153 180//153 179//153 +f 185//154 176//154 180//154 +f 186//155 182//155 181//155 +f 187//156 183//156 182//156 +f 188//157 184//157 183//157 +f 189//158 185//158 184//158 +f 190//159 181//159 185//159 +f 191//160 187//160 186//160 +f 192//161 188//161 187//161 +f 193//162 189//162 188//162 +f 194//163 190//163 189//163 +f 195//164 186//164 190//164 +f 196//165 192//165 191//165 +f 197//166 193//166 192//166 +f 198//167 194//167 193//167 +f 199//168 195//168 194//168 +f 200//169 191//169 195//169 +f 201//170 197//170 196//170 +f 202//171 198//171 197//171 +f 203//172 199//172 198//172 +f 204//173 200//173 199//173 +f 205//174 196//174 200//174 +f 206//175 202//175 201//175 +f 207//176 203//176 202//176 +f 208//177 204//177 203//177 +f 209//178 205//178 204//178 +f 210//179 201//179 205//179 +f 206//180 212//180 207//180 +f 212//181 208//181 207//181 +f 213//182 209//182 208//182 +f 214//183 210//183 209//183 +f 215//184 206//184 210//184 +f 216//185 212//185 211//185 +f 217//186 213//186 212//186 +f 218//187 214//187 213//187 +f 214//188 220//188 215//188 +f 220//189 211//189 215//189 +f 151//190 217//190 216//190 +f 217//191 153//191 218//191 +f 153//192 219//192 218//192 +f 154//193 220//193 219//193 +f 155//194 216//194 220//194 +f 156//125 157//125 152//125 +f 157//126 158//126 153//126 +f 158//127 159//127 154//127 +f 159//128 160//128 155//128 +f 155//129 160//129 156//129 +f 161//130 162//130 157//130 +f 157//131 162//131 163//131 +f 163//132 164//132 159//132 +f 164//133 165//133 160//133 +f 165//134 161//134 156//134 +f 166//135 167//135 162//135 +f 167//136 168//136 163//136 +f 168//137 169//137 164//137 +f 169//138 170//138 165//138 +f 170//139 166//139 161//139 +f 171//140 172//140 167//140 +f 172//141 173//141 168//141 +f 173//142 174//142 169//142 +f 174//143 175//143 170//143 +f 175//144 171//144 166//144 +f 171//145 176//145 177//145 +f 177//146 178//146 173//146 +f 178//147 179//147 174//147 +f 179//148 180//148 175//148 +f 180//149 176//149 171//149 +f 181//150 182//150 177//150 +f 182//151 183//151 178//151 +f 183//152 184//152 179//152 +f 184//153 185//153 180//153 +f 185//154 181//154 176//154 +f 186//155 187//155 182//155 +f 187//156 188//156 183//156 +f 188//157 189//157 184//157 +f 189//158 190//158 185//158 +f 190//159 186//159 181//159 +f 191//160 192//160 187//160 +f 192//161 193//161 188//161 +f 193//162 194//162 189//162 +f 194//163 195//163 190//163 +f 195//164 191//164 186//164 +f 196//165 197//165 192//165 +f 197//166 198//166 193//166 +f 198//167 199//167 194//167 +f 199//168 200//168 195//168 +f 200//169 196//169 191//169 +f 201//170 202//170 197//170 +f 202//171 203//171 198//171 +f 203//172 204//172 199//172 +f 204//173 205//173 200//173 +f 205//174 201//174 196//174 +f 206//175 207//175 202//175 +f 207//176 208//176 203//176 +f 208//177 209//177 204//177 +f 209//178 210//178 205//178 +f 210//179 206//179 201//179 +f 206//180 211//180 212//180 +f 212//181 213//181 208//181 +f 213//182 214//182 209//182 +f 214//183 215//183 210//183 +f 215//184 211//184 206//184 +f 216//185 217//185 212//185 +f 217//186 218//186 213//186 +f 218//187 219//187 214//187 +f 214//188 219//188 220//188 +f 220//189 216//189 211//189 +f 151//190 152//190 217//190 +f 217//191 152//191 153//191 +f 153//192 154//192 219//192 +f 154//193 155//193 220//193 +f 155//194 151//194 216//194 +o Cube.005 +v -0.037569 0.109333 -0.160000 +v -0.206579 0.427194 -0.160000 +v -0.037569 0.109333 -0.180000 +v -0.206579 0.427194 -0.180000 +v 0.006579 0.132806 -0.160000 +v -0.162431 0.450667 -0.160000 +v 0.006579 0.132806 -0.180000 +v -0.162431 0.450667 -0.180000 +vn -0.8829 -0.4695 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 0.8829 0.4695 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn 0.4695 -0.8829 -0.0000 +vn -0.4695 0.8829 -0.0000 +s 0 +usemtl TAR +f 222//195 223//195 221//195 +f 224//196 227//196 223//196 +f 228//197 225//197 227//197 +f 225//198 222//198 221//198 +f 227//199 221//199 223//199 +f 224//200 226//200 228//200 +f 222//195 224//195 223//195 +f 224//196 228//196 227//196 +f 228//197 226//197 225//197 +f 225//198 226//198 222//198 +f 227//199 225//199 221//199 +f 224//200 222//200 226//200 diff --git a/assets/models/figure/torso.obj.import b/assets/models/figure/torso.obj.import new file mode 100644 index 0000000..c99959d --- /dev/null +++ b/assets/models/figure/torso.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://dd6pk5jitktjj" +path="res://.godot/imported/torso.obj-e03d5e5539be9f34087d4fba6d1bed4b.mesh" + +[deps] + +files=["res://.godot/imported/torso.obj-e03d5e5539be9f34087d4fba6d1bed4b.mesh"] + +source_file="res://assets/models/figure/torso.obj" +dest_files=["res://.godot/imported/torso.obj-e03d5e5539be9f34087d4fba6d1bed4b.mesh", "res://.godot/imported/torso.obj-e03d5e5539be9f34087d4fba6d1bed4b.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/upper_arm_l.mtl b/assets/models/figure/upper_arm_l.mtl new file mode 100644 index 0000000..d609450 --- /dev/null +++ b/assets/models/figure/upper_arm_l.mtl @@ -0,0 +1,12 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl COAT +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.710566 0.393123 0.021981 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/upper_arm_l.obj b/assets/models/figure/upper_arm_l.obj new file mode 100644 index 0000000..1ab9d94 --- /dev/null +++ b/assets/models/figure/upper_arm_l.obj @@ -0,0 +1,201 @@ +# Blender 4.3.2 +# www.blender.org +mtllib upper_arm_l.mtl +o Sphere.002 +v 0.031172 0.050676 -0.031172 +v 0.050437 0.013176 -0.050437 +v 0.050437 -0.033176 -0.050437 +v 0.031172 -0.070676 -0.031172 +v 0.044084 0.050676 0.000000 +v 0.071329 0.013176 0.000000 +v 0.071329 -0.033176 0.000000 +v 0.044084 -0.070676 0.000000 +v 0.031172 0.050676 0.031172 +v 0.050437 0.013176 0.050437 +v 0.050437 -0.033176 0.050437 +v 0.031172 -0.070676 0.031172 +v -0.000000 0.050676 0.044084 +v -0.000000 0.013176 0.071329 +v -0.000000 -0.033176 0.071329 +v -0.000000 -0.070676 0.044084 +v -0.031172 0.050676 0.031172 +v -0.050437 0.013176 0.050437 +v -0.050437 -0.033176 0.050437 +v -0.031172 -0.070676 0.031172 +v -0.000000 -0.085000 0.000000 +v -0.000000 0.065000 0.000000 +v -0.044084 0.050676 0.000000 +v -0.071329 0.013176 0.000000 +v -0.071329 -0.033176 0.000000 +v -0.044084 -0.070676 0.000000 +v -0.031172 0.050676 -0.031172 +v -0.050437 0.013176 -0.050437 +v -0.050437 -0.033176 -0.050437 +v -0.031172 -0.070676 -0.031172 +v -0.000000 0.050676 -0.044084 +v -0.000000 0.013176 -0.071329 +v -0.000000 -0.033176 -0.071329 +v -0.000000 -0.070676 -0.044084 +vn 0.3177 -0.5573 -0.7671 +vn 0.3177 0.5573 -0.7671 +vn 0.1270 -0.9434 -0.3065 +vn 0.3827 -0.0000 -0.9239 +vn 0.1270 0.9434 -0.3065 +vn 0.3065 0.9434 -0.1270 +vn 0.7671 -0.5573 -0.3177 +vn 0.7671 0.5573 -0.3177 +vn 0.3065 -0.9434 -0.1270 +vn 0.9239 -0.0000 -0.3827 +vn 0.3065 0.9434 0.1270 +vn 0.7671 -0.5573 0.3177 +vn 0.7671 0.5573 0.3177 +vn 0.3065 -0.9434 0.1270 +vn 0.9239 -0.0000 0.3827 +vn 0.1270 0.9434 0.3065 +vn 0.3177 -0.5573 0.7671 +vn 0.3177 0.5573 0.7671 +vn 0.1270 -0.9434 0.3065 +vn 0.3827 -0.0000 0.9239 +vn -0.1270 0.9434 0.3065 +vn -0.3177 -0.5573 0.7671 +vn -0.3177 0.5573 0.7671 +vn -0.1270 -0.9434 0.3065 +vn -0.3827 -0.0000 0.9239 +vn -0.3065 0.9434 0.1270 +vn -0.7671 -0.5573 0.3177 +vn -0.7671 0.5573 0.3177 +vn -0.3065 -0.9434 0.1270 +vn -0.9239 -0.0000 0.3827 +vn -0.3065 0.9434 -0.1270 +vn -0.7671 -0.5573 -0.3177 +vn -0.7671 0.5573 -0.3177 +vn -0.3065 -0.9434 -0.1270 +vn -0.9239 -0.0000 -0.3827 +vn -0.1270 0.9434 -0.3065 +vn -0.3177 -0.5573 -0.7671 +vn -0.3177 0.5573 -0.7671 +vn -0.1270 -0.9434 -0.3065 +vn -0.3827 -0.0000 -0.9239 +s 0 +usemtl COAT +f 33//1 4//1 34//1 +f 31//2 2//2 32//2 +f 21//3 34//3 4//3 +f 32//4 3//4 33//4 +f 31//5 22//5 1//5 +f 1//6 22//6 5//6 +f 3//7 8//7 4//7 +f 1//8 6//8 2//8 +f 21//9 4//9 8//9 +f 2//10 7//10 3//10 +f 5//11 22//11 9//11 +f 7//12 12//12 8//12 +f 5//13 10//13 6//13 +f 21//14 8//14 12//14 +f 6//15 11//15 7//15 +f 9//16 22//16 13//16 +f 11//17 16//17 12//17 +f 9//18 14//18 10//18 +f 21//19 12//19 16//19 +f 10//20 15//20 11//20 +f 13//21 22//21 17//21 +f 15//22 20//22 16//22 +f 13//23 18//23 14//23 +f 21//24 16//24 20//24 +f 14//25 19//25 15//25 +f 17//26 22//26 23//26 +f 19//27 26//27 20//27 +f 17//28 24//28 18//28 +f 21//29 20//29 26//29 +f 18//30 25//30 19//30 +f 23//31 22//31 27//31 +f 25//32 30//32 26//32 +f 23//33 28//33 24//33 +f 21//34 26//34 30//34 +f 24//35 29//35 25//35 +f 27//36 22//36 31//36 +f 29//37 34//37 30//37 +f 27//38 32//38 28//38 +f 21//39 30//39 34//39 +f 28//40 33//40 29//40 +f 33//1 3//1 4//1 +f 31//2 1//2 2//2 +f 32//4 2//4 3//4 +f 3//7 7//7 8//7 +f 1//8 5//8 6//8 +f 2//10 6//10 7//10 +f 7//12 11//12 12//12 +f 5//13 9//13 10//13 +f 6//15 10//15 11//15 +f 11//17 15//17 16//17 +f 9//18 13//18 14//18 +f 10//20 14//20 15//20 +f 15//22 19//22 20//22 +f 13//23 17//23 18//23 +f 14//25 18//25 19//25 +f 19//27 25//27 26//27 +f 17//28 23//28 24//28 +f 18//30 24//30 25//30 +f 25//32 29//32 30//32 +f 23//33 27//33 28//33 +f 24//35 28//35 29//35 +f 29//37 33//37 34//37 +f 27//38 31//38 32//38 +f 28//40 32//40 33//40 +o Cone.005 +v 0.005000 -0.275000 -0.068000 +v 0.005000 -0.005000 -0.060000 +v 0.053083 -0.275000 -0.048083 +v 0.047426 -0.005000 -0.042426 +v 0.073000 -0.275000 0.000000 +v 0.065000 -0.005000 0.000000 +v 0.053083 -0.275000 0.048083 +v 0.047426 -0.005000 0.042426 +v 0.005000 -0.275000 0.068000 +v 0.005000 -0.005000 0.060000 +v -0.043083 -0.275000 0.048083 +v -0.037426 -0.005000 0.042426 +v -0.063000 -0.275000 0.000000 +v -0.055000 -0.005000 0.000000 +v -0.043083 -0.275000 -0.048083 +v -0.037426 -0.005000 -0.042426 +vn 0.3825 0.0274 -0.9235 +vn 0.9235 0.0274 -0.3825 +vn 0.9235 0.0274 0.3825 +vn 0.3825 0.0274 0.9235 +vn -0.3825 0.0274 0.9235 +vn -0.9235 0.0274 0.3825 +vn -0.0000 1.0000 -0.0000 +vn -0.9235 0.0274 -0.3825 +vn -0.3825 0.0274 -0.9235 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT +f 36//41 37//41 35//41 +f 38//42 39//42 37//42 +f 40//43 41//43 39//43 +f 42//44 43//44 41//44 +f 44//45 45//45 43//45 +f 46//46 47//46 45//46 +f 48//47 44//47 40//47 +f 48//48 49//48 47//48 +f 50//49 35//49 49//49 +f 41//50 45//50 49//50 +f 36//41 38//41 37//41 +f 38//42 40//42 39//42 +f 40//43 42//43 41//43 +f 42//44 44//44 43//44 +f 44//45 46//45 45//45 +f 46//46 48//46 47//46 +f 40//47 38//47 36//47 +f 36//47 50//47 48//47 +f 48//47 46//47 44//47 +f 44//47 42//47 40//47 +f 40//47 36//47 48//47 +f 48//48 50//48 49//48 +f 50//49 36//49 35//49 +f 49//50 35//50 37//50 +f 37//50 39//50 41//50 +f 41//50 43//50 45//50 +f 45//50 47//50 49//50 +f 49//50 37//50 41//50 diff --git a/assets/models/figure/upper_arm_l.obj.import b/assets/models/figure/upper_arm_l.obj.import new file mode 100644 index 0000000..c9b798e --- /dev/null +++ b/assets/models/figure/upper_arm_l.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://bmc4mjbi54a4a" +path="res://.godot/imported/upper_arm_l.obj-592f773c4767d26471e01260374b5776.mesh" + +[deps] + +files=["res://.godot/imported/upper_arm_l.obj-592f773c4767d26471e01260374b5776.mesh"] + +source_file="res://assets/models/figure/upper_arm_l.obj" +dest_files=["res://.godot/imported/upper_arm_l.obj-592f773c4767d26471e01260374b5776.mesh", "res://.godot/imported/upper_arm_l.obj-592f773c4767d26471e01260374b5776.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/assets/models/figure/upper_arm_r.mtl b/assets/models/figure/upper_arm_r.mtl new file mode 100644 index 0000000..d609450 --- /dev/null +++ b/assets/models/figure/upper_arm_r.mtl @@ -0,0 +1,12 @@ +# Blender 4.3.2 MTL File: 'None' +# www.blender.org + +newmtl COAT +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.710566 0.393123 0.021981 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.500000 +d 1.000000 +illum 2 diff --git a/assets/models/figure/upper_arm_r.obj b/assets/models/figure/upper_arm_r.obj new file mode 100644 index 0000000..86c6eda --- /dev/null +++ b/assets/models/figure/upper_arm_r.obj @@ -0,0 +1,201 @@ +# Blender 4.3.2 +# www.blender.org +mtllib upper_arm_r.mtl +o Sphere.001 +v 0.031172 0.050676 -0.031172 +v 0.050437 0.013176 -0.050437 +v 0.050437 -0.033176 -0.050437 +v 0.031172 -0.070676 -0.031172 +v 0.044084 0.050676 0.000000 +v 0.071329 0.013176 0.000000 +v 0.071329 -0.033176 0.000000 +v 0.044084 -0.070676 0.000000 +v 0.031172 0.050676 0.031172 +v 0.050437 0.013176 0.050437 +v 0.050437 -0.033176 0.050437 +v 0.031172 -0.070676 0.031172 +v 0.000000 0.050676 0.044084 +v 0.000000 0.013176 0.071329 +v 0.000000 -0.033176 0.071329 +v 0.000000 -0.070676 0.044084 +v -0.031172 0.050676 0.031172 +v -0.050437 0.013176 0.050437 +v -0.050437 -0.033176 0.050437 +v -0.031172 -0.070676 0.031172 +v 0.000000 -0.085000 0.000000 +v 0.000000 0.065000 0.000000 +v -0.044084 0.050676 0.000000 +v -0.071329 0.013176 0.000000 +v -0.071329 -0.033176 0.000000 +v -0.044084 -0.070676 0.000000 +v -0.031172 0.050676 -0.031172 +v -0.050437 0.013176 -0.050437 +v -0.050437 -0.033176 -0.050437 +v -0.031172 -0.070676 -0.031172 +v 0.000000 0.050676 -0.044084 +v 0.000000 0.013176 -0.071329 +v 0.000000 -0.033176 -0.071329 +v 0.000000 -0.070676 -0.044084 +vn 0.3177 -0.5573 -0.7671 +vn 0.3177 0.5573 -0.7671 +vn 0.1270 -0.9434 -0.3065 +vn 0.3827 -0.0000 -0.9239 +vn 0.1270 0.9434 -0.3065 +vn 0.3065 -0.9434 -0.1270 +vn 0.9239 -0.0000 -0.3827 +vn 0.3065 0.9434 -0.1270 +vn 0.7671 -0.5573 -0.3177 +vn 0.7671 0.5573 -0.3177 +vn 0.3065 -0.9434 0.1270 +vn 0.9239 -0.0000 0.3827 +vn 0.3065 0.9434 0.1270 +vn 0.7671 -0.5573 0.3177 +vn 0.7671 0.5573 0.3177 +vn 0.1270 -0.9434 0.3065 +vn 0.3827 -0.0000 0.9239 +vn 0.1270 0.9434 0.3065 +vn 0.3177 -0.5573 0.7671 +vn 0.3177 0.5573 0.7671 +vn -0.1270 -0.9434 0.3065 +vn -0.3827 -0.0000 0.9239 +vn -0.1270 0.9434 0.3065 +vn -0.3177 -0.5573 0.7671 +vn -0.3177 0.5573 0.7671 +vn -0.3065 -0.9434 0.1270 +vn -0.9239 -0.0000 0.3827 +vn -0.3065 0.9434 0.1270 +vn -0.7671 -0.5573 0.3177 +vn -0.7671 0.5573 0.3177 +vn -0.3065 -0.9434 -0.1270 +vn -0.9239 -0.0000 -0.3827 +vn -0.3065 0.9434 -0.1270 +vn -0.7671 -0.5573 -0.3177 +vn -0.7671 0.5573 -0.3177 +vn -0.1270 -0.9434 -0.3065 +vn -0.3827 -0.0000 -0.9239 +vn -0.1270 0.9434 -0.3065 +vn -0.3177 -0.5573 -0.7671 +vn -0.3177 0.5573 -0.7671 +s 0 +usemtl COAT +f 33//1 4//1 34//1 +f 31//2 2//2 32//2 +f 21//3 34//3 4//3 +f 32//4 3//4 33//4 +f 31//5 22//5 1//5 +f 21//6 4//6 8//6 +f 2//7 7//7 3//7 +f 1//8 22//8 5//8 +f 3//9 8//9 4//9 +f 1//10 6//10 2//10 +f 21//11 8//11 12//11 +f 6//12 11//12 7//12 +f 5//13 22//13 9//13 +f 7//14 12//14 8//14 +f 5//15 10//15 6//15 +f 21//16 12//16 16//16 +f 10//17 15//17 11//17 +f 9//18 22//18 13//18 +f 11//19 16//19 12//19 +f 9//20 14//20 10//20 +f 21//21 16//21 20//21 +f 14//22 19//22 15//22 +f 13//23 22//23 17//23 +f 15//24 20//24 16//24 +f 13//25 18//25 14//25 +f 21//26 20//26 26//26 +f 18//27 25//27 19//27 +f 17//28 22//28 23//28 +f 19//29 26//29 20//29 +f 17//30 24//30 18//30 +f 21//31 26//31 30//31 +f 24//32 29//32 25//32 +f 23//33 22//33 27//33 +f 25//34 30//34 26//34 +f 23//35 28//35 24//35 +f 21//36 30//36 34//36 +f 28//37 33//37 29//37 +f 27//38 22//38 31//38 +f 29//39 34//39 30//39 +f 27//40 32//40 28//40 +f 33//1 3//1 4//1 +f 31//2 1//2 2//2 +f 32//4 2//4 3//4 +f 2//7 6//7 7//7 +f 3//9 7//9 8//9 +f 1//10 5//10 6//10 +f 6//12 10//12 11//12 +f 7//14 11//14 12//14 +f 5//15 9//15 10//15 +f 10//17 14//17 15//17 +f 11//19 15//19 16//19 +f 9//20 13//20 14//20 +f 14//22 18//22 19//22 +f 15//24 19//24 20//24 +f 13//25 17//25 18//25 +f 18//27 24//27 25//27 +f 19//29 25//29 26//29 +f 17//30 23//30 24//30 +f 24//32 28//32 29//32 +f 25//34 29//34 30//34 +f 23//35 27//35 28//35 +f 28//37 32//37 33//37 +f 29//39 33//39 34//39 +f 27//40 31//40 32//40 +o Cone.004 +v -0.005000 -0.275000 -0.068000 +v -0.005000 -0.005000 -0.060000 +v 0.043083 -0.275000 -0.048083 +v 0.037426 -0.005000 -0.042426 +v 0.063000 -0.275000 0.000000 +v 0.055000 -0.005000 0.000000 +v 0.043083 -0.275000 0.048083 +v 0.037426 -0.005000 0.042426 +v -0.005000 -0.275000 0.068000 +v -0.005000 -0.005000 0.060000 +v -0.053083 -0.275000 0.048083 +v -0.047426 -0.005000 0.042426 +v -0.073000 -0.275000 0.000000 +v -0.065000 -0.005000 0.000000 +v -0.053083 -0.275000 -0.048083 +v -0.047426 -0.005000 -0.042426 +vn 0.3825 0.0274 -0.9235 +vn 0.9235 0.0274 -0.3825 +vn 0.9235 0.0274 0.3825 +vn 0.3825 0.0274 0.9235 +vn -0.3825 0.0274 0.9235 +vn -0.9235 0.0274 0.3825 +vn -0.0000 1.0000 -0.0000 +vn -0.9235 0.0274 -0.3825 +vn -0.3825 0.0274 -0.9235 +vn -0.0000 -1.0000 -0.0000 +s 0 +usemtl COAT +f 36//41 37//41 35//41 +f 38//42 39//42 37//42 +f 40//43 41//43 39//43 +f 42//44 43//44 41//44 +f 44//45 45//45 43//45 +f 46//46 47//46 45//46 +f 48//47 44//47 40//47 +f 48//48 49//48 47//48 +f 50//49 35//49 49//49 +f 41//50 45//50 49//50 +f 36//41 38//41 37//41 +f 38//42 40//42 39//42 +f 40//43 42//43 41//43 +f 42//44 44//44 43//44 +f 44//45 46//45 45//45 +f 46//46 48//46 47//46 +f 40//47 38//47 36//47 +f 36//47 50//47 48//47 +f 48//47 46//47 44//47 +f 44//47 42//47 40//47 +f 40//47 36//47 48//47 +f 48//48 50//48 49//48 +f 50//49 36//49 35//49 +f 49//50 35//50 37//50 +f 37//50 39//50 41//50 +f 41//50 43//50 45//50 +f 45//50 47//50 49//50 +f 49//50 37//50 41//50 diff --git a/assets/models/figure/upper_arm_r.obj.import b/assets/models/figure/upper_arm_r.obj.import new file mode 100644 index 0000000..61594fb --- /dev/null +++ b/assets/models/figure/upper_arm_r.obj.import @@ -0,0 +1,25 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://c72wqo5ylf6o5" +path="res://.godot/imported/upper_arm_r.obj-8ad590db82886a51a0f47f489e698ba7.mesh" + +[deps] + +files=["res://.godot/imported/upper_arm_r.obj-8ad590db82886a51a0f47f489e698ba7.mesh"] + +source_file="res://assets/models/figure/upper_arm_r.obj" +dest_files=["res://.godot/imported/upper_arm_r.obj-8ad590db82886a51a0f47f489e698ba7.mesh", "res://.godot/imported/upper_arm_r.obj-8ad590db82886a51a0f47f489e698ba7.mesh"] + +[params] + +generate_tangents=true +generate_lods=true +generate_shadow_mesh=true +generate_lightmap_uv2=false +generate_lightmap_uv2_texel_size=0.2 +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +force_disable_mesh_compression=false diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 0b4d816..48dc150 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -578,7 +578,45 @@ numpy), a `.json` with the grip (the origin), the left hand's support point and bounds, and a 128 px Cycles icon in `assets/icons/items/`. Each surface's material is a `Palette` name; `TRIM2_`/`TRIM3_` surfaces are the tier treatment. `ItemModels` loads them, keeps the surfaces a tier shows and paints them from `Palette` (tier 0 -faded). `EntityView` puts the held item in each figure's right hand (`HAND`), turned -with the player's pitch, and draws items lying in the world with one MultiMesh per +faded). `EntityView` puts the held item in each figure's right hand, pointed along +the player's look, and draws items lying in the world with one MultiMesh per model and tier. The hotbar shows the icons. +## Player figure (A2) + +`tools/models/figure.py` builds the islander in headless Blender as twelve rigid +parts (pelvis, torso, head, upper arms, forearms, thighs, shins and the wing-sail), +each an OBJ whose origin is the joint it turns about, plus `figure.json` with the +joints and hand points (`make art` rebuilds these and the items). OBJ has no +skeleton, so the figure is jointed rather than skinned. + +`FigureRig` hangs the parts on a tree of pivot nodes (`hips/waist/spine/...`) and +paints them from `Palette`, `COAT` in the player's own oilskin. `FigurePoses` holds +every animation as key poses (joint rotations in degrees and a hip lift) and turns +them into `Animation` resources with position and rotation tracks. One +`AnimationTree`, in manual mode, plays them: + +- `move`: a Transition between ground (a BlendSpace1D of idle, walk and run by speed, + time-scaled with speed), crouch (still and creeping), air, skydive, glide, swim and + aboard; +- `holding`: the arms' carry for the held item (long in both hands, short in one, or + carried in front), filtered to the arms and off while the hands are busy; +- `reload` and `use`: arm-and-head layers faded in while the FLAG_ bits say so; +- `act`: a OneShot on the upper body for fire (long or short), a boathook swing, a + keg throw and building; +- `hit`: a OneShot flinch of the chest and head when health drops. + +The spine takes a third of the look's pitch and the hand is turned so the item points +along the whole of it, whatever the arm is doing. + +Figures animate from replicated state only. `FigureRig.drive()` reads a `SimEntity` +as `ClientMirror` fills it from snapshots: position (speed comes from movement when +velocity isn't replicated), look, health, the held item and the FLAG_ bits, with +reloading and using now copied into `reload_ticks` and `use_ticks` as 1 or 0. One-off +actions come from FX records (`EntityView.hear()`, fed by `ClientSession`): a SHOT +with an item fires it, a SHOT with no item is a boathook swing (`Harvest.swing` now +reports every swing as a `swing` event, hit or miss), and PLACE (new in protocol 4) +is a piece placed. Being in the air waits `AIR_DELAY` before it shows, so steps down a +slope don't flicker. `EntityView.animate_live = false` lets captures pose figures +exactly. + diff --git a/src/app/client_session.gd b/src/app/client_session.gd index d211304..5b4117c 100644 --- a/src/app/client_session.gd +++ b/src/app/client_session.gd @@ -42,6 +42,8 @@ var paused: bool = false var _viewed: Simulation = null var _status: Label = null +## ClientGame.fx_received when the figures last heard the FX. +var _fx_seen: int = 0 func _init() -> void: @@ -213,6 +215,10 @@ func _show(delta: float) -> void: view.entities.barge_at = mirror.barge_at view.rig.update_aim(input.aiming() and mirror.own_id != 0, delta) view.sync() + var fresh: int = mini(game.fx_received - _fx_seen, game.fx.size()) + _fx_seen = game.fx_received + if fresh > 0: + view.entities.hear(game.fx.slice(game.fx.size() - fresh)) _show_ghost() if mirror.own_id != 0: # The player's own look is newer than any command made from it. diff --git a/src/client/entities/entity_view.gd b/src/client/entities/entity_view.gd index bf54610..0872c76 100644 --- a/src/client/entities/entity_view.gd +++ b/src/client/entities/entity_view.gd @@ -1,10 +1,13 @@ ## Draws what moves in a match: players with what they hold, the sky barge while it -## crosses, items lying in the world and sea chests. `sync()` matches everything to the simulation as it is -## now. These are stand-in shapes built in code, in the weathered seafaring palette of -## docs/STYLE.md: an oilskin coat, a sou'wester and a canvas wing-sail. The art -## pass replaces them. Held and lying items are the models of A4 (ItemModels): a held -## one sits with its grip in the figure's right hand and points where its player looks. -## Nothing here is ever used for collision. +## crosses, items lying in the world and sea chests. `sync()` matches everything to the +## simulation as it is now, and `animate()` steps the players' figures. +## +## Players are FigureRigs (A2): jointed islanders in oilskins, animated from what the +## simulation replicates about them, with shots, swings and building played from FX +## records through hear(). Held and lying items are the models of A4 (ItemModels): a +## held one sits with its grip in the figure's right hand and points where its player +## looks. The barge and chests are still stand-in shapes. Nothing here is ever used +## for collision. class_name EntityView extends Node3D @@ -24,8 +27,6 @@ const ITEM: Color = Palette.GILT ## carries them all at one point; this only spreads them out to be seen. const DECK_SPACING: float = 1.3 const DECK_ROWS: int = 4 -## Where a figure's right hand holds an item, from its feet, facing +Z; its right is -X. -const HAND: Vector3 = Vector3(-0.24, 1.2, 0.32) ## Items lying in the world are drawn this much larger than life, to be seen. const PICKUP_SCALE: float = 1.4 @@ -36,8 +37,10 @@ var local_id: int = 0 var barge_at: Vector3 = Vector3.INF var _sim: Simulation -## Entity ID -> the figure's root node. +## Entity ID -> its FigureRig. var _figures: Dictionary = {} +## Whether _process steps the figures. Captures that pose figures exactly turn it off. +var animate_live: bool = true var _barge: Node3D ## Items lying in the world: one MultiMeshInstance3D per item model and tier. var _pickups: Node3D @@ -63,7 +66,7 @@ func figure_count() -> int: ## The figure drawn for a player, or null. -func figure_of(entity_id: int) -> Node3D: +func figure_of(entity_id: int) -> FigureRig: return _figures.get(entity_id) @@ -116,11 +119,12 @@ func sync() -> void: if entity.archetype != SimEntity.ARCHETYPE_PLAYER: continue seen[entity.id] = true - var figure: Node3D = _figures.get(entity.id) + var figure: FigureRig = _figures.get(entity.id) if figure == null: figure = _build_figure(entity.id) _figures[entity.id] = figure add_child(figure) + figure.drive(entity, 0.0) figure.visible = not entity.eliminated figure.position = entity.position figure.rotation.y = float(entity.yaw) / PlayerCommand.YAW_STEPS * TAU @@ -131,8 +135,6 @@ func sync() -> void: figure.position += offset.rotated(Vector3.UP, heading) figure.rotation.y = heading aboard += 1 - figure.scale.y = Tuning.CROUCH_HEIGHT / Tuning.PLAYER_HEIGHT if entity.crouching else 1.0 - (figure.get_node("Sail") as Node3D).visible = entity.drop_state == Drop.GLIDING _hold(figure, entity) for entity_id: int in _figures.keys(): if not seen.has(entity_id): @@ -147,25 +149,45 @@ func sync() -> void: chests.set_instance_color(index, CHEST_OPEN if _sim.loot.chest_opened[index] != 0 else CHEST_SHUT) -func _process(_delta: float) -> void: +func _process(delta: float) -> void: sync() + if animate_live: + animate(delta) -## Puts the held item's model in the figure's hand, pointing where the player looks. -## Nothing is held aboard the barge, falling, gliding or swimming. -func _hold(figure: Node3D, entity: SimEntity) -> void: - var hand: Node3D = figure.get_node("Hand") - var held: MeshInstance3D = hand.get_node("Held") +## Drives every figure from its player's state and steps its animation by `delta`. +func animate(delta: float) -> void: + if _sim == null: + return + for entity_id: int in _figures: + var entity: SimEntity = _sim.entities.find(entity_id) + var figure: FigureRig = _figures[entity_id] + if entity == null or not figure.visible: + continue + figure.drive(entity, delta) + figure.advance(delta) + + +## Plays the actions FX records show (shots, swings, pieces placed) on the figures of +## the players who made them. +func hear(records: Array[Dictionary]) -> void: + for record: Dictionary in records: + var figure: FigureRig = _figures.get(int(record.get("player", 0))) + if figure != null and figure.visible: + figure.hear(record) + + +## Puts the held item's model in the figure's hand; the figure points it where the +## player looks. Nothing is held aboard the barge, falling, gliding or swimming. +func _hold(figure: FigureRig, entity: SimEntity) -> void: var busy: bool = entity.drop_state != Drop.NONE or entity.swimming or entity.eliminated - hand.visible = not busy + figure.hand().visible = not busy if busy: return var id: String = ItemModels.id_of(held_code(entity)) var mesh: ArrayMesh = ItemModels.model(id, held_tier(entity)) - if held.mesh != mesh: - held.mesh = mesh - var pitch: float = float(entity.pitch) / PlayerCommand.PITCH_MAX * (PI * 0.5) - hand.rotation = Vector3(-pitch, 0.0, 0.0) + if figure.held().mesh != mesh: + figure.held().mesh = mesh func _sync_pickups() -> void: @@ -221,41 +243,10 @@ func _item_field(key: String) -> MultiMeshInstance3D: return field -func _build_figure(entity_id: int) -> Node3D: +func _build_figure(entity_id: int) -> FigureRig: var coat: Color = OILSKINS[0] if entity_id == local_id else OILSKINS[1 + entity_id % (OILSKINS.size() - 1)] - var figure: Node3D = Node3D.new() + var figure: FigureRig = FigureRig.new(coat) figure.name = "player_%d" % entity_id - var legs: BoxMesh = BoxMesh.new() - legs.size = Vector3(0.42, 0.8, 0.26) - figure.add_child(_part(legs, TAR, Vector3(0.0, 0.4, 0.0))) - var body: CapsuleMesh = CapsuleMesh.new() - body.radius = 0.3 - body.height = 0.95 - figure.add_child(_part(body, coat, Vector3(0.0, 1.05, 0.0))) - var head: SphereMesh = SphereMesh.new() - head.radius = 0.16 - head.height = 0.32 - figure.add_child(_part(head, SKIN, Vector3(0.0, 1.6, 0.0))) - var brim: CylinderMesh = CylinderMesh.new() - brim.top_radius = 0.17 - brim.bottom_radius = 0.33 - brim.height = 0.16 - # The sou'wester's brim runs long at the back. - figure.add_child(_part(brim, coat.darkened(0.25), Vector3(0.0, 1.76, -0.05))) - var sail_mesh: BoxMesh = BoxMesh.new() - sail_mesh.size = Vector3(2.6, 0.04, 0.9) - var sail: MeshInstance3D = _part(sail_mesh, CANVAS, Vector3(0.0, 2.15, -0.1)) - sail.name = "Sail" - sail.rotation.x = deg_to_rad(-8.0) - sail.visible = false - figure.add_child(sail) - var hand: Node3D = Node3D.new() - hand.name = "Hand" - hand.position = HAND - figure.add_child(hand) - var held: MeshInstance3D = MeshInstance3D.new() - held.name = "Held" - hand.add_child(held) return figure diff --git a/src/client/entities/figure_poses.gd b/src/client/entities/figure_poses.gd new file mode 100644 index 0000000..65cacd8 --- /dev/null +++ b/src/client/entities/figure_poses.gd @@ -0,0 +1,310 @@ +## The figure's animations (A2) as key poses, turned into Animation resources for +## FigureRig. Each pose maps a joint to its rotation in degrees (Euler, Godot's YXZ +## order), from the rest pose: standing straight, arms hanging. "lift" moves the hips +## from their rest height, in metres. +## +## Which way is which, for a figure facing +Z with its right toward -X: +## - limbs hang down, so a negative X turn swings a leg or arm forward; +## - the waist and neck stand up, so a positive X turn leans forward or looks down; +## - a negative Z turn takes a right limb out to the side, a positive one a left limb. +class_name FigurePoses +extends RefCounted + +const ARMS: Array[String] = ["shoulder_r", "elbow_r", "shoulder_l", "elbow_l"] +const ARMS_AND_HEAD: Array[String] = ["shoulder_r", "elbow_r", "shoulder_l", "elbow_l", "neck"] +const UPPER: Array[String] = ["waist", "neck", "shoulder_r", "elbow_r", "shoulder_l", "elbow_l"] +## A flinch moves only the chest and head, so the arms keep their hold. +const TORSO: Array[String] = ["waist", "neck"] + +const PATHS: Dictionary = { + "hips": "hips", + "waist": "hips/waist", + "neck": "hips/waist/spine/neck", + "shoulder_r": "hips/waist/spine/shoulder_r", + "elbow_r": "hips/waist/spine/shoulder_r/elbow_r", + "shoulder_l": "hips/waist/spine/shoulder_l", + "elbow_l": "hips/waist/spine/shoulder_l/elbow_l", + "hip_r": "hips/hip_r", + "knee_r": "hips/hip_r/knee_r", + "hip_l": "hips/hip_l", + "knee_l": "hips/hip_l/knee_l", +} + +## Arms a little away from the coat, as they hang at rest. +const EASE: Dictionary = {"shoulder_r": Vector3(0, 0, -6), "shoulder_l": Vector3(0, 0, 6), "elbow_r": Vector3(-8, 0, 0), "elbow_l": Vector3(-8, 0, 0)} + +## Name -> [length in seconds, loops, keys as [time, pose] in time order]. A looping +## clip's last key is its first again, added by animation(). +static var _all: Dictionary = {} + + +static func clips() -> Dictionary: + if _all.is_empty(): + _all = _clips() + return _all + + +static func path_of(joint: String) -> String: + return PATHS[joint] + + +## The pose with right and left swapped, as the other half of a stride. +static func mirror(pose: Dictionary) -> Dictionary: + var out: Dictionary = {} + for key: String in pose: + var value: Variant = pose[key] + var other: String = key + if key.ends_with("_r"): + other = key.trim_suffix("_r") + "_l" + elif key.ends_with("_l"): + other = key.trim_suffix("_l") + "_r" + if value is Vector3 and key != "lift": + var turn: Vector3 = value + out[other] = Vector3(turn.x, -turn.y, -turn.z) + else: + out[other] = value + return out + + +## `pose` laid over `base`: joints in `pose` replace those in `base`. +static func over(base: Dictionary, pose: Dictionary) -> Dictionary: + var out: Dictionary = base.duplicate() + for key: String in pose: + out[key] = pose[key] + return out + + +## Builds a clip. `rest` is figure.json's joints, for the hips' rest position. +static func animation(name: String, rest: Dictionary) -> Animation: + var clip: Array = clips()[name] + var length: float = clip[0] + var loops: bool = clip[1] + var keys: Array = (clip[2] as Array).duplicate() + if loops: + keys.append([length, (keys[0] as Array)[1]]) + var made: Animation = Animation.new() + made.length = length + made.loop_mode = Animation.LOOP_LINEAR if loops else Animation.LOOP_NONE + var hips_rest: Array = rest.get("hips", [0.0, 0.92, 0.0]) + var hips_at: Vector3 = Vector3(float(hips_rest[0]), float(hips_rest[1]), float(hips_rest[2])) + var lift_track: int = made.add_track(Animation.TYPE_POSITION_3D) + made.track_set_path(lift_track, NodePath(PATHS["hips"])) + for joint: String in PATHS: + var track: int = made.add_track(Animation.TYPE_ROTATION_3D) + made.track_set_path(track, NodePath(PATHS[joint])) + for key: Array in keys: + var pose: Dictionary = key[1] + var degrees: Vector3 = pose.get(joint, Vector3.ZERO) + made.rotation_track_insert_key(track, float(key[0]), Basis.from_euler(degrees * (PI / 180.0)).get_rotation_quaternion()) + for key: Array in keys: + var pose: Dictionary = key[1] + made.position_track_insert_key(lift_track, float(key[0]), hips_at + (pose.get("lift", Vector3.ZERO) as Vector3)) + return made + + +static func _clips() -> Dictionary: + var clips: Dictionary = {} + var stand: Dictionary = EASE.duplicate() + + # Standing: slow breath, a little shift of weight. + clips["idle"] = [2.4, true, [ + [0.0, over(stand, {"waist": Vector3(2, 0, 0)})], + [1.2, over(stand, {"waist": Vector3(4, 2, 0), "neck": Vector3(-2, -3, 0), "shoulder_r": Vector3(0, 0, -8), "shoulder_l": Vector3(0, 0, 8), "lift": Vector3(0, -0.012, 0)})], + ]] + clips["aboard"] = [3.0, true, [ + [0.0, over(stand, {"waist": Vector3(3, 0, 0), "hip_r": Vector3(0, 0, -6), "hip_l": Vector3(0, 0, 6), "lift": Vector3(0, -0.01, 0)})], + [1.5, over(stand, {"waist": Vector3(3, 0, -3), "neck": Vector3(6, 8, 0), "hip_r": Vector3(0, 0, -6), "hip_l": Vector3(0, 0, 6), "lift": Vector3(0, -0.02, 0)})], + ]] + + # Walking: right foot forward at 0, passing at a quarter, left forward at a half. + var walk_contact: Dictionary = { + "hip_r": Vector3(-28, 0, 0), "knee_r": Vector3(8, 0, 0), + "hip_l": Vector3(22, 0, 0), "knee_l": Vector3(22, 0, 0), + "shoulder_r": Vector3(20, 0, -6), "shoulder_l": Vector3(-20, 0, 6), + "elbow_r": Vector3(-10, 0, 0), "elbow_l": Vector3(-28, 0, 0), + "waist": Vector3(4, -5, 0), "hips": Vector3(0, 6, 0), "lift": Vector3(0, -0.035, 0), + } + var walk_pass: Dictionary = { + "hip_r": Vector3(2, 0, 0), "knee_r": Vector3(4, 0, 0), + "hip_l": Vector3(-12, 0, 0), "knee_l": Vector3(48, 0, 0), + "shoulder_r": Vector3(0, 0, -6), "shoulder_l": Vector3(0, 0, 6), + "elbow_r": Vector3(-14, 0, 0), "elbow_l": Vector3(-14, 0, 0), + "waist": Vector3(4, 0, 0), "lift": Vector3(0, 0.015, 0), + } + clips["walk"] = [0.72, true, [ + [0.0, walk_contact], [0.18, walk_pass], [0.36, mirror(walk_contact)], [0.54, mirror(walk_pass)], + ]] + var run_contact: Dictionary = { + "hip_r": Vector3(-48, 0, 0), "knee_r": Vector3(22, 0, 0), + "hip_l": Vector3(30, 0, 0), "knee_l": Vector3(70, 0, 0), + "shoulder_r": Vector3(42, 0, -8), "shoulder_l": Vector3(-46, 0, 8), + "elbow_r": Vector3(-60, 0, 0), "elbow_l": Vector3(-95, 0, 0), + "waist": Vector3(12, -9, 0), "hips": Vector3(4, 9, 0), "neck": Vector3(-8, 4, 0), "lift": Vector3(0, -0.05, 0), + } + var run_flight: Dictionary = { + "hip_r": Vector3(-10, 0, 0), "knee_r": Vector3(30, 0, 0), + "hip_l": Vector3(-30, 0, 0), "knee_l": Vector3(95, 0, 0), + "shoulder_r": Vector3(5, 0, -8), "shoulder_l": Vector3(-5, 0, 8), + "elbow_r": Vector3(-80, 0, 0), "elbow_l": Vector3(-80, 0, 0), + "waist": Vector3(12, 0, 0), "hips": Vector3(4, 0, 0), "neck": Vector3(-8, 0, 0), "lift": Vector3(0, 0.06, 0), + } + clips["run"] = [0.56, true, [ + [0.0, run_contact], [0.14, run_flight], [0.28, mirror(run_contact)], [0.42, mirror(run_flight)], + ]] + + # Crouched: hips low, knees forward, leaning in. + var crouch: Dictionary = over(stand, { + "hip_r": Vector3(-78, 0, -4), "knee_r": Vector3(100, 0, 0), + "hip_l": Vector3(-62, 0, 4), "knee_l": Vector3(104, 0, 0), + "waist": Vector3(26, 0, 0), "neck": Vector3(-20, 0, 0), "lift": Vector3(0, -0.38, 0), + }) + clips["crouch_idle"] = [2.0, true, [ + [0.0, crouch], + [1.0, over(crouch, {"waist": Vector3(28, 2, 0), "lift": Vector3(0, -0.39, 0)})], + ]] + var creep: Dictionary = over(crouch, { + "hip_r": Vector3(-92, 0, -4), "knee_r": Vector3(98, 0, 0), + "hip_l": Vector3(-50, 0, 4), "knee_l": Vector3(108, 0, 0), + "shoulder_r": Vector3(14, 0, -8), "shoulder_l": Vector3(-14, 0, 8), + }) + var creep_pass: Dictionary = over(crouch, { + "hip_r": Vector3(-70, 0, -4), "knee_r": Vector3(96, 0, 0), + "hip_l": Vector3(-80, 0, 4), "knee_l": Vector3(124, 0, 0), "lift": Vector3(0, -0.36, 0), + }) + clips["crouch_walk"] = [0.9, true, [ + [0.0, creep], [0.225, creep_pass], [0.45, mirror(creep)], [0.675, mirror(creep_pass)], + ]] + + # In the air from a jump or a fall: knees up, arms out for balance. + var air: Dictionary = { + "hip_r": Vector3(-38, 0, -4), "knee_r": Vector3(52, 0, 0), + "hip_l": Vector3(-14, 0, 4), "knee_l": Vector3(34, 0, 0), + "shoulder_r": Vector3(-24, 0, -38), "shoulder_l": Vector3(-24, 0, 38), + "elbow_r": Vector3(-30, 0, 0), "elbow_l": Vector3(-30, 0, 0), + "waist": Vector3(6, 0, 0), + } + clips["air"] = [0.8, true, [ + [0.0, air], + [0.4, over(air, {"shoulder_r": Vector3(-20, 0, -46), "shoulder_l": Vector3(-20, 0, 46)})], + ]] + + # Falling from the barge, belly down, spread out. + var skydive: Dictionary = { + "hips": Vector3(72, 0, 0), "waist": Vector3(6, 0, 0), "neck": Vector3(-55, 0, 0), + "shoulder_r": Vector3(-70, 0, -70), "shoulder_l": Vector3(-70, 0, 70), + "elbow_r": Vector3(-30, 0, 0), "elbow_l": Vector3(-30, 0, 0), + "hip_r": Vector3(6, 0, -14), "hip_l": Vector3(6, 0, 14), + "knee_r": Vector3(40, 0, 0), "knee_l": Vector3(40, 0, 0), "lift": Vector3(0, 0.2, 0), + } + clips["skydive"] = [1.0, true, [ + [0.0, skydive], + [0.5, over(skydive, {"shoulder_r": Vector3(-74, 0, -64), "shoulder_l": Vector3(-74, 0, 64), "knee_r": Vector3(48, 0, 0), "knee_l": Vector3(34, 0, 0)})], + ]] + + # Hanging under the wing-sail, both hands up on its lines. + var glide: Dictionary = { + "hips": Vector3(12, 0, 0), "waist": Vector3(-4, 0, 0), "neck": Vector3(10, 0, 0), + "shoulder_r": Vector3(-158, 0, -16), "shoulder_l": Vector3(-158, 0, 16), + "elbow_r": Vector3(-22, 0, 0), "elbow_l": Vector3(-22, 0, 0), + "hip_r": Vector3(14, 0, -3), "hip_l": Vector3(10, 0, 3), + "knee_r": Vector3(18, 0, 0), "knee_l": Vector3(26, 0, 0), + } + clips["glide"] = [1.6, true, [ + [0.0, glide], + [0.8, over(glide, {"hips": Vector3(12, 0, 4), "hip_r": Vector3(8, 0, -3), "hip_l": Vector3(16, 0, 3)})], + ]] + + # Swimming: lying along the water, a crawl stroke and a flutter kick. + var swim: Dictionary = { + "hips": Vector3(78, 0, 0), "waist": Vector3(-4, 0, 0), "neck": Vector3(-58, 0, 0), + "shoulder_r": Vector3(-170, 0, -10), "elbow_r": Vector3(-10, 0, 0), + "shoulder_l": Vector3(-30, 0, 20), "elbow_l": Vector3(-50, 0, 0), + "hip_r": Vector3(-12, 0, -4), "knee_r": Vector3(20, 0, 0), + "hip_l": Vector3(12, 0, 4), "knee_l": Vector3(10, 0, 0), "lift": Vector3(0, 0.18, 0), + } + var swim_pull: Dictionary = over(swim, { + "shoulder_r": Vector3(-90, 0, -6), "elbow_r": Vector3(-30, 0, 0), + "shoulder_l": Vector3(-110, 0, 46), "elbow_l": Vector3(-80, 0, 0), + "hip_r": Vector3(12, 0, -4), "hip_l": Vector3(-12, 0, 4), "waist": Vector3(-4, 10, 0), + }) + clips["swim"] = [1.3, true, [ + [0.0, swim], [0.325, swim_pull], [0.65, mirror(swim)], [0.975, mirror(swim_pull)], + ]] + + # How the held item is carried (arms only). + # Long things at the chest, the right hand at the grip and the left reaching + # along to the fore-end. + clips["hold_long"] = [1.0, true, [[0.0, { + "shoulder_r": Vector3(2, 0, 12), "elbow_r": Vector3(-92, 0, 0), + "shoulder_l": Vector3(-62, 0, -22), "elbow_l": Vector3(-16, 0, 0), + }]]] + clips["hold_short"] = [1.0, true, [[0.0, { + "shoulder_r": Vector3(-72, 0, 10), "elbow_r": Vector3(-14, 0, 0), + "shoulder_l": Vector3(4, 0, 8), "elbow_l": Vector3(-22, 0, 0), + }]]] + clips["hold_carry"] = [1.0, true, [[0.0, { + "shoulder_r": Vector3(-36, 0, 14), "elbow_r": Vector3(-74, 0, 0), + "shoulder_l": Vector3(-30, 0, -14), "elbow_l": Vector3(-70, 0, 0), + }]]] + + # Reloading: the left hand works at the breech, the head bent to it. + var reload: Dictionary = { + "shoulder_r": Vector3(-28, 0, 18), "elbow_r": Vector3(-78, 0, 0), + "shoulder_l": Vector3(-46, 0, -30), "elbow_l": Vector3(-96, 0, 0), "neck": Vector3(22, 0, 0), + } + clips["reload"] = [0.8, true, [ + [0.0, reload], + [0.4, over(reload, {"shoulder_l": Vector3(-30, 0, -20), "elbow_l": Vector3(-112, 0, 0)})], + ]] + # Using something: the hand to the mouth, head back. + var use: Dictionary = { + "shoulder_r": Vector3(-58, 0, 34), "elbow_r": Vector3(-128, 0, 0), + "shoulder_l": Vector3(-6, 0, 8), "elbow_l": Vector3(-20, 0, 0), "neck": Vector3(-18, 0, 0), + } + clips["use"] = [1.0, true, [ + [0.0, use], + [0.5, over(use, {"neck": Vector3(-24, 0, 0), "elbow_r": Vector3(-134, 0, 0)})], + ]] + + # One-off actions on the upper body, each starting and ending at its carry. + var long: Dictionary = (clips["hold_long"][2][0][1] as Dictionary).duplicate() + var short: Dictionary = (clips["hold_short"][2][0][1] as Dictionary).duplicate() + clips["fire_long"] = [0.28, false, [ + [0.0, over(long, {"waist": Vector3(0, 0, 0)})], + [0.04, over(long, {"waist": Vector3(-6, 3, 0), "neck": Vector3(-4, 0, 0), "shoulder_r": Vector3(-26, 0, 18), "elbow_r": Vector3(-62, 0, 0)})], + [0.28, over(long, {"waist": Vector3(0, 0, 0)})], + ]] + clips["fire_short"] = [0.25, false, [ + [0.0, short], + [0.04, over(short, {"shoulder_r": Vector3(-92, 0, 10), "elbow_r": Vector3(-30, 0, 0), "waist": Vector3(-3, 0, 0)})], + [0.25, short], + ]] + clips["swing"] = [0.5, false, [ + [0.0, long], + [0.16, over(long, {"waist": Vector3(-6, 32, 0), "shoulder_r": Vector3(-140, 0, -20), "elbow_r": Vector3(-70, 0, 0), "shoulder_l": Vector3(-120, 0, -10), "elbow_l": Vector3(-60, 0, 0)})], + [0.26, over(long, {"waist": Vector3(18, -24, 0), "shoulder_r": Vector3(-50, 0, 20), "elbow_r": Vector3(-10, 0, 0), "shoulder_l": Vector3(-56, 0, -30), "elbow_l": Vector3(-20, 0, 0), "neck": Vector3(10, 0, 0)})], + [0.5, long], + ]] + var carry: Dictionary = (clips["hold_carry"][2][0][1] as Dictionary).duplicate() + clips["throw"] = [0.55, false, [ + [0.0, carry], + [0.2, over(carry, {"waist": Vector3(-10, 20, 0), "shoulder_r": Vector3(-160, 0, -24), "elbow_r": Vector3(-80, 0, 0), "shoulder_l": Vector3(-60, 0, 10)})], + [0.32, over(carry, {"waist": Vector3(16, -16, 0), "shoulder_r": Vector3(-70, 0, 6), "elbow_r": Vector3(-6, 0, 0)})], + [0.55, carry], + ]] + # Building: two strokes of a mallet. + clips["build"] = [0.5, false, [ + [0.0, long], + [0.1, over(long, {"shoulder_r": Vector3(-128, 0, 0), "elbow_r": Vector3(-96, 0, 0), "waist": Vector3(-4, 0, 0)})], + [0.2, over(long, {"shoulder_r": Vector3(-56, 0, 10), "elbow_r": Vector3(-22, 0, 0), "waist": Vector3(14, 0, 0), "neck": Vector3(14, 0, 0)})], + [0.3, over(long, {"shoulder_r": Vector3(-120, 0, 0), "elbow_r": Vector3(-92, 0, 0)})], + [0.4, over(long, {"shoulder_r": Vector3(-56, 0, 10), "elbow_r": Vector3(-22, 0, 0), "waist": Vector3(14, 0, 0), "neck": Vector3(14, 0, 0)})], + [0.5, long], + ]] + # Struck: the chest jerks back and the head turns away (the waist and neck only). + clips["flinch"] = [0.32, false, [ + [0.0, {}], + [0.06, {"waist": Vector3(-14, 10, 5), "neck": Vector3(-16, -14, 0)}], + [0.32, {}], + ]] + return clips diff --git a/src/client/entities/figure_poses.gd.uid b/src/client/entities/figure_poses.gd.uid new file mode 100644 index 0000000..312a05b --- /dev/null +++ b/src/client/entities/figure_poses.gd.uid @@ -0,0 +1 @@ +uid://doj02kfiymqvi diff --git a/src/client/entities/figure_rig.gd b/src/client/entities/figure_rig.gd new file mode 100644 index 0000000..0dd0055 --- /dev/null +++ b/src/client/entities/figure_rig.gd @@ -0,0 +1,438 @@ +## A player's figure (A2): the islander that tools/models/figure.py builds in Blender, +## hung on a hierarchy of pivots and animated by an AnimationTree. +## +## The parts are rigid OBJ models, one per limb, each with its origin at the joint it +## turns about (assets/models/figure/, with figure.json giving the joints). Debian's +## Blender can't export a skinned glTF, so the figure is jointed like a carved toy +## rather than skinned, which suits the folk-art look. +## +## Every animation is built here in code from key poses (FigurePoses), and played by +## one AnimationTree: +## +## move Transition: ground (idle, walk, run by speed), crouch (still and +## creeping by speed), air, skydive, glide, swim, aboard +## hold filtered to the arms: how the held item is carried (long, short, carry) +## reload, use filtered to the arms and head, blended in while they last +## act OneShot on the upper body: fire_long, fire_short, swing, throw, build +## hit OneShot flinch +## +## drive() sets the tree's parameters from a SimEntity, which on a network client is +## only what snapshots and FX replicate (position, look, the FLAG_ bits, the held +## item and health), and trigger() plays one-off actions from FX records. Nothing +## here reads input or any other client-only state. advance() steps the tree; the +## tree runs in manual mode so tests and captures can pose a figure exactly. +class_name FigureRig +extends Node3D + +const MODEL_DIR: String = "res://assets/models/figure" +## Joints the animations turn (and, for the hips, move). The spine and hands aren't +## animated: the code turns the spine with the player's pitch and points the hand +## along the aim. +const ANIMATED: Array[String] = [ + "hips", "waist", "neck", "shoulder_r", "elbow_r", "shoulder_l", "elbow_l", + "hip_r", "knee_r", "hip_l", "knee_l", +] +## Joint -> its parent pivot. "spine" sits on the waist joint and carries the chest. +const PARENT: Dictionary = { + "hips": "", "waist": "hips", "spine": "waist", "neck": "spine", + "shoulder_r": "spine", "elbow_r": "shoulder_r", "shoulder_l": "spine", "elbow_l": "shoulder_l", + "hip_r": "hips", "knee_r": "hip_r", "hip_l": "hips", "knee_l": "hip_l", "sail": "", +} +## Part model -> the joint pivot it hangs on. +const PART_JOINT: Dictionary = { + "pelvis": "hips", "torso": "spine", "head": "neck", + "upper_arm_r": "shoulder_r", "forearm_r": "elbow_r", + "upper_arm_l": "shoulder_l", "forearm_l": "elbow_l", + "thigh_r": "hip_r", "shin_r": "knee_r", "thigh_l": "hip_l", "shin_l": "knee_l", + "sail": "sail", +} +## Material names in the part models -> Palette colours. COAT and COAT_DARK are the +## player's own oilskin. +const COLOURS: Dictionary = { + "TAR": Palette.TAR, "TAR_WEATHERED": Palette.TAR_WEATHERED, "SKIN": Palette.SKIN, + "INK": Palette.INK, "BARK": Palette.BARK, "CANVAS": Palette.CANVAS, "GILT": Palette.GILT, + "PLANK": Palette.PLANK, "OCHRE_RED": Palette.OCHRE_RED, "TANNED_SAIL": Palette.TANNED_SAIL, +} +const COAT_SHADE: float = 0.28 +## The states of `move`, in input order. +const STATES: Array[String] = ["ground", "crouch", "air", "skydive", "glide", "swim", "aboard"] +const HOLDS: Array[String] = ["long", "short", "carry"] +const ACTIONS: Array[String] = ["fire_long", "fire_short", "swing", "throw", "build"] +## How long a figure must be off the ground before it's drawn in the air, so steps +## down a slope don't flicker into a leap. +const AIR_DELAY: float = 0.12 +## How quickly the drawn speed follows the real one, per second. +const SPEED_FOLLOW: float = 10.0 +## How much of the look's pitch the chest takes; the held item takes all of it. +const SPINE_PITCH: float = 0.35 + +static var _layout: Dictionary = {} +static var _meshes: Dictionary = {} +static var _library: AnimationLibrary = null + +var coat: Color = Palette.OILSKIN +var tree: AnimationTree +## Joint name -> its pivot node. +var joints: Dictionary = {} +## The state, hold and speed last driven, for tests and captures. +var state: String = "ground" +var hold: String = "long" +var speed: float = 0.0 + +var _hand: Node3D +var _held: MeshInstance3D +var _sail: Node3D +var _pitch: float = 0.0 +var _holding: bool = true +var _airborne: float = 0.0 +var _last_position: Vector3 = Vector3.INF +var _last_health: int = -1 +var _reload: float = 0.0 +var _use: float = 0.0 +var _reloading: bool = false +var _using: bool = false + + +## Builds the figure in `coat_colour`. +func _init(coat_colour: Color = Palette.OILSKIN) -> void: + coat = coat_colour + var layout: Dictionary = FigureRig.layout() + var at: Dictionary = layout.get("joints", {}) + for joint: String in PARENT: + var pivot: Node3D = Node3D.new() + pivot.name = joint + var parent_name: String = PARENT[joint] + var place: Vector3 = _vector(at.get("waist" if joint == "spine" else joint, [0, 0, 0])) + if parent_name != "": + var parent_joint: String = "waist" if parent_name == "spine" else parent_name + place -= _vector(at.get(parent_joint, [0, 0, 0])) + pivot.position = place + joints[joint] = pivot + (self if parent_name == "" else joints[parent_name] as Node3D).add_child(pivot) + for part: String in PART_JOINT: + var mesh: ArrayMesh = FigureRig.part_mesh(part, coat) + if mesh == null: + continue + var instance: MeshInstance3D = MeshInstance3D.new() + instance.name = part + instance.mesh = mesh + (joints[PART_JOINT[part]] as Node3D).add_child(instance) + _sail = joints["sail"] + _sail.visible = false + _hand = Node3D.new() + _hand.name = "hand_r" + _hand.position = _vector(layout.get("hand_r", [-0.24, 0.86, 0.03])) - _vector(at.get("elbow_r", [0, 0, 0])) + (joints["elbow_r"] as Node3D).add_child(_hand) + _held = MeshInstance3D.new() + _held.name = "Held" + _hand.add_child(_held) + tree = _build_tree() + add_child(tree) + + +## figure.json: joints, parts and hands. +static func layout() -> Dictionary: + if _layout.is_empty(): + var parsed: Variant = JSON.parse_string(FileAccess.get_file_as_string(MODEL_DIR + "/figure.json")) + _layout = parsed if parsed is Dictionary else {"joints": {}} + return _layout + + +## A part's model painted for a coat colour; shared, so don't change it. +static func part_mesh(part: String, coat_colour: Color) -> ArrayMesh: + var key: String = "%s@%s" % [part, coat_colour.to_html(false)] + if _meshes.has(key): + return _meshes[key] + var path: String = "%s/%s.obj" % [MODEL_DIR, part] + var made: ArrayMesh = null + if ResourceLoader.exists(path): + var source: Mesh = load(path) as Mesh + if source != null: + made = ArrayMesh.new() + for surface: int in source.get_surface_count(): + var material: Material = source.surface_get_material(surface) + var name: String = material.resource_name if material != null else "" + made.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, source.surface_get_arrays(surface)) + var paint: StandardMaterial3D = StandardMaterial3D.new() + paint.albedo_color = colour_of(name, coat_colour) + paint.roughness = 0.6 if name.begins_with("COAT") else 0.88 + if name == "GILT": + paint.metallic = 0.35 + made.surface_set_material(made.get_surface_count() - 1, paint) + made.surface_set_name(made.get_surface_count() - 1, name) + made.resource_name = key + _meshes[key] = made + return made + + +## The Palette colour of a part's material, with COAT the player's own. +static func colour_of(material_name: String, coat_colour: Color) -> Color: + if material_name == "COAT": + return coat_colour + if material_name == "COAT_DARK": + return coat_colour.darkened(COAT_SHADE) + return COLOURS.get(material_name, Palette.HOLD_SHADOW) + + +## Every animation the figure has, built once from FigurePoses. +static func library() -> AnimationLibrary: + if _library == null: + _library = AnimationLibrary.new() + var rest: Dictionary = layout().get("joints", {}) + for name: String in FigurePoses.clips(): + _library.add_animation(name, FigurePoses.animation(name, rest)) + return _library + + +static func clear() -> void: + _meshes.clear() + _layout.clear() + _library = null + + +func hand() -> Node3D: + return _hand + + +func held() -> MeshInstance3D: + return _held + + +func sail() -> Node3D: + return _sail + + +## Sets the tree from an entity's replicated state. `delta` is the time since the last +## drive, for the speed it derives from movement and for the delay before the air. +func drive(entity: SimEntity, delta: float) -> void: + var flat: Vector3 = Vector3(entity.velocity.x, 0.0, entity.velocity.z) + var moved: float = flat.length() + if moved == 0.0 and _last_position != Vector3.INF and delta > 0.0: + var step: Vector3 = entity.position - _last_position + moved = Vector2(step.x, step.z).length() / delta + # A jump in place (a correction, a respawn) isn't running. + if moved > Tuning.SLIDE_MAX_SPEED * 2.0: + moved = 0.0 + _last_position = entity.position + speed = moved if delta <= 0.0 else lerpf(speed, moved, clampf(delta * SPEED_FOLLOW, 0.0, 1.0)) + _airborne = 0.0 if entity.on_ground or entity.swimming else _airborne + delta + state = state_of(entity, _airborne >= AIR_DELAY) + _holding = state in ["ground", "crouch", "air"] + hold = hold_of(EntityView.held_code(entity)) + _reloading = entity.reload_ticks > 0 and _holding + _using = entity.use_ticks > 0 and _holding + if _last_health >= 0 and entity.health < _last_health and not entity.eliminated: + flinch() + _last_health = entity.health + _pitch = float(entity.pitch) / PlayerCommand.PITCH_MAX * (PI * 0.5) + _sail.visible = state == "glide" + _hand.visible = _holding + tree.set("parameters/move/transition_request", state) + tree.set("parameters/ground/blend_position", speed) + tree.set("parameters/crouch/blend_position", speed) + tree.set("parameters/ground_pace/scale", clampf(speed / Tuning.WALK_SPEED, 0.75, 1.3) if speed > 0.3 else 1.0) + tree.set("parameters/hold/transition_request", hold) + tree.set("parameters/holding/blend_amount", 1.0 if _holding else 0.0) + + +## Which of STATES an entity is drawn in. +static func state_of(entity: SimEntity, airborne: bool) -> String: + match entity.drop_state: + Drop.ABOARD: + return "aboard" + Drop.FREEFALL: + return "skydive" + Drop.GLIDING: + return "glide" + if entity.swimming: + return "swim" + if airborne: + return "air" + return "crouch" if entity.crouching else "ground" + + +## How an item is carried: long things in both hands, small weapons in one, and +## everything else (tonics, bandages, kegs) held up in front. +static func hold_of(code: int) -> String: + var id: String = ItemModels.id_of(code) + if ItemModels.info(id).get("support") != null: + return "long" + var def: ItemDef = ItemCatalog.get_def(code) + if def != null and def.is_weapon() and id != "powder_keg": + return "short" + return "carry" + + +## Plays the one-off action an FX record shows: a shot, a swing or throw, a harvest +## hit (a swing) or a piece placed. +func hear(record: Dictionary) -> void: + match int(record.get("kind", 0)): + NetFx.SHOT: + var id: String = ItemModels.id_of(int(record.get("item", -1))) + if id == ItemCatalog.BOATHOOK: + act("swing") + elif id == "powder_keg": + act("throw") + else: + act("fire_long" if hold_of(int(record["item"])) == "long" else "fire_short") + NetFx.PLACE: + act("build") + + +## Plays one of ACTIONS on the upper body, from its start. +func act(action: String) -> void: + if not ACTIONS.has(action) or not _holding: + return + tree.set("parameters/action/transition_request", action) + tree.set("parameters/act/request", AnimationNodeOneShot.ONE_SHOT_REQUEST_FIRE) + + +func flinch() -> void: + tree.set("parameters/hit/request", AnimationNodeOneShot.ONE_SHOT_REQUEST_FIRE) + + +## Steps the animation by `delta` and points the chest and held item along the look. +func advance(delta: float) -> void: + _reload = move_toward(_reload, 1.0 if _reloading else 0.0, delta * 6.0) + _use = move_toward(_use, 1.0 if _using else 0.0, delta * 6.0) + tree.set("parameters/reload/blend_amount", _reload) + tree.set("parameters/use/blend_amount", _use) + tree.advance(delta) + _aim() + + +## Whether an action or flinch is playing. +func acting() -> bool: + return bool(tree.get("parameters/act/active")) or bool(tree.get("parameters/hit/active")) + + +## The hand's orientation relative to the figure. +func hand_basis() -> Basis: + return relative(_hand).basis + + +## A node's transform relative to this figure, without needing the scene tree. +func relative(node: Node3D) -> Transform3D: + var out: Transform3D = Transform3D.IDENTITY + var at: Node = node + while at != null and at != self: + out = (at as Node3D).transform * out + at = at.get_parent() + return out + + +func _aim() -> void: + var spine: Node3D = joints["spine"] + spine.rotation = Vector3(-_pitch * SPINE_PITCH if _holding else 0.0, 0.0, 0.0) + # The item points along the look whatever the arm is doing; the arm only places it. + var parent: Transform3D = relative(_hand.get_parent() as Node3D) + _hand.basis = parent.basis.orthonormalized().inverse() * Basis(Vector3.RIGHT, -_pitch) + + +func _build_tree() -> AnimationTree: + var made: AnimationTree = AnimationTree.new() + made.name = "Animation" + made.add_animation_library("", FigureRig.library()) + made.callback_mode_process = AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_MANUAL + made.deterministic = true + var root: AnimationNodeBlendTree = AnimationNodeBlendTree.new() + + var ground: AnimationNodeBlendSpace1D = AnimationNodeBlendSpace1D.new() + ground.add_blend_point(_clip("idle"), 0.0, -1, &"idle") + ground.add_blend_point(_clip("walk"), Tuning.WALK_SPEED, -1, &"walk") + ground.add_blend_point(_clip("run"), Tuning.SPRINT_SPEED, -1, &"run") + ground.min_space = 0.0 + ground.max_space = Tuning.SPRINT_SPEED + ground.sync = true + root.add_node("ground", ground) + root.add_node("ground_pace", AnimationNodeTimeScale.new()) + root.connect_node("ground_pace", 0, "ground") + var crouch: AnimationNodeBlendSpace1D = AnimationNodeBlendSpace1D.new() + crouch.add_blend_point(_clip("crouch_idle"), 0.0, -1, &"crouch_idle") + crouch.add_blend_point(_clip("crouch_walk"), Tuning.CROUCH_SPEED, -1, &"crouch_walk") + crouch.min_space = 0.0 + crouch.max_space = Tuning.CROUCH_SPEED + crouch.sync = true + root.add_node("crouch", crouch) + + var move: AnimationNodeTransition = AnimationNodeTransition.new() + move.xfade_time = 0.18 + move.input_count = STATES.size() + for index: int in STATES.size(): + move.set_input_name(index, STATES[index]) + root.add_node("move", move) + root.connect_node("move", 0, "ground_pace") + root.connect_node("move", 1, "crouch") + for index: int in range(2, STATES.size()): + root.add_node("clip_" + STATES[index], _clip(STATES[index])) + root.connect_node("move", index, "clip_" + STATES[index]) + + var holds: AnimationNodeTransition = AnimationNodeTransition.new() + holds.xfade_time = 0.15 + holds.input_count = HOLDS.size() + for index: int in HOLDS.size(): + holds.set_input_name(index, HOLDS[index]) + root.add_node("hold_" + HOLDS[index], _clip("hold_" + HOLDS[index])) + root.add_node("hold", holds) + for index: int in HOLDS.size(): + root.connect_node("hold", index, "hold_" + HOLDS[index]) + var holding: AnimationNodeBlend2 = _filtered(AnimationNodeBlend2.new(), FigurePoses.ARMS) as AnimationNodeBlend2 + root.add_node("holding", holding) + root.connect_node("holding", 0, "move") + root.connect_node("holding", 1, "hold") + + var last: String = "holding" + for layer: String in ["reload", "use"]: + root.add_node("clip_" + layer, _clip(layer)) + root.add_node(layer, _filtered(AnimationNodeBlend2.new(), FigurePoses.ARMS_AND_HEAD)) + root.connect_node(layer, 0, last) + root.connect_node(layer, 1, "clip_" + layer) + last = layer + + var actions: AnimationNodeTransition = AnimationNodeTransition.new() + actions.xfade_time = 0.0 + actions.input_count = ACTIONS.size() + for index: int in ACTIONS.size(): + actions.set_input_name(index, ACTIONS[index]) + root.add_node("clip_" + ACTIONS[index], _clip(ACTIONS[index])) + root.add_node("action", actions) + for index: int in ACTIONS.size(): + root.connect_node("action", index, "clip_" + ACTIONS[index]) + var act_shot: AnimationNodeOneShot = _filtered(AnimationNodeOneShot.new(), FigurePoses.UPPER) as AnimationNodeOneShot + act_shot.fadein_time = 0.04 + act_shot.fadeout_time = 0.12 + root.add_node("act", act_shot) + root.connect_node("act", 0, last) + root.connect_node("act", 1, "action") + + root.add_node("clip_flinch", _clip("flinch")) + var hit: AnimationNodeOneShot = _filtered(AnimationNodeOneShot.new(), FigurePoses.TORSO) as AnimationNodeOneShot + hit.fadein_time = 0.03 + hit.fadeout_time = 0.1 + root.add_node("hit", hit) + root.connect_node("hit", 0, "act") + root.connect_node("hit", 1, "clip_flinch") + root.connect_node("output", 0, "hit") + + made.tree_root = root + made.root_node = NodePath("..") + made.active = true + return made + + +func _clip(name: String) -> AnimationNodeAnimation: + var node: AnimationNodeAnimation = AnimationNodeAnimation.new() + node.animation = name + return node + + +func _filtered(node: AnimationNode, filtered: Array[String]) -> AnimationNode: + node.filter_enabled = true + for joint: String in filtered: + node.set_filter_path(NodePath(FigurePoses.path_of(joint)), true) + return node + + +static func _vector(values: Variant) -> Vector3: + var list: Array = values if values is Array else [0, 0, 0] + return Vector3(float(list[0]), float(list[1]), float(list[2])) diff --git a/src/client/entities/figure_rig.gd.uid b/src/client/entities/figure_rig.gd.uid new file mode 100644 index 0000000..7fddb59 --- /dev/null +++ b/src/client/entities/figure_rig.gd.uid @@ -0,0 +1 @@ +uid://12b1bqsxv725 diff --git a/src/net/client_mirror.gd b/src/net/client_mirror.gd index 68ca735..2d82ab0 100644 --- a/src/net/client_mirror.gd +++ b/src/net/client_mirror.gd @@ -148,6 +148,9 @@ func _show_player(entity: SimEntity, record: PackedInt32Array, shown: Dictionary entity.swimming = flags & NetSnapshot.FLAG_SWIMMING != 0 entity.eliminated = flags & NetSnapshot.FLAG_ELIMINATED != 0 entity.drop_state = (flags >> NetSnapshot.FLAG_DROP_SHIFT) & 3 + # Only whether they last, for drawing: the ticks left aren't replicated. + entity.reload_ticks = 1 if flags & NetSnapshot.FLAG_RELOADING != 0 else 0 + entity.use_ticks = 1 if flags & NetSnapshot.FLAG_USING != 0 else 0 # What is in the player's hands, for whoever draws it: the item's code, or -1. entity.item = record[NetSnapshot.R_HELD] - 1 if entity.drop_state == Drop.ABOARD and barge_at != Vector3.INF: @@ -165,5 +168,8 @@ func _show_own(entity: SimEntity, game: ClientGame) -> void: entity.crouching = me.crouching entity.swimming = me.swimming entity.drop_state = me.drop_state + entity.velocity = me.velocity + entity.reload_ticks = me.reload_ticks + entity.use_ticks = me.use_ticks if me.drop_state == Drop.ABOARD and barge_at != Vector3.INF: entity.position = barge_at diff --git a/src/net/net_fx.gd b/src/net/net_fx.gd index d579e5a..9c68c1c 100644 --- a/src/net/net_fx.gd +++ b/src/net/net_fx.gd @@ -1,5 +1,5 @@ -## Things that happen and are gone, on the wire: shots fired, where shots landed, and -## harvesting swings. They change nothing a client keeps (damage, broken props and +## Things that happen and are gone, on the wire: shots fired and boathook swings, +## where shots landed, harvesting hits and pieces placed. They change nothing a client keeps (damage, broken props and ## pieces arrive in snapshots and WORLD), so they are only for drawing and sound: an ## FX message goes unreliably on the state channel next to each snapshot, and a lost ## one is a missed flash, not a wrong world. Sending them reliably would add to the @@ -11,9 +11,12 @@ ## s16 x 3 position in decimetres, ## SHOT: s16 yaw and s16 pitch of the aim, in 1/10000 radian, ## IMPACT: u8 what was hit (Weapons.HIT_), varint target, -## HARVEST: varint prop, or 0 and varint piece plus one for a piece. +## HARVEST: varint prop, or 0 and varint piece plus one for a piece, +## PLACE: varint piece. ## -## Positions are where the shot began, where it landed, or the swinging player's feet. +## A boathook swing is a SHOT with no item (code -1). Positions are where the shot or +## swing began, where it landed, the swinging player's feet for HARVEST, or the +## placed piece's centre. ## The decoder returns an empty Dictionary for anything malformed and never raises. class_name NetFx extends RefCounted @@ -23,7 +26,8 @@ const MSG_FX: int = 18 const SHOT: int = 1 const IMPACT: int = 2 const HARVEST: int = 3 -const KIND_NAMES: Array[String] = ["", "shot", "impact", "harvest"] +const PLACE: int = 4 +const KIND_NAMES: Array[String] = ["", "shot", "impact", "harvest", "place"] const HEADER_BYTES: int = 6 const MAX_EVENTS: int = 255 @@ -33,13 +37,14 @@ const ANGLE_SCALE: float = 10000.0 ## The FX record for a simulation event, or an empty Dictionary for events that aren't -## FX. `players` maps entity IDs to their feet, for harvest swings. -static func from_event(event: Dictionary, tick: int, players: Dictionary = {}) -> Dictionary: +## FX. `players` maps entity IDs to their feet, for harvest swings; `pieces` maps +## piece IDs to their centres, for pieces placed. +static func from_event(event: Dictionary, tick: int, players: Dictionary = {}, pieces: Dictionary = {}) -> Dictionary: match String(event.get("type", "")): - "shot": + "shot", "swing": var direction: Vector3 = event["direction"] return { - "kind": SHOT, "tick": tick, "player": int(event["player"]), "item": int(event["item"]), + "kind": SHOT, "tick": tick, "player": int(event["player"]), "item": int(event.get("item", -1)), "position": event["from"], "yaw": atan2(direction.x, direction.z), "pitch": asin(clampf(direction.y, -1.0, 1.0)), } @@ -55,6 +60,12 @@ static func from_event(event: Dictionary, tick: int, players: Dictionary = {}) - "position": players.get(player, Vector3.ZERO), "prop": int(event.get("prop", -1)), "piece": int(event.get("piece", 0)), } + "piece_placed": + return { + "kind": PLACE, "tick": tick, "player": int(event["player"]), "item": -1, + "position": pieces.get(int(event["piece"]), players.get(int(event["player"]), Vector3.ZERO)), + "piece": int(event["piece"]), + } return {} @@ -109,6 +120,8 @@ static func _encode_one(record: Dictionary, back: int) -> PackedByteArray: HARVEST: NetSnapshot._put_varint(out, maxi(int(record["prop"]), -1) + 1) NetSnapshot._put_varint(out, maxi(int(record["piece"]), 0)) + PLACE: + NetSnapshot._put_varint(out, maxi(int(record["piece"]), 0)) return out.data_array @@ -127,7 +140,7 @@ static func decode(bytes: PackedByteArray) -> Dictionary: var kind: int = bytes[cursor[0]] var back: int = bytes[cursor[0] + 1] cursor[0] += 2 - if kind < SHOT or kind > HARVEST: + if kind < SHOT or kind > PLACE: return {} var player: int = NetSnapshot._read_varint(bytes, cursor) if player < 0 or cursor[0] + 7 > bytes.size(): @@ -161,6 +174,11 @@ static func decode(bytes: PackedByteArray) -> Dictionary: return {} record["prop"] = prop - 1 record["piece"] = piece + PLACE: + var placed: int = NetSnapshot._read_varint(bytes, cursor) + if placed < 0: + return {} + record["piece"] = placed events.append(record) if cursor[0] != bytes.size(): return {} diff --git a/src/net/net_protocol.gd b/src/net/net_protocol.gd index 6d2ef4b..3006c2d 100644 --- a/src/net/net_protocol.gd +++ b/src/net/net_protocol.gd @@ -16,7 +16,7 @@ class_name NetProtocol extends RefCounted ## Raised whenever the wire format changes in a way old clients can't read. -const VERSION: int = 3 +const VERSION: int = 4 const MAGIC: String = "TDWL" const CHANNEL_CONTROL: int = 0 ## Unreliable game traffic: commands up, snapshots down. diff --git a/src/server/net_game.gd b/src/server/net_game.gd index 78dd567..6d9e319 100644 --- a/src/server/net_game.gd +++ b/src/server/net_game.gd @@ -167,7 +167,7 @@ func after_tick() -> void: net.send(handle, NetProtocol.CHANNEL_STATE, fx, false) -## Keeps this tick's shots, impacts and swings as FX records, once per simulation tick +## Keeps this tick's shots, swings, impacts and pieces placed as FX records, once per simulation tick ## (outside a match the simulation isn't stepped and its events are stale). func _collect_fx() -> void: var sim: Simulation = loop.sim @@ -175,12 +175,17 @@ func _collect_fx() -> void: return _fx_tick = sim.tick var feet: Dictionary = {} + var centres: Dictionary = {} for event: Dictionary in sim.events: - if event["type"] == "harvest" or event["type"] == "piece_hit": + if event["type"] == "harvest" or event["type"] == "piece_hit" or event["type"] == "piece_placed": var player: SimEntity = sim.entities.find(int(event["player"])) if player != null: feet[player.id] = player.position - var record: Dictionary = NetFx.from_event(event, sim.tick, feet) + if event["type"] == "piece_placed": + var piece: StructureSet.Piece = sim.structures.find(int(event["piece"])) + if piece != null and not piece.boxes.is_empty(): + centres[piece.id] = piece.boxes[0].get_center() + var record: Dictionary = NetFx.from_event(event, sim.tick, feet, centres) if not record.is_empty(): _fx.append(record) # A client is sent its FX at least every snapshot interval; keep a little more. diff --git a/src/sim/harvest.gd b/src/sim/harvest.gd index bf0fe3c..3268604 100644 --- a/src/sim/harvest.gd +++ b/src/sim/harvest.gd @@ -100,6 +100,8 @@ static func swing(player: SimEntity, ground: SimGround, props: PropSet, events: if player.action_cooldown > 0 or not can_swing(player): return -1 player.action_cooldown = swing_interval_ticks() + # Every swing, hit or miss, for whoever draws or hears it. + events.append({"type": "swing", "player": player.id, "from": eye(player), "direction": look_direction(player)}) var hit: Vector2 = _prop_hit(player, ground, props) if structures != null: var piece_hit: Vector2 = _piece_hit(player, ground, structures) diff --git a/test/capture/figure_actions.tscn b/test/capture/figure_actions.tscn new file mode 100644 index 0000000..262e21e --- /dev/null +++ b/test/capture/figure_actions.tscn @@ -0,0 +1,7 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://test/capture/figure_scene.gd" id="1"] + +[node name="CaptureFigure" type="Node3D"] +script = ExtResource("1") +stage = "actions" diff --git a/test/capture/figure_close.tscn b/test/capture/figure_close.tscn new file mode 100644 index 0000000..e337f43 --- /dev/null +++ b/test/capture/figure_close.tscn @@ -0,0 +1,7 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://test/capture/figure_scene.gd" id="1"] + +[node name="CaptureFigure" type="Node3D"] +script = ExtResource("1") +stage = "close" diff --git a/test/capture/figure_scene.gd b/test/capture/figure_scene.gd new file mode 100644 index 0000000..e8f2d17 --- /dev/null +++ b/test/capture/figure_scene.gd @@ -0,0 +1,168 @@ +## Capture scenario for the player figure (A2), on seed 2's island in the real +## MatchView. Each stage stands a row of figures, each frozen at a chosen moment of one +## animation, seen from in front and to their right: +## +## - states: idle, walk, run, crouched, creeping, in the air, skydiving, gliding, +## swimming. (Aboard the barge is the idle with the feet set wider; the deck +## placement would pull it out of the row.) +## - actions: carrying a longgun, a revolver and a tonic, firing each kind, a boathook +## swing, a keg thrown, building, reloading, drinking and a flinch. +## - close: one figure holding the dock carbine, close up, three-quarter front. +extends Node3D + +@export var stage: String = "states" +@export var match_seed: int = 2 + +## [label, item id or "", setup, seconds to run, action or ""]. Setup names a state. +const STATES: Array = [ + ["idle", "", "ground", 0.6, ""], + ["walk", "", "walk", 0.2, ""], + ["run", "", "run", 0.15, ""], + ["crouch", "", "crouch", 0.8, ""], + ["creep", "", "creep", 0.25, ""], + ["air", "", "air", 0.5, ""], + ["skydive", "", "skydive", 0.8, ""], + ["glide", "", "glide", 0.8, ""], + ["swim", "", "swim", 0.35, ""], +] +const ACTIONS: Array = [ + ["long", "whalers_longgun", "ground", 0.6, ""], + ["short", "signal_revolver", "ground", 0.6, ""], + ["carry", "brine_tonic", "ground", 0.6, ""], + ["fire_long", "dock_carbine", "ground", 0.04, "fire_long"], + ["fire_short", "signal_revolver", "ground", 0.04, "fire_short"], + ["swing_back", "", "ground", 0.16, "swing"], + ["swing", "", "ground", 0.26, "swing"], + ["throw", "powder_keg", "ground", 0.2, "throw"], + ["build", "", "ground", 0.1, "build"], + ["reload", "dock_carbine", "reload", 0.5, ""], + ["use", "brine_tonic", "use", 0.5, ""], + ["flinch", "dock_carbine", "flinch", 0.06, ""], +] + +var sim: Simulation +var view: MatchView + + +func _ready() -> void: + sim = Simulation.new(match_seed) + var spot: Vector3 = _open_ground() + var rows: Array = STATES if stage == "states" else ACTIONS + if stage == "close": + rows = [["close", "dock_carbine", "ground", 0.6, ""]] + var players: Array[SimEntity] = [] + for index: int in rows.size(): + players.append(_stand(_at(spot, index, rows.size()), rows[index])) + view = MatchView.new() + view.setup(sim, 0) + add_child(view) + view.entities.animate_live = false + view.sync() + for index: int in rows.size(): + _pose(players[index], rows[index]) + var middle: Vector3 = _at(spot, (rows.size() - 1) * 0.5 + (1.0 if rows.size() > 1 else 0.0), rows.size()) + if stage == "close": + view.look_from(middle + Vector3(-2.0, 1.55, 2.6), middle + Vector3(0.0, 1.0, 0.0)) + else: + var back: float = 2.0 + rows.size() * 0.42 + view.look_from(middle + Vector3(-back, 1.7, back * 0.3), middle + Vector3(0.0, 1.0, 0.0)) + view.settle() + + +func _at(spot: Vector3, index: float, count: int) -> Vector3: + var at: Vector3 = spot + Vector3(0.0, 0.0, (index - (count - 1) * 0.5) * 1.5 + 1.0) + at.y = sim.ground.terrain_height(at.x, at.z) + return at + + +func _stand(at: Vector3, row: Array) -> SimEntity: + var player: SimEntity = sim.entities.find(sim.add_player()) + player.position = at + player.drop_state = Drop.NONE + player.on_ground = true + player.health = 100 + player.yaw = 0 + var id: String = row[1] + if id != "": + player.slot_items[0] = ItemCatalog.code_of(id) + player.slot_counts[0] = 1 + player.slot_tiers[0] = 2 + player.selected = 1 + else: + player.selected = 0 + match String(row[2]): + "walk": + player.velocity = Vector3(0.0, 0.0, Tuning.WALK_SPEED) + "run": + player.velocity = Vector3(0.0, 0.0, Tuning.SPRINT_SPEED) + "crouch": + player.crouching = true + "creep": + player.crouching = true + player.velocity = Vector3(0.0, 0.0, Tuning.CROUCH_SPEED) + "air": + player.on_ground = false + player.position.y += 0.5 + "skydive": + player.drop_state = Drop.FREEFALL + player.on_ground = false + player.position.y += 0.6 + "glide": + player.drop_state = Drop.GLIDING + player.on_ground = false + player.position.y += 0.4 + "swim": + player.swimming = true + player.on_ground = false + "aboard": + player.drop_state = Drop.ABOARD + player.on_ground = false + "reload": + player.reload_ticks = 10 + "use": + player.use_ticks = 10 + return player + + +func _pose(player: SimEntity, row: Array) -> void: + var figure: FigureRig = view.entities.figure_of(player.id) + # The barge's deck isn't drawn here: put the passenger back where it stands. + figure.position = player.position + figure.drive(player, 0.0) + figure.drive(player, 1.0) + figure.advance(0.0) + if String(row[2]) == "flinch": + figure.advance(0.4) + player.health = 70 + figure.drive(player, 0.0) + if String(row[4]) != "": + figure.advance(0.4) + figure.act(row[4]) + var left: float = float(row[3]) + while left > 0.0: + var step: float = minf(left, 1.0 / 60.0) + figure.advance(step) + left -= step + + +## Fairly flat, open ground above the sea near the middle of the island. +func _open_ground() -> Vector3: + var size: float = Tuning.WORLD_SIZE_METRES + var best: Vector3 = Vector3(size * 0.5, 0.0, size * 0.5) + for ring: int in 60: + for step: int in 24: + var angle: float = TAU * step / 24.0 + var x: float = size * 0.5 + cos(angle) * ring * 12.0 + var z: float = size * 0.5 + sin(angle) * ring * 12.0 + var feet: Vector3 = Vector3(x, sim.ground.terrain_height(x, z), z) + if feet.y < sim.sea_level + 3.0 or sim.ground.terrain_normal(x, z).y < 0.985: + continue + if not sim.props.near(feet, 12.0).is_empty(): + continue + var level: bool = true + for dz: float in [-7.0, 0.0, 9.0]: + if absf(sim.ground.terrain_height(x - 2.0, z + dz) - feet.y) > 0.8: + level = false + if level: + return feet + return best diff --git a/test/capture/figure_scene.gd.uid b/test/capture/figure_scene.gd.uid new file mode 100644 index 0000000..26ad612 --- /dev/null +++ b/test/capture/figure_scene.gd.uid @@ -0,0 +1 @@ +uid://mbpyawoimo5k diff --git a/test/capture/figure_states.tscn b/test/capture/figure_states.tscn new file mode 100644 index 0000000..12c425d --- /dev/null +++ b/test/capture/figure_states.tscn @@ -0,0 +1,7 @@ +[gd_scene load_steps=2 format=3] + +[ext_resource type="Script" path="res://test/capture/figure_scene.gd" id="1"] + +[node name="CaptureFigure" type="Node3D"] +script = ExtResource("1") +stage = "states" diff --git a/test/client/test_figure_rig.gd b/test/client/test_figure_rig.gd new file mode 100644 index 0000000..114988a --- /dev/null +++ b/test/client/test_figure_rig.gd @@ -0,0 +1,254 @@ +extends TestCase + +## A2: the player figure's parts and joints, its animations, and that it animates from +## replicated state only: a client's mirrored entity (snapshot fields and FLAG_ bits) +## and FX records. + +var tree: SceneTree +var figure: FigureRig +var player: SimEntity + + +func before_each() -> void: + super.before_each() + tree = Engine.get_main_loop() as SceneTree + figure = FigureRig.new(Palette.OCHRE_RED) + tree.root.add_child(figure) + player = SimEntity.new(7, SimEntity.ARCHETYPE_PLAYER) + player.health = 100 + player.on_ground = true + + +func after_each() -> void: + if is_instance_valid(figure): + figure.free() + FigureRig.clear() + super.after_each() + + +func test_every_part_is_built_from_the_generated_models() -> void: + var layout: Dictionary = FigureRig.layout() + assert_eq(layout.get("generator", ""), "tools/models/figure.py") + for part: String in FigureRig.PART_JOINT: + var mesh: ArrayMesh = FigureRig.part_mesh(part, Palette.OILSKIN) + assert_not_null(mesh, "%s has a model" % part) + if mesh == null: + continue + for surface: int in mesh.get_surface_count(): + var name: String = mesh.surface_get_name(surface) + assert_true(name.begins_with("COAT") or FigureRig.COLOURS.has(name), "%s's %s is a Palette colour" % [part, name]) + assert_eq(FigureRig.colour_of("COAT", Palette.SEA_PAINT), Palette.SEA_PAINT, "the coat is the player's own") + assert_eq(FigureRig.colour_of("SKIN", Palette.SEA_PAINT), Palette.SKIN) + + +func test_standing_figure_is_player_sized_with_feet_on_the_ground() -> void: + figure.drive(player, 0.0) + figure.advance(0.0) + var bounds: AABB = _bounds() + assert_near(bounds.position.y, 0.0, 0.06, "feet at the origin") + assert_near(bounds.end.y, Tuning.PLAYER_HEIGHT, 0.12, "as tall as the player's body") + assert_true(bounds.size.x < 0.9 and bounds.size.z < 1.0, "no bigger round than a person with arms out: %s" % bounds.size) + assert_true(figure.relative(figure.hand()).origin.x < 0.0, "the right hand is on the -X side") + + +func test_crouching_brings_the_head_down_to_crouch_height() -> void: + player.crouching = true + figure.drive(player, 0.0) + _run(0.6) + var top: float = _bounds().end.y + assert_true(top < Tuning.CROUCH_HEIGHT + 0.2 and top > Tuning.CROUCH_HEIGHT - 0.35, "crouched head height %f" % top) + + +func test_states_follow_the_replicated_flags() -> void: + assert_eq(FigureRig.state_of(player, false), "ground") + player.crouching = true + assert_eq(FigureRig.state_of(player, false), "crouch") + assert_eq(FigureRig.state_of(player, true), "air") + player.swimming = true + assert_eq(FigureRig.state_of(player, true), "swim") + for drop: Array in [[Drop.ABOARD, "aboard"], [Drop.FREEFALL, "skydive"], [Drop.GLIDING, "glide"]]: + player.drop_state = drop[0] + assert_eq(FigureRig.state_of(player, false), drop[1]) + + +func test_a_short_hop_off_the_ground_doesnt_flicker_into_the_air() -> void: + player.on_ground = false + figure.drive(player, 0.05) + assert_eq(figure.state, "ground", "under AIR_DELAY") + figure.drive(player, 0.1) + assert_eq(figure.state, "air") + player.on_ground = true + figure.drive(player, 0.02) + assert_eq(figure.state, "ground") + + +func test_speed_comes_from_movement_when_velocity_isnt_replicated() -> void: + # A mirrored player: only positions arrive, velocity stays zero. + for step: int in 40: + player.position = Vector3(0.0, 0.0, step * Tuning.WALK_SPEED / 30.0) + figure.drive(player, 1.0 / 30.0) + assert_near(figure.speed, Tuning.WALK_SPEED, 0.3) + player.position += Vector3(80.0, 0.0, 0.0) + figure.drive(player, 1.0 / 30.0) + assert_true(figure.speed < Tuning.WALK_SPEED, "a teleport isn't a sprint") + + +func test_walking_swings_the_legs_and_standing_still_doesnt() -> void: + figure.drive(player, 0.0) + var still: Array[float] = _leg_range(1.5) + assert_true(still[1] - still[0] < 0.05, "idle legs barely move: %s" % [still]) + player.velocity = Vector3(0.0, 0.0, Tuning.SPRINT_SPEED) + figure.drive(player, 0.0) + var running: Array[float] = _leg_range(1.5) + assert_true(running[1] - running[0] > 1.0, "running legs swing: %s" % [running]) + + +func test_every_state_poses_differently() -> void: + var poses: Dictionary = {} + var states: Array = [ + ["ground", func() -> void: pass], + ["crouch", func() -> void: player.crouching = true], + ["swim", func() -> void: player.swimming = true], + ["skydive", func() -> void: player.drop_state = Drop.FREEFALL], + ["glide", func() -> void: player.drop_state = Drop.GLIDING], + ] + for entry: Array in states: + player = SimEntity.new(7, SimEntity.ARCHETYPE_PLAYER) + player.on_ground = true + (entry[1] as Callable).call() + figure.drive(player, 0.0) + _run(0.8) + assert_eq(figure.state, entry[0]) + poses[entry[0]] = _signature() + for a: String in poses: + for b: String in poses: + if a < b: + assert_true((poses[a] as Vector3).distance_to(poses[b]) > 0.15, "%s and %s look different" % [a, b]) + + +func test_glide_shows_the_sail_and_hides_the_held_item() -> void: + player.drop_state = Drop.GLIDING + player.on_ground = false + figure.drive(player, 0.0) + assert_true(figure.sail().visible) + assert_false(figure.hand().visible) + + +func test_fx_play_the_actions_on_the_upper_body() -> void: + figure.drive(player, 0.0) + _run(0.3) + var before: Quaternion = (figure.joints["shoulder_r"] as Node3D).quaternion + figure.hear({"kind": NetFx.SHOT, "item": -1, "player": 7}) + assert_false(figure.acting(), "starts on the next step") + _run(0.16) + assert_true(figure.acting(), "a boathook swing plays") + var during: Quaternion = (figure.joints["shoulder_r"] as Node3D).quaternion + assert_true(before.angle_to(during) > 0.5, "the arm swings back") + _run(0.6) + assert_false(figure.acting(), "and finishes") + figure.hear({"kind": NetFx.PLACE, "item": -1, "player": 7, "piece": 3}) + _run(0.1) + assert_true(figure.acting(), "placing a piece plays the mallet") + _run(0.6) + figure.hear({"kind": NetFx.SHOT, "item": ItemCatalog.code_of("dock_carbine"), "player": 7}) + _run(0.05) + assert_true(figure.acting(), "a shot kicks") + + +func test_swimming_figures_dont_act() -> void: + player.swimming = true + figure.drive(player, 0.0) + figure.hear({"kind": NetFx.SHOT, "item": -1, "player": 7}) + _run(0.1) + assert_false(figure.acting()) + + +func test_losing_health_flinches_and_reloading_moves_the_left_arm() -> void: + figure.drive(player, 0.0) + _run(0.3) + player.health = 80 + figure.drive(player, 0.0) + _run(0.05) + assert_true(figure.acting(), "a flinch") + _run(0.5) + player.slot_items = PackedInt32Array([ItemCatalog.code_of("dock_carbine")]) + player.slot_tiers = PackedInt32Array([1]) + player.selected = 1 + figure.drive(player, 0.0) + _run(0.4) + var resting: Quaternion = (figure.joints["elbow_l"] as Node3D).quaternion + player.reload_ticks = 1 + figure.drive(player, 0.0) + _run(0.4) + assert_true(resting.angle_to((figure.joints["elbow_l"] as Node3D).quaternion) > 0.4, "the left hand goes to the breech") + + +func test_holds_by_item() -> void: + assert_eq(FigureRig.hold_of(-1), "long", "the boathook in both hands") + assert_eq(FigureRig.hold_of(ItemCatalog.code_of("whalers_longgun")), "long") + assert_eq(FigureRig.hold_of(ItemCatalog.code_of("signal_revolver")), "short") + assert_eq(FigureRig.hold_of(ItemCatalog.code_of("brine_tonic")), "carry") + assert_eq(FigureRig.hold_of(ItemCatalog.code_of("powder_keg")), "carry") + + +func test_the_held_item_points_along_the_look_whatever_the_arm_does() -> void: + player.pitch = -PlayerCommand.PITCH_MAX / 3 + player.velocity = Vector3(0.0, 0.0, Tuning.SPRINT_SPEED) + figure.drive(player, 0.0) + var pitch: float = float(player.pitch) / PlayerCommand.PITCH_MAX * (PI * 0.5) + for step: int in 20: + _run(0.05) + var muzzle: Vector3 = figure.hand_basis() * Vector3(0.0, 0.0, 1.0) + assert_near(muzzle.y, sin(pitch), 0.02, "step %d" % step) + assert_near(muzzle.x, 0.0, 0.02) + + +func test_mirrored_players_carry_reload_and_use_flags() -> void: + var record: PackedInt32Array = NetSnapshot.record_of(player) + player.reload_ticks = 9 + record = NetSnapshot.record_of(player) + assert_true(record[NetSnapshot.R_FLAGS] & NetSnapshot.FLAG_RELOADING != 0) + + +func _run(seconds: float) -> void: + var left: float = seconds + while left > 0.0: + var step: float = minf(left, 1.0 / 30.0) + figure.advance(step) + left -= step + + +## The lowest and highest the right thigh turns over a time. +func _leg_range(seconds: float) -> Array[float]: + var low: float = INF + var high: float = -INF + var left: float = seconds + while left > 0.0: + figure.advance(1.0 / 30.0) + left -= 1.0 / 30.0 + var turn: float = (figure.joints["hip_r"] as Node3D).rotation.x + low = minf(low, turn) + high = maxf(high, turn) + return [low, high] + + +## Where the head and both hands are, summed into one vector to compare poses. +func _signature() -> Vector3: + var head: Vector3 = figure.relative(figure.joints["neck"]).origin + var hand_l: Vector3 = figure.relative(figure.joints["elbow_l"]).origin + var knee: Vector3 = figure.relative(figure.joints["knee_r"]).origin + return head * 1.0 + hand_l * 0.5 + knee * 0.25 + + +## The figure's drawn bounds, in its own space, from every part's mesh. +func _bounds() -> AABB: + var out: AABB = AABB() + var first: bool = true + for node: Node in figure.find_children("*", "MeshInstance3D", true, false): + var part: MeshInstance3D = node + if part.mesh == null or not part.is_visible_in_tree() or part.name == "sail": + continue + var box: AABB = figure.relative(part) * part.mesh.get_aabb() + out = box if first else out.merge(box) + first = false + return out diff --git a/test/client/test_figure_rig.gd.uid b/test/client/test_figure_rig.gd.uid new file mode 100644 index 0000000..b6b409b --- /dev/null +++ b/test/client/test_figure_rig.gd.uid @@ -0,0 +1 @@ +uid://2s5dkcs4jit0 diff --git a/test/client/test_item_models.gd b/test/client/test_item_models.gd index 51be723..c74429d 100644 --- a/test/client/test_item_models.gd +++ b/test/client/test_item_models.gd @@ -91,20 +91,22 @@ func test_figures_hold_their_players_item_in_the_right_hand() -> void: var player: SimEntity = made[1] var view: EntityView = EntityView.new() view.setup(sim) - var figure: Node3D = view.figure_of(player.id) - var held: MeshInstance3D = figure.get_node("Hand/Held") + var figure: FigureRig = view.figure_of(player.id) + var held: MeshInstance3D = figure.held() assert_eq(held.mesh, ItemModels.model("whalers_longgun", 3)) - assert_true((figure.get_node("Hand") as Node3D).position.x < 0.0, "the right hand, on the figure's -X side") + assert_true(figure.relative(figure.hand()).origin.x < 0.0, "the right hand, on the figure's -X side") player.selected = 0 view.sync() assert_eq(held.mesh, ItemModels.model("boathook", 1), "the boathook when nothing else is held") player.pitch = PlayerCommand.PITCH_MAX / 2 view.sync() - var muzzle: Vector3 = (figure.get_node("Hand") as Node3D).transform.basis * Vector3(0.0, 0.0, 1.0) + figure.drive(player, 0.1) + figure.advance(0.1) + var muzzle: Vector3 = figure.hand_basis() * Vector3(0.0, 0.0, 1.0) assert_true(muzzle.y > 0.5, "looking up points the item up") player.drop_state = Drop.GLIDING view.sync() - assert_false((figure.get_node("Hand") as Node3D).visible, "both hands on the wing-sail") + assert_false(figure.hand().visible, "both hands on the wing-sail") view.free() diff --git a/test/client/test_match_view.gd b/test/client/test_match_view.gd index d982c4f..1c921c3 100644 --- a/test/client/test_match_view.gd +++ b/test/client/test_match_view.gd @@ -48,14 +48,15 @@ func test_gliding_players_show_a_wing_sail() -> void: var view: MatchView = MatchView.new() view.setup(loop.sim, 1) var bot: SimEntity = loop.sim.entities.find(2) - assert_false((view.entities.figure_of(2).get_node("Sail") as Node3D).visible) + assert_false(view.entities.figure_of(2).sail().visible) var guard: int = 0 while bot.drop_state != Drop.GLIDING and guard < 3000: loop.run_tick() guard += 1 view.sync() + view.entities.animate(0.1) assert_eq(bot.drop_state, Drop.GLIDING) - assert_true((view.entities.figure_of(2).get_node("Sail") as Node3D).visible) + assert_true(view.entities.figure_of(2).sail().visible) view.free() diff --git a/test/net/test_net_fx.gd b/test/net/test_net_fx.gd index 9d283ba..1c91c0f 100644 --- a/test/net/test_net_fx.gd +++ b/test/net/test_net_fx.gd @@ -1,6 +1,7 @@ extends TestCase -## Issue N11: shots, impacts and swings on the wire (NetFx). +## Issue N11: shots, impacts and swings on the wire (NetFx). A2 added boathook swings +## that miss (a SHOT with no item) and pieces placed (PLACE), for the figures. func _records() -> Array[Dictionary]: @@ -9,6 +10,7 @@ func _records() -> Array[Dictionary]: {"kind": NetFx.IMPACT, "tick": 401, "player": 3, "item": 2, "position": Vector3(130.0, 11.0, 220.0), "hit": Weapons.HIT_PLAYER, "target": 700}, {"kind": NetFx.HARVEST, "tick": 402, "player": 4, "item": -1, "position": Vector3(50.0, 9.0, 60.0), "prop": 12, "piece": 0}, {"kind": NetFx.HARVEST, "tick": 402, "player": 5, "item": -1, "position": Vector3(51.0, 9.0, 61.0), "prop": -1, "piece": 33}, + {"kind": NetFx.PLACE, "tick": 402, "player": 6, "item": -1, "position": Vector3(52.0, 10.5, 62.5), "piece": 41}, ] @@ -18,8 +20,8 @@ func test_records_survive_the_trip() -> void: assert_false(message.is_empty()) assert_eq(message["tick"], 402) var events: Array = message["events"] - assert_eq(events.size(), 4) - for index: int in 4: + assert_eq(events.size(), 5) + for index: int in 5: var sent: Dictionary = _records()[index] var got: Dictionary = events[index] for key: String in sent: @@ -64,3 +66,16 @@ func test_malformed_messages_are_refused() -> void: var bad_kind: PackedByteArray = bytes.duplicate() bad_kind[NetFx.HEADER_BYTES] = 9 assert_true(NetFx.decode(bad_kind).is_empty(), "unknown kind") + + +func test_swings_and_placed_pieces_from_the_simulation() -> void: + var swing: Dictionary = NetFx.from_event({"type": "swing", "player": 9, "from": Vector3(1.0, 2.0, 3.0), "direction": Vector3.FORWARD}, 80) + assert_eq(swing["kind"], NetFx.SHOT) + assert_eq(swing["item"], -1, "a swing is a shot with no item") + var placed: Dictionary = NetFx.from_event({"type": "piece_placed", "player": 9, "piece": 12, "kind": 0, "material": 0}, 80, {9: Vector3.ONE}, {12: Vector3(4.0, 5.0, 6.0)}) + assert_eq(placed["kind"], NetFx.PLACE) + assert_eq(placed["piece"], 12) + assert_eq(placed["position"], Vector3(4.0, 5.0, 6.0), "at the piece") + var unknown: Dictionary = NetFx.from_event({"type": "piece_placed", "player": 9, "piece": 13}, 80, {9: Vector3.ONE}) + assert_eq(unknown["position"], Vector3.ONE, "at the builder, without the piece's centre") + diff --git a/test/sim/test_harvest.gd b/test/sim/test_harvest.gd index 6ea87fe..2ff06f1 100644 --- a/test/sim/test_harvest.gd +++ b/test/sim/test_harvest.gd @@ -54,7 +54,7 @@ func test_a_hit_yields_the_props_material_and_damages_it() -> void: assert_eq(player.materials[Materials.DRIFTWOOD], Tuning.HARVEST_PER_HIT) assert_eq(player.materials[Materials.STONE], 0) assert_eq(sim.props.health[0], 200 - Tuning.HARVEST_DAMAGE) - assert_eq(sim.events[0]["material"], Materials.DRIFTWOOD) + assert_eq(_harvest(sim)["material"], Materials.DRIFTWOOD) func test_each_prop_kind_gives_its_own_material() -> void: @@ -93,7 +93,7 @@ func test_looking_away_misses() -> void: for _i: int in 1: sim.submit_command(1, PlayerCommand.from_input(sim.tick, Vector2.ZERO, PI, 0.0, PlayerCommand.BUTTON_FIRE)) sim.step() - hits += sim.events.size() + hits += sim.events.filter(func(event: Dictionary) -> bool: return event["type"] != "swing").size() assert_eq(hits, 0) @@ -120,7 +120,7 @@ func test_carry_cap_stops_gains_but_not_damage() -> void: player.materials[Materials.STONE] = Tuning.MATERIAL_CAP - 5 _swing_for(sim, 1) assert_eq(player.materials[Materials.STONE], Tuning.MATERIAL_CAP) - assert_eq(sim.events[0]["amount"], 5, "the event reports what was actually gained") + assert_eq(_harvest(sim)["amount"], 5, "the event reports what was actually gained") _swing_for(sim, Harvest.swing_interval_ticks()) assert_eq(player.materials[Materials.STONE], Tuning.MATERIAL_CAP, "never over the cap") assert_eq(sim.props.health[0], 400 - Tuning.HARVEST_DAMAGE * 2, "capped players still damage props") @@ -199,3 +199,30 @@ func test_harvesting_on_a_real_island_is_deterministic() -> void: assert_eq(gained, Tuning.HARVEST_PER_HIT * 2, "two swings at a real pine") hashes.append(sim.state_hash()) assert_eq(hashes[0], hashes[1]) + + +## This tick's harvest event; every swing also makes a "swing" event before it. +func _harvest(sim: Simulation) -> Dictionary: + for event: Dictionary in sim.events: + if event["type"] == "harvest": + return event + return {} + + +func test_every_swing_reports_itself_hit_or_miss() -> void: + var sim: Simulation = Simulation.new(5, SimGround.flat(0.0)) + var player: SimEntity = sim.entities.find(sim.add_player()) + player.drop_state = Drop.NONE + player.on_ground = true + player.position = Vector3(10.0, 0.0, 10.0) + player.pitch = PlayerCommand.PITCH_MAX / 2 + var events: Array[Dictionary] = [] + Harvest.swing(player, sim.ground, sim.props, events, sim.structures) + assert_eq(events.size(), 1, "a miss: %s" % [events]) + assert_eq(events[0]["type"], "swing") + assert_eq(events[0]["player"], player.id) + var direction: Vector3 = events[0]["direction"] + assert_true(direction.y > 0.5, "along the look") + Harvest.swing(player, sim.ground, sim.props, events, sim.structures) + assert_eq(events.size(), 1, "not again until the boathook is ready") + diff --git a/tools/models/figure.py b/tools/models/figure.py new file mode 100644 index 0000000..44dd830 --- /dev/null +++ b/tools/models/figure.py @@ -0,0 +1,251 @@ +"""Tidewall's player figure (A2), built in headless Blender. + + blender --background --factory-startup --python tools/models/figure.py + +A low-poly islander in an oilskin coat and a sou'wester, with sea boots, a rolled +bedding bundle on the back and a canvas wing-sail for the glide. Writes: + + assets/models/figure/.obj one model per moving part, with .mtl + assets/models/figure/figure.json the joints, which part hangs from which, and + where the right hand closes + +Debian's Blender can't export glTF (its exporter needs numpy), and OBJ carries no +skeleton, so the figure is a set of rigid parts. Each part's origin is the joint it +turns about; the client (FigureRig) hangs them on a hierarchy of pivots from +figure.json and animates the pivots with an AnimationTree. + +Conventions, in Godot's axes after export: +Y up, the figure faces +Z, its right is +-X, and it stands with its feet at the origin, 1.8 m tall to the hat's crown. +Materials are named after Palette colours, as for items; COAT and COAT_DARK are the +player's own oilskin colour and a darker shade of it, which the client fills in. + +Everything is built from primitives here, with no randomness. +""" + +import json +import math +import os +import sys + +import bpy + +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) +import items # noqa: E402 (the shared builders: box, tube, ball, ring, material) + +OUT_DIR = os.path.join(items.ROOT, "assets", "models", "figure") + +# Joints, in Godot's axes (x, y, z): +Y up, facing +Z, the figure's right toward -X. +JOINTS = { + "hips": (0.0, 0.92, 0.0), + "waist": (0.0, 1.02, 0.0), + "neck": (0.0, 1.50, 0.0), + "shoulder_r": (-0.225, 1.42, 0.0), + "shoulder_l": (0.225, 1.42, 0.0), + "elbow_r": (-0.235, 1.14, 0.0), + "elbow_l": (0.235, 1.14, 0.0), + "hip_r": (-0.11, 0.90, 0.0), + "hip_l": (0.11, 0.90, 0.0), + "knee_r": (-0.11, 0.49, 0.0), + "knee_l": (0.11, 0.49, 0.0), + "sail": (0.0, 1.46, -0.2), +} +# Part -> (the joint it turns about, the joint it hangs from or None for the root). +PARTS = { + "pelvis": ("hips", None), + "torso": ("waist", "hips"), + "head": ("neck", "waist"), + "upper_arm_r": ("shoulder_r", "waist"), + "upper_arm_l": ("shoulder_l", "waist"), + "forearm_r": ("elbow_r", "shoulder_r"), + "forearm_l": ("elbow_l", "shoulder_l"), + "thigh_r": ("hip_r", "hips"), + "thigh_l": ("hip_l", "hips"), + "shin_r": ("knee_r", "hip_r"), + "shin_l": ("knee_l", "hip_l"), + "sail": ("sail", None), +} +# Where the right hand closes on a grip, and the left on a support, in Godot axes. +HAND_R = (-0.24, 0.86, 0.03) +HAND_L = (0.24, 0.86, 0.03) +# Placeholder colours for the player's own oilskin, so the .mtl files look right. +OWN = {"COAT": items.PALETTE["OILSKIN"], "COAT_DARK": tuple(c * 0.72 for c in items.PALETTE["OILSKIN"])} + + +def b(x, y, z): + """Godot (x, y, z) to Blender (x, -z, y).""" + return (x, -z, y) + + +def own_materials(): + for name, rgb in OWN.items(): + made = bpy.data.materials.new(name) + made.use_nodes = True + linear = tuple(items.srgb_to_linear(c) for c in rgb) + made.node_tree.nodes.get("Principled BSDF").inputs["Base Color"].default_value = linear + (1.0,) + made.diffuse_color = linear + (1.0,) + + +def built(make): + """Runs a builder and returns the objects it added.""" + before = set(bpy.data.objects) + make() + return [obj for obj in bpy.data.objects if obj not in before] + + +# --- Parts, built where they stand in the rest pose (Godot axes via b()) --------- + +def pelvis(): + # The coat's skirt, flaring a little, over a tarred belt. + items.tube(0.25, 0.34, b(0.0, 0.84, 0.0), "COAT", axis="Z", sides=8, radius2=0.205) + obj = bpy.context.active_object + obj.scale = (1.0, 0.72, 1.0) + items.tube(0.21, 0.05, b(0.0, 1.0, 0.0), "TAR", axis="Z", sides=8) + bpy.context.active_object.scale = (1.0, 0.74, 1.0) + items.box((0.07, 0.02, 0.05), b(0.0, 1.0, 0.155), "GILT", bevel=0.0) + + +def torso(): + items.tube(0.205, 0.46, b(0.0, 1.25, 0.0), "COAT", axis="Z", sides=8, radius2=0.235) + bpy.context.active_object.scale = (1.0, 0.68, 1.0) + # The coat's front edge and its toggles. + items.box((0.03, 0.012, 0.44), b(0.0, 1.25, 0.158), "COAT_DARK", bevel=0.0) + for index in range(3): + items.box((0.06, 0.02, 0.016), b(0.0, 1.12 + index * 0.12, 0.166), "BARK", bevel=0.0) + # A turned-up collar. + items.tube(0.13, 0.08, b(0.0, 1.49, -0.01), "COAT_DARK", axis="Z", sides=8, radius2=0.15) + # A rolled bedding bundle across the back, tied with tarred cord. + items.tube(0.075, 0.42, b(0.0, 1.38, -0.21), "TANNED_SAIL", axis="X", sides=8) + for side in (-1.0, 1.0): + items.ring(0.078, 0.01, b(side * 0.13, 1.38, -0.21), "TAR", axis="X") + items.box((0.05, 0.02, 0.36), b(-0.1, 1.3, -0.17), "TAR", rot=(0.0, math.radians(-28), 0.0), bevel=0.0) + + +def head(): + items.tube(0.055, 0.1, b(0.0, 1.53, 0.0), "SKIN", axis="Z", sides=8) + items.ball(0.115, b(0.0, 1.635, 0.01), "SKIN", rings=6, segments=10) + items.box((0.03, 0.04, 0.05), b(0.0, 1.63, 0.125), "SKIN", rot=(math.radians(10), 0.0, 0.0), bevel=0.005) + for side in (-1.0, 1.0): + items.box((0.026, 0.01, 0.016), b(side * 0.045, 1.665, 0.108), "INK", bevel=0.0) + # A short, square beard. + items.box((0.17, 0.08, 0.09), b(0.0, 1.56, 0.07), "BARK", bevel=0.01) + # The sou'wester: a soft crown and a brim that runs long down the back. + items.tube(0.128, 0.11, b(0.0, 1.735, -0.005), "COAT", axis="Z", sides=10, radius2=0.1) + bpy.ops.mesh.primitive_cylinder_add(vertices=12, radius=0.2, depth=0.022, location=b(0.0, 1.69, -0.045)) + brim = bpy.context.active_object + brim.scale = (1.0, 1.22, 1.0) + brim.rotation_euler = (math.radians(-9), 0.0, 0.0) + items.finish(brim, "COAT_DARK") + + +def upper_arm(side): + x = side * 0.225 + items.ball(0.075, b(x, 1.41, 0.0), "COAT", rings=5, segments=8) + items.tube(0.068, 0.27, b(side * 0.23, 1.28, 0.0), "COAT", axis="Z", sides=8, radius2=0.06) + + +def forearm(side): + x = side * 0.236 + items.tube(0.06, 0.2, b(x, 1.04, 0.0), "COAT", axis="Z", sides=8, radius2=0.054) + items.tube(0.064, 0.05, b(x, 0.93, 0.0), "COAT_DARK", axis="Z", sides=8) + # A mitten: the hand closed on nothing, its thumb toward the front. + items.box((0.07, 0.085, 0.1), b(x, 0.86, 0.015), "SKIN", bevel=0.015) + items.box((0.025, 0.035, 0.05), b(x - side * 0.03, 0.885, 0.055), "SKIN", bevel=0.006) + + +def thigh(side): + items.tube(0.085, 0.42, b(side * 0.11, 0.7, 0.0), "TAR", axis="Z", sides=8, radius2=0.075) + + +def shin(side): + x = side * 0.11 + items.tube(0.07, 0.22, b(x, 0.38, 0.0), "TAR", axis="Z", sides=8) + # A sea boot to below the knee, with its top turned down, and its foot. + items.tube(0.086, 0.26, b(x, 0.16, 0.0), "TAR_WEATHERED", axis="Z", sides=8, radius2=0.08) + items.tube(0.094, 0.05, b(x, 0.3, 0.0), "TAR", axis="Z", sides=8) + items.box((0.13, 0.25, 0.08), b(x, 0.04, 0.05), "TAR_WEATHERED", bevel=0.02) + + +def sail(): + # A canvas wing on two spars, swept back and bowed up at the tips, hung from a + # yoke over the shoulders. + for side in (-1.0, 1.0): + bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(side * 0.66, 2.06, -0.08)) + panel = bpy.context.active_object + panel.scale = (1.3, 0.85, 0.012) + panel.rotation_euler = (math.radians(4), math.radians(side * -9), math.radians(side * 12)) + items.finish(panel, "CANVAS") + bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(side * 0.62, 2.065, -0.1)) + band = bpy.context.active_object + band.scale = (1.2, 0.12, 0.016) + band.rotation_euler = (math.radians(4), math.radians(side * -9), math.radians(side * 12)) + items.finish(band, "OCHRE_RED") + items.tube(0.02, 1.36, b(side * 0.66, 2.1, 0.33), "PLANK", axis="X", sides=6, + rot_extra=(0.0, math.radians(side * -9), math.radians(side * 12))) + # The lines from the wing down to the yoke. + items.tube(0.007, 0.62, b(side * 0.3, 1.78, -0.12), "TAR", axis="Z", sides=4, + rot_extra=(0.0, math.radians(side * 30), 0.0)) + items.tube(0.024, 0.95, b(0.0, 2.08, -0.1), "PLANK", axis="Y", sides=6) + items.box((0.36, 0.05, 0.05), b(0.0, 1.5, -0.2), "PLANK", bevel=0.008) + + +BUILDERS = { + "pelvis": pelvis, + "torso": torso, + "head": head, + "upper_arm_r": lambda: upper_arm(-1.0), + "upper_arm_l": lambda: upper_arm(1.0), + "forearm_r": lambda: forearm(-1.0), + "forearm_l": lambda: forearm(1.0), + "thigh_r": lambda: thigh(-1.0), + "thigh_l": lambda: thigh(1.0), + "shin_r": lambda: shin(-1.0), + "shin_l": lambda: shin(1.0), + "sail": sail, +} + + +def export_part(name, objects): + """Moves a part so its joint is at the origin and writes it as an OBJ.""" + joint = b(*JOINTS[PARTS[name][0]]) + bpy.ops.object.select_all(action="DESELECT") + for obj in objects: + obj.location = (obj.location[0] - joint[0], obj.location[1] - joint[1], obj.location[2] - joint[2]) + obj.select_set(True) + bpy.ops.wm.obj_export( + filepath=os.path.join(OUT_DIR, name + ".obj"), export_selected_objects=True, + apply_modifiers=True, export_uv=False, export_normals=True, export_materials=True, + export_triangulated_mesh=True, forward_axis="NEGATIVE_Z", up_axis="Y", + export_object_groups=False, export_material_groups=False, path_mode="STRIP", + ) + for obj in objects: + obj.hide_set(True) + + +def main(): + os.makedirs(OUT_DIR, exist_ok=True) + items.clear_scene() + own_materials() + triangles = 0 + for name, make in BUILDERS.items(): + objects = built(make) + for obj in objects: + obj.data.update() + triangles += sum(len(poly.vertices) - 2 for poly in obj.data.polygons) + export_part(name, objects) + print("figure part %s done" % name) + info = { + "generator": "tools/models/figure.py", + "joints": {name: [round(v, 4) for v in at] for name, at in JOINTS.items()}, + "parts": {name: {"joint": joint, "parent": parent} for name, (joint, parent) in PARTS.items()}, + "hand_r": list(HAND_R), + "hand_l": list(HAND_L), + "height": 1.8, + "triangles_before_bevel": triangles, + } + with open(os.path.join(OUT_DIR, "figure.json"), "w") as out: + json.dump(info, out, indent="\t", sort_keys=True) + out.write("\n") + + +if __name__ == "__main__": + main() diff --git a/tools/models/items.py b/tools/models/items.py index a47e7d1..f7f2434 100644 --- a/tools/models/items.py +++ b/tools/models/items.py @@ -476,4 +476,5 @@ def main(): print("item %s done" % item_id) -main() +if __name__ == "__main__": + main()