Compare commits

..

52 Commits

Author SHA1 Message Date
Codex d0e3a8d551 Reset phone-game progress on every launch 2026-10-30 17:31:47 +02:00
Codex b572e0bf50 Connect the spare-key story and add flashlight-dependent stair descent 2026-10-30 14:59:20 +02:00
Codex d1c1375395 Establish mother's letter request in the first call 2026-10-30 14:23:05 +02:00
Codex 69d608765c Gate phone dialogue on heard discoveries and fix memory display 2026-10-30 13:39:50 +02:00
Codex b437475b75 Normalize bundled font license whitespace 2026-10-30 13:11:59 +02:00
Codex c60ba40e9b Polish phone typography and add black-screen redial epilogue 2026-10-30 13:11:25 +02:00
Codex aa45c6c0bd Remove request cancellation and protect the final mother dialogue 2026-10-30 12:49:18 +02:00
Codex 2476242d27 Remove marked menu captions and audio credits text 2026-10-30 12:35:31 +02:00
Codex 2df499ab7a Add centered main menu with bokeh backdrop and Escape navigation 2026-10-30 12:31:52 +02:00
Codex 1a90e1ad21 Raise siren volume and simplify the call screen 2026-10-30 12:26:10 +02:00
Codex 5b8d60b1f6 Extend pre-impact pause and synchronize both call timers 2026-10-30 01:49:04 +02:00
Codex 56d9af9d2e Redesign phone calls with a responsive word cloud and user siren 2026-10-30 01:38:31 +02:00
Codex 6549ba9308 Improve phone ambience and dialogue flow; keep stairwell intact 2026-10-30 01:03:42 +02:00
Codex eaefde2e07 Voice mother with Carol and synchronize all call events 2026-10-30 00:43:57 +02:00
Codex 23d4e49468 Complete Jessica voiceover for Katya and build DoOtboy 0.2.1 2026-10-30 00:23:30 +02:00
Codex b36d5acc8b Preserve Jessica voice samples and pending Katya voiceover 2026-10-29 22:45:42 +02:00
Codex 39f9af7b53 Add timed friend messages before and after the call breaks 2026-10-29 22:36:22 +02:00
Codex 2b2cc8686a Build ten-call DoOtboy phone narrative with draft Russian voices 2026-10-29 22:31:17 +02:00
JariKo 3bb991ae8f Revert idle arcade experiment and restore previous gameplay 2026-10-29 21:45:14 +02:00
JariKo 92f5135f9d Merge remote-tracking branch 'origin/main' 2026-10-29 21:39:41 +02:00
JariKo d7514e2f14 Add click-powered idle arcade abilities and roaming helpers 2026-10-29 21:39:15 +02:00
Codex 59cc83c552 Fix DoOtboy timed choices, validate UI endings and rename Katya 2026-10-29 21:36:20 +02:00
JariKo 7906dc6cec Record refreshed Windows build and verified Meshy apparatus 2026-10-29 21:16:30 +02:00
JariKo c843263c0a Add Do Otboy Godot apartment time-loop prototype 2026-10-29 17:27:47 +02:00
JariKo 12a360c0ea Document Meshy apparatus provenance and verified Windows build 2026-10-29 16:34:18 +02:00
JariKo 4ca0c2a899 Integrate five Meshy apparatus with fitted soul poses and anchored restraints 2026-10-29 16:31:02 +02:00
JariKo 4a8bcd13f1 Add matching multiview concepts for remaining five apparatus 2026-10-29 15:38:33 +02:00
JariKo b9751f3b52 Record verified Windows build with halved walking arm swing 2026-10-29 13:31:54 +02:00
JariKo 078cc5bb24 Halve walking arm swing for heroine and helpers 2026-10-29 13:29:58 +02:00
JariKo f60b87e725 Record packaged 65-second performance verification and soak commands 2026-10-29 13:20:20 +02:00
JariKo f4a01058d6 Fix delayed FPS collapse from dense imp collision recovery and repeated routing 2026-10-29 13:16:22 +02:00
JariKo e031595dc4 Record verified Windows build with incremental F5 and maiden optimizations 2026-10-29 12:48:58 +02:00
JariKo c48761ef20 Make F5 incremental and reduce iron maiden geometry, physics and idle updates 2026-10-29 12:47:09 +02:00
JariKo 18f944d9eb Record refreshed playable Windows build and matching local metadata 2026-10-29 12:23:41 +02:00
JariKo b0f3b0263f Record fresh Windows build and packaged gait verification 2026-10-29 11:53:58 +02:00
JariKo ebe00c366c Reduce walking arm swing and elbow flexion amplitude by twenty percent 2026-10-29 00:00:53 +02:00
JariKo cc22bdcc4b Synchronize elbow flexion and extension with human walking arm swing 2026-10-28 23:59:10 +02:00
JariKo fa92716570 Increase walking elbow flexion while preserving approved idle 2026-10-28 23:56:19 +02:00
JariKo ba19d752a6 Relax succubus arms, strengthen idle and allow Space to skip intro 2026-10-28 23:52:50 +02:00
JariKo b9a4e40c42 Detail maiden interior with matching PBR metals and progressive incandescence 2026-10-28 23:43:56 +02:00
JariKo fcd67109d4 Record Windows review build and fix exported maiden QA captures 2026-10-28 23:34:17 +02:00
JariKo e3a85d8dec Integrate painted Meshy succubus, fix arm skinning and add grounded idle 2026-10-28 23:30:37 +02:00
JariKo b28f15eec8 Replace iron maiden with textured Meshy model and working hinged doors 2026-10-28 23:29:42 +02:00
JariKo 49cf962945 Texture Meshy succubus from color reference and add approval turntable 2026-10-28 23:08:46 +02:00
JariKo f51f3f6449 Replace imps with rigged swamp demon and adapt gait and activities 2026-10-28 23:04:47 +02:00
JariKo 8ee99c0ea0 Archive Meshy succubus comparison and document generation limitations 2026-10-28 23:01:56 +02:00
JariKo c97a85d1f2 Record successful publication and fix OAuth scope for future pushes 2026-10-28 22:28:03 +02:00
JariKo 7f663969be Enable approved Infernal model and gait for heroine and helpers 2026-10-28 22:12:02 +02:00
JariKo e53a377ff3 Prepare painted rigged Infernal STL model and approval previews 2026-10-28 22:07:52 +02:00
JariKo a99162ae33 Add opening heroine orbit with Serafina voice and delayed controls 2026-10-28 21:11:24 +02:00
JariKo d40609c9ee Preserve initial outfit review and tested heel-safe gait for reference revision 2026-10-28 20:27:46 +02:00
JariKo 60471b44e6 Document active Git checkout and ongoing push workflow 2026-10-28 19:58:10 +02:00
488 changed files with 25305 additions and 209 deletions
+8
View File
@@ -6,3 +6,11 @@
*.py text eol=lf *.py text eol=lf
*.ps1 text eol=crlf *.ps1 text eol=crlf
*.glb filter=lfs diff=lfs merge=lfs -text *.glb filter=lfs diff=lfs merge=lfs -text
*.stl filter=lfs diff=lfs merge=lfs -text
*.blend filter=lfs diff=lfs merge=lfs -text
/Demon_v0.19/reviews/infernal_v01/*.gif filter=lfs diff=lfs merge=lfs -text
/tools/model_sources/meshy_v01/*.gif filter=lfs diff=lfs merge=lfs -text
*.fbx filter=lfs diff=lfs merge=lfs -text
/tools/model_sources/meshy_v01/painted_v02/*.gif filter=lfs diff=lfs merge=lfs -text
+2
View File
@@ -7,6 +7,7 @@
!/AGENTS.md !/AGENTS.md
!/PROJECT_NOTES.md !/PROJECT_NOTES.md
!/Demon_v0.19/ !/Demon_v0.19/
!/DoOtboy/
!/tools/ !/tools/
# Godot generated state, local exports and test output. # Godot generated state, local exports and test output.
@@ -19,6 +20,7 @@
**/*.bak **/*.bak
**/__pycache__/ **/__pycache__/
**/*.pyc **/*.pyc
**/*.blend1
/tools/godot/ /tools/godot/
/tools/templates/ /tools/templates/
+18
View File
@@ -1,5 +1,23 @@
# Succubus model credits # Succubus model credits
## Five apparatus models v01 (2026-10-29)
Pillory, stretching rack, wheel with water vat, musical chair and cauldron:
generated through Meshy image-to-3d from project concept art corrected using
built-in image_gen. Source GLBs retain PBR 4K; local Blender preparation sets
game scale, splits moving parts and exports PBR 2K. Water, effects, live cuffs,
chains, mechanical axes and final soul poses are implemented in the project.
Task IDs, original assets, previews, prompts and reproduction details:
tools/model_sources/equipment_meshy_v01/README.md and generation.json.
## Iron maiden v01 (2026-10-28)
Generated using Meshy from the user-approved project concept art. Resource:
multi-image-to-3d; task 01a1845b-d214-7150-8267-02bdbab6abd8. Game geometry,
independent hinged doors and smooth interior prepared locally in Blender.
Source, reference, provenance and reproduction commands:
tools/model_sources/iron_maiden_v01/README.md. PBR textures are retained.
Anatomical base, morphs, skeleton and weights: MakeHuman Community, CC0. Anatomical base, morphs, skeleton and weights: MakeHuman Community, CC0.
https://www.makehumancommunity.org/about/license.html https://www.makehumancommunity.org/about/license.html
https://github.com/makehumancommunity/makehuman/tree/master/makehuman/data https://github.com/makehumancommunity/makehuman/tree/master/makehuman/data
+12 -1
View File
@@ -1,7 +1,18 @@
# Demon 0.19 — уровень и экономика # Demon 0.19 — уровень и экономика
## Орудия Meshy — 29 октября
Колодки, дыба, колесо с чаном, музыкальный стул и котёл получили новые
текстурированные модели. Динамики стула направлены к голове, ноги стоят на
опоре. Колесо и валики вращаются отдельно от корпуса, вода остаётся в ёмкостях.
На каждом из шести орудий манжеты и цепи закрепляют кисти и лодыжки души.
Посадка проверена на всех десяти персонажах, включая контакт стоп и бёдер.
## Рабочие изменения 28 октября ## Рабочие изменения 28 октября
- Пробел пропускает вступительную кат-сцену: останавливает голос и возвращает игровую камеру и управление.
- В покое руки суккубы опущены вдоль тела со слегка согнутыми локтями; при беге двигаются в противофазе. Усилены дыхание, движения плеч, головы, крыльев и хвоста в айдле.
- На орудии: 10 секунд непрерывного бездействия — сгорание души и штраф 50 золота. Работа сбрасывает отсчёт. Награда за потерянную душу не выдаётся. - На орудии: 10 секунд непрерывного бездействия — сгорание души и штраф 50 золота. Работа сбрасывает отсчёт. Награда за потерянную душу не выдаётся.
- Очередь движется от приёмных ворот к воротам напротив. Первая душа ждёт 10 секунд, затем уходит со штрафом 50 золота. У следующей начинается новый отсчёт. Старых нарастающих штрафов больше нет; золото не уходит ниже нуля. - Очередь движется от приёмных ворот к воротам напротив. Первая душа ждёт 10 секунд, затем уходит со штрафом 50 золота. У следующей начинается новый отсчёт. Старых нарастающих штрафов больше нет; золото не уходит ниже нуля.
- Строительство, гримуар и пауза останавливают таймеры. Размещение на орудии занимает 0,5 секунды: распад на мелкие огоньки и сборка в правильной позе. До окончания эффекта работа заблокирована. - Строительство, гримуар и пауза останавливают таймеры. Размещение на орудии занимает 0,5 секунды: распад на мелкие огоньки и сборка в правильной позе. До окончания эффекта работа заблокирована.
@@ -15,7 +26,7 @@
Запуск: Demon.exe. Godot для игры устанавливать не нужно. Запуск: Demon.exe. Godot для игры устанавливать не нужно.
F5 — добавить 1000 золота, выставить максимальный опыт (уровень 10) и заполнить запас душ до 10 000 000. Повторные нажатия не дублируют очки навыков. F5 — добавить 1000 золота, 1000 душ и один уровень (до уровня 10). За новый уровень даётся одно очко навыков; на максимальном уровне добавляются только валюты. Удержание клавиши не повторяет бонус.
- Внизу появилась полоса опыта с уровнем и свободными очками навыков. - Внизу появилась полоса опыта с уровнем и свободными очками навыков.
- За золото покупаются новые типы орудий и их экземпляры. Улучшения, закалка и ранги орудий удалены из гримуара, строительства и расчёта наград. - За золото покупаются новые типы орудий и их экземпляры. Улучшения, закалка и ранги орудий удалены из гримуара, строительства и расчёта наград.
+6
View File
@@ -1,5 +1,11 @@
# Визуальные референсы 0.17 # Визуальные референсы 0.17
Обновление 29 октября 2026: рабочие модели всех шести орудий теперь используют
Meshy-геометрию и PBR из игровых концептов. Подготовленные референсы, задачи
и игровые кадры: tools/model_sources/equipment_meshy_v01/README.md.
Вода, эффекты и живые крепления добавлены отдельно. Ниже сохранена история
визуальных исследований прежних процедурных моделей.
Изображения изучены как референсы конструкции и пропорций. В сборку не включены чужие фотографии или текстуры: модели, геометрия, вода и эффекты созданы кодом проекта. Изображения изучены как референсы конструкции и пропорций. В сборку не включены чужие фотографии или текстуры: модели, геометрия, вода и эффекты созданы кодом проекта.
- [Science Museum Group: Ecclesiastical pillory, 1601–1800](https://collection.sciencemuseumgroup.org.uk/objects/co155179/ecclesiastical-pillory) — шарнирная деревянная доска с отверстиями для головы и кистей, железные крепления. - [Science Museum Group: Ecclesiastical pillory, 1601–1800](https://collection.sciencemuseumgroup.org.uk/objects/co155179/ecclesiastical-pillory) — шарнирная деревянная доска с отверстиями для головы и кистей, железные крепления.
+37 -2
View File
@@ -6,13 +6,23 @@ var ropes=[]
var heat_materials=[] var heat_materials=[]
var heat_light: OmniLight3D var heat_light: OmniLight3D
var heat=0.0 var heat=0.0
var applied_heat=-1.0
var tension=0.0 var tension=0.0
var submerged=false var submerged=false
var splash_count=0 var splash_count=0
var drops=[] var drops=[]
var wheel_cuffs=[] var wheel_cuffs=[]
var restraints
func setup(game,development): func setup(game,development):
g=game;d=development g=game;d=development
if d.device.get_meta("apparatus_model","")=="meshy_equipment_v01":
restraints=preload("res://apparatus_restraints.gd").new();restraints.setup(g,d)
if d.selected==2:
water=preload("res://water_surface.gd").new().build(g,d.device,1.29,Vector3(0,.87,.18),false)
water.scale.z=.76
for i in range(14):
var drop=g.ball(d.device,Vector3.ZERO,Vector3(.035,.075,.035),Color("9cbab9"));drop.hide();drops.append(drop)
return
if d.selected==1: if d.selected==1:
for x in [-0.42,0.42]: for x in [-0.42,0.42]:
for z in [-1.42,1.42]: for z in [-1.42,1.42]:
@@ -44,16 +54,42 @@ func setup(game,development):
var n=queue.pop_back() var n=queue.pop_back()
for c in n.get_children():queue.append(c) for c in n.get_children():queue.append(c)
if n is MeshInstance3D and n!=d.flame: if n is MeshInstance3D and n!=d.flame:
if d.device.get_meta("apparatus_model","")=="iron_maiden_v01":
for surface in range(n.mesh.get_surface_count()):
var original=n.get_active_material(surface)
var glow=preload("res://maiden_material.gd").make(original,d.device.global_position.y)
n.set_surface_override_material(surface,glow);heat_materials.append(glow)
continue
var mat=ShaderMaterial.new();mat.shader=preload("res://forged.gdshader") var mat=ShaderMaterial.new();mat.shader=preload("res://forged.gdshader")
if n.material_override is StandardMaterial3D:mat.set_shader_parameter("tint",n.material_override.albedo_color) if n.material_override is StandardMaterial3D:mat.set_shader_parameter("tint",n.material_override.albedo_color)
n.material_override=mat;heat_materials.append(mat) n.material_override=mat;heat_materials.append(mat)
heat_light=OmniLight3D.new();d.device.add_child(heat_light);heat_light.position=Vector3(0,1,0.8);heat_light.light_color=Color("ff5819");heat_light.omni_range=3;heat_light.light_energy=0 heat_light=OmniLight3D.new();d.device.add_child(heat_light);heat_light.position=Vector3(0,1,0.8);heat_light.light_color=Color("ff5819");heat_light.omni_range=3;heat_light.light_energy=0
restraints=preload("res://apparatus_restraints.gd").new();restraints.setup(g,d)
func reset(): func reset():
tension=0;heat=0;submerged=false tension=0;heat=0;submerged=false
if d.selected==3:apply_heat()
func apply_heat():
if is_equal_approx(heat,applied_heat):return
applied_heat=heat
for mat in heat_materials:mat.set_shader_parameter("heat",heat)
heat_light.visible=heat>.001
if d.device.get_meta("apparatus_model","")=="iron_maiden_v01":
heat_light.light_color=Color("ff2510").lerp(Color("ffad48"),smoothstep(.55,1.0,heat))
heat_light.light_energy=pow(heat,1.5)*3.2
else:heat_light.light_energy=heat*0.9
func update(dt,active): func update(dt,active):
var i=g.index_of(g.working) var i=g.index_of(g.working)
if restraints:restraints.update(g.souls[i].visual if i>=0 else null)
if d.device.has_meta("handle_rotor"):
var rotor=d.device.get_meta("handle_rotor")
if d.selected==2:rotor.rotation.z=d.crank.rotation.z
elif d.selected==1:
for part_name in ["HeadRoller","FootRoller"]:
var roller=d.device.find_child(part_name,true,false)
if roller:roller.rotation.x=d.crank.rotation.z
if d.selected==1 and i>=0: if d.selected==1 and i>=0:
tension=move_toward(tension,clampf(d.elapsed,0,1) if d.stage==0 else 1.0,dt*2) tension=move_toward(tension,clampf(d.elapsed,0,1) if d.stage==0 else 1.0,dt*2)
var s=g.souls[i] var s=g.souls[i]
@@ -82,5 +118,4 @@ func update(dt,active):
var target=clampf(d.elapsed/3.0,0,1) if i>=0 and d.stage>0 else 0.0 var target=clampf(d.elapsed/3.0,0,1) if i>=0 and d.stage>0 else 0.0
if d.release_clock>0:target=heat if d.release_clock>0:target=heat
heat=move_toward(heat,target,dt*(1.5 if target>heat else 0.3)) heat=move_toward(heat,target,dt*(1.5 if target>heat else 0.3))
for mat in heat_materials:mat.set_shader_parameter("heat",heat) apply_heat()
heat_light.light_energy=heat*0.9
+78
View File
@@ -0,0 +1,78 @@
extends Node3D
# Every live restraint has a body endpoint and an apparatus endpoint.
var g
var d
var bindings=[]
static var link_mesh: TorusMesh
static var link_material: StandardMaterial3D
func setup(game,state):
g=game;d=state;name="LiveRestraints"
d.device.add_child(self)
if link_mesh==null:
link_mesh=TorusMesh.new();link_mesh.inner_radius=.017;link_mesh.outer_radius=.027;link_mesh.rings=8;link_mesh.ring_segments=6
link_material=StandardMaterial3D.new();link_material.albedo_color=Color("605342");link_material.metallic=.85;link_material.roughness=.43
for side in ["L","R"]:
var sx=1.0 if side=="L" else -1.0
for wrist in [true,false]:
var bone=("wrist." if wrist else "foot.")+side
var parent_bone=("lowerarm01." if wrist else "lowerleg01.")+side
var cuff=preload("res://leather_cuff.gd").make(g,self,Vector3.ZERO,.080 if wrist else .095)
cuff.name="WristCuff"+side if wrist else "AnkleCuff"+side
var anchor=Marker3D.new();anchor.name="Anchor"+bone.replace(".","")
var support=d.crank if d.selected==2 else d.device
support.add_child(anchor)
anchor.position=anchor_at(d.selected,sx,wrist)
var eye=MeshInstance3D.new();eye.mesh=link_mesh;eye.material_override=link_material;support.add_child(eye);eye.position=anchor.position;eye.scale=Vector3.ONE*2
eye.rotation.x=PI/2
eye.set_meta("no_walk_collision",true)
eye.set_meta("apparatus_restraint",true);eye.cast_shadow=GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
var chain=MultiMeshInstance3D.new();add_child(chain);chain.name="Chain"+bone.replace(".","")
var mm=MultiMesh.new();mm.transform_format=MultiMesh.TRANSFORM_3D;mm.mesh=link_mesh;mm.instance_count=24;chain.multimesh=mm;chain.material_override=link_material
chain.cast_shadow=GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
bindings.append({"bone":bone,"parent_bone":parent_bone,"cuff":cuff,"anchor":anchor,"chain":chain,"eye":eye,"start":Vector3.ZERO,"end":Vector3.ZERO})
# No restraint geometry participates in NPC walking physics.
for mesh in find_children("*","MeshInstance3D",true,false):
mesh.set_meta("no_walk_collision",true);mesh.set_meta("apparatus_restraint",true);mesh.cast_shadow=GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
hide()
func anchor_at(kind,sx,wrist):
match kind:
0:return Vector3(sx*.59,1.70,0) if wrist else Vector3(sx*.35,.14,-.55)
1:return Vector3(sx*.42,1.16,-1.42 if wrist else 1.42)
2:return Vector3(sx*.74,.74 if wrist else -.74,.10)
3:return Vector3(sx*.40,1.40,-.30) if wrist else Vector3(sx*.25,.35,-.25)
4:return Vector3(sx*.61,1.06,.20) if wrist else Vector3(sx*.23,.30,.48)
return Vector3(sx*1.25,1.65,.15) if wrist else Vector3(sx*.35,.45,-.35)
func update(soul):
visible=soul!=null
for binding in bindings:
binding.eye.visible=visible
if not visible:continue
var at=to_local(soul.bone_world(binding.bone))
var toward=to_local(soul.bone_world(binding.parent_bone))-at
var axis=toward.normalized()
binding.cuff.position=at+axis*.045
binding.cuff.quaternion=Quaternion(Vector3.UP,axis)
var start=binding.cuff.position
var end=to_local(binding.anchor.global_position)
binding.start=start;binding.end=end
var length=start.distance_to(end)
var count=clampi(ceili(length/.043),2,24)
binding.chain.multimesh.visible_instance_count=count
var down=global_basis.inverse()*Vector3.DOWN
var sag=minf(.10,length*.10)
for j in range(count):
var t=(j+.5)/float(count)
var point=start.lerp(end,t)+down*sin(t*PI)*sag
var tangent=(end-start+down*cos(t*PI)*sag*PI).normalized()
if tangent.length_squared()<.001:tangent=Vector3.UP
var q=Quaternion(Vector3.FORWARD,tangent)*Quaternion(Vector3.FORWARD,PI/2 if j%2 else 0.0)
var scale_z=maxf(.65,length/maxi(count,1)/.047)
binding.chain.multimesh.set_instance_transform(j,Transform3D(Basis(q).scaled(Vector3(.70,1,scale_z)),point))
func _process(_dt):
if g==null or d==null or g.paused:return
var soul_id=d.get("soul",-1) if d is Dictionary else g.working
var placement=d.get("placement",0.0) if d is Dictionary else d.placement_clock
var i=g.index_of(soul_id)
update(g.souls[i].visual if i>=0 and placement<=0 else null)
func _exit_tree():
g=null;d=null
@@ -0,0 +1,23 @@
# Iron maiden physics mesh
The visible Meshy model is unchanged. These three concave shapes retain the hollow
body and the two separate moving doors, with small surface detail removed from
physics using a 12 cm world-space vertex grid and duplicate-triangle removal.
| Part | Render triangles | Collision triangles |
| --- | ---: | ---: |
| Body | 63,260 | 2,308 |
| Left door | 13,921 | 579 |
| Right door | 13,895 | 592 |
Generated from the committed `iron_maiden.glb` with
`tools/bake_maiden_collision.gd`. Run from the repository root:
```powershell
& tools/godot/Godot_v4.3-stable_win64_console.exe --path Demon_v0.19 --script "$PWD/tools/bake_maiden_collision.gd"
```
`iron_maiden.gd` attaches these shapes to the corresponding visible mesh nodes.
`mesh_walking.gd` uses them in the playable room; door transforms move the shapes
with their hinges. Background rooms use separate mesh-derived convex pieces to
avoid costly triangle contact recovery for decorative imps.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://c4pu3eygt6e4y"
path="res://.godot/imported/iron_maiden.glb-becc2a15b0689d3fd809e932ed47a928.scn"
[deps]
source_file="res://art/equipment/iron_maiden_v01/iron_maiden.glb"
dest_files=["res://.godot/imported/iron_maiden.glb-becc2a15b0689d3fd809e932ed47a928.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=false
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=true
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 15 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dx0sqfg38ks84"
path="res://.godot/imported/iron_maiden_Image_0.jpg-f6ee579cc3c55dbc17f6bfbca1b8dae5.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "abc55db7df710ef5a99ca62f55de62bb"
}
[deps]
source_file="res://art/equipment/iron_maiden_v01/iron_maiden_Image_0.jpg"
dest_files=["res://.godot/imported/iron_maiden_Image_0.jpg-f6ee579cc3c55dbc17f6bfbca1b8dae5.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c7u0kec30jl02"
path="res://.godot/imported/iron_maiden_Image_1.jpg-d51c196e2c01c86d3db2645e99535ca7.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "7269fcd31a2b122b8c924eadc56822f7"
}
[deps]
source_file="res://art/equipment/iron_maiden_v01/iron_maiden_Image_1.jpg"
dest_files=["res://.godot/imported/iron_maiden_Image_1.jpg-d51c196e2c01c86d3db2645e99535ca7.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 11 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dv2tn24mj4s58"
path="res://.godot/imported/iron_maiden_Image_2.jpg-da441b4b500293093b6aec87e40a7f71.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "97940641db71c7ef90df2e4c5be83693"
}
[deps]
source_file="res://art/equipment/iron_maiden_v01/iron_maiden_Image_2.jpg"
dest_files=["res://.godot/imported/iron_maiden_Image_2.jpg-da441b4b500293093b6aec87e40a7f71.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
@@ -0,0 +1,23 @@
{
"source_task": "01a1845b-d214-7150-8267-02bdbab6abd8",
"resource": "multi-image-to-3d",
"height_m": 3.1,
"hinges_blender": {
"LeftDoor": [
-0.8125486969947815,
0.0,
0.0
],
"RightDoor": [
0.8134756684303284,
0.0,
0.0
]
},
"door_height": [
0.25,
2.48
],
"construction": "Closed source partitioned once; two front quadrants, separate smooth lining, recomputed normals.",
"triangles": 92228
}
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://drlakfturx763"
path="res://.godot/imported/cauldron.glb-69377aa72ab7e693d61fe8d785e2c7dd.scn"
[deps]
source_file="res://art/equipment/meshy_v01/cauldron.glb"
dest_files=["res://.godot/imported/cauldron.glb-69377aa72ab7e693d61fe8d785e2c7dd.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=false
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 626 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dfkvm1rx3tylp"
path="res://.godot/imported/cauldron_Image_0.jpg-82af0cd9433e9561d24468926485625b.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "6ee5dc18888323a6375f02276d279650"
}
[deps]
source_file="res://art/equipment/meshy_v01/cauldron_Image_0.jpg"
dest_files=["res://.godot/imported/cauldron_Image_0.jpg-82af0cd9433e9561d24468926485625b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cios14t5t1hw4"
path="res://.godot/imported/cauldron_Image_1.jpg-e99b360e5d3d18a76559bcc70d11c9d6.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "8bb9e79b81725f84506c60cfee598d4a"
}
[deps]
source_file="res://art/equipment/meshy_v01/cauldron_Image_1.jpg"
dest_files=["res://.godot/imported/cauldron_Image_1.jpg-e99b360e5d3d18a76559bcc70d11c9d6.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 215 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d1bmb44kdd73e"
path="res://.godot/imported/cauldron_Image_2.jpg-5f648f294b1219d92b9678b0b8d5933d.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "b756803f20db251c2ba4d0dc3b6e7cf7"
}
[deps]
source_file="res://art/equipment/meshy_v01/cauldron_Image_2.jpg"
dest_files=["res://.godot/imported/cauldron_Image_2.jpg-5f648f294b1219d92b9678b0b8d5933d.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
@@ -0,0 +1,106 @@
{
"pillory": {
"source_sha256": "551d87b892e8e8cc67906791de5d0f8cb95640227f78aaed5e4bf38bc5b27d93",
"game_sha256": "72bb7ea9c5220236e7133773254e8f5a7d0efff97d2258f6966a01cc88e257d3",
"triangles": 15210,
"blender_bounds": [
[
-0.989691972732544,
-0.9544674754142761,
-0.000264640839304775
],
[
0.9891226291656494,
0.9544674754142761,
2.479335308074951
]
],
"parts": [
"Body",
"UpperYoke"
]
},
"rack": {
"source_sha256": "d5554a28bb812fd8aa0f0492204319f278f05d5024352cc63f393c08cef273df",
"game_sha256": "a1171784e85b1d4dff67d61fe633b797f19b52160f578b1683501afdbc0a4408",
"triangles": 7768,
"blender_bounds": [
[
-0.7920066118240356,
-1.5920144319534302,
-4.083245949004777e-05
],
[
0.7941781878471375,
1.8529947996139526,
1.3078043460845947
]
],
"parts": [
"Body",
"FootRoller",
"HeadRoller"
]
},
"wheel_vat": {
"source_sha256": "44370539c7ed35dea9027c1ed5546cb6f3b9e6cde01a99e837509d2db294051c",
"game_sha256": "b5405b2655ba65855a2c9d0b4988cfead813e91708fe775b2b05dcebaba0f576",
"triangles": 8791,
"blender_bounds": [
[
-1.870709776878357,
-1.6211438179016113,
-0.001041287905536592
],
[
1.8681535720825195,
1.6145036220550537,
2.9022161960601807
]
],
"parts": [
"Body",
"Wheel"
]
},
"musical_chair": {
"source_sha256": "14260d90cc5551932835b7b81e99d3396135435bb85d1c2ce1191f531801d727",
"game_sha256": "cc3c3e54837d51b7baa87bf5d9672f69720c3341c0fe50f76bf8b2bc6cce3e20",
"triangles": 13360,
"blender_bounds": [
[
-1.2581496238708496,
-0.8997828960418701,
0.00028335212846286595
],
[
1.259320855140686,
0.6499825119972229,
2.6508123874664307
]
],
"parts": [
"Body"
]
},
"cauldron": {
"source_sha256": "56a22608fb70daa6ef66b73fea1ab0fe28785f86dcee15a564c49d43a2d1596b",
"game_sha256": "05fc87f954a998865835c143b413ec3467701e284c97b0d2399972e2155531a5",
"triangles": 15207,
"blender_bounds": [
[
-1.7284685373306274,
-1.7284685373306274,
-7.974684558575973e-05
],
[
1.7284685373306274,
1.7284685373306274,
1.8782514333724976
]
],
"parts": [
"Body"
]
}
}
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b3doll1hqe7ig"
path="res://.godot/imported/musical_chair.glb-44ddcd0732b9d52b2fa32e427c5d5480.scn"
[deps]
source_file="res://art/equipment/meshy_v01/musical_chair.glb"
dest_files=["res://.godot/imported/musical_chair.glb-44ddcd0732b9d52b2fa32e427c5d5480.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=false
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 735 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b40cr237vbv8n"
path="res://.godot/imported/musical_chair_Image_0.jpg-053de38e3ebeed52d81ac5ed8dac7806.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "086406385e61b0f206b195b8894c4b93"
}
[deps]
source_file="res://art/equipment/meshy_v01/musical_chair_Image_0.jpg"
dest_files=["res://.godot/imported/musical_chair_Image_0.jpg-053de38e3ebeed52d81ac5ed8dac7806.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bf8pgswa0oskd"
path="res://.godot/imported/musical_chair_Image_1.jpg-bc02f0ce5eaec79fe69ebffcaeeef0ca.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "f36c93dfc34dfd7c851abdd909a223bc"
}
[deps]
source_file="res://art/equipment/meshy_v01/musical_chair_Image_1.jpg"
dest_files=["res://.godot/imported/musical_chair_Image_1.jpg-bc02f0ce5eaec79fe69ebffcaeeef0ca.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 292 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bmvoet4vx8fjb"
path="res://.godot/imported/musical_chair_Image_2.jpg-f34858caf80958636f5d5dbe10ae09eb.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "8857baf43123e06660221c508ce26750"
}
[deps]
source_file="res://art/equipment/meshy_v01/musical_chair_Image_2.jpg"
dest_files=["res://.godot/imported/musical_chair_Image_2.jpg-f34858caf80958636f5d5dbe10ae09eb.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://crvrmwu5h8o4l"
path="res://.godot/imported/pillory.glb-3dcbfc4dcba47871a6c80e600341d667.scn"
[deps]
source_file="res://art/equipment/meshy_v01/pillory.glb"
dest_files=["res://.godot/imported/pillory.glb-3dcbfc4dcba47871a6c80e600341d667.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=false
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 664 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://7worlr2b0lpb"
path="res://.godot/imported/pillory_Image_0.jpg-f12800529c7e9abdaadf80f66c4f5095.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "2797b7ab3249206940e9e30deea71f63"
}
[deps]
source_file="res://art/equipment/meshy_v01/pillory_Image_0.jpg"
dest_files=["res://.godot/imported/pillory_Image_0.jpg-f12800529c7e9abdaadf80f66c4f5095.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://miub4jdgd3ct"
path="res://.godot/imported/pillory_Image_1.jpg-df6eed64384ef131ad02abf65497ffba.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "ff11e9ab6c4a5a1cbb15907e0bb4ebab"
}
[deps]
source_file="res://art/equipment/meshy_v01/pillory_Image_1.jpg"
dest_files=["res://.godot/imported/pillory_Image_1.jpg-df6eed64384ef131ad02abf65497ffba.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 242 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://djrjxks4ryfmh"
path="res://.godot/imported/pillory_Image_2.jpg-d892275a93da1cf049a85939b9d04ab3.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "bb1f882658b98ec12602f9f919a3e74e"
}
[deps]
source_file="res://art/equipment/meshy_v01/pillory_Image_2.jpg"
dest_files=["res://.godot/imported/pillory_Image_2.jpg-d892275a93da1cf049a85939b9d04ab3.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://cg81un3gx8vu"
path="res://.godot/imported/rack.glb-989e29f95696746d85e72a29495d739c.scn"
[deps]
source_file="res://art/equipment/meshy_v01/rack.glb"
dest_files=["res://.godot/imported/rack.glb-989e29f95696746d85e72a29495d739c.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=false
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 596 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bb1im4sv73m4b"
path="res://.godot/imported/rack_Image_0.jpg-fad20199066b9d751e3f57917fe3afdb.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "b9968a01354976592dc664f40c5c65af"
}
[deps]
source_file="res://art/equipment/meshy_v01/rack_Image_0.jpg"
dest_files=["res://.godot/imported/rack_Image_0.jpg-fad20199066b9d751e3f57917fe3afdb.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bgkmfche66oq8"
path="res://.godot/imported/rack_Image_1.jpg-8514a5d44e4dbb4fde8b0c443373b417.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "818512251bccd984a81a5ae35d9a67f9"
}
[deps]
source_file="res://art/equipment/meshy_v01/rack_Image_1.jpg"
dest_files=["res://.godot/imported/rack_Image_1.jpg-8514a5d44e4dbb4fde8b0c443373b417.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 225 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://brvfilnf78g2q"
path="res://.godot/imported/rack_Image_2.jpg-a8cc7dbd72e863807a3d40c2370bf828.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "81d3f27df087e35e15e145abec941b98"
}
[deps]
source_file="res://art/equipment/meshy_v01/rack_Image_2.jpg"
dest_files=["res://.godot/imported/rack_Image_2.jpg-a8cc7dbd72e863807a3d40c2370bf828.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://cj05be3eovqpi"
path="res://.godot/imported/wheel_vat.glb-5ad411385cf592451d7717ff095a7c8a.scn"
[deps]
source_file="res://art/equipment/meshy_v01/wheel_vat.glb"
dest_files=["res://.godot/imported/wheel_vat.glb-5ad411385cf592451d7717ff095a7c8a.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=false
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 743 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dxxywvhhscsd5"
path="res://.godot/imported/wheel_vat_Image_0.jpg-977680068d04ba05c89d52364f16bba1.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "0704f24e6ab18d8042532693a0adeb5f"
}
[deps]
source_file="res://art/equipment/meshy_v01/wheel_vat_Image_0.jpg"
dest_files=["res://.godot/imported/wheel_vat_Image_0.jpg-977680068d04ba05c89d52364f16bba1.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d0mndbbij1ad5"
path="res://.godot/imported/wheel_vat_Image_1.jpg-20e9df67cdc82171578c564c93d7671a.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "897efcbe541ea93de7d8d6e9f668b427"
}
[deps]
source_file="res://art/equipment/meshy_v01/wheel_vat_Image_1.jpg"
dest_files=["res://.godot/imported/wheel_vat_Image_1.jpg-20e9df67cdc82171578c564c93d7671a.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 277 KiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cx5cnmxxhmljc"
path="res://.godot/imported/wheel_vat_Image_2.jpg-6316f58d34b1a98c8f038e640237e212.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "e847bf4c95eb5e3728c81cdbeb4be2c8"
}
[deps]
source_file="res://art/equipment/meshy_v01/wheel_vat_Image_2.jpg"
dest_files=["res://.godot/imported/wheel_vat_Image_2.jpg-6316f58d34b1a98c8f038e640237e212.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
@@ -0,0 +1,123 @@
{
"source_file": "Meshy_AI_Swamp_demon_20250714_texture.fbx",
"source_sha256": "4c65404ca40cf50ba871382424b116aab75e69544dc189cdd419ac139e5fc5cf",
"texture_sha256": "61cb0c8a705f574179b7735ee2c354054105812e8283a96146f8a7b4706ab8c8",
"vertices": 14998,
"triangles": 30000,
"height": 1.28,
"joints": {
"Body": {
"position": [
0,
0.57,
-0.1
],
"parent": ""
},
"Head": {
"position": [
0,
0.78,
0.2
],
"parent": "Body"
},
"LegL": {
"position": [
-0.24,
0.43,
-0.16
],
"parent": "Body"
},
"KneeL": {
"position": [
-0.27,
0.27,
-0.2
],
"parent": "LegL"
},
"FootL": {
"position": [
-0.28,
0.065,
0.16
],
"parent": "KneeL"
},
"LegR": {
"position": [
0.24,
0.43,
-0.16
],
"parent": "Body"
},
"KneeR": {
"position": [
0.27,
0.27,
-0.2
],
"parent": "LegR"
},
"FootR": {
"position": [
0.28,
0.065,
0.16
],
"parent": "KneeR"
},
"ArmL": {
"position": [
-0.35,
0.8,
-0.03
],
"parent": "Body"
},
"ElbowL": {
"position": [
-0.46,
0.45,
0.12
],
"parent": "ArmL"
},
"HandL": {
"position": [
-0.47,
0.16,
0.3
],
"parent": "ElbowL"
},
"ArmR": {
"position": [
0.35,
0.8,
-0.03
],
"parent": "Body"
},
"ElbowR": {
"position": [
0.46,
0.45,
0.12
],
"parent": "ArmR"
},
"HandR": {
"position": [
0.47,
0.16,
0.3
],
"parent": "ElbowR"
}
},
"animation": "Runtime imp_gait.gd IK and imp_activities.gd; original FBX has no rig or clips."
}
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://cea7mr1nksra6"
path="res://.godot/imported/swamp_imp.glb-d40fdf032f82ad5e23c18df7d32671f4.scn"
[deps]
source_file="res://art/imps/swamp_v01/swamp_imp.glb"
dest_files=["res://.godot/imported/swamp_imp.glb-d40fdf032f82ad5e23c18df7d32671f4.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ufopov3ktek1"
path="res://.godot/imported/swamp_imp_Meshy_AI_Swamp_demon_20250714_texture.png-6d779f4f7a37b9d71e2b2acb2b3528ca.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "375a1eb2c34fb7d820291ece3fbc0b5e"
}
[deps]
source_file="res://art/imps/swamp_v01/swamp_imp_Meshy_AI_Swamp_demon_20250714_texture.png"
dest_files=["res://.godot/imported/swamp_imp_Meshy_AI_Swamp_demon_20250714_texture.png-6d779f4f7a37b9d71e2b2acb2b3528ca.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bp2h37q5xsbmh"
path="res://.godot/imported/infernal_game.glb-784a16c52d1a54cac75b033abdf77181.scn"
[deps]
source_file="res://art/succubus/infernal_v01/infernal_game.glb"
dest_files=["res://.godot/imported/infernal_game.glb-784a16c52d1a54cac75b033abdf77181.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://3ewf2ue5ec7x"
path="res://.godot/imported/infernal_game_infernal_basecolor.png-176bfc5cb66a1a16f6a9562cbd0a57c2.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "ec06996f35d03b5dff4ef74214143a93"
}
[deps]
source_file="res://art/succubus/infernal_v01/infernal_game_infernal_basecolor.png"
dest_files=["res://.godot/imported/infernal_game_infernal_basecolor.png-176bfc5cb66a1a16f6a9562cbd0a57c2.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dwy7syq0fx6th"
path="res://.godot/imported/infernal_game_infernal_normal.png-2ffc28f6cf680dfae1d9df37d99308df.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "1fd5b6ab6d56b8a97cd3149923cfd9b1"
}
[deps]
source_file="res://art/succubus/infernal_v01/infernal_game_infernal_normal.png"
dest_files=["res://.godot/imported/infernal_game_infernal_normal.png-2ffc28f6cf680dfae1d9df37d99308df.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://vn6snu2s5d24"
path="res://.godot/imported/infernal_game_infernal_orm.png-5a89109bbf41773a273250e3f34517c8.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "e403e04738838a82a634d99ad78bcb53"
}
[deps]
source_file="res://art/succubus/infernal_v01/infernal_game_infernal_orm.png"
dest_files=["res://.godot/imported/infernal_game_infernal_orm.png-5a89109bbf41773a273250e3f34517c8.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
@@ -0,0 +1,38 @@
# Active Meshy succubus v02
Approved painted source: tools/model_sources/meshy_v01/painted_v02/succubus_painted.glb.
Meshy parent generation multi-image-to-3d / 01a18440-82d5-70e3-bd4f-720763eae473;
paint retexture / 01a18454-81f3-762f-b9b7-57b5e54af4a9. No new paid stages for integration.
Prepared locally with tools/build_meshy_succubus.py (Blender 5.0). Inputs include
existing tools/model_sources/infernal_game.blend and the committed skin ownership mask.
Run Blender with --background --python-exit-code 1 --python tools/build_meshy_succubus.py.
The optimized mesh keeps original face-corner UVs and PBR maps, receives the existing
166-bone rig, Idle/Walk/Whip tracks and the animated whip. Shoes and sculpture contacts
are separated. Exposed arm ownership uses the approved skin mask, rather than proximity
to a wing; arm geometry stays intact. Coincident shoulder seam weights are equalized
and smoothed so the forearm strips and shoulder tears do not reappear on movement.
Build checks finite animated coordinates, normalized weights and edge growth <0.12m.
Measured results are in manifest.json.
Runtime: succubus_actor.gd uses this GLB for heroine and helpers. meshy_gait.gd extends
the approved grounded gait: visible 4.2s breathing, shoulder/head drift, wing/tail
secondary motion. Relaxed arms are retargeted to the Meshy surface so hands hang
beside the thighs with slightly bent elbows. Opposing arm swing follows the actual
distance-driven run phase. Idle fades on walking/striking and freezes on pause.
Foot anchors remain fixed. No lip-sync added.
QA: --test-gait PASS including idle movement, grounded idle feet and paused idle,
heroine + three helpers, five speeds, turns, strikes, stopping, pause and teleport.
Intro test PASS with the model and idle. Local in-game idle/walk/strike captures inspected.
The final Windows EXE also passes --test-gait without SCRIPT ERROR/ERROR.
Windows build was made from a snapshot of 49cf962 plus this task's runtime changes,
because equipment/main scripts were concurrently being edited in the working checkout.
Those uncommitted equipment changes were not included or overwritten. Build output:
Demon_v0.19_Windows/Demon.exe (local only). Full rebuild command after the working tree
is ready: tools/build_v19.ps1 with the Godot 4.3 console executable path.
Generated staging sources, editable checkpoint, frames and logs stay under ignored
Demon_v0.19/captures/meshy-integration. Original high-poly painted Meshy source stays
in tools/model_sources/meshy_v01/painted_v02 for future texture/geometry edits.
@@ -0,0 +1,50 @@
{
"source_triangles": 1351422,
"game_vertices": 80237,
"game_triangles": 100405,
"bones": 166,
"clips": [
"Idle",
"Walk",
"Whip"
],
"max_nearest_source_distance": 0.27485957741737366,
"textures": [
[
8192,
8192
],
[
4096,
4096
],
[
4096,
4096
],
[
4096,
4096
],
[
4096,
4096
],
[
4096,
4096
]
],
"source_task": "01a18454-81f3-762f-b9b7-57b5e54af4a9",
"deformation_checks": {
"Idle": {
"max_edge_growth_m": 2.2243854526371454e-07
},
"Walk": {
"max_edge_growth_m": 2.385202800929409e-07
},
"Whip": {
"max_edge_growth_m": 0.05535165758474635
}
}
}
Binary file not shown.
@@ -0,0 +1,36 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b4jx0om4p8tqk"
path="res://.godot/imported/succubus_game.glb-371cf14b682e8237a655f82acd3ceb7b.scn"
[deps]
source_file="res://art/succubus/meshy_v02/succubus_game.glb"
dest_files=["res://.godot/imported/succubus_game.glb-371cf14b682e8237a655f82acd3ceb7b.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 21 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://lgtbfpkpxokg"
path="res://.godot/imported/succubus_game_Image_0.jpg-cec9ee0b6063a4ed57257d2acf1b244b.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "3bda756cc39262596720cd6398cdb83c"
}
[deps]
source_file="res://art/succubus/meshy_v02/succubus_game_Image_0.jpg"
dest_files=["res://.godot/imported/succubus_game_Image_0.jpg-cec9ee0b6063a4ed57257d2acf1b244b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://df5dubp7tpa2d"
path="res://.godot/imported/succubus_game_Image_1.jpg-c8a69432c00266d27fb55ac429807b82.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "17b15cb310d64a13af5c439cb855c271"
}
[deps]
source_file="res://art/succubus/meshy_v02/succubus_game_Image_1.jpg"
dest_files=["res://.godot/imported/succubus_game_Image_1.jpg-c8a69432c00266d27fb55ac429807b82.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 MiB

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d15nujrupbplf"
path="res://.godot/imported/succubus_game_Image_2.jpg-618758e2eaa20e2547d077b691b3c6ef.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "d569dc1c1ba7ab16f41c0115ff63134e"
}
[deps]
source_file="res://art/succubus/meshy_v02/succubus_game_Image_2.jpg"
dest_files=["res://.godot/imported/succubus_game_Image_2.jpg-618758e2eaa20e2547d077b691b3c6ef.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.
@@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://bamstjlukbfa1"
path="res://.godot/imported/intro_serafina.mp3-a51bcbb5fc574e842310b314086bb95b.mp3str"
[deps]
source_file="res://audio/intro_serafina.mp3"
dest_files=["res://.godot/imported/intro_serafina.mp3-a51bcbb5fc574e842310b314086bb95b.mp3str"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
View File
+13 -6
View File
@@ -16,6 +16,10 @@ var initialized=false
var moving=false var moving=false
var stride=1.55 var stride=1.55
var last_direction=Vector3.ZERO var last_direction=Vector3.ZERO
var stride_min=1.25
var stride_max=1.65
var track_width=.065
var swing_height=.15
func setup(owner_actor): func setup(owner_actor):
actor=owner_actor;skeleton=actor.find_children("*","Skeleton3D",true,false)[0] actor=owner_actor;skeleton=actor.find_children("*","Skeleton3D",true,false)[0]
@@ -67,7 +71,7 @@ func landing(f,progress,travel_direction):
# Narrow catwalk track, with enough clearance for the boots to pass each other. # Narrow catwalk track, with enough clearance for the boots to pass each other.
var side=1.0 if f.side=="L" else -1.0 var side=1.0 if f.side=="L" else -1.0
var destination=actor.global_position+travel_direction*((1.0-progress)*stride+stride*.25) var destination=actor.global_position+travel_direction*((1.0-progress)*stride+stride*.25)
destination+=actor.global_basis.x.normalized()*side*.065*scale_y destination+=actor.global_basis.x.normalized()*side*track_width*scale_y
destination.y=ground_height(f) destination.y=ground_height(f)
return destination return destination
@@ -81,7 +85,7 @@ func update(dt):
var was_moving=moving;moving=distance>.00015 and dt>0 var was_moving=moving;moving=distance>.00015 and dt>0
var scale_y=actor.global_basis.get_scale().y var scale_y=actor.global_basis.get_scale().y
# Longer steps at higher upgrade speeds; phase still follows the actual distance. # Longer steps at higher upgrade speeds; phase still follows the actual distance.
stride=lerpf(1.25,1.65,clampf((last_speed/scale_y-1.3)/2.0,0,1))*scale_y stride=lerpf(stride_min,stride_max,clampf((last_speed/scale_y-1.3)/2.0,0,1))*scale_y
walk_weight=move_toward(walk_weight,1.0 if moving else 0.0,dt*7) walk_weight=move_toward(walk_weight,1.0 if moving else 0.0,dt*7)
if moving: if moving:
distance_walked+=distance;phase=fposmod(phase+distance/stride,1.0) distance_walked+=distance;phase=fposmod(phase+distance/stride,1.0)
@@ -103,7 +107,7 @@ func update(dt):
var u=clampf((p-f.start_phase)/maxf(.01,1.0-f.start_phase),0,1) var u=clampf((p-f.start_phase)/maxf(.01,1.0-f.start_phase),0,1)
var ease=u*u*(3-2*u) var ease=u*u*(3-2*u)
f.target=f.start.lerp(f.landing,ease) f.target=f.start.lerp(f.landing,ease)
f.target.y=ground_height(f)+sin(u*PI)*.15*scale_y f.target.y=ground_height(f)+sin(u*PI)*swing_height*scale_y
else: else:
if not f.grounded: if not f.grounded:
f.anchor=f.landing;f.anchor.y=ground_height(f);f.yaw=actor.global_rotation.y;f.grounded=true f.anchor=f.landing;f.anchor.y=ground_height(f);f.yaw=actor.global_rotation.y;f.grounded=true
@@ -146,7 +150,10 @@ func update(dt):
skeleton.set_bone_pose_position(bones["root"],skeleton.to_local(root_position));skeleton.force_update_all_bone_transforms() skeleton.set_bone_pose_position(bones["root"],skeleton.to_local(root_position));skeleton.force_update_all_bone_transforms()
for f in feet: for f in feet:
leg(f,f.target) leg(f,f.target)
set_rotation("foot."+f.side,foot_orientation(f,dt))
func foot_orientation(f,_dt):
var yaw=f.yaw if f.grounded else actor.global_rotation.y var yaw=f.yaw if f.grounded else actor.global_rotation.y
var foot_rotation=Quaternion(Vector3.UP,yaw)*f.rotation var orientation=Quaternion(Vector3.UP,yaw)*f.rotation
if not f.grounded:foot_rotation=Quaternion(actor.global_basis.x.normalized(),sin(maxf(0,f.last_phase-.5)*TAU)*-.12)*foot_rotation if not f.grounded:orientation=Quaternion(actor.global_basis.x.normalized(),sin(maxf(0,f.last_phase-.5)*TAU)*-.12)*orientation
set_rotation("foot."+f.side,foot_rotation) return orientation
+3 -3
View File
@@ -119,9 +119,9 @@ func reward(amount=20):
func test_boost(): func test_boost():
g.coins+=1000 g.coins+=1000
g.essence=preload("res://progression.gd").MAX_RESOURCE g.essence+=1000
xp=Economy.XP_THRESHOLDS.back() var current=Economy.level(xp)
points=maxi(0,Economy.XP_THRESHOLDS.size()-1-g.speed_level-action_level-leadership) if current<Economy.XP_THRESHOLDS.size():reward(Economy.XP_THRESHOLDS[current]-xp)
g.refresh_ui() g.refresh_ui()
g.save_progress() g.save_progress()
g.say("Казна одобрила внеплановое финансирование.") g.say("Казна одобрила внеплановое финансирование.")
+13 -8
View File
@@ -85,20 +85,25 @@ func run(g):
Input.parse_input_event(key) Input.parse_input_event(key)
await g.get_tree().process_frame await g.get_tree().process_frame
check(g.coins==cash+2000,"F5 adds exactly 1000 per key press") check(g.coins==cash+2000,"F5 adds exactly 1000 per key press")
check(g.essence==g.Progression.MAX_RESOURCE and dev.xp==E.XP_THRESHOLDS.back() and E.level(dev.xp)==10,"F5 fills souls and maximum experience") check(g.essence==2000 and dev.xp==210 and E.level(dev.xp)==3,"two F5 presses add 2000 souls and exactly two levels")
check(dev.points==9,"F5 grants maximum available skill points") check(dev.points==2,"one skill point granted per gained level")
w.upgrade("speed");w.upgrade("power");w.upgrade("leadership") w.upgrade("speed");w.upgrade("power")
check(dev.points==6,"three learned skills consume three points") check(dev.points==0,"learned skills consume earned points")
g.essence=12;cash=g.coins;dev.test_boost() g.essence=12;cash=g.coins;dev.xp=250;dev.test_boost()
check(g.coins==cash+1000 and g.essence==g.Progression.MAX_RESOURCE and dev.points==6,"repeat boost refills souls without duplicating skill points") check(g.coins==cash+1000 and g.essence==1012 and dev.xp==370 and dev.points==1,"partial-level progress advances to next level; souls are added")
w.upgrade("leadership")
for i in range(10):dev.test_boost()
check(E.level(dev.xp)==10 and dev.points==6,"repeated boosts stop at maximum level without duplicate points")
var soul_cash=g.essence;cash=g.coins;dev.test_boost()
check(g.coins==cash+1000 and g.essence==soul_cash+1000 and dev.points==6,"at level cap both wallets still gain 1000 and points stay fixed")
var repeat=InputEventKey.new();repeat.keycode=KEY_F5;repeat.physical_keycode=KEY_F5;repeat.pressed=true;repeat.echo=true var repeat=InputEventKey.new();repeat.keycode=KEY_F5;repeat.physical_keycode=KEY_F5;repeat.pressed=true;repeat.echo=true
cash=g.coins;Input.parse_input_event(repeat);await g.get_tree().process_frame cash=g.coins;Input.parse_input_event(repeat);await g.get_tree().process_frame
check(g.coins==cash,"holding F5 does not repeatedly grant gold") check(g.coins==cash,"holding F5 does not repeatedly grant gold")
snap=g.progress_snapshot();path="user://qa_f5_v019.json" snap=g.progress_snapshot();path="user://qa_f5_v019.json"
check(g.Progression.write_save(path,snap)==OK,"F5 bonus save written") check(g.Progression.write_save(path,snap)==OK,"F5 bonus save written")
saved=g.Progression.read_save(path,g.build_id);DirAccess.remove_absolute(ProjectSettings.globalize_path(path)) saved=g.Progression.read_save(path,g.build_id);DirAccess.remove_absolute(ProjectSettings.globalize_path(path))
check(saved.essence==g.Progression.MAX_RESOURCE and saved.development.xp==E.XP_THRESHOLDS.back() and saved.development.points==6,"maximum souls, experience and remaining points survive save reload") check(saved.essence==g.essence and saved.development.xp==E.XP_THRESHOLDS.back() and saved.development.points==6,"added souls, experience and remaining points survive save reload")
check(g.gold_value.text==str(g.coins) and g.souls_value.text==str(g.essence),"F5 refreshes both resource counters") check(g.gold_value.text==str(g.coins) and g.souls_value.text==str(g.essence),"F5 refreshes both resource counters")
print("PASS: F5 +1000 gold per press, 10 million souls, maximum experience, no duplicate skill points, held-key protection and save round trip") print("PASS: F5 +1000 gold, +1000 souls, +one level per press, level cap, no duplicate skill points, held-key protection and save round trip")
print("ALL ECONOMY TESTS PASSED — DEMON 0.19 (%d checks)"%checks) print("ALL ECONOMY TESTS PASSED — DEMON 0.19 (%d checks)"%checks)
g.get_tree().quit() g.get_tree().quit()
+6 -1
View File
@@ -168,11 +168,16 @@ func bake_repeated(root,locations):
var n=queue.pop_back() var n=queue.pop_back()
for child in n.get_children():queue.append(child) for child in n.get_children():queue.append(child)
if n is CollisionShape3D: if n is CollisionShape3D:
# Bokeh rooms need solid silhouettes, not triangle-level ornament contact.
# Convex pieces avoid expensive capsule recovery when an imp gets stuck.
var collision=n.shape
var source_mesh=n.get_parent().get_parent()
if source_mesh is MeshInstance3D:collision=source_mesh.mesh.create_convex_shape(true,true)
for location in locations: for location in locations:
if absf(location.y)>.1 or absf(location.z)>20.1 or location.x< -22.1 or location.x>40.1:continue if absf(location.y)>.1 or absf(location.z)>20.1 or location.x< -22.1 or location.x>40.1:continue
var body=StaticBody3D.new();body.collision_layer=2;body.collision_mask=0;g.add_child(body) var body=StaticBody3D.new();body.collision_layer=2;body.collision_mask=0;g.add_child(body)
var tr=n.global_transform;tr.origin+=location;body.transform=tr var tr=n.global_transform;tr.origin+=location;body.transform=tr
var shape=CollisionShape3D.new();shape.shape=n.shape;body.add_child(shape) var shape=CollisionShape3D.new();shape.shape=collision;body.add_child(shape)
if not n is MeshInstance3D or not n.visible:continue if not n is MeshInstance3D or not n.visible:continue
var mm=MultiMesh.new();mm.transform_format=MultiMesh.TRANSFORM_3D;mm.mesh=n.mesh;mm.instance_count=locations.size() var mm=MultiMesh.new();mm.transform_format=MultiMesh.TRANSFORM_3D;mm.mesh=n.mesh;mm.instance_count=locations.size()
for i in range(locations.size()): for i in range(locations.size()):
+6
View File
@@ -24,6 +24,12 @@ func build(game,d):
preload("res://new_equipment.gd").new().build(g,d) preload("res://new_equipment.gd").new().build(g,d)
return return
var root=d.device var root=d.device
if d.selected in [0,1,2]:
preload("res://meshy_equipment.gd").new().build(g,d)
return
if d.selected==3:
preload("res://iron_maiden.gd").new().build(g,d)
return
if d.selected==0: if d.selected==0:
preload("res://pillory.gd").new().build(g,d) preload("res://pillory.gd").new().build(g,d)
return return
+157
View File
@@ -0,0 +1,157 @@
extends RefCounted
var failures=0
var checks=0
var folder=""
func check(ok,label):
checks+=1
if not ok:failures+=1;push_error("EQUIPMENT QA: "+label)
func shot(g,name):
if DisplayServer.get_name()=="headless":return
await g.get_tree().process_frame
await g.get_tree().process_frame
await RenderingServer.frame_post_draw
g.get_viewport().get_texture().get_image().save_png(folder+"/"+name+".png")
func triangles(d):
var faces=PackedVector3Array()
for mesh in d.device.find_children("*","MeshInstance3D",true,false):
if mesh.get_parent().name=="LiveRestraints" or mesh.get_meta("no_walk_collision",false) or not mesh.is_visible_in_tree() or mesh.mesh is QuadMesh:continue
if mesh.mesh is ArrayMesh:
for v in mesh.mesh.get_faces():faces.append(d.device.to_local(mesh.to_global(v)))
return faces
func clear_ray(faces,a,b):
for j in range(0,faces.size(),3):
if Geometry3D.segment_intersects_triangle(a,b,faces[j],faces[j+1],faces[j+2])!=null:return false
return true
func skin_contacts(actor,d):
var feet=PackedVector3Array()
var thighs=PackedVector3Array()
for mesh in actor.model.find_children("*","MeshInstance3D",true,false):
if mesh.skin==null:continue
var matrices=[];var names=[]
for bind in range(mesh.skin.get_bind_count()):
var index=actor.skeleton.find_bone(mesh.skin.get_bind_name(bind))
if index<0:index=mesh.skin.get_bind_bone(bind)
matrices.append(actor.skeleton.get_bone_global_pose(index)*mesh.skin.get_bind_pose(bind))
names.append(actor.skeleton.get_bone_name(index))
for surface in range(mesh.mesh.get_surface_count()):
var arrays=mesh.mesh.surface_get_arrays(surface)
var vertices=arrays[Mesh.ARRAY_VERTEX];var bones=arrays[Mesh.ARRAY_BONES];var weights=arrays[Mesh.ARRAY_WEIGHTS]
for j in range(vertices.size()):
var max_weight=0.0;var dominant=0
for k in range(4):
if weights[j*4+k]>max_weight:max_weight=weights[j*4+k];dominant=bones[j*4+k]
var bone=names[dominant]
var is_foot=bone.begins_with("foot.") or bone.begins_with("toe")
var is_thigh=bone.begins_with("upperleg")
if not is_foot and not is_thigh:continue
var p=Vector3.ZERO
for k in range(4):
if weights[j*4+k]>0:p+=(matrices[bones[j*4+k]]*vertices[j])*weights[j*4+k]
p=d.device.to_local(actor.skeleton.to_global(p))
if is_foot:feet.append(p)
else:thighs.append(p)
return {"feet":feet,"thighs":thighs}
func run(g):
await g.get_tree().create_timer(.3).timeout
g.start_game();g.set_process(false);g.reset_shift();g.game_started=true;g.paused=false
g.hud.hide();g.menu.show_page("")
for imp in g.life.imps+g.life.neighbours:imp.root.hide()
folder="res://captures/equipment-meshy" if OS.has_feature("editor") else OS.get_executable_path().get_base_dir()+"/captures/equipment-meshy"
DirAccess.make_dir_recursive_absolute(folder)
var w=g.workshop
for kind in range(6):
if "--equipment-only=4" in OS.get_cmdline_user_args() and kind!=4:continue
var d=w.add_station(kind,Vector3(3,0,0))
d.motion.restraints.set_process(false)
var original_faces=triangles(d)
check(d.device.get_meta("apparatus_model","") in ["meshy_equipment_v01","iron_maiden_v01"],"prepared model %d"%kind)
if kind==2:
check(absf(d.crank.position.y-1.62)<.01,"wheel origin at axle")
check(d.motion.water!=null and d.motion.water.get_parent()!=d.crank,"water independent from wheel")
var water_before=d.motion.water.transform
d.crank.rotation.z=PI/2
check(d.motion.water.transform==water_before,"turning wheel leaves water stationary")
d.crank.rotation.z=0
if kind==5:
check(d.special.liquid.position.y<1.65 and d.special.liquid.position.y>.5,"liquid below rim above hollow floor")
for soul_kind in range(10):
var actor=g.make_person(false,soul_kind);g.add_child(actor);g.make_ghost(actor,soul_kind);g.set_soul_reveal(actor,1);actor.mount_station(kind)
actor.position=d.device.position;actor.rotation=Vector3.ZERO
if kind==1:actor.rotation.x=-PI/2;actor.position+=Vector3(0,1.04,1.13)
elif kind==2:actor.position+=Vector3(0,.47,.27)
elif kind==3:actor.position+=Vector3(0,.22,0)
elif kind==5:actor.position+=Vector3(0,.45,0);actor.scale=Vector3.ONE*.85
actor.update_torture(.01,false)
d.motion.restraints.update(actor)
check(d.motion.restraints.bindings.size()==4,"four live restraints %d/%d"%[kind,soul_kind])
for binding in d.motion.restraints.bindings:
var body_point=d.motion.restraints.to_local(actor.bone_world(binding.bone))
check(binding.cuff.position.distance_to(body_point)<.06,"cuff follows bone %d/%d/%s"%[kind,soul_kind,binding.bone])
check(binding.end.distance_to(d.motion.restraints.to_local(binding.anchor.global_position))<.001,"chain ends at apparatus")
check(binding.chain.multimesh.visible_instance_count>=2,"chain links visible")
var head=d.device.to_local(actor.bone_world("head"))
if kind in [0,4,5]:
var contacts=skin_contacts(actor,d)
var sole=INF
for p in contacts.feet:sole=minf(sole,p.y)
var floor_y=.10 if kind==0 else (.33 if kind==4 else .40)
check(sole>=floor_y-.01,"actual foot vertices clear base %d/%d min=%f"%[kind,soul_kind,sole])
if kind==4:
if soul_kind==0:print("SEAT_GEOMETRY hip=",actor.bone_local("upperleg01.L")," knee=",actor.bone_local("lowerleg01.L")," ankle=",actor.bone_local("foot.L"))
var penetration=0
for p in contacts.thighs:
if absf(p.x)<.46 and p.z>-.43 and p.z<.125 and p.y<.69:penetration+=1
check(penetration==0,"actual thigh vertices clear cushion %d count=%d"%[soul_kind,penetration])
if kind==0:
for bone in ["head","wrist.L","wrist.R"]:
var at=d.device.to_local(actor.bone_world(bone))
for offset in [-.035,0,.035]:
check(clear_ray(original_faces,Vector3(at.x+offset,at.y,-.3),Vector3(at.x+offset,at.y,.3)),"open aperture clears %d/%s"%[soul_kind,bone])
elif kind==1:
for bone in ["root","spine01","spine02","head"]:
var at=d.device.to_local(actor.bone_world(bone))
check(at.y>.94 and absf(at.z)<1.65,"lying torso above bed %d/%s %s"%[soul_kind,bone,str(at)])
elif kind==2:
check(Vector2(head.x,head.y-1.62).length()<1.28,"head within wheel radius")
for angle in [0.0,PI/2,PI,PI*1.5]:
d.crank.rotation.z=angle
actor.rotation.z=angle;actor.position=d.device.position+Vector3(sin(angle)*1.15,1.62-cos(angle)*1.15,.27)
actor.update_torture(.01,false);d.motion.restraints.update(actor)
var torso=d.device.to_local(actor.bone_world("spine02"))
check(Vector2(torso.x,torso.y-1.62).length()<1.28 and torso.z>.18,"body follows front of wheel through full turn")
if soul_kind==7 and angle in [PI/2,PI]:await shot(g,"wheel-angle-%d"%roundi(rad_to_deg(angle)))
d.crank.rotation.z=0;actor.rotation.z=0;actor.position=d.device.position+Vector3(0,.47,.27);actor.update_torture(0,false)
elif kind==4:
for bone in ["root","upperleg01.L","upperleg01.R"]:
var at=d.device.to_local(actor.bone_world(bone))
check(at.y>.76 and absf(at.x)<.48,"hips clear seat and fit width")
for speaker in d.special.speaker_roots:
var target=d.device.to_local(actor.bone_world("head"))-speaker.position
check(speaker.basis.z.dot(target.normalized())>.92,"speaker points toward actual head")
elif kind==5:
for bone in ["root","spine01","upperleg01.L","upperleg01.R","foot.L","foot.R"]:
var at=d.device.to_local(actor.bone_world(bone))
check(Vector2(at.x,at.z).length()<1.15 and at.y>.40,"submerged body fits cavity %d/%s %s"%[soul_kind,bone,str(at)])
if soul_kind in [0,7]:
d.motion.restraints.update(actor)
g.camera.position=d.device.position+Vector3(4.0,2.8,4.8);g.camera.look_at(d.device.position+Vector3(0,1.25,0));g.camera.size=4.7
await shot(g,"%d-soul-%d"%( [kind,soul_kind] ))
# All four quarter-turns keep body, anchors and cuffs in the same frame.
d.motion.restraints.update(actor)
var before=[]
for binding in d.motion.restraints.bindings:before.append(binding.cuff.global_position-d.device.position)
var initial=actor.transform
for turn in range(4):
d.device.rotation.y=turn*PI/2
actor.transform=Transform3D(Basis(Vector3.UP,turn*PI/2),d.device.position)*Transform3D(initial.basis,initial.origin-d.device.position)
d.motion.restraints.update(actor)
for j in range(4):check(d.motion.restraints.bindings[j].cuff.global_position.distance_to(d.device.position+before[j].rotated(Vector3.UP,turn*PI/2))<.002,"rotation preserves attachment sides")
d.device.rotation.y=0;actor.transform=initial
actor.queue_free()
await g.get_tree().process_frame
d.motion.restraints.update(null)
check(not d.motion.restraints.visible,"empty apparatus hides live cuffs and chains")
w.dispose_station(d);w.stations.erase(d);w.bars.clear()
await g.get_tree().process_frame
if failures==0:print("ALL EQUIPMENT TESTS PASSED (%d): 6 apparatus, 10 souls, apertures, cavities, seat, inward speakers, moving wheel, four rotations, four anchored restraints"%checks)
g.get_tree().quit(1 if failures else 0)
+37
View File
@@ -10,9 +10,29 @@ func run(g):
var actors=[g.avatar] var actors=[g.avatar]
for h in g.workshop.helpers:actors.append(h.model) for h in g.workshop.helpers:actors.append(h.model)
for actor in actors: for actor in actors:
actor.reset_gait()
for frame in range(10):actor._process(1.0/60)
var hand_start=actor.gait.point("wrist.L")
var feet_start=[actor.gait.point("foot.L"),actor.gait.point("foot.R")]
var idle_motion=0.0
for frame in range(240):
actor._process(1.0/60)
idle_motion=maxf(idle_motion,actor.gait.point("wrist.L").distance_to(hand_start))
check(idle_motion>.012,"visible idle breathing and relaxed arm motion")
for side in ["L","R"]:
var upper=actor.gait.point("lowerarm01."+side)-actor.gait.point("upperarm01."+side)
var forearm=actor.gait.point("wrist."+side)-actor.gait.point("lowerarm01."+side)
check(upper.normalized().dot(Vector3.DOWN)>.96,"retargeted idle arms remain near vertical")
check(upper.angle_to(forearm)>deg_to_rad(8) and upper.angle_to(forearm)<deg_to_rad(30),"relaxed elbow bend")
for i in range(2):check(actor.gait.point("foot."+actor.gait.feet[i].side).distance_to(feet_start[i])<.003,"idle feet stay grounded")
var idle_time=actor.gait.idle_time
g.paused=true;actor._process(.05);check(is_equal_approx(actor.gait.idle_time,idle_time),"pause freezes idle animation");g.paused=false
for speed in [1.0,2.5,3.3,4.375,5.775]: for speed in [1.0,2.5,3.3,4.375,5.775]:
actor.get_parent().position=Vector3.ZERO;actor.rotation=Vector3.ZERO;actor.striking=false;actor.refresh();actor.animator.advance(0);actor.reset_gait() actor.get_parent().position=Vector3.ZERO;actor.rotation=Vector3.ZERO;actor.striking=false;actor.refresh();actor.animator.advance(0);actor.reset_gait()
var max_slide=0.0;var max_error=0.0;var max_lift=0.0;var min_contact=10.0;var planted_frames=0 var max_slide=0.0;var max_error=0.0;var max_lift=0.0;var min_contact=10.0;var planted_frames=0
var hand_min=Vector2(INF,INF);var hand_max=Vector2(-INF,-INF);var cross_sum=0.0
var hand_sum=Vector2.ZERO;var samples=0;var elbow_min=INF;var elbow_max=0.0
var forward_angles=0.0;var back_angles=0.0;var forward_samples=0;var back_samples=0
for frame in range(240): for frame in range(240):
var before=[] var before=[]
for f in actor.gait.feet:before.append({"grounded":f.grounded,"anchor":f.anchor,"position":actor.gait.point("foot."+f.side)}) for f in actor.gait.feet:before.append({"grounded":f.grounded,"anchor":f.anchor,"position":actor.gait.point("foot."+f.side)})
@@ -20,6 +40,19 @@ func run(g):
actor.get_parent().position+=direction*speed/60 actor.get_parent().position+=direction*speed/60
actor.rotation.y=lerp_angle(actor.rotation.y,atan2(direction.x,direction.z),.16) actor.rotation.y=lerp_angle(actor.rotation.y,atan2(direction.x,direction.z),.16)
actor._process(1.0/60) actor._process(1.0/60)
if frame>30 and frame<110:
var hand_offsets=Vector2.ZERO
for side_index in range(2):
var side="L" if side_index==0 else "R"
hand_offsets[side_index]=(actor.gait.point("wrist."+side)-actor.gait.point("upperarm01."+side)).dot(actor.global_basis.z.normalized())
hand_min[side_index]=minf(hand_min[side_index],hand_offsets[side_index]);hand_max[side_index]=maxf(hand_max[side_index],hand_offsets[side_index])
var upper=actor.gait.point("lowerarm01."+side)-actor.gait.point("upperarm01."+side)
var forearm=actor.gait.point("wrist."+side)-actor.gait.point("lowerarm01."+side)
var angle=upper.angle_to(forearm);elbow_min=minf(elbow_min,angle);elbow_max=maxf(elbow_max,angle)
var swing_direction=upper.normalized().dot(actor.global_basis.z.normalized())
if swing_direction>.05:forward_angles+=angle;forward_samples+=1
if swing_direction<-.05:back_angles+=angle;back_samples+=1
cross_sum+=hand_offsets.x*hand_offsets.y;hand_sum+=hand_offsets;samples+=1
for i in range(2): for i in range(2):
var f=actor.gait.feet[i];var actual=actor.gait.point("foot."+f.side) var f=actor.gait.feet[i];var actual=actor.gait.point("foot."+f.side)
max_error=maxf(max_error,actual.distance_to(f.target)) max_error=maxf(max_error,actual.distance_to(f.target))
@@ -31,6 +64,10 @@ func run(g):
check(max_slide<.003,"stance slip "+str(actor.scale.x)+" "+str(speed)) check(max_slide<.003,"stance slip "+str(actor.scale.x)+" "+str(speed))
check(min_contact>-.002,"ground clearance") check(min_contact>-.002,"ground clearance")
check(max_lift>.08 and planted_frames>150,"alternating lift/support") check(max_lift>.08 and planted_frames>150,"alternating lift/support")
check(hand_max.x-hand_min.x>.12 and hand_max.y-hand_min.y>.12,"both hands swing during locomotion")
check(cross_sum/samples-(hand_sum.x/samples)*(hand_sum.y/samples)<0,"opposing left/right arm swing")
check(elbow_min<deg_to_rad(23) and elbow_max>deg_to_rad(28) and elbow_max<deg_to_rad(39),"half swing still extends beside body and flexes forward")
check(forward_samples>0 and back_samples>0 and forward_angles/maxi(1,forward_samples)>back_angles/maxi(1,back_samples)+deg_to_rad(9),"elbow flexion follows actual forward/backward shoulder swing")
print("GAIT_METRICS ",JSON.stringify({"scale":actor.scale.x,"speed":speed,"max_slide":max_slide,"max_target_error":max_error,"max_lift":max_lift,"min_contact":min_contact})) print("GAIT_METRICS ",JSON.stringify({"scale":actor.scale.x,"speed":speed,"max_slide":max_slide,"max_target_error":max_error,"max_lift":max_lift,"min_contact":min_contact}))
var phase=actor.gait.phase var phase=actor.gait.phase
for frame in range(30):actor._process(1.0/60) for frame in range(30):actor._process(1.0/60)
+18 -80
View File
@@ -1,81 +1,19 @@
extends RefCounted extends RefCounted
func build(g): const SCENE=preload("res://art/imps/swamp_v01/swamp_imp.glb")
var r=Node3D.new();r.name="Imp";r.set_meta("species","imp");r.set_meta("model_revision",2) const JOINTS={
var s=preload("res://hero.gd").new();s.g=g "Body":[Vector3(0,.57,-.10),""],"Head":[Vector3(0,.78,.20),""],
var skin=Color("785140");var horn=Color("30251f");var hide=Color("352b25");var rim=Color("907558") "LegL":[Vector3(-.24,.43,-.16),""],"KneeL":[Vector3(-.27,.27,-.20),"LegL"],"FootL":[Vector3(-.28,.065,.16),"KneeL"],
# A rounded abdomen, narrow waist, stooped chest and articulated limbs. "LegR":[Vector3(.24,.43,-.16),""],"KneeR":[Vector3(.27,.27,-.20),"LegR"],"FootR":[Vector3(.28,.065,.16),"KneeR"],
s.loft(r,Vector3.ZERO,[[.35,.13,.12,0],[.44,.19,.145,0],[.55,.205,.17,-.025],[.69,.20,.18,-.045],[.80,.165,.155,-.025],[.88,.085,.09,.025]],skin) "ArmL":[Vector3(-.35,.80,-.03),""],"ElbowL":[Vector3(-.46,.45,.12),"ArmL"],"HandL":[Vector3(-.47,.16,.30),"ElbowL"],
for side in [-1,1]: "ArmR":[Vector3(.35,.80,-.03),""],"ElbowR":[Vector3(.46,.45,.12),"ArmR"],"HandR":[Vector3(.47,.16,.30),"ElbowR"]}
s.tube(r,[Vector3(side*.13,.80,-.035),Vector3(side*.19,.69,-.09),Vector3(side*.13,.54,-.12)],[.065,.075,.04],skin.darkened(.10)) func build(_g):
var head=Node3D.new();r.add_child(head);head.name="Head";head.position=Vector3(0,.85,.035) var root=Node3D.new();root.name="Imp";root.set_meta("species","imp");root.set_meta("model_revision",3);root.set_meta("model_asset","swamp_v01");root.set_meta("knee_bend",-1.0)
s.loft(head,Vector3.ZERO,[[-.055,.075,.075,.02],[.015,.13,.115,.045],[.105,.158,.125,.035],[.19,.137,.105,.015],[.235,.075,.07,0],[.25,.025,.03,0]],skin) var nodes={}
for side in [-1,1]: for key in JOINTS:
s.tube(head,[Vector3(side*.105,.19,-.02),Vector3(side*.17,.29,-.07),Vector3(side*.15,.40,-.105),Vector3(side*.095,.435,-.075)],[.051,.036,.017,.001],horn) var item=JOINTS[key];var node=Node3D.new();nodes[key]=node
for j in range(4): var parent=root if item[1]=="" else nodes[item[1]]
var ridge=TorusMesh.new();ridge.inner_radius=.030-j*.003;ridge.outer_radius=.036-j*.003;ridge.rings=24;ridge.ring_segments=12 parent.add_child(node)
var a=g.mesh_node(head,ridge,Vector3(side*(.12+j*.013),.22+j*.026,-.025-j*.015),horn.lightened(.10));a.scale=Vector3(1,.5,1) node.name="Knee" if key.begins_with("Knee") else ("Foot" if key.begins_with("Foot") else ("Elbow" if key.begins_with("Elbow") else ("Hand" if key.begins_with("Hand") else key)))
s.tube(head,[Vector3(side*.13,.13,.005),Vector3(side*.27,.185,-.06),Vector3(side*.23,.075,-.025)],[.056,.009,.001],skin) node.position=item[0]-(Vector3.ZERO if item[1]=="" else JOINTS[item[1]][0])
s.tube(head,[Vector3(side*.16,.135,.006),Vector3(side*.237,.163,-.035)],[.026,.002],skin.darkened(.25)) var visual=SCENE.instantiate();visual.name="SwampVisual";root.add_child(visual)
var eye=Node3D.new();head.add_child(eye);eye.name="EyeL" if side<0 else "EyeR";eye.position=Vector3(side*.067,.126,.139) return root
g.ball(eye,Vector3.ZERO,Vector3(.068,.035,.026),Color("c7aa6b"));g.ball(eye,Vector3(0,0,.014),Vector3(.012,.027,.008),Color("17130f"))
g.ball(eye,Vector3(-.012,.007,.016),Vector3.ONE*.006,Color("efdaa8"))
s.tube(head,[Vector3(side*.018,.168,.117),Vector3(side*.10,.157,.129),Vector3(side*.13,.14,.105)],[.021,.025,.008],skin.darkened(.12))
s.tube(head,[Vector3(side*.04,.065,.139),Vector3(side*.10,.070,.12)],[.025,.014],skin.lightened(.05))
g.ball(head,Vector3(side*.025,.075,.173),Vector3(.014,.009,.006),horn)
s.tube(head,[Vector3(side*.053,.028,.143),Vector3(side*.058,.06,.156)],[.012,.001],Color("b4a48a"))
s.tube(head,[Vector3(0,.125,.13),Vector3(0,.070,.184),Vector3(0,.057,.164)],[.026,.030,.018],skin.darkened(.08))
s.tube(head,[Vector3(-.07,.022,.12),Vector3(0,.009,.151),Vector3(.07,.022,.12)],[.006,.009,.006],Color("38231d"))
g.ball(head,Vector3(0,-.025,.102),Vector3(.09,.05,.065),skin.darkened(.06))
for side in [-1,1]:
var leg=Node3D.new();r.add_child(leg);leg.name="LegL" if side<0 else "LegR";leg.position=Vector3(side*.135,.44,0)
s.tube(leg,[Vector3.ZERO,Vector3(0,-.09,.02),Vector3(0,-.19,.025)],[.077,.070,.054],skin)
var knee=Node3D.new();leg.add_child(knee);knee.name="Knee";knee.position=Vector3(0,-.19,.025)
g.ball(knee,Vector3(0,0,.014),Vector3(.115,.105,.10),skin.darkened(.08))
s.tube(knee,[Vector3.ZERO,Vector3(0,-.08,-.025),Vector3(0,-.19,-.025)],[.052,.046,.033],skin)
var foot=Node3D.new();knee.add_child(foot);foot.name="Foot";foot.position=Vector3(0,-.19,-.025)
for toe in [-1,1]:
s.loft(foot,Vector3(toe*.034,0,0),[[-.052,.032,.080,.052],[-.02,.034,.083,.050],[.025,.031,.065,.035],[.055,.021,.035,.005]],horn)
g.line(foot,Vector3(toe*.034,-.025,.130),Vector3(toe*.034,.014,.105),.006,rim.darkened(.3))
var arm=Node3D.new();r.add_child(arm);arm.name="ArmL" if side<0 else "ArmR";arm.position=Vector3(side*.18,.77,.005)
s.tube(arm,[Vector3.ZERO,Vector3(side*.055,-.10,.005),Vector3(side*.085,-.22,.025)],[.069,.062,.045],skin)
var elbow=Node3D.new();arm.add_child(elbow);elbow.name="Elbow";elbow.position=Vector3(side*.085,-.22,.025)
g.ball(elbow,Vector3.ZERO,Vector3(.09,.085,.085),skin.darkened(.05))
s.tube(elbow,[Vector3.ZERO,Vector3(side*.018,-.12,.035),Vector3(side*.025,-.23,.075)],[.044,.039,.029],skin)
g.ball(elbow,Vector3(side*.025,-.25,.078),Vector3(.075,.09,.05),skin)
for finger in range(3):
var a=Vector3(side*.025+(finger-1)*.024,-.28,.083)
s.tube(elbow,[a,a+Vector3(0,-.045,.015),a+Vector3(0,-.055,.035)],[.011,.008,.001],horn)
s.tube(elbow,[Vector3(-side*.005,-.23,.085),Vector3(-side*.025,-.265,.11)],[.015,.004],skin)
s.loft(r,Vector3.ZERO,[[.33,.16,.13,0],[.40,.185,.15,0],[.47,.19,.16,0]],hide)
s.loft(r,Vector3.ZERO,[[.445,.193,.164,0],[.475,.193,.164,0]],rim.darkened(.35))
for i in range(7):g.line(r,Vector3(-.12+i*.04,.435,.151),Vector3(-.11+i*.04,.405,.15),.004,rim)
var tail=Node3D.new();r.add_child(tail);tail.name="Tail"
s.tube(tail,[Vector3(0,.41,-.13),Vector3(.08,.32,-.30),Vector3(.23,.35,-.44),Vector3(.29,.49,-.44),Vector3(.25,.56,-.39)],[.033,.026,.019,.012,.002],skin)
for i in range(5):g.ball(r,Vector3(0,.49+i*.055,-.18),Vector3(.035,.035,.045),horn)
merge_parts(r)
return r
func merge_parts(root):
# Bake fixed details per articulated part, preserving vertex colours and rig nodes.
for child in root.get_children():
if child is Node3D and not child is MeshInstance3D:merge_parts(child)
var st=SurfaceTool.new();st.begin(Mesh.PRIMITIVE_TRIANGLES)
var sources=[]
for n in root.get_children():
if not n is MeshInstance3D:continue
sources.append(n)
var color=n.material_override.albedo_color
for surface in range(n.mesh.get_surface_count()):
var arrays=n.mesh.surface_get_arrays(surface)
var verts=arrays[Mesh.ARRAY_VERTEX];var normals=arrays[Mesh.ARRAY_NORMAL];var indices=arrays[Mesh.ARRAY_INDEX]
var size=indices.size() if indices!=null and indices.size()>0 else verts.size()
for i in range(size):
var index=indices[i] if indices!=null and indices.size()>0 else i
st.set_color(color.srgb_to_linear())
st.set_normal((n.transform.basis.inverse().transposed()*normals[index]).normalized())
st.add_vertex(n.transform*verts[index])
if sources.is_empty():return
st.index();var mesh=MeshInstance3D.new();mesh.mesh=st.commit()
var material=StandardMaterial3D.new();material.vertex_color_use_as_albedo=true;material.roughness=.88
mesh.material_override=material;root.add_child(mesh)
for n in sources:n.free()
+1 -1
View File
@@ -45,7 +45,7 @@ func make_props(imp):
g.box(props,Vector3(.14,.09,.65),Vector3(.40,.06,.15),Color("595447")) g.box(props,Vector3(.14,.09,.65),Vector3(.40,.06,.15),Color("595447"))
for x in range(9):g.line(props,Vector3(-.04+x*.045,.08,.65),Vector3(-.04+x*.045,.025,.72),.014,Color("8e8a70")) for x in range(9):g.line(props,Vector3(-.04+x*.045,.08,.65),Vector3(-.04+x*.045,.025,.72),.014,Color("8e8a70"))
elif imp.activity in ["clean","draw"]: elif imp.activity in ["clean","draw"]:
props.reparent(imp.model.get_node("ArmR"),false);props.position=Vector3(.11,-.46,.10) props.reparent(imp.model.get_node("ArmR/Elbow/Hand"),false);props.position=Vector3(0,-.025,.03)
if imp.activity=="clean": if imp.activity=="clean":
g.box(props,Vector3(0,0,.06),Vector3(.14,.05,.16),Color("68432d")) g.box(props,Vector3(0,0,.06),Vector3(.14,.05,.16),Color("68432d"))
for i in range(5):g.line(props,Vector3((i-2)*.025,-.02,.06),Vector3((i-2)*.025,-.08,.09),.008,Color("b9a47a")) for i in range(5):g.line(props,Vector3((i-2)*.025,-.02,.06),Vector3((i-2)*.025,-.08,.09),.008,Color("b9a47a"))
+31 -6
View File
@@ -3,6 +3,7 @@ var root: Node3D
var variation=0.0 var variation=0.0
var model var model
var feet=[] var feet=[]
var skin=preload("res://imp_skin.gd").new()
var previous=Vector3.ZERO var previous=Vector3.ZERO
var phase=.1 var phase=.1
var clock=0.0 var clock=0.0
@@ -15,26 +16,51 @@ const CYCLE_DISTANCE=.48
func setup(record): func setup(record):
model=record.model;root=record.root;variation=record.phase;previous=root.global_position model=record.model;root=record.root;variation=record.phase;previous=root.global_position
feet.clear() feet.clear()
skin=preload("res://imp_skin.gd").new();skin.setup(model)
phase=.1;weight=0;body_height=0;body_rotation=Vector3.ZERO;last_direction=Vector3.ZERO phase=.1;weight=0;body_height=0;body_rotation=Vector3.ZERO;last_direction=Vector3.ZERO
for side in ["L","R"]: for side in ["L","R"]:
var leg=model.get_node("Leg"+side);var knee=leg.get_node("Knee");var foot=knee.get_node("Foot") var leg=model.get_node("Leg"+side);var knee=leg.get_node("Knee");var foot=knee.get_node("Foot")
feet.append({"leg":leg,"knee":knee,"foot":foot,"side":side,"anchor":foot.global_position,"target":foot.global_position,"start":foot.global_position,"landing":foot.global_position,"swing":false,"yaw":root.rotation.y,"last_phase":.1 if side=="L" else .6}) feet.append({"width":leg.position.x+knee.position.x+foot.position.x,"forward":leg.position.z+knee.position.z+foot.position.z,"leg":leg,"knee":knee,"foot":foot,"side":side,"anchor":foot.global_position,"target":foot.global_position,"start":foot.global_position,"landing":foot.global_position,"swing":false,"yaw":root.rotation.y,"last_phase":.1 if side=="L" else .6})
func reset(): func reset():
previous=root.global_position;weight=0;phase=.1;last_direction=Vector3.ZERO previous=root.global_position;weight=0;phase=.1;last_direction=Vector3.ZERO
model.position=Vector3.ZERO;body_height=0;body_rotation=Vector3.ZERO;model.rotation=Vector3.ZERO model.position=Vector3.ZERO;body_height=0;body_rotation=Vector3.ZERO;model.rotation=Vector3.ZERO
for f in feet:f.leg.rotation=Vector3.ZERO;f.knee.rotation=Vector3.ZERO;f.foot.rotation=Vector3.ZERO for f in feet:f.leg.rotation=Vector3.ZERO;f.knee.rotation=Vector3.ZERO;f.foot.rotation=Vector3.ZERO
for f in feet: for f in feet:
f.anchor=f.foot.global_position;f.anchor.y=root.global_position.y+.06;f.target=f.anchor;f.swing=false;f.yaw=root.rotation.y f.anchor=f.foot.global_position;f.anchor.y=root.global_position.y+.06;f.target=f.anchor;f.swing=false;f.yaw=root.rotation.y
skin.update()
func solve(f): func solve(f):
var hip=f.leg.global_position;var l1=f.knee.position.length();var l2=f.foot.position.length() var hip=f.leg.global_position;var l1=f.knee.position.length();var l2=f.foot.position.length()
var delta=f.target-hip;var distance=clampf(delta.length(),absf(l1-l2)+.001,l1+l2-.001) var delta=f.target-hip;var distance=clampf(delta.length(),absf(l1-l2)+.001,l1+l2-.001)
var direction=delta.normalized();var forward=root.global_basis.z.normalized() var direction=delta.normalized();var forward=root.global_basis.z.normalized()
var bend=(forward-direction*forward.dot(direction)).normalized() var bend=(forward-direction*forward.dot(direction)).normalized()*float(model.get_meta("knee_bend",1.0))
var along=(l1*l1-l2*l2+distance*distance)/(2*distance) var along=(l1*l1-l2*l2+distance*distance)/(2*distance)
var elbow=hip+direction*along+bend*sqrt(maxf(0,l1*l1-along*along)) var elbow=hip+direction*along+bend*sqrt(maxf(0,l1*l1-along*along))
f.leg.quaternion=Quaternion(f.knee.position.normalized(),(f.leg.get_parent().to_local(elbow)-f.leg.position).normalized()) f.leg.quaternion=Quaternion(f.knee.position.normalized(),(f.leg.get_parent().to_local(elbow)-f.leg.position).normalized())
f.knee.quaternion=Quaternion(f.foot.position.normalized(),(f.leg.to_local(f.target)-f.knee.position).normalized()) f.knee.quaternion=Quaternion(f.foot.position.normalized(),(f.leg.to_local(f.target)-f.knee.position).normalized())
f.foot.global_rotation=Vector3(0,f.yaw,0) f.foot.global_rotation=Vector3(0,f.yaw,0)
func pose_work_hands():
var activity=root.get_meta("activity","")
if activity not in ["clean","mop","draw"]:return
var t=clock
for side in ["L","R"]:
if side=="L" and activity!="mop":continue
var arm=model.get_node("Arm"+side);var elbow=arm.get_node("Elbow");var hand=elbow.get_node("Hand")
var target=Vector3(.12,.35,.57) if side=="R" else Vector3(-.12,.54,.47)
if activity=="mop":target.z+=sin(t*3)*.10
elif activity=="clean":target=Vector3(.30+cos(t*6)*.04,.54+sin(t*6)*.035,.54)
else:target=Vector3(.26+cos(t*7)*.045,.84+sin(t*7)*.045,.53)
target=root.to_global(target)
var shoulder=arm.global_position;var l1=elbow.position.length();var l2=hand.position.length()
var delta=target-shoulder;var distance=clampf(delta.length(),absf(l1-l2)+.001,l1+l2-.001)
var direction=delta.normalized();target=shoulder+direction*distance
var outward=root.global_basis.x*(-1 if side=="L" else 1)
var bend=(outward-direction*outward.dot(direction)).normalized()
var along=(l1*l1-l2*l2+distance*distance)/(2*distance)
var joint=shoulder+direction*along+bend*sqrt(maxf(0,l1*l1-along*along))
arm.quaternion=Quaternion(elbow.position.normalized(),(arm.get_parent().to_local(joint)-arm.position).normalized())
elbow.quaternion=Quaternion(hand.position.normalized(),(arm.to_local(target)-elbow.position).normalized())
hand.global_rotation=root.global_rotation
arm_pose[0 if side=="L" else 1]=arm.rotation
func update(dt,acting=false): func update(dt,acting=false):
dt=minf(dt,.05);clock+=dt dt=minf(dt,.05);clock+=dt
var delta=root.global_position-previous;delta.y=0;previous=root.global_position var delta=root.global_position-previous;delta.y=0;previous=root.global_position
@@ -51,7 +77,7 @@ func update(dt,acting=false):
if moving: if moving:
if p>=.56: if p>=.56:
if not f.swing:f.start=f.target;f.swing=true if not f.swing:f.start=f.target;f.swing=true
f.landing=root.global_position+root.global_basis.x*(-.135 if f.side=="L" else .135)+forward*.08;f.landing.y=ground f.landing=root.global_position+root.global_basis.x*f.width+forward*(f.forward+.08);f.landing.y=ground
var t=clampf((p-.56)/.44,0,1);f.target=f.start.lerp(f.landing,smoothstep(0,1,t));f.target.y=ground+sin(t*PI)*.065 var t=clampf((p-.56)/.44,0,1);f.target=f.start.lerp(f.landing,smoothstep(0,1,t));f.target.y=ground+sin(t*PI)*.065
else: else:
if f.swing:f.anchor=f.landing;f.anchor.y=ground;f.swing=false;f.yaw=root.rotation.y if f.swing:f.anchor=f.landing;f.anchor.y=ground;f.swing=false;f.yaw=root.rotation.y
@@ -77,6 +103,5 @@ func update(dt,acting=false):
arm_pose[i]=arm_pose[i].lerp(desired,1-exp(-dt*8));arm.rotation=arm_pose[i] arm_pose[i]=arm_pose[i].lerp(desired,1-exp(-dt*8));arm.rotation=arm_pose[i]
arm.get_node("Elbow").rotation.x=-.05-sin(phase*TAU+i*PI)*.045*weight arm.get_node("Elbow").rotation.x=-.05-sin(phase*TAU+i*PI)*.045*weight
model.get_node("Head").rotation=Vector3(sin(clock*2)*.012, sin(clock*.8+variation)*.025, -sin(phase*TAU)*.018*weight) model.get_node("Head").rotation=Vector3(sin(clock*2)*.012, sin(clock*.8+variation)*.025, -sin(phase*TAU)*.018*weight)
var blink=absf(sin(clock*.68+variation)) if acting:pose_work_hands()
for side in ["L","R"]:model.get_node("Head/Eye"+side).scale.y=clampf(blink*24,.10,1) skin.update()
model.get_node("Tail").rotation.y=sin(clock*2.4+variation)*(.12+.08*weight)
+24
View File
@@ -0,0 +1,24 @@
extends RefCounted
# Drive the imported skin from the same IK/activity controls used by navigation.
var model:Node3D
var skeleton:Skeleton3D
var bindings=[]
func setup(root):
model=root;skeleton=find_skeleton(model.get_node("SwampVisual"))
assert(skeleton!=null,"Swamp imp must contain its skin skeleton")
var controls={"Body":"Body","Head":"Head","LegL":"LegL","KneeL":"LegL/Knee","FootL":"LegL/Knee/Foot","LegR":"LegR","KneeR":"LegR/Knee","FootR":"LegR/Knee/Foot","ArmL":"ArmL","ElbowL":"ArmL/Elbow","HandL":"ArmL/Elbow/Hand","ArmR":"ArmR","ElbowR":"ArmR/Elbow","HandR":"ArmR/Elbow/Hand"}
for name in controls:
var index=skeleton.find_bone(name);assert(index>=0,"Missing swamp bone: "+name)
bindings.append({"index":index,"control":model.get_node(controls[name]),"rest":skeleton.get_bone_global_rest(index)})
update()
func find_skeleton(node):
if node is Skeleton3D:return node
for child in node.get_children():
var found=find_skeleton(child)
if found:return found
return null
func update():
for binding in bindings:
var control=model.global_transform.affine_inverse()*binding.control.global_transform
var pose=Transform3D(control.basis*binding.rest.basis,control.origin)
skeleton.set_bone_global_pose_override(binding.index,skeleton.global_transform.affine_inverse()*model.global_transform*pose,1.0,true)
+33 -1
View File
@@ -5,11 +5,38 @@ func check(ok,label):
func shot(g,name): func shot(g,name):
await g.get_tree().process_frame;await RenderingServer.frame_post_draw await g.get_tree().process_frame;await RenderingServer.frame_post_draw
g.get_viewport().get_texture().get_image().save_png("res://captures/imps-v02/"+name+".png") g.get_viewport().get_texture().get_image().save_png("res://captures/imps-v02/"+name+".png")
func verify_skin(imp):
var skin=imp.gait.skin
check(skin.skeleton.get_bone_count()==14,"all fourteen skin joints imported")
for binding in skin.bindings:
var actual=skin.skeleton.global_transform*skin.skeleton.get_bone_global_pose(binding.index)
check(actual.origin.distance_to(binding.control.global_position)<.0001,"skin follows IK control: "+str(binding.index))
var meshes=imp.model.get_node("SwampVisual").find_children("*","MeshInstance3D",true,false)
check(meshes.size()==1,"single shared textured mesh per imp")
for mesh in meshes:
check(mesh.skin!=null and mesh.skin.get_bind_count()==14,"mesh is actually skinned")
check(mesh.get_active_material(0).albedo_texture!=null,"original colour texture preserved")
var arrays=mesh.mesh.surface_get_arrays(0)
var vertices=arrays[Mesh.ARRAY_VERTEX];var bones=arrays[Mesh.ARRAY_BONES];var weights=arrays[Mesh.ARRAY_WEIGHTS]
var low=Vector3(INF,INF,INF);var high=-low
for i in range(vertices.size()):
var pos=Vector3.ZERO;var total=0.0
for j in range(4):
var weight=weights[i*4+j]
if weight<=0:continue
var bind=bones[i*4+j];var index=skin.skeleton.find_bone(mesh.skin.get_bind_name(bind))
if index<0:index=mesh.skin.get_bind_bone(bind)
pos+=(skin.skeleton.get_bone_global_pose(index)*mesh.skin.get_bind_pose(bind)*vertices[i])*weight;total+=weight
check(pos.is_finite() and absf(total-1)<.001,"finite normalized deformed vertices")
low=low.min(pos);high=high.max(pos)
check((high-low).length()<2.8,"skin remains bounded without exploding vertices")
func run(g): func run(g):
await g.get_tree().create_timer(.3).timeout await g.get_tree().create_timer(.3).timeout
g.start_game();g.set_process(false);g.reset_shift();g.game_started=true;g.paused=false g.start_game();g.set_process(false);g.reset_shift();g.game_started=true;g.paused=false
var imp=g.life.imps[0];var gait=imp.gait var imp=g.life.imps[0];var gait=imp.gait
check(imp.model.get_meta("model_revision")==2 and imp.model.has_node("LegL/Knee/Foot") and imp.model.has_node("ArmR/Elbow") and imp.model.has_node("Head/EyeL"),"new articulated model") check(imp.model.get_meta("model_revision")==3 and imp.model.has_node("LegL/Knee/Foot") and imp.model.has_node("ArmR/Elbow") and imp.model.has_node("SwampVisual"),"new articulated model")
verify_skin(imp)
for actor in g.life.imps+g.life.neighbours:check(actor.model.get_meta("model_asset")=="swamp_v01","replacement applied to all 28 imps")
for fps in [30,60,144]: for fps in [30,60,144]:
for speed in [.5,1.25]: for speed in [.5,1.25]:
imp.root.position=Vector3(3,0,2);imp.root.rotation=Vector3.ZERO;imp.model.rotation=Vector3.ZERO;imp.model.position=Vector3.ZERO imp.root.position=Vector3(3,0,2);imp.root.rotation=Vector3.ZERO;imp.model.rotation=Vector3.ZERO;imp.model.position=Vector3.ZERO
@@ -24,6 +51,7 @@ func run(g):
var f=gait.feet[i];max_error=maxf(max_error,f.foot.global_position.distance_to(f.target));min_floor=minf(min_floor,f.foot.global_position.y-.052) var f=gait.feet[i];max_error=maxf(max_error,f.foot.global_position.distance_to(f.target));min_floor=minf(min_floor,f.foot.global_position.y-.052)
if not f.swing and not last[i].swing and f.anchor.is_equal_approx(last[i].anchor):max_slide=maxf(max_slide,f.foot.global_position.distance_to(last[i].at)) if not f.swing and not last[i].swing and f.anchor.is_equal_approx(last[i].anchor):max_slide=maxf(max_slide,f.foot.global_position.distance_to(last[i].at))
check(max_error<.006,"foot reach %d %.2f"%[fps,speed]);check(max_slide<.004,"planted hoof slip %d %.2f"%[fps,speed]);check(min_floor>-.005,"hooves stay above floor") check(max_error<.006,"foot reach %d %.2f"%[fps,speed]);check(max_slide<.004,"planted hoof slip %d %.2f"%[fps,speed]);check(min_floor>-.005,"hooves stay above floor")
verify_skin(imp)
var phase=gait.phase var phase=gait.phase
for i in range(fps):gait.update(1.0/fps) for i in range(fps):gait.update(1.0/fps)
check(is_equal_approx(gait.phase,phase),"blocked imp does not march in place") check(is_equal_approx(gait.phase,phase),"blocked imp does not march in place")
@@ -37,10 +65,14 @@ func run(g):
g.life.move_imp(imp,Vector3(1,0,0),1.0/60) g.life.move_imp(imp,Vector3(1,0,0),1.0/60)
check(imp.root.position.distance_to(before)<.04,"crowd avoidance has no teleport pushes") check(imp.root.position.distance_to(before)<.04,"crowd avoidance has no teleport pushes")
check(absf(angle_difference(yaw,imp.root.rotation.y))<=.051,"turn speed bounded") check(absf(angle_difference(yaw,imp.root.rotation.y))<=.051,"turn speed bounded")
DirAccess.make_dir_recursive_absolute("res://captures/imps-v02")
for kind in ["clean","mop","draw","hum"]: for kind in ["clean","mop","draw","hum"]:
if kind=="clean" and g.workshop.stations.is_empty():g.workshop.add_station(0,Vector3(2,0,0));g.workshop.rebuild_nav() if kind=="clean" and g.workshop.stations.is_empty():g.workshop.add_station(0,Vector3(2,0,0));g.workshop.rebuild_nav()
g.life.activities.finish(imp);g.life.activities.start(imp,kind);imp.root.position=imp.activity_target;gait.reset() g.life.activities.finish(imp);g.life.activities.start(imp,kind);imp.root.position=imp.activity_target;gait.reset()
for i in range(50):g.life.activities.update(imp,.02);gait.update(.02,true) for i in range(50):g.life.activities.update(imp,.02);gait.update(.02,true)
verify_skin(imp)
g.hud.hide();g.player.hide();g.camera.position=imp.root.position+Vector3(2,1.6,3);g.camera.look_at(imp.root.position+Vector3(0,.65,0));g.camera.size=2.6
await shot(g,"activity-"+kind)
var arm=imp.model.get_node("ArmR").rotation;g.life.activities.finish(imp);gait.update(.02,false) var arm=imp.model.get_node("ArmR").rotation;g.life.activities.finish(imp);gait.update(.02,false)
check(imp.model.get_node("ArmR").rotation.distance_to(arm)<.35,"activity returns smoothly to walking") check(imp.model.get_node("ArmR").rotation.distance_to(arm)<.35,"activity returns smoothly to walking")
DirAccess.make_dir_recursive_absolute("res://captures/imps-v02") DirAccess.make_dir_recursive_absolute("res://captures/imps-v02")
+35
View File
@@ -0,0 +1,35 @@
extends "res://catwalk.gd"
# Approved Infernal locomotion: grounded heels and gentle secondary motion.
var secondary_time=0.0
func _init():
stride_min=.95;stride_max=1.15;track_width=.09;swing_height=.11
func ground_height(f):
return actor.get_parent().global_position.y+f.rest.y*actor.global_basis.get_scale().y+.004
func update(dt):
super.update(dt)
secondary_time+=dt
for side in ["L","R"]:
var sign_x=1.0 if side=="L" else -1.0
rotate_world("Wing."+side,actor.global_basis.y,sign_x*sin(phase*TAU-.7)*.035*walk_weight)
rotate_world("Wing."+side,actor.global_basis.z,sign_x*sin(phase*TAU*2-.5)*.022*walk_weight)
rotate_world("Wing."+side,actor.global_basis.y,sign_x*sin(secondary_time*.8)*.010)
var tail_angle=sin(secondary_time*.95)*.012+sin(phase*TAU-.9)*.024*walk_weight
rotate_world("Tail",actor.global_basis.y,tail_angle)
rotate_world("Tail",actor.global_basis.x,sin(secondary_time*.7)*.006)
func foot_orientation(f,dt):
var body_yaw=actor.global_rotation.y
# The planted shoe may pivot, but the ankle must never remain twisted behind
# a turning shin. Keep its heading within an anatomical range of the pelvis.
var difference=wrapf(f.yaw-body_yaw,-PI,PI)
if absf(difference)>deg_to_rad(22):f.yaw=body_yaw+clampf(difference,-deg_to_rad(22),deg_to_rad(22))
var yaw=f.yaw if f.grounded else lerp_angle(f.yaw,body_yaw,minf(1,dt*18))
if not f.grounded:f.yaw=yaw
var orientation=Quaternion(Vector3.UP,yaw)*f.rotation
# A high heel has a rigid arch. Lift the whole shoe with the leg rather than
# sharply flexing its toe or rolling it onto the outer edge during swing.
var roll=sin(clampf((f.last_phase-.5)*2,0,1)*PI)*-.045 if not f.grounded else 0.0
return Quaternion(actor.global_basis.x.normalized(),roll)*orientation

Some files were not shown because too many files have changed in this diff Show More