Replace iron maiden with textured Meshy model and working hinged doors
This commit is contained in:
@@ -1,5 +1,13 @@
|
||||
# Succubus model credits
|
||||
|
||||
## 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
|
||||
|
||||
@@ -44,6 +44,10 @@ 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":
|
||||
var glow=ShaderMaterial.new();glow.shader=preload("res://maiden_heat.gdshader")
|
||||
n.material_overlay=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)
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,36 @@
|
||||
[remap]
|
||||
|
||||
importer="scene"
|
||||
importer_version=1
|
||||
type="PackedScene"
|
||||
uid="uid://c4pu3eygt6e4y"
|
||||
path="res://.godot/imported/iron_maiden.glb-becc2a15b0689d3fd809e932ed47a928.scn"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/equipment/iron_maiden_v01/iron_maiden.glb"
|
||||
dest_files=["res://.godot/imported/iron_maiden.glb-becc2a15b0689d3fd809e932ed47a928.scn"]
|
||||
|
||||
[params]
|
||||
|
||||
nodes/root_type=""
|
||||
nodes/root_name=""
|
||||
nodes/apply_root_scale=true
|
||||
nodes/root_scale=1.0
|
||||
nodes/import_as_skeleton_bones=false
|
||||
meshes/ensure_tangents=true
|
||||
meshes/generate_lods=false
|
||||
meshes/create_shadow_meshes=true
|
||||
meshes/light_baking=1
|
||||
meshes/lightmap_texel_size=0.2
|
||||
meshes/force_disable_compression=true
|
||||
skins/use_named_skins=true
|
||||
animation/import=true
|
||||
animation/fps=30
|
||||
animation/trimming=false
|
||||
animation/remove_immutable_tracks=true
|
||||
animation/import_rest_as_RESET=false
|
||||
import_script/path=""
|
||||
_subresources={}
|
||||
gltf/naming_version=1
|
||||
gltf/embedded_image_handling=1
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 15 MiB |
@@ -0,0 +1,37 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dx0sqfg38ks84"
|
||||
path="res://.godot/imported/iron_maiden_Image_0.jpg-f6ee579cc3c55dbc17f6bfbca1b8dae5.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
generator_parameters={
|
||||
"md5": "abc55db7df710ef5a99ca62f55de62bb"
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/equipment/iron_maiden_v01/iron_maiden_Image_0.jpg"
|
||||
dest_files=["res://.godot/imported/iron_maiden_Image_0.jpg-f6ee579cc3c55dbc17f6bfbca1b8dae5.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 MiB |
@@ -0,0 +1,37 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://c7u0kec30jl02"
|
||||
path="res://.godot/imported/iron_maiden_Image_1.jpg-d51c196e2c01c86d3db2645e99535ca7.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
generator_parameters={
|
||||
"md5": "7269fcd31a2b122b8c924eadc56822f7"
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/equipment/iron_maiden_v01/iron_maiden_Image_1.jpg"
|
||||
dest_files=["res://.godot/imported/iron_maiden_Image_1.jpg-d51c196e2c01c86d3db2645e99535ca7.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 11 MiB |
@@ -0,0 +1,37 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dv2tn24mj4s58"
|
||||
path="res://.godot/imported/iron_maiden_Image_2.jpg-da441b4b500293093b6aec87e40a7f71.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
generator_parameters={
|
||||
"md5": "97940641db71c7ef90df2e4c5be83693"
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/equipment/iron_maiden_v01/iron_maiden_Image_2.jpg"
|
||||
dest_files=["res://.godot/imported/iron_maiden_Image_2.jpg-da441b4b500293093b6aec87e40a7f71.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"source_task": "01a1845b-d214-7150-8267-02bdbab6abd8",
|
||||
"resource": "multi-image-to-3d",
|
||||
"height_m": 3.1,
|
||||
"hinges_blender": {
|
||||
"LeftDoor": [
|
||||
-0.8125486969947815,
|
||||
0.0,
|
||||
0.0
|
||||
],
|
||||
"RightDoor": [
|
||||
0.8134756684303284,
|
||||
0.0,
|
||||
0.0
|
||||
]
|
||||
},
|
||||
"door_height": [
|
||||
0.25,
|
||||
2.48
|
||||
],
|
||||
"construction": "Closed source partitioned once; two front quadrants, separate smooth lining, recomputed normals.",
|
||||
"triangles": 92228
|
||||
}
|
||||
@@ -24,6 +24,9 @@ func build(game,d):
|
||||
preload("res://new_equipment.gd").new().build(g,d)
|
||||
return
|
||||
var root=d.device
|
||||
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,13 @@
|
||||
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")
|
||||
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")
|
||||
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()
|
||||
@@ -0,0 +1,49 @@
|
||||
extends RefCounted
|
||||
var failures=0
|
||||
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("res://captures/iron-maiden/"+name+".png")
|
||||
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("")
|
||||
DirAccess.make_dir_recursive_absolute("res://captures/iron-maiden")
|
||||
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")
|
||||
var surfaces=d.device.find_children("*","MeshInstance3D",true,false)
|
||||
var textured=0
|
||||
for mesh in surfaces:
|
||||
if mesh==d.flame:continue
|
||||
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")
|
||||
check(mesh.material_overlay is ShaderMaterial,"independent heat overlay")
|
||||
check(textured>0,"Meshy textures present")
|
||||
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")
|
||||
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(35):w.step_station(d,.1,true)
|
||||
check(d.stage==1,"station advances through closure into heat")
|
||||
check(d.motion.heat>0,"heat advances")
|
||||
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")
|
||||
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)
|
||||
@@ -0,0 +1,10 @@
|
||||
shader_type spatial;
|
||||
render_mode blend_add, depth_draw_never, unshaded, shadows_disabled;
|
||||
uniform float heat=0.0;
|
||||
varying float model_height;
|
||||
void vertex(){ model_height=VERTEX.y; }
|
||||
void fragment(){
|
||||
float warmth=heat*(.35+.65*(1.0-smoothstep(0.0,2.8,model_height)));
|
||||
ALBEDO=vec3(1.0,.07,.003)*warmth*warmth*.22;
|
||||
ALPHA=heat*.45;
|
||||
}
|
||||
+6
-2
@@ -86,7 +86,7 @@ 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
|
||||
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
|
||||
if FileAccess.file_exists("res://build_info.json"):
|
||||
var stamp=JSON.parse_string(FileAccess.get_file_as_string("res://build_info.json"))
|
||||
@@ -144,7 +144,8 @@ func _ready():
|
||||
say("Первый день. Последняя надежда на отпуск.")
|
||||
refresh_ui()
|
||||
if automatic: build_auto_arm()
|
||||
if "--test-intro" in args:call_deferred("run_intro_tests")
|
||||
if "--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")
|
||||
@@ -1011,3 +1012,6 @@ 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)
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.6 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 MiB |
Reference in New Issue
Block a user