fix: avatar rendering face zoom (#525)

* fix: avatar rendering face zoom * remove unwanted code * fix snapshots
decentraland · Jan 18, 2025 · 40e3f92 · 40e3f92
1 parent 72e023e
commit 40e3f92
Showing 9 changed files with 6 additions and 11 deletions.
diff --git a/godot/project.godot b/godot/project.godot
@@ -38,10 +38,6 @@ gdscript/warnings/redundant_await=false
 window/size/viewport_width=1280
 window/size/viewport_height=720
 
-[editor]
-
-run/main_run_args="--avatar-renderer --avatars ../tests/avatars-test-input.json"
-
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/dcl_build_plugin/plugin.cfg", "res://addons/godot-xr-tools/plugin.cfg", "res://addons/resource_tracker/plugin.cfg", "res://addons/webview-godot-android/plugin.cfg")

diff --git a/godot/src/tool/avatar_renderer/avatar_renderer_helper.gd b/godot/src/tool/avatar_renderer/avatar_renderer_helper.gd
@@ -11,7 +11,7 @@ class AvatarRendererSpecs:
 	var face_dest_path := ""
 	var face_width := 256
 	var face_height := 256
-	var face_zoom := 25
+	var face_zoom := 25.0
 
 	var avatar: DclAvatarWireFormat
 

diff --git a/godot/src/tool/avatar_renderer/avatar_renderer_standalone.gd b/godot/src/tool/avatar_renderer/avatar_renderer_standalone.gd
@@ -125,7 +125,7 @@ func _async_on_avatar_avatar_loaded():
 		ensure_base_dir_exists(face_dest_path)
 
 		var face_image = await avatar_preview.async_get_viewport_image(
-			true, Vector2i(profile.face_width, profile.face_height)
+			true, Vector2i(profile.face_width, profile.face_height), profile.face_zoom
 		)
 		face_image.save_png(face_dest_path)
 		logs.push_back("🟢 " + face_dest_path)

diff --git a/godot/src/ui/components/backpack/avatar_preview.gd b/godot/src/ui/components/backpack/avatar_preview.gd
@@ -109,15 +109,14 @@ func _on_gui_input(event):
 			camera_3d.transform = changed_transform
 
 
-func async_get_viewport_image(face: bool, dest_size: Vector2i, fov: Variant = null) -> Image:
+func async_get_viewport_image(face: bool, dest_size: Vector2i, fov: float = 40) -> Image:
 	avatar.emote_controller.freeze_on_idle()
 	avatar.rotation.y = 0.0
 	const PROFILE_BODY_CAMERA_POSITION = Vector3(0, 2.3, -3.5)
-	const PROFILE_HEAD_CAMERA_POSITION = Vector3(0, 1.6, -1.25)
+	const PROFILE_HEAD_CAMERA_POSITION = Vector3(0, 1.7, -1.25)
 	camera_3d.position = PROFILE_HEAD_CAMERA_POSITION if face else PROFILE_BODY_CAMERA_POSITION
 	camera_3d.rotation_degrees = DEFAULT_ROTATION if not face else Vector3(0.0, 180.0, 0.0)
-	if fov is float:
-		camera_3d.fov = fov
+	camera_3d.fov = fov
 
 	set_deferred("size", dest_size)
 	set_size(dest_size)

diff --git a/godot/src/ui/components/backpack/backpack.gd b/godot/src/ui/components/backpack/backpack.gd
@@ -282,7 +282,7 @@ func async_prepare_snapshots(new_mutable_avatar: DclAvatarWireFormat, profile: D
 	cloned_avatar_preview.show_platform = false
 	cloned_avatar_preview.hide_name = true
 	cloned_avatar_preview.can_move = false
-	var face = await cloned_avatar_preview.async_get_viewport_image(true, Vector2i(256, 256))
+	var face = await cloned_avatar_preview.async_get_viewport_image(true, Vector2i(256, 256), 25)
 	var body = await cloned_avatar_preview.async_get_viewport_image(false, Vector2i(256, 512))
 
 	var body_data: PackedByteArray = body.save_png_to_buffer()

diff --git a/...generation/bafkreia6x2mlr2mmdry66czgpze6khwcdmcpqbkjeu7bmrydzaxf3v4x6q_face.png b/...generation/bafkreia6x2mlr2mmdry66czgpze6khwcdmcpqbkjeu7bmrydzaxf3v4x6q_face.png
diff --git a/...generation/bafkreid7hnqaw5qpb2ohwj2in344f5gx5ehxyc7wvlgbii5fbcbqh2am6q_face.png b/...generation/bafkreid7hnqaw5qpb2ohwj2in344f5gx5ehxyc7wvlgbii5fbcbqh2am6q_face.png
diff --git a/...generation/bafkreidw3wn32cugqfi4jlqgzldakfbhjcyn377mm3qrjkquo5v4ud5k2u_face.png b/...generation/bafkreidw3wn32cugqfi4jlqgzldakfbhjcyn377mm3qrjkquo5v4ud5k2u_face.png
diff --git a/tests/snapshots/avatar-image-generation/mati_avatar_test_face.png b/tests/snapshots/avatar-image-generation/mati_avatar_test_face.png