Compare commits
47 Commits
7f663969be
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| d0e3a8d551 | |||
| b572e0bf50 | |||
| d1c1375395 | |||
| 69d608765c | |||
| b437475b75 | |||
| c60ba40e9b | |||
| aa45c6c0bd | |||
| 2476242d27 | |||
| 2df499ab7a | |||
| 1a90e1ad21 | |||
| 5b8d60b1f6 | |||
| 56d9af9d2e | |||
| 6549ba9308 | |||
| eaefde2e07 | |||
| 23d4e49468 | |||
| b36d5acc8b | |||
| 39f9af7b53 | |||
| 2b2cc8686a | |||
| 3bb991ae8f | |||
| 92f5135f9d | |||
| d7514e2f14 | |||
| 59cc83c552 | |||
| 7906dc6cec | |||
| c843263c0a | |||
| 12a360c0ea | |||
| 4ca0c2a899 | |||
| 4a8bcd13f1 | |||
| b9751f3b52 | |||
| 078cc5bb24 | |||
| f60b87e725 | |||
| f4a01058d6 | |||
| e031595dc4 | |||
| c48761ef20 | |||
| 18f944d9eb | |||
| b0f3b0263f | |||
| ebe00c366c | |||
| cc22bdcc4b | |||
| fa92716570 | |||
| ba19d752a6 | |||
| b9a4e40c42 | |||
| fcd67109d4 | |||
| e3a85d8dec | |||
| b28f15eec8 | |||
| 49cf962945 | |||
| f51f3f6449 | |||
| 8ee99c0ea0 | |||
| c97a85d1f2 |
@@ -10,3 +10,7 @@
|
||||
*.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
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
!/AGENTS.md
|
||||
!/PROJECT_NOTES.md
|
||||
!/Demon_v0.19/
|
||||
!/DoOtboy/
|
||||
!/tools/
|
||||
|
||||
# Godot generated state, local exports and test output.
|
||||
|
||||
@@ -1,5 +1,23 @@
|
||||
# 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.
|
||||
https://www.makehumancommunity.org/about/license.html
|
||||
https://github.com/makehumancommunity/makehuman/tree/master/makehuman/data
|
||||
|
||||
@@ -1,7 +1,18 @@
|
||||
# Demon 0.19 — уровень и экономика
|
||||
|
||||
## Орудия Meshy — 29 октября
|
||||
|
||||
Колодки, дыба, колесо с чаном, музыкальный стул и котёл получили новые
|
||||
текстурированные модели. Динамики стула направлены к голове, ноги стоят на
|
||||
опоре. Колесо и валики вращаются отдельно от корпуса, вода остаётся в ёмкостях.
|
||||
На каждом из шести орудий манжеты и цепи закрепляют кисти и лодыжки души.
|
||||
Посадка проверена на всех десяти персонажах, включая контакт стоп и бёдер.
|
||||
|
||||
## Рабочие изменения 28 октября
|
||||
|
||||
- Пробел пропускает вступительную кат-сцену: останавливает голос и возвращает игровую камеру и управление.
|
||||
- В покое руки суккубы опущены вдоль тела со слегка согнутыми локтями; при беге двигаются в противофазе. Усилены дыхание, движения плеч, головы, крыльев и хвоста в айдле.
|
||||
|
||||
- На орудии: 10 секунд непрерывного бездействия — сгорание души и штраф 50 золота. Работа сбрасывает отсчёт. Награда за потерянную душу не выдаётся.
|
||||
- Очередь движется от приёмных ворот к воротам напротив. Первая душа ждёт 10 секунд, затем уходит со штрафом 50 золота. У следующей начинается новый отсчёт. Старых нарастающих штрафов больше нет; золото не уходит ниже нуля.
|
||||
- Строительство, гримуар и пауза останавливают таймеры. Размещение на орудии занимает 0,5 секунды: распад на мелкие огоньки и сборка в правильной позе. До окончания эффекта работа заблокирована.
|
||||
@@ -15,7 +26,7 @@
|
||||
|
||||
Запуск: Demon.exe. Godot для игры устанавливать не нужно.
|
||||
|
||||
F5 — добавить 1000 золота, выставить максимальный опыт (уровень 10) и заполнить запас душ до 10 000 000. Повторные нажатия не дублируют очки навыков.
|
||||
F5 — добавить 1000 золота, 1000 душ и один уровень (до уровня 10). За новый уровень даётся одно очко навыков; на максимальном уровне добавляются только валюты. Удержание клавиши не повторяет бонус.
|
||||
|
||||
- Внизу появилась полоса опыта с уровнем и свободными очками навыков.
|
||||
- За золото покупаются новые типы орудий и их экземпляры. Улучшения, закалка и ранги орудий удалены из гримуара, строительства и расчёта наград.
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# Визуальные референсы 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) — шарнирная деревянная доска с отверстиями для головы и кистей, железные крепления.
|
||||
|
||||
@@ -6,13 +6,23 @@ var ropes=[]
|
||||
var heat_materials=[]
|
||||
var heat_light: OmniLight3D
|
||||
var heat=0.0
|
||||
var applied_heat=-1.0
|
||||
var tension=0.0
|
||||
var submerged=false
|
||||
var splash_count=0
|
||||
var drops=[]
|
||||
var wheel_cuffs=[]
|
||||
var restraints
|
||||
func setup(game,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:
|
||||
for x in [-0.42,0.42]:
|
||||
for z in [-1.42,1.42]:
|
||||
@@ -44,16 +54,42 @@ func setup(game,development):
|
||||
var n=queue.pop_back()
|
||||
for c in n.get_children():queue.append(c)
|
||||
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")
|
||||
if n.material_override is StandardMaterial3D:mat.set_shader_parameter("tint",n.material_override.albedo_color)
|
||||
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
|
||||
restraints=preload("res://apparatus_restraints.gd").new();restraints.setup(g,d)
|
||||
|
||||
func reset():
|
||||
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):
|
||||
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:
|
||||
tension=move_toward(tension,clampf(d.elapsed,0,1) if d.stage==0 else 1.0,dt*2)
|
||||
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
|
||||
if d.release_clock>0:target=heat
|
||||
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)
|
||||
heat_light.light_energy=heat*0.9
|
||||
apply_heat()
|
||||
|
||||
@@ -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.
|
||||
@@ -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
|
||||
|
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
|
||||
|
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
|
||||
|
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
|
||||
}
|
||||
@@ -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
|
||||
|
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
|
||||
|
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
|
||||
|
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"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
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
|
||||
|
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
|
||||
|
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
|
||||
@@ -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
|
||||
|
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
|
||||
|
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
|
||||
|
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
|
||||
@@ -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
|
||||
|
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
|
||||
|
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
|
||||
|
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
|
||||
@@ -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
|
||||
|
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
|
||||
|
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
|
||||
|
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."
|
||||
}
|
||||
@@ -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
|
||||
|
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
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
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
|
||||
|
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
|
||||
|
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
|
||||
@@ -119,9 +119,9 @@ func reward(amount=20):
|
||||
|
||||
func test_boost():
|
||||
g.coins+=1000
|
||||
g.essence=preload("res://progression.gd").MAX_RESOURCE
|
||||
xp=Economy.XP_THRESHOLDS.back()
|
||||
points=maxi(0,Economy.XP_THRESHOLDS.size()-1-g.speed_level-action_level-leadership)
|
||||
g.essence+=1000
|
||||
var current=Economy.level(xp)
|
||||
if current<Economy.XP_THRESHOLDS.size():reward(Economy.XP_THRESHOLDS[current]-xp)
|
||||
g.refresh_ui()
|
||||
g.save_progress()
|
||||
g.say("Казна одобрила внеплановое финансирование.")
|
||||
|
||||
@@ -85,20 +85,25 @@ func run(g):
|
||||
Input.parse_input_event(key)
|
||||
await g.get_tree().process_frame
|
||||
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(dev.points==9,"F5 grants maximum available skill points")
|
||||
w.upgrade("speed");w.upgrade("power");w.upgrade("leadership")
|
||||
check(dev.points==6,"three learned skills consume three points")
|
||||
g.essence=12;cash=g.coins;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.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==2,"one skill point granted per gained level")
|
||||
w.upgrade("speed");w.upgrade("power")
|
||||
check(dev.points==0,"learned skills consume earned points")
|
||||
g.essence=12;cash=g.coins;dev.xp=250;dev.test_boost()
|
||||
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
|
||||
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")
|
||||
snap=g.progress_snapshot();path="user://qa_f5_v019.json"
|
||||
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))
|
||||
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")
|
||||
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)
|
||||
g.get_tree().quit()
|
||||
|
||||
@@ -168,11 +168,16 @@ func bake_repeated(root,locations):
|
||||
var n=queue.pop_back()
|
||||
for child in n.get_children():queue.append(child)
|
||||
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:
|
||||
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 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
|
||||
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()):
|
||||
|
||||
@@ -24,6 +24,12 @@ func build(game,d):
|
||||
preload("res://new_equipment.gd").new().build(g,d)
|
||||
return
|
||||
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:
|
||||
preload("res://pillory.gd").new().build(g,d)
|
||||
return
|
||||
|
||||
@@ -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)
|
||||
@@ -10,9 +10,29 @@ func run(g):
|
||||
var actors=[g.avatar]
|
||||
for h in g.workshop.helpers:actors.append(h.model)
|
||||
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]:
|
||||
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 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):
|
||||
var before=[]
|
||||
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.rotation.y=lerp_angle(actor.rotation.y,atan2(direction.x,direction.z),.16)
|
||||
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):
|
||||
var f=actor.gait.feet[i];var actual=actor.gait.point("foot."+f.side)
|
||||
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(min_contact>-.002,"ground clearance")
|
||||
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}))
|
||||
var phase=actor.gait.phase
|
||||
for frame in range(30):actor._process(1.0/60)
|
||||
|
||||
@@ -1,81 +1,19 @@
|
||||
extends RefCounted
|
||||
func build(g):
|
||||
var r=Node3D.new();r.name="Imp";r.set_meta("species","imp");r.set_meta("model_revision",2)
|
||||
var s=preload("res://hero.gd").new();s.g=g
|
||||
var skin=Color("785140");var horn=Color("30251f");var hide=Color("352b25");var rim=Color("907558")
|
||||
# A rounded abdomen, narrow waist, stooped chest and articulated limbs.
|
||||
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)
|
||||
for side in [-1,1]:
|
||||
s.tube(r,[Vector3(side*.13,.80,-.035),Vector3(side*.19,.69,-.09),Vector3(side*.13,.54,-.12)],[.065,.075,.04],skin.darkened(.10))
|
||||
var head=Node3D.new();r.add_child(head);head.name="Head";head.position=Vector3(0,.85,.035)
|
||||
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)
|
||||
for side in [-1,1]:
|
||||
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)
|
||||
for j in range(4):
|
||||
var ridge=TorusMesh.new();ridge.inner_radius=.030-j*.003;ridge.outer_radius=.036-j*.003;ridge.rings=24;ridge.ring_segments=12
|
||||
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)
|
||||
s.tube(head,[Vector3(side*.13,.13,.005),Vector3(side*.27,.185,-.06),Vector3(side*.23,.075,-.025)],[.056,.009,.001],skin)
|
||||
s.tube(head,[Vector3(side*.16,.135,.006),Vector3(side*.237,.163,-.035)],[.026,.002],skin.darkened(.25))
|
||||
var eye=Node3D.new();head.add_child(eye);eye.name="EyeL" if side<0 else "EyeR";eye.position=Vector3(side*.067,.126,.139)
|
||||
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()
|
||||
const SCENE=preload("res://art/imps/swamp_v01/swamp_imp.glb")
|
||||
const JOINTS={
|
||||
"Body":[Vector3(0,.57,-.10),""],"Head":[Vector3(0,.78,.20),""],
|
||||
"LegL":[Vector3(-.24,.43,-.16),""],"KneeL":[Vector3(-.27,.27,-.20),"LegL"],"FootL":[Vector3(-.28,.065,.16),"KneeL"],
|
||||
"LegR":[Vector3(.24,.43,-.16),""],"KneeR":[Vector3(.27,.27,-.20),"LegR"],"FootR":[Vector3(.28,.065,.16),"KneeR"],
|
||||
"ArmL":[Vector3(-.35,.80,-.03),""],"ElbowL":[Vector3(-.46,.45,.12),"ArmL"],"HandL":[Vector3(-.47,.16,.30),"ElbowL"],
|
||||
"ArmR":[Vector3(.35,.80,-.03),""],"ElbowR":[Vector3(.46,.45,.12),"ArmR"],"HandR":[Vector3(.47,.16,.30),"ElbowR"]}
|
||||
func build(_g):
|
||||
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)
|
||||
var nodes={}
|
||||
for key in JOINTS:
|
||||
var item=JOINTS[key];var node=Node3D.new();nodes[key]=node
|
||||
var parent=root if item[1]=="" else nodes[item[1]]
|
||||
parent.add_child(node)
|
||||
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)))
|
||||
node.position=item[0]-(Vector3.ZERO if item[1]=="" else JOINTS[item[1]][0])
|
||||
var visual=SCENE.instantiate();visual.name="SwampVisual";root.add_child(visual)
|
||||
return root
|
||||
|
||||
@@ -45,7 +45,7 @@ func make_props(imp):
|
||||
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"))
|
||||
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":
|
||||
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"))
|
||||
|
||||
@@ -3,6 +3,7 @@ var root: Node3D
|
||||
var variation=0.0
|
||||
var model
|
||||
var feet=[]
|
||||
var skin=preload("res://imp_skin.gd").new()
|
||||
var previous=Vector3.ZERO
|
||||
var phase=.1
|
||||
var clock=0.0
|
||||
@@ -15,26 +16,51 @@ const CYCLE_DISTANCE=.48
|
||||
func setup(record):
|
||||
model=record.model;root=record.root;variation=record.phase;previous=root.global_position
|
||||
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
|
||||
for side in ["L","R"]:
|
||||
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():
|
||||
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
|
||||
for f in feet:f.leg.rotation=Vector3.ZERO;f.knee.rotation=Vector3.ZERO;f.foot.rotation=Vector3.ZERO
|
||||
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
|
||||
skin.update()
|
||||
func solve(f):
|
||||
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 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 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.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)
|
||||
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):
|
||||
dt=minf(dt,.05);clock+=dt
|
||||
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 p>=.56:
|
||||
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
|
||||
else:
|
||||
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.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)
|
||||
var blink=absf(sin(clock*.68+variation))
|
||||
for side in ["L","R"]:model.get_node("Head/Eye"+side).scale.y=clampf(blink*24,.10,1)
|
||||
model.get_node("Tail").rotation.y=sin(clock*2.4+variation)*(.12+.08*weight)
|
||||
if acting:pose_work_hands()
|
||||
skin.update()
|
||||
|
||||
@@ -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)
|
||||
@@ -5,11 +5,38 @@ func check(ok,label):
|
||||
func shot(g,name):
|
||||
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")
|
||||
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):
|
||||
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
|
||||
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 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
|
||||
@@ -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)
|
||||
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")
|
||||
verify_skin(imp)
|
||||
var phase=gait.phase
|
||||
for i in range(fps):gait.update(1.0/fps)
|
||||
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)
|
||||
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")
|
||||
DirAccess.make_dir_recursive_absolute("res://captures/imps-v02")
|
||||
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()
|
||||
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)
|
||||
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)
|
||||
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")
|
||||
|
||||
@@ -41,5 +41,20 @@ func run(g):
|
||||
assert(not g.intro.active)
|
||||
g.intro.begin();g.reset_shift()
|
||||
assert(not g.intro.active and not g.intro.voice.playing and not g.avatar.cinematic_idle)
|
||||
# Space skips during lead, speech and camera return without leaking gameplay input.
|
||||
for phase in ["lead","voice","tail"]:
|
||||
g.intro.begin()
|
||||
if phase!="lead":g.intro.update(2.1)
|
||||
if phase=="tail":g.intro._voice_finished();g.intro.update(.3)
|
||||
var before_coins=g.coins;var before_position=g.player.position
|
||||
var release=InputEventKey.new();release.keycode=KEY_SPACE;release.pressed=false
|
||||
g._input(release);assert(g.intro.active)
|
||||
var echo=InputEventKey.new();echo.keycode=KEY_SPACE;echo.pressed=true;echo.echo=true
|
||||
g._input(echo);assert(g.intro.active)
|
||||
var skip=InputEventKey.new();skip.keycode=KEY_SPACE;skip.physical_keycode=KEY_SPACE;skip.pressed=true
|
||||
g._input(skip)
|
||||
assert(not g.intro.active and not g.intro.voice.playing and not g.paused and g.hud.visible)
|
||||
assert(not g.avatar.cinematic_idle and is_equal_approx(g.camera.size,20))
|
||||
assert(g.coins==before_coins and g.player.position==before_position and g.orbit.keys.is_empty())
|
||||
print("PASS: intro full recording, 2s lead/tail, input lock, camera restore, suspend, resume and reset (%d ms)" % (Time.get_ticks_msec()-start))
|
||||
g.get_tree().quit()
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
extends RefCounted
|
||||
# Meshy shell is split locally at the actual hinge plane, not from the open concept.
|
||||
const MODEL=preload("res://art/equipment/iron_maiden_v01/iron_maiden.glb")
|
||||
const COLLISIONS={
|
||||
"Body":preload("res://art/equipment/iron_maiden_v01/collision/body.tres"),
|
||||
"LeftDoorSurface":preload("res://art/equipment/iron_maiden_v01/collision/left_door_surface.tres"),
|
||||
"RightDoorSurface":preload("res://art/equipment/iron_maiden_v01/collision/right_door_surface.tres")}
|
||||
func build(g,d):
|
||||
var root=d.device
|
||||
var model=MODEL.instantiate();root.add_child(model)
|
||||
root.set_meta("apparatus_model","iron_maiden_v01")
|
||||
d.door=model.find_child("LeftDoor",true,false)
|
||||
d.second_door=model.find_child("RightDoor",true,false)
|
||||
assert(d.door!=null and d.second_door!=null,"Iron maiden requires two independent hinge nodes")
|
||||
for name in COLLISIONS:model.find_child(name,true,false).set_meta("walk_collision_shape",COLLISIONS[name])
|
||||
preload("res://maiden_interior.gd").new().build(g,model,d.door,d.second_door)
|
||||
d.door.rotation.y=-1.8;d.second_door.rotation.y=1.8
|
||||
d.flame=g.ball(root,Vector3(0,.20,0),Vector3(1.15,.25,.85),Color("ff8735"))
|
||||
d.flame.material_override=g.mat(Color("ff8735"),true);d.flame.hide()
|
||||
d.flame.cast_shadow=GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
|
||||
@@ -0,0 +1,94 @@
|
||||
extends RefCounted
|
||||
var failures=0
|
||||
var capture_folder=""
|
||||
func check(ok,label):
|
||||
if not ok:failures+=1;push_error("IRON MAIDEN QA: "+label)
|
||||
func shot(g,name):
|
||||
await RenderingServer.frame_post_draw
|
||||
g.get_viewport().get_texture().get_image().save_png(capture_folder+"/"+name+".png")
|
||||
func collision_check(g,d):
|
||||
var subject=Node3D.new();g.add_child(subject)
|
||||
await g.get_tree().physics_frame;await g.get_tree().physics_frame
|
||||
subject.position=d.device.position+Vector3(0,.35,-3)
|
||||
g.workshop.mesh_walking.move_actor(subject,Vector3(0,0,5),.25,1.18)
|
||||
check(subject.position.z<d.device.position.z-.2,"simplified back shell blocks a swept capsule")
|
||||
subject.position=d.device.position+Vector3(0,.35,2.5)
|
||||
g.workshop.mesh_walking.move_actor(subject,Vector3(0,0,-2.5),.25,1.18)
|
||||
check(absf(subject.position.z-d.device.position.z)<.15,"open doors preserve the hollow entrance above the base")
|
||||
d.door.rotation.y=0;d.second_door.rotation.y=0
|
||||
await g.get_tree().physics_frame;await g.get_tree().physics_frame
|
||||
subject.position=d.device.position+Vector3(0,.35,2.5)
|
||||
g.workshop.mesh_walking.move_actor(subject,Vector3(0,0,-3),.25,1.18)
|
||||
check(subject.position.z>d.device.position.z+.2,"closed moving doors block entry")
|
||||
d.door.rotation.y=-1.8;d.second_door.rotation.y=1.8
|
||||
await g.get_tree().physics_frame;subject.queue_free()
|
||||
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("")
|
||||
capture_folder="res://captures/iron-maiden" if OS.has_feature("editor") else OS.get_executable_path().get_base_dir()+"/captures/iron-maiden"
|
||||
DirAccess.make_dir_recursive_absolute(capture_folder)
|
||||
var w=g.workshop;var d=w.add_station(3,Vector3(3,0,0))
|
||||
check(d.device.get_meta("apparatus_model","")=="iron_maiden_v01","Meshy model selected")
|
||||
check(d.door!=d.second_door and d.door.get_child_count()>0 and d.second_door.get_child_count()>0,"independent populated doors")
|
||||
check(d.door.position.x<0 and d.second_door.position.x>0,"opposite side hinges")
|
||||
check(d.door.find_child("InnerLeftDetail",true,false)!=null and d.second_door.find_child("InnerRightDetail",true,false)!=null,"interior trim follows both moving doors")
|
||||
check(d.device.find_child("InnerBackDetail",true,false)!=null and d.device.find_child("InnerGrate",true,false)!=null,"reinforced back and solid grated floor")
|
||||
var surfaces=d.device.find_children("*","MeshInstance3D",true,false)
|
||||
var textured=0
|
||||
for mesh in surfaces:
|
||||
if mesh.get_meta("apparatus_restraint",false):continue
|
||||
if mesh==d.flame:continue
|
||||
if mesh.get_meta("no_walk_collision",false):
|
||||
check(not mesh.has_node("MeshWalkingCollider"),"internal detail does not duplicate shell physics")
|
||||
check(mesh.cast_shadow==GeometryInstance3D.SHADOW_CASTING_SETTING_OFF,"internal detail skips redundant shadows")
|
||||
for i in range(mesh.mesh.get_surface_count()):
|
||||
var mat=mesh.mesh.surface_get_material(i)
|
||||
if mat is StandardMaterial3D and mat.albedo_texture!=null:textured+=1
|
||||
check(mesh.material_override==null,"original surface material preserved")
|
||||
for i in range(mesh.mesh.get_surface_count()):
|
||||
check(mesh.get_surface_override_material(i) is ShaderMaterial,"PBR-preserving incandescence material")
|
||||
check(textured>0,"Meshy textures present")
|
||||
var outer=d.device.find_child("Body",true,false).get_active_material(0)
|
||||
var inner=d.device.find_child("BodyLining",true,false).get_active_material(0)
|
||||
for map_name in ["color_map","metal_map","rough_map","normal_map"]:
|
||||
check(outer.get_shader_parameter(map_name)==inner.get_shader_parameter(map_name),"inner and outer share original PBR "+map_name)
|
||||
g.camera.position=Vector3(5.8,3.5,3);g.camera.look_at(d.device.position+Vector3(0,1.5,0));g.camera.size=4.5
|
||||
await shot(g,"open")
|
||||
await collision_check(g,d)
|
||||
for k in range(19):
|
||||
d.door.rotation.y=-1.8+float(k)*.1;d.second_door.rotation.y=1.8-float(k)*.1
|
||||
check(d.door.transform.is_finite() and d.second_door.transform.is_finite(),"finite hinge sweep")
|
||||
if k==9:await shot(g,"half")
|
||||
check(absf(d.door.rotation.y)<.0001 and absf(d.second_door.rotation.y)<.0001,"both doors reach closed pose")
|
||||
await shot(g,"closed")
|
||||
# Exercise the actual station state machine and heat without replacing PBR.
|
||||
w.unlock=3;g.uid=0;w.spawn();var s=g.souls.back();s.required=[3];s.entering=false;s.entry_time=1
|
||||
g.set_soul_reveal(s.visual,1);w.attach(s,0);w.step_station(d,.9,false)
|
||||
for k in range(16):w.step_station(d,.1,true)
|
||||
check(d.motion.heat>.3 and d.motion.heat<.6,"progressive red stage")
|
||||
await shot(g,"warming")
|
||||
for k in range(19):w.step_station(d,.1,true)
|
||||
check(d.stage==1,"station advances through closure into heat")
|
||||
check(d.motion.heat>.94 and d.motion.heat_light.light_energy>2.8,"full incandescence with reflected light")
|
||||
await shot(g,"heated")
|
||||
for k in range(100):
|
||||
w.step_station(d,.1,true)
|
||||
if d.soul<0:break
|
||||
check(d.soul<0 and g.done==1,"completion releases soul and rewards once")
|
||||
for k in range(40):w.step_station(d,.1,false)
|
||||
check(is_equal_approx(d.door.rotation.y,-1.8) and is_equal_approx(d.second_door.rotation.y,1.8),"doors reopen after cooldown")
|
||||
for k in range(25):w.step_station(d,.1,false)
|
||||
check(d.motion.heat<.01 and d.motion.heat_light.light_energy<.01,"incandescence cools back to original metal")
|
||||
check(not d.motion.heat_light.visible,"cooled heat light leaves rendering")
|
||||
await shot(g,"cooled")
|
||||
var other=w.add_station(3,Vector3(8,0,0))
|
||||
var first_detail=d.device.find_child("InnerBackDetail",true,false).get_child(0)
|
||||
var second_detail=other.device.find_child("InnerBackDetail",true,false).get_child(0)
|
||||
check(first_detail.mesh==second_detail.mesh,"repeated devices reuse cached detail geometry")
|
||||
check(first_detail.get_active_material(0)!=second_detail.get_active_material(0),"each device has independent heat material")
|
||||
var before=other.motion.heat_materials[0].get_shader_parameter("heat")
|
||||
d.motion.heat=.8;d.motion.apply_heat()
|
||||
check(other.motion.heat_materials[0].get_shader_parameter("heat")==before,"heating one cached device does not heat its neighbour")
|
||||
print("IRON MAIDEN QA ","PASSED" if failures==0 else "FAILED",": textured model, hinges, sweep, close/heat/reward/reopen")
|
||||
g.get_tree().quit(1 if failures else 0)
|
||||
@@ -73,16 +73,32 @@ func burn(s):
|
||||
burns.append({"root":s.node,"fx":fx,"materials":materials,"t":0.0,"sparks":sparks,"light":light})
|
||||
|
||||
func update(dt):
|
||||
var profiling=g.get_meta("profile_life",false)
|
||||
var activity_us=0;var movement_us=0;var gait_us=0
|
||||
var worst={"total_us":0} if profiling else null
|
||||
activities.update_marks(dt)
|
||||
for imp in imps+neighbours:
|
||||
if profiling:imp["path_us"]=0;imp["collision_us"]=0
|
||||
var tick=Time.get_ticks_usec() if profiling else 0
|
||||
var busy=activities.update(imp,dt)
|
||||
var activity_cost=Time.get_ticks_usec()-tick if profiling else 0
|
||||
if profiling:activity_us+=activity_cost;tick=Time.get_ticks_usec()
|
||||
if not busy:
|
||||
imp.patrol_age+=dt
|
||||
if imp.root.position.distance_to(imp.patrol_target)<.25 or imp.patrol_age>9:
|
||||
imp.patrol_angle+=1.05;imp.patrol_age=0;imp.patrol_target=patrol_point(imp)
|
||||
if imp.has("origin"):move_neighbour(imp,imp.patrol_target,dt)
|
||||
else:move_imp(imp,imp.patrol_target,dt)
|
||||
var movement_cost=Time.get_ticks_usec()-tick if profiling else 0
|
||||
if profiling:
|
||||
movement_us+=movement_cost;tick=Time.get_ticks_usec()
|
||||
if activity_cost+movement_cost>worst.total_us:
|
||||
worst={"total_us":activity_cost+movement_cost,"number":imp.activity_number,"activity":imp.activity,
|
||||
"path_us":imp.path_us,"collision_us":imp.collision_us,"position":str(imp.root.position),
|
||||
"target":str(imp.get("activity_target",imp.patrol_target))}
|
||||
imp.gait.update(dt,busy and imp.activity_time>0)
|
||||
if profiling:gait_us+=Time.get_ticks_usec()-tick
|
||||
if profiling:g.set_meta("life_profile",Vector3(activity_us,movement_us,gait_us));g.set_meta("life_worst",worst)
|
||||
for i in range(burns.size()-1,-1,-1):
|
||||
var b=burns[i];b.t+=dt
|
||||
for mat in b.materials:mat.set_shader_parameter("progress",b.t/1.7)
|
||||
@@ -102,7 +118,11 @@ func update(dt):
|
||||
|
||||
func move_imp(imp,target,dt):
|
||||
var w=g.workshop
|
||||
var destination=w.cell(w.free_floor(target))
|
||||
var profile_tick=Time.get_ticks_usec() if g.get_meta("profile_life",false) else 0
|
||||
if imp.get("requested_target")!=target or imp.revision!=w.revision:
|
||||
imp["requested_target"]=target
|
||||
imp["resolved_target"]=w.free_floor(target,.36)
|
||||
var destination=w.cell(imp.resolved_target)
|
||||
if imp.destination!=destination or imp.revision!=w.revision:
|
||||
imp.destination=destination;imp.revision=w.revision
|
||||
var start=w.cell(imp.root.position)
|
||||
@@ -110,7 +130,8 @@ func move_imp(imp,target,dt):
|
||||
imp.root.position=w.free_floor(imp.root.position);start=w.cell(imp.root.position);imp.velocity=Vector3.ZERO;imp.gait.reset()
|
||||
imp.path=w.nav.get_point_path(start,destination)
|
||||
if not imp.path.is_empty():imp.path.remove_at(0)
|
||||
var next=target
|
||||
if profile_tick>0:imp.path_us+=Time.get_ticks_usec()-profile_tick
|
||||
var next=imp.resolved_target
|
||||
if not imp.path.is_empty():next=Vector3(imp.path[0].x,0,imp.path[0].y)
|
||||
var step_dt=minf(dt,.05)
|
||||
var desired_velocity=(next-imp.root.position).normalized()*1.25
|
||||
@@ -123,11 +144,13 @@ func move_imp(imp,target,dt):
|
||||
if other.root!=imp.root:actors.append(other.root.position)
|
||||
for position in actors:
|
||||
var delta=imp.root.position-position;delta.y=0
|
||||
if delta.length_squared()<.52*.52:
|
||||
desired_velocity+=(delta.normalized() if delta.length_squared()>.0001 else Vector3.RIGHT)*1.4*(1-delta.length()/.52)
|
||||
if delta.length_squared()<.72*.72:
|
||||
desired_velocity+=(delta.normalized() if delta.length_squared()>.0001 else Vector3.RIGHT)*1.4*(1-delta.length()/.72)
|
||||
imp.velocity=imp.get("velocity",Vector3.ZERO).move_toward(desired_velocity.limit_length(1.35),step_dt*5)
|
||||
var before=imp.root.position;var desired=before+imp.velocity*step_dt
|
||||
w.mesh_walking.move_actor(imp.root,desired-imp.root.position,.20,1.0)
|
||||
if profile_tick>0:profile_tick=Time.get_ticks_usec()
|
||||
w.mesh_walking.move_actor(imp.root,desired-imp.root.position,.34,1.18)
|
||||
if profile_tick>0:imp.collision_us+=Time.get_ticks_usec()-profile_tick
|
||||
imp.root.position.x=clampf(imp.root.position.x,-7.1,w.walk_right());imp.root.position.z=clampf(imp.root.position.z,-4.8,5.6)
|
||||
face_motion(imp,imp.root.position-before,step_dt)
|
||||
if imp.root.position.distance_to(next)<.12 and not imp.path.is_empty():imp.path.remove_at(0)
|
||||
@@ -147,7 +170,9 @@ func move_neighbour(imp,target,dt):
|
||||
var desired=(target-imp.root.position).normalized()*1.15;desired.y=0
|
||||
imp.velocity=imp.velocity.move_toward(desired,dt*4)
|
||||
var before=imp.root.position
|
||||
g.workshop.mesh_walking.move_actor(imp.root,imp.velocity*dt,.20,1.0)
|
||||
var profile_tick=Time.get_ticks_usec() if g.get_meta("profile_life",false) else 0
|
||||
g.workshop.mesh_walking.move_actor(imp.root,imp.velocity*dt,.34,1.18)
|
||||
if profile_tick>0:imp.collision_us+=Time.get_ticks_usec()-profile_tick
|
||||
imp.root.position.x=clampf(imp.root.position.x,imp.origin.x-7.1,imp.origin.x+7.1)
|
||||
imp.root.position.z=clampf(imp.root.position.z,imp.origin.z-5.5,imp.origin.z+5.5)
|
||||
face_motion(imp,imp.root.position-before,dt)
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
shader_type spatial;
|
||||
render_mode cull_disabled;
|
||||
uniform float heat=0.0;
|
||||
uniform float base_height=0.0;
|
||||
uniform vec4 base_color:source_color=vec4(1.0);
|
||||
uniform sampler2D color_map:source_color,hint_default_white,filter_linear_mipmap_anisotropic;
|
||||
uniform sampler2D metal_map:hint_default_white,filter_linear_mipmap_anisotropic;
|
||||
uniform sampler2D rough_map:hint_default_white,filter_linear_mipmap_anisotropic;
|
||||
uniform sampler2D normal_map:hint_normal,filter_linear_mipmap_anisotropic;
|
||||
uniform float metal_value=1.0;
|
||||
uniform float rough_value=1.0;
|
||||
uniform float normal_strength=1.0;
|
||||
uniform bool use_normal=false;
|
||||
uniform int metal_channel=2;
|
||||
uniform int rough_channel=1;
|
||||
uniform vec2 uv_scale=vec2(1.0);
|
||||
uniform vec2 uv_offset=vec2(0.0);
|
||||
uniform bool tile_region=false;
|
||||
uniform vec2 atlas_origin=vec2(0.0);
|
||||
uniform vec2 atlas_size=vec2(1.0);
|
||||
varying float model_height;
|
||||
void vertex(){ model_height=(MODEL_MATRIX*vec4(VERTEX,1.0)).y-base_height; }
|
||||
float channel_value(vec4 color,int channel){
|
||||
if(channel==4){return dot(color.rgb,vec3(.333333));}
|
||||
return color[channel];
|
||||
}
|
||||
void fragment(){
|
||||
vec2 uv=UV*uv_scale+uv_offset;
|
||||
if(tile_region){uv=atlas_origin+fract(uv*vec2(4.0,7.0))*atlas_size;}
|
||||
vec3 original=base_color.rgb*texture(color_map,uv).rgb;
|
||||
float warmth=clamp(heat*1.10-smoothstep(.2,3.1,model_height)*.08,0.0,1.0)*smoothstep(.18,.35,model_height);
|
||||
vec3 hot=mix(vec3(.75,.002,.001),vec3(1.0,.10,.003),smoothstep(.25,.80,warmth));
|
||||
hot=mix(hot,vec3(1.0,.44,.045),smoothstep(.82,1.0,warmth)*.65);
|
||||
ALBEDO=mix(original,hot*.35,smoothstep(.35,1.0,warmth)*.45);
|
||||
METALLIC=metal_value*channel_value(texture(metal_map,uv),metal_channel);
|
||||
ROUGHNESS=clamp(rough_value*channel_value(texture(rough_map,uv),rough_channel),.1,1.0);
|
||||
if(use_normal){NORMAL_MAP=texture(normal_map,uv).rgb;NORMAL_MAP_DEPTH=normal_strength;}
|
||||
float texture_relief=.45+.55*clamp(dot(original,vec3(.333333))*3.5,0.0,1.0);
|
||||
EMISSION=hot*pow(warmth,1.8)*1.4*texture_relief;
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
extends RefCounted
|
||||
# Local construction follows the existing lining; each door's details share its hinge.
|
||||
const PROFILE=[Vector3(.25,.73,.54),Vector3(.5,.75,.56),Vector3(1,.75,.56),Vector3(1.7,.75,.56),Vector3(2.15,.72,.54),Vector3(2.35,.55,.40),Vector3(2.43,.35,.25)]
|
||||
const IRON=Color("34343a")
|
||||
const BRASS=Color("8b6842")
|
||||
const DARK=Color("14171c")
|
||||
var g
|
||||
var outer_metal
|
||||
static var detail_cache={}
|
||||
static var lining_cache={}
|
||||
# Regions of the existing Meshy atlas: bare iron and aged brass, with matching PBR maps.
|
||||
const IRON_REGION=Vector4(.41015625,.1875,.0234375,.0234375)
|
||||
const BRASS_REGION=Vector4(.6796875,.5859375,.0234375,.0234375)
|
||||
func metal(brass=false):
|
||||
var material=outer_metal.duplicate()
|
||||
material.set_meta("atlas_region",BRASS_REGION if brass else IRON_REGION)
|
||||
material.albedo_color=Color.WHITE
|
||||
return material
|
||||
func line_lining(model):
|
||||
for node in model.find_children("*Lining","MeshInstance3D",true,false):
|
||||
node.cast_shadow=GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
|
||||
node.set_meta("no_walk_collision",true)
|
||||
if lining_cache.has(node.name):node.mesh=lining_cache[node.name];continue
|
||||
var mesh=ArrayMesh.new();var transform=model.global_transform.affine_inverse()*node.global_transform
|
||||
for surface in range(node.mesh.get_surface_count()):
|
||||
var arrays=node.mesh.surface_get_arrays(surface);var uv=PackedVector2Array()
|
||||
for vertex in arrays[Mesh.ARRAY_VERTEX]:
|
||||
var p=transform*vertex
|
||||
uv.append(Vector2(fposmod(atan2(-p.z,p.x),TAU)/TAU,p.y/2.4))
|
||||
arrays[Mesh.ARRAY_TEX_UV]=uv
|
||||
mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES,arrays)
|
||||
mesh.surface_set_material(surface,metal())
|
||||
node.mesh=mesh
|
||||
lining_cache[node.name]=mesh
|
||||
func tube(root,a,b,radius,color):
|
||||
var mesh=CylinderMesh.new();mesh.top_radius=radius;mesh.bottom_radius=radius;mesh.height=a.distance_to(b)
|
||||
mesh.radial_segments=8;mesh.rings=0
|
||||
var node=g.mesh_node(root,mesh,(a+b)*.5,color)
|
||||
node.quaternion=Quaternion(Vector3.UP,(b-a).normalized())
|
||||
func rivet(root,p,size,color):
|
||||
var mesh=SphereMesh.new();mesh.radius=.5;mesh.height=1;mesh.radial_segments=8;mesh.rings=4
|
||||
var node=g.mesh_node(root,mesh,p,color);node.scale=size
|
||||
func restore_detail(root,title):
|
||||
if not detail_cache.has(title):return false
|
||||
for record in detail_cache[title]:
|
||||
var node=MeshInstance3D.new();node.mesh=record.mesh;node.transform=record.transform
|
||||
node.set_meta("no_walk_collision",true)
|
||||
node.cast_shadow=GeometryInstance3D.SHADOW_CASTING_SETTING_OFF;root.add_child(node)
|
||||
return true
|
||||
func remember_detail(root,title):
|
||||
var meshes=[]
|
||||
for node in root.get_children():
|
||||
if node is MeshInstance3D:meshes.append({"mesh":node.mesh,"transform":node.transform})
|
||||
detail_cache[title]=meshes
|
||||
func point(height,angle,inset=.012):
|
||||
var shape=PROFILE[0]
|
||||
for j in range(PROFILE.size()-1):
|
||||
if height<=PROFILE[j+1].x:
|
||||
shape=PROFILE[j].lerp(PROFILE[j+1],inverse_lerp(PROFILE[j].x,PROFILE[j+1].x,height));break
|
||||
return Vector3(cos(angle)*(shape.y*.86-inset),height,-sin(angle)*(shape.z*.70-inset))
|
||||
func arc(root,height,a,b,radius,color,inset=.012):
|
||||
for k in range(20):tube(root,point(height,lerpf(a,b,float(k)/20),inset),point(height,lerpf(a,b,float(k+1)/20),inset),radius,color)
|
||||
func section(parent,origin,a,b,title):
|
||||
var root=Node3D.new();parent.add_child(root);root.name=title;root.position=-origin
|
||||
if restore_detail(root,title):return root
|
||||
# Raised steel perimeter, inset brass seams and small round rivets.
|
||||
for h in [.31,.76,1.28,1.80,2.16]:
|
||||
arc(root,h,a+.035,b-.035,.013,IRON)
|
||||
arc(root,h+.027,a+.06,b-.06,.006,BRASS,.018)
|
||||
for k in range(7):rivet(root,point(h,lerpf(a+.08,b-.08,float(k)/6),.027),Vector3.ONE*.035,BRASS)
|
||||
for k in range(1,5):
|
||||
var angle=lerpf(a,b,float(k)/5)
|
||||
for j in range(12):
|
||||
var h=.32+j*.151
|
||||
tube(root,point(h,angle,.025),point(h+.151,angle,.025),.010,IRON)
|
||||
# Shallow embossed diamonds on each panel; decoration stays close to the lining.
|
||||
for h in [1.02,1.55,2.00]:
|
||||
var angle=(a+b)*.5;var spread=(b-a)*.13
|
||||
var corners=[point(h+.11,angle,.035),point(h,angle+spread,.035),point(h-.11,angle,.035),point(h,angle-spread,.035)]
|
||||
for k in range(4):tube(root,corners[k],corners[(k+1)%4],.008,BRASS)
|
||||
rivet(root,point(h,angle,.039),Vector3.ONE*.043,BRASS)
|
||||
for side in [-1,1]:
|
||||
for k in range(24):
|
||||
var u=float(k)/24;var v=float(k+1)/24
|
||||
var t=u*TAU*1.25;var next=v*TAU*1.25
|
||||
var radius=.115*(1-u)+.018;var next_radius=.115*(1-v)+.018
|
||||
var p=point(h+sin(t)*radius,angle+side*(spread*.62+cos(t)*radius*spread/.13),.045)
|
||||
var q=point(h+sin(next)*next_radius,angle+side*(spread*.62+cos(next)*next_radius*spread/.13),.045)
|
||||
tube(root,p,q,.007,BRASS)
|
||||
merge(root)
|
||||
remember_detail(root,title)
|
||||
return root
|
||||
func merge(root):
|
||||
# Batch fixed decorations by metal, separately for the body and each moving leaf.
|
||||
var batches={}
|
||||
for node in root.get_children():
|
||||
if not node is MeshInstance3D:continue
|
||||
var key=node.material_override.albedo_color.to_html()
|
||||
if not batches.has(key):
|
||||
var tool=SurfaceTool.new();tool.begin(Mesh.PRIMITIVE_TRIANGLES)
|
||||
batches[key]={"tool":tool,"color":node.material_override.albedo_color}
|
||||
batches[key].tool.append_from(node.mesh,0,node.transform)
|
||||
node.free()
|
||||
for key in batches:
|
||||
var mesh=batches[key].tool.commit();var mat=metal(batches[key].color==BRASS)
|
||||
mesh.surface_set_material(0,mat)
|
||||
var node=MeshInstance3D.new();node.mesh=mesh;node.set_meta("no_walk_collision",true);node.cast_shadow=GeometryInstance3D.SHADOW_CASTING_SETTING_OFF;root.add_child(node)
|
||||
func build(game,model,left,right):
|
||||
g=game
|
||||
outer_metal=model.find_child("Body",true,false).mesh.surface_get_material(0)
|
||||
line_lining(model)
|
||||
section(model,Vector3.ZERO,0,PI,"InnerBackDetail")
|
||||
section(left,left.position,PI,PI*1.5,"InnerLeftDetail")
|
||||
section(right,right.position,PI*1.5,TAU,"InnerRightDetail")
|
||||
var floor_root=Node3D.new();model.add_child(floor_root);floor_root.name="InnerGrate"
|
||||
if not restore_detail(floor_root,"InnerGrate"):
|
||||
var plate=g.cylinder(floor_root,Vector3(0,.24,0),.61,.035,DARK);plate.scale.z=.61
|
||||
for j in range(-7,8):
|
||||
var x=j*.072;var reach=sqrt(maxf(0,1-pow(x/.58,2)))*.34
|
||||
g.box(floor_root,Vector3(x,.268,0),Vector3(.026,.027,reach*2),IRON)
|
||||
for z in [-.23,0,.23]:g.box(floor_root,Vector3(0,.259,z),Vector3(1.02,.018,.022),BRASS)
|
||||
merge(floor_root);remember_detail(floor_root,"InnerGrate")
|
||||
var bounce=OmniLight3D.new();model.add_child(bounce);bounce.name="InteriorBounce"
|
||||
bounce.position=Vector3(0,1.35,.06);bounce.omni_range=1.65;bounce.light_color=Color("d7ae7d");bounce.light_energy=.32
|
||||
model.set_meta("interior_detail",true)
|
||||
@@ -0,0 +1,24 @@
|
||||
extends RefCounted
|
||||
static func make(original,base_height):
|
||||
var material=ShaderMaterial.new();material.shader=preload("res://maiden_heat.gdshader")
|
||||
material.set_shader_parameter("base_height",base_height)
|
||||
if original is StandardMaterial3D:
|
||||
material.set_shader_parameter("base_color",original.albedo_color)
|
||||
material.set_shader_parameter("metal_value",original.metallic)
|
||||
material.set_shader_parameter("rough_value",original.roughness)
|
||||
material.set_shader_parameter("metal_channel",original.metallic_texture_channel)
|
||||
material.set_shader_parameter("rough_channel",original.roughness_texture_channel)
|
||||
material.set_shader_parameter("uv_scale",Vector2(original.uv1_scale.x,original.uv1_scale.y))
|
||||
material.set_shader_parameter("uv_offset",Vector2(original.uv1_offset.x,original.uv1_offset.y))
|
||||
if original.has_meta("atlas_region"):
|
||||
var region=original.get_meta("atlas_region")
|
||||
material.set_shader_parameter("atlas_origin",Vector2(region.x,region.y))
|
||||
material.set_shader_parameter("atlas_size",Vector2(region.z,region.w))
|
||||
material.set_shader_parameter("tile_region",true)
|
||||
for pair in [["color_map",original.albedo_texture],["metal_map",original.metallic_texture],["rough_map",original.roughness_texture]]:
|
||||
if pair[1]!=null:material.set_shader_parameter(pair[0],pair[1])
|
||||
if original.normal_enabled and original.normal_texture:
|
||||
material.set_shader_parameter("normal_map",original.normal_texture)
|
||||
material.set_shader_parameter("normal_strength",original.normal_scale)
|
||||
material.set_shader_parameter("use_normal",true)
|
||||
return material
|
||||
@@ -0,0 +1,88 @@
|
||||
extends RefCounted
|
||||
var failures=0
|
||||
var records=[]
|
||||
func check(ok,label):
|
||||
if not ok:failures+=1;push_error("MAIDEN PERFORMANCE QA: "+label)
|
||||
func sample(g,label,frames=120):
|
||||
var times=[]
|
||||
var life_cost=Vector3.ZERO
|
||||
g.set_meta("profile_life",true)
|
||||
for frame in range(frames+30):
|
||||
g.workshop.spawn_clock=-100.0
|
||||
var start=Time.get_ticks_usec()
|
||||
await g.get_tree().process_frame
|
||||
await RenderingServer.frame_post_draw
|
||||
if frame>=30:
|
||||
times.append(float(Time.get_ticks_usec()-start)/1000.0)
|
||||
life_cost+=g.get_meta("life_profile",Vector3.ZERO)
|
||||
times.sort()
|
||||
var record={"phase":label,"median_ms":times[times.size()/2],"p95_ms":times[int(times.size()*.95)],
|
||||
"process_ms":Performance.get_monitor(Performance.TIME_PROCESS)*1000,
|
||||
"physics_ms":Performance.get_monitor(Performance.TIME_PHYSICS_PROCESS)*1000,
|
||||
"nodes":Performance.get_monitor(Performance.OBJECT_NODE_COUNT),
|
||||
"objects":Performance.get_monitor(Performance.OBJECT_COUNT),
|
||||
"draws":Performance.get_monitor(Performance.RENDER_TOTAL_DRAW_CALLS_IN_FRAME),
|
||||
"primitives":Performance.get_monitor(Performance.RENDER_TOTAL_PRIMITIVES_IN_FRAME),
|
||||
"video_mb":Performance.get_monitor(Performance.RENDER_VIDEO_MEM_USED)/1048576.0,
|
||||
"burns":g.life.burns.size(),"heat":g.workshop.stations[0].motion.heat if not g.workshop.stations.is_empty() else 0.0,
|
||||
"imp_activity_ms":life_cost.x/frames/1000,"imp_movement_ms":life_cost.y/frames/1000,"imp_gait_ms":life_cost.z/frames/1000}
|
||||
records.append(record);print("MAIDEN_PROFILE ",JSON.stringify(record))
|
||||
return record
|
||||
func run(g):
|
||||
await g.get_tree().create_timer(.3).timeout
|
||||
g.start_game();g.reset_shift();g.game_started=true;g.paused=false;g.menu.show_page("")
|
||||
DisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_DISABLED);Engine.max_fps=0
|
||||
var w=g.workshop;g.player.position=Vector3(1,0,2);g.camera.size=17
|
||||
await sample(g,"empty_room")
|
||||
var started=Time.get_ticks_usec();var d=w.add_station(3,Vector3(3,0,0))
|
||||
w.rebuild_nav()
|
||||
print("MAIDEN_BUILD_MS ",float(Time.get_ticks_usec()-started)/1000.0)
|
||||
for mesh in d.device.find_children("*","MeshInstance3D",true,false):
|
||||
var triangles=0
|
||||
for surface in range(mesh.mesh.get_surface_count()):
|
||||
var arrays=mesh.mesh.surface_get_arrays(surface)
|
||||
var indices=arrays[Mesh.ARRAY_INDEX]
|
||||
triangles+=(indices.size() if indices!=null and indices.size()>0 else arrays[Mesh.ARRAY_VERTEX].size())/3
|
||||
print("MAIDEN_GEOMETRY ",mesh.get_parent().name,"/",mesh.name," triangles=",triangles)
|
||||
g.player.position=w.approach(d);g.avatar.reset_gait()
|
||||
var baseline=await sample(g,"maiden_idle")
|
||||
var station_nodes=d.device.find_children("*","",true,false).size()
|
||||
for cycle in range(3):
|
||||
w.spawn();var soul=g.souls.back();soul.required=[3];soul.entering=false;soul.entry_time=1
|
||||
g.set_soul_reveal(soul.visual,1);w.attach(soul,0)
|
||||
var root=soul.node;var target=g.done+1
|
||||
for step in range(24):
|
||||
w.step_station(d,.1,true)
|
||||
await g.get_tree().process_frame
|
||||
if cycle==0:await sample(g,"maiden_hot",45)
|
||||
for step in range(60):
|
||||
if d.soul<0:break
|
||||
w.step_station(d,.1,true)
|
||||
await g.get_tree().process_frame
|
||||
check(g.done==target and d.soul<0,"cycle completes once")
|
||||
# Cleanup must run through the normal game process, including life.update.
|
||||
w.spawn_clock=-100.0
|
||||
await g.get_tree().create_timer(6.5).timeout
|
||||
check(not is_instance_valid(root) and g.life.burns.is_empty(),"normal frames remove soul and burn effects")
|
||||
var cooled=await sample(g,"cooled_%d"%cycle)
|
||||
check(d.motion.heat<.001 and d.motion.heat_light.light_energy<.001,"heat and light return to idle")
|
||||
check(d.device.find_children("*","",true,false).size()==station_nodes and g.souls.is_empty(),"no accumulating station nodes or souls after repeated cycles")
|
||||
# Timings are diagnostic: imp activities and thermal clocks change over time.
|
||||
check(cooled.video_mb<baseline.video_mb+8,"video memory returns near idle baseline after cleanup")
|
||||
var local_imps=g.life.imps;var neighbours=g.life.neighbours
|
||||
g.life.imps=[];g.life.neighbours=[]
|
||||
await sample(g,"after_cycles_frozen_imps")
|
||||
g.life.imps=local_imps;g.life.neighbours=neighbours
|
||||
for x in [6.0,9.0,0.0]:
|
||||
started=Time.get_ticks_usec();w.add_station(3,Vector3(x,0,-2))
|
||||
print("MAIDEN_REPEAT_BUILD_MS ",float(Time.get_ticks_usec()-started)/1000.0)
|
||||
w.rebuild_nav()
|
||||
await sample(g,"four_maidens_idle")
|
||||
DirAccess.make_dir_recursive_absolute("res://captures/maiden-performance")
|
||||
var tag="current"
|
||||
for arg in OS.get_cmdline_user_args():
|
||||
if arg.begins_with("--maiden-profile="):tag=arg.get_slice("=",1).validate_filename()
|
||||
var file=FileAccess.open("res://captures/maiden-performance/"+tag+".json",FileAccess.WRITE)
|
||||
file.store_string(JSON.stringify(records,"\t"));file.close()
|
||||
print("MAIDEN PERFORMANCE QA ","PASSED" if failures==0 else "FAILED",": rendered timings, repeated cycles, normal-loop cleanup and stable station resources")
|
||||
g.get_tree().quit(1 if failures else 0)
|
||||
@@ -86,8 +86,10 @@ var quips = ["Ещё один. Наверху сегодня скидки на
|
||||
|
||||
func _ready():
|
||||
var args=OS.get_cmdline_user_args()
|
||||
test_mode="--test-intro" in args or "--test-room-decor" in args or "--test-camera-controls" in args or "--test-rubies" in args or "--test-runtime-burn" in args or "--test-single-punishment" in args or "--test-expansion" in args or "--test-imps" in args or "--test-flight-camera" in args or "--test-maintenance" in args or "--test-castle" in args or "--test-building" in args or "--test-workflow" in args or "--test-roster" in args or "--test-priority" in args or "--test-mesh" in args or "--test-economy" in args or "--test-posture" in args or "--test-gait" in args or "--test-visuals" in args or "--test-mode" in args or "--test-exit" in args or "--test-ui" in args or "--test-audio" in args or "--test-sentences" in args or "--test-hud" in args
|
||||
if "--test-equipment-models" in args:args.append("--test-mesh")
|
||||
test_mode="--test-iron-maiden" in args or "--test-intro" in args or "--test-room-decor" in args or "--test-camera-controls" in args or "--test-rubies" in args or "--test-runtime-burn" in args or "--test-single-punishment" in args or "--test-expansion" in args or "--test-imps" in args or "--test-flight-camera" in args or "--test-maintenance" in args or "--test-castle" in args or "--test-building" in args or "--test-workflow" in args or "--test-roster" in args or "--test-priority" in args or "--test-mesh" in args or "--test-economy" in args or "--test-posture" in args or "--test-gait" in args or "--test-visuals" in args or "--test-mode" in args or "--test-exit" in args or "--test-ui" in args or "--test-audio" in args or "--test-sentences" in args or "--test-hud" in args
|
||||
capture_mode="--capture-workflow" in args or "--capture-roster" in args or "--capture-economy" in args or "--capture-posture" in args or "--capture-gait" in args or "--capture" in args or "--capture-workshop" in args
|
||||
test_mode=test_mode or "--test-maiden-performance" in args or "--test-performance-soak" in args
|
||||
if FileAccess.file_exists("res://build_info.json"):
|
||||
var stamp=JSON.parse_string(FileAccess.get_file_as_string("res://build_info.json"))
|
||||
if stamp is Dictionary: build_id=str(stamp.get("id",build_id))
|
||||
@@ -144,7 +146,10 @@ func _ready():
|
||||
say("Первый день. Последняя надежда на отпуск.")
|
||||
refresh_ui()
|
||||
if automatic: build_auto_arm()
|
||||
if "--test-intro" in args:call_deferred("run_intro_tests")
|
||||
if "--test-performance-soak" in args:call_deferred("run_performance_soak_tests")
|
||||
elif "--test-maiden-performance" in args:call_deferred("run_maiden_performance_tests")
|
||||
elif "--test-iron-maiden" in args:call_deferred("run_iron_maiden_tests")
|
||||
elif "--test-intro" in args:call_deferred("run_intro_tests")
|
||||
elif "--test-exit" in args: call_deferred("test_exit")
|
||||
elif "--test-audio" in args: call_deferred("run_audio_tests")
|
||||
elif "--test-ui" in args: call_deferred("run_ui_tests")
|
||||
@@ -162,6 +167,7 @@ func _ready():
|
||||
elif "--test-workflow" in args:call_deferred("run_workflow_tests")
|
||||
elif "--test-roster" in args:call_deferred("run_roster_tests")
|
||||
elif "--test-priority" in args:call_deferred("run_delivery_priority_tests")
|
||||
elif "--test-equipment-models" in args:call_deferred("run_equipment_model_tests")
|
||||
elif "--test-mesh" in args:call_deferred("run_mesh_tests")
|
||||
elif "--test-sentences" in args:call_deferred("run_sentence_tests")
|
||||
elif "--test-economy" in args:call_deferred("run_economy_tests")
|
||||
@@ -522,6 +528,8 @@ func floating(text: String, p: Vector3, c: Color):
|
||||
|
||||
func _input(event):
|
||||
if intro.active:
|
||||
if event is InputEventKey and event.pressed and not event.echo and (event.keycode==KEY_SPACE or event.physical_keycode==KEY_SPACE):
|
||||
intro.finish()
|
||||
get_viewport().set_input_as_handled()
|
||||
return
|
||||
if workshop:workshop.track_pointer(event)
|
||||
@@ -572,7 +580,9 @@ func _process(delta):
|
||||
time+=dt
|
||||
for gear in moving_gears: gear.rotation.z+=dt*0.65
|
||||
if workshop:
|
||||
var profile_tick=Time.get_ticks_usec() if get_meta("profile_life",false) else 0
|
||||
workshop.update(dt)
|
||||
if profile_tick>0:set_meta("workshop_cpu_us",Time.get_ticks_usec()-profile_tick)
|
||||
return
|
||||
if paused or not game_started: return
|
||||
advance_spawns(dt)
|
||||
@@ -961,6 +971,9 @@ func capture_economy():
|
||||
func run_mesh_tests():
|
||||
await preload("res://mesh_walking_tests.gd").new().run(self)
|
||||
|
||||
func run_equipment_model_tests():
|
||||
await preload("res://equipment_model_tests.gd").new().run(self)
|
||||
|
||||
func run_delivery_priority_tests():
|
||||
await preload("res://delivery_priority_tests.gd").new().run(self)
|
||||
|
||||
@@ -1011,3 +1024,12 @@ func run_room_decor_tests():
|
||||
|
||||
func run_intro_tests():
|
||||
await preload("res://intro_tests.gd").new().run(self)
|
||||
|
||||
func run_iron_maiden_tests():
|
||||
await preload("res://iron_maiden_tests.gd").new().run(self)
|
||||
|
||||
func run_maiden_performance_tests():
|
||||
await preload("res://maiden_performance_tests.gd").new().run(self)
|
||||
|
||||
func run_performance_soak_tests():
|
||||
await preload("res://performance_soak_tests.gd").new().run(self)
|
||||
|
||||
@@ -37,11 +37,11 @@ func run(g):
|
||||
activities.update(imp,.2)
|
||||
check(imp.activity==kind and is_instance_valid(imp.activity_props),"activity starts with real props: "+kind)
|
||||
var before=imp.model.get_node("ArmR").rotation
|
||||
activities.update(imp,.3)
|
||||
activities.update(imp,.3);imp.gait.update(.05,true)
|
||||
check(imp.model.get_node("ArmR").rotation!=before,"activity animates: "+kind)
|
||||
g.camera.position=imp.root.position+Vector3(3,2.4,4);g.camera.look_at(imp.root.position+Vector3(0,.6,0));g.camera.size=3.5
|
||||
if kind=="draw":
|
||||
activities.update(imp,3.5)
|
||||
activities.update(imp,3.5);imp.gait.update(.05,true)
|
||||
check(imp.activity_mark.edges.all(func(edge):return edge.node.visible),"pentagram is drawn in five strokes")
|
||||
for node in g.architecture.walls:node.show()
|
||||
g.camera.position=imp.root.position+Vector3(3,1.5,2);g.camera.look_at(imp.root.position+Vector3(-.3,.7,0))
|
||||
|
||||
@@ -14,6 +14,8 @@ func setup(game):
|
||||
shape_node=CollisionShape3D.new();shape_node.shape=shape;shape_node.position.y=1.02;probe.add_child(shape_node)
|
||||
func build(root):
|
||||
for mesh in root.find_children("*","MeshInstance3D",true,false):
|
||||
# Internal lining/embossing is enclosed by the real exterior shell.
|
||||
if mesh.get_meta("no_walk_collision",false):continue
|
||||
if not mesh.is_visible_in_tree() or mesh.mesh==null:continue
|
||||
if mesh.mesh is QuadMesh:continue
|
||||
if mesh.material_override is ShaderMaterial and mesh.material_override.shader in [preload("res://surface_water.gdshader"),preload("res://boiling.gdshader"),preload("res://leather.gdshader")]:continue
|
||||
@@ -21,14 +23,23 @@ func build(root):
|
||||
if bounds.size.length()<.24:continue
|
||||
var body=StaticBody3D.new();body.name="MeshWalkingCollider";body.collision_layer=2;body.collision_mask=0
|
||||
mesh.add_child(body)
|
||||
var collider=CollisionShape3D.new();collider.shape=mesh.mesh.create_trimesh_shape();body.add_child(collider)
|
||||
collider.shape.backface_collision=true
|
||||
var collider=CollisionShape3D.new()
|
||||
collider.shape=mesh.get_meta("walk_collision_shape") if mesh.has_meta("walk_collision_shape") else mesh.mesh.create_trimesh_shape()
|
||||
body.add_child(collider)
|
||||
if collider.shape is ConcavePolygonShape3D:collider.shape.backface_collision=true
|
||||
func rebuild(stations):
|
||||
outlines.clear()
|
||||
for s in stations:
|
||||
for mesh in s.device.find_children("*","MeshInstance3D",true,false):
|
||||
if not mesh.has_node("MeshWalkingCollider"):continue
|
||||
var points=PackedVector2Array()
|
||||
var collider=mesh.get_node("MeshWalkingCollider").get_child(0) as CollisionShape3D
|
||||
if collider.shape is ConvexPolygonShape3D:
|
||||
# The route planner must use the same hull as the swept capsule.
|
||||
for v in collider.shape.points:
|
||||
var point=mesh.global_transform*v;points.append(Vector2(point.x,point.z))
|
||||
if points.size()>2:outlines.append(Geometry2D.convex_hull(points))
|
||||
continue
|
||||
var faces=mesh.mesh.get_faces()
|
||||
for i in range(0,faces.size(),3):
|
||||
var a=mesh.global_transform*faces[i];var b=mesh.global_transform*faces[i+1];var c=mesh.global_transform*faces[i+2]
|
||||
@@ -42,7 +53,12 @@ func blocked(point,radius=.32):
|
||||
if point.distance_to(Geometry2D.get_closest_point_to_segment(point,polygon[i],polygon[i+1]))<radius:return true
|
||||
return false
|
||||
func move_actor(node,motion,radius=.30,height=1.65):
|
||||
shape.radius=radius;shape.height=maxf(height,2*radius);shape_node.position.y=(.195 if height>1.4 else .10)+height/2
|
||||
if motion.length_squared()<.0000001:return
|
||||
if not is_equal_approx(shape.radius,radius):shape.radius=radius
|
||||
var capsule_height=maxf(height,2*radius)
|
||||
if not is_equal_approx(shape.height,capsule_height):shape.height=capsule_height
|
||||
var offset=(.195 if height>1.4 else .10)+height/2
|
||||
if not is_equal_approx(shape_node.position.y,offset):shape_node.position.y=offset
|
||||
probe.position=node.position;probe.force_update_transform()
|
||||
var remaining=motion
|
||||
for i in range(4):
|
||||
|
||||
@@ -31,7 +31,7 @@ func run(g):
|
||||
for n in w.node_buttons:
|
||||
if n.key in ["speed","auto"]:check(n.button.modulate==Color.WHITE and n.gems.filled==1,"learned upgrades stay bright and show a ruby")
|
||||
g.say("Проверка диалога");check(g.life.hero_bubble.find_children("*","Polygon2D",true,false).is_empty(),"hero dialogue has no arrow")
|
||||
w.spawn();var soul=g.souls.back();soul.entering=false;g.set_soul_reveal(soul.visual,1)
|
||||
w.add_station(0,Vector3(2,0,0));w.spawn();var soul=g.souls.back();soul.entering=false;g.set_soul_reveal(soul.visual,1)
|
||||
g.development.speak(soul,"Проверка")
|
||||
check(not is_instance_valid(g.development.bubble),"soul dialogue disabled")
|
||||
if failures==0:print("ALL MESH WALKING TESTS PASSED: mesh clearance, sweep, slide, rotation, removal, learned UI and arrowless dialogue")
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
extends RefCounted
|
||||
# Water, restraints and moving controls stay independent of the Meshy surfaces.
|
||||
const MODELS={
|
||||
0:preload("res://art/equipment/meshy_v01/pillory.glb"),
|
||||
1:preload("res://art/equipment/meshy_v01/rack.glb"),
|
||||
2:preload("res://art/equipment/meshy_v01/wheel_vat.glb"),
|
||||
4:preload("res://art/equipment/meshy_v01/musical_chair.glb"),
|
||||
5:preload("res://art/equipment/meshy_v01/cauldron.glb")}
|
||||
static var collisions={}
|
||||
func build(g,d):
|
||||
var root=d.device
|
||||
var model=MODELS[d.selected].instantiate();root.add_child(model)
|
||||
root.set_meta("apparatus_model","meshy_equipment_v01")
|
||||
for mesh in model.find_children("*","MeshInstance3D",true,false):
|
||||
var key=str(d.selected)+"/"+str(mesh.name)
|
||||
if not collisions.has(key):collisions[key]=mesh.mesh.create_convex_shape(true,true)
|
||||
mesh.set_meta("walk_collision_shape",collisions[key])
|
||||
if d.selected==0:root.set_meta("pillory_apertures",3)
|
||||
if d.selected==2:
|
||||
d.crank=model.find_child("Wheel",true,false)
|
||||
assert(d.crank!=null,"The wheel requires a separate axle pivot")
|
||||
root.set_meta("wheel_radius",1.28)
|
||||
# Central axle is perpendicular to the wheel; the frame stays behind it.
|
||||
var axle=g.cylinder(root,Vector3(0,1.62,-.31),.12,.52,Color("332e28"));axle.rotation.x=PI/2
|
||||
g.line(root,Vector3(-1.34,1.62,-.53),Vector3(1.34,1.62,-.53),.085,Color("453124"))
|
||||
for side in [-1,1]:
|
||||
g.box(root,Vector3(side*1.35,1.62,-.25),Vector3(.28,.28,.28),Color("332e28"))
|
||||
for y in [1.53,1.71]:g.ball(root,Vector3(side*1.35,y,-.09),Vector3.ONE*.045,Color("89734b"))
|
||||
if d.selected in [1,2]:
|
||||
var handle=Node3D.new();root.add_child(handle);handle.name="WindingHandle"
|
||||
handle.position=Vector3(1.0,1.08,-1.34) if d.selected==1 else Vector3(1.48,1.62,0)
|
||||
handle.rotation.y=PI/2
|
||||
var pivot=Node3D.new();handle.add_child(pivot);pivot.name="HandleRotor"
|
||||
g.line(pivot,Vector3.ZERO,Vector3(.25,0,0),.035,Color("38332c"))
|
||||
g.line(pivot,Vector3(.25,0,0),Vector3(.25,0,.20),.04,Color("61432b"))
|
||||
for mesh in handle.find_children("*","MeshInstance3D",true,false):mesh.set_meta("no_walk_collision",true)
|
||||
if d.selected==1:d.crank=pivot
|
||||
root.set_meta("handle_rotor",pivot)
|
||||
if d.selected==4:
|
||||
for side in [-1,1]:
|
||||
var speaker=Node3D.new();root.add_child(speaker);speaker.name="InwardFacingSpeaker"
|
||||
speaker.position=Vector3(side*.90,1.75,-.18)
|
||||
var direction=Vector3(0,1.75,-.12)-speaker.position
|
||||
speaker.rotation.y=atan2(direction.x,direction.z)
|
||||
d.special.speaker_roots.append(speaker)
|
||||
# Invisible measured contact proxy for the upholstered seat surface.
|
||||
var seat=MeshInstance3D.new();root.add_child(seat);seat.name="ChairSeat";seat.position=Vector3(0,.64,-.12)
|
||||
var contact=BoxMesh.new();contact.size=Vector3(.96,.12,.48);seat.mesh=contact;seat.hide();seat.set_meta("no_walk_collision",true)
|
||||
d.special["seat"]=seat
|
||||
var rest=g.box(root,Vector3(0,.29,.53),Vector3(.85,.08,.38),Color("3e3028"));rest.name="ChairFootrest"
|
||||