fix eyebrow fallback

decentraland · Oct 3, 2024 · 8604946 · 8604946
1 parent 8f78a1c
commit 8604946
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 6 deletions.
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -1,7 +1,7 @@
 on:
  push:
  branches:
- # - main
+ - main
 
  workflow_dispatch:
  inputs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -163,7 +163,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- os: [bigwin, ubuntu-22.04, macos-14-xlarge]
+ os: [ubuntu-22.04]
  runs-on: ${{ matrix.os }}
  steps:
  - uses: actions/checkout@v2

diff --git a/godot/assets/environment/cli_environment.tres b/godot/assets/environment/cli_environment.tres
@@ -18,7 +18,5 @@ glow_enabled = true
 glow_levels/1 = 1.0
 glow_levels/2 = 1.0
 glow_levels/5 = 0.0
-glow_intensity = 2.0
 glow_mix = 0.0
 glow_hdr_threshold = 0.9
-glow_hdr_scale = 0.1
diff --git a/godot/src/decentraland_components/avatar/wearables/wearables.gd b/godot/src/decentraland_components/avatar/wearables/wearables.gd
@@ -392,7 +392,7 @@ class Categories:
  ]
 
  const UPPER_BODY_DEFAULT_HIDES: PackedStringArray = [HANDS]
- const REQUIRED_CATEGORIES: PackedStringArray = [EYES, MOUTH]
+ const REQUIRED_CATEGORIES: PackedStringArray = [EYES, MOUTH, EYEBROWS]
 
  const MAIN_CATEGORIES: Dictionary = {
  BODY_SHAPE: [BODY_SHAPE],

diff --git a/godot/src/test/avatar/avatar_list.json b/godot/src/test/avatar/avatar_list.json
@@ -661,6 +661,79 @@
  "a": 1
  }
  }
+ },
+ {
+ "ref": "without emissive",
+ "bodyShape": "urn:decentraland:off-chain:base-avatars:BaseFemale",
+ "wearables": [
+ "urn:decentraland:off-chain:base-avatars:f_simple_yellow_tshirt",
+ "urn:decentraland:off-chain:base-avatars:f_short_blue_jeans",
+ "urn:decentraland:off-chain:base-avatars:pink_sleepers",
+ "urn:decentraland:off-chain:base-avatars:cornrows",
+ "urn:decentraland:off-chain:base-avatars:green_stone_tiara",
+ "urn:decentraland:off-chain:base-avatars:f_mouth_04"
+ ],
+ "forceRender": [],
+ "eyes": {
+ "color": {
+ "r": 0.052996814250946045,
+ "g": 0.5021452307701111,
+ "b": 0.025209957733750343,
+ "a": 1
+ }
+ },
+ "hair": {
+ "color": {
+ "r": 0.009899990633130074,
+ "g": 0.9900000095367432,
+ "b": 0.23136761784553528,
+ "a": 1
+ }
+ },
+ "skin": {
+ "color": {
+ "r": 0.8666666746139526,
+ "g": 0.6941176652908325,
+ "b": 0.5607843399047852,
+ "a": 1
+ }
+ }
+ },
+ {
+ "ref": "without emissive v2",
+ "bodyShape": "urn:decentraland:off-chain:base-avatars:BaseFemale",
+ "skin": {
+ "color": {
+ "r": 0.800000011920929,
+ "g": 0.6078431606292725,
+ "b": 0.46666666865348816,
+ "a": 1
+ }
+ },
+ "hair": {
+ "color": {
+ "r": 0.48235294222831726,
+ "g": 0.2823529541492462,
+ "b": 0.0941176488995552,
+ "a": 1
+ }
+ },
+ "eyes": {
+ "color": {
+ "r": 0.125490203499794,
+ "g": 0.7019608020782471,
+ "b": 0.9647058844566345,
+ "a": 1
+ }
+ },
+ "wearables": [
+ "urn:decentraland:off-chain:base-avatars:f_blue_jacket",
+ "urn:decentraland:off-chain:base-avatars:f_capris",
+ "urn:decentraland:off-chain:base-avatars:ruby_blue_loafer",
+ "urn:decentraland:off-chain:base-avatars:pony_tail",
+ "urn:decentraland:off-chain:base-avatars:pearls_earring",
+ "urn:decentraland:off-chain:base-avatars:f_mouth_05"
+ ]
  }
  ],
  "emotes": [

diff --git a/godot/src/test/avatar/avatar_tester_standalone.gd b/godot/src/test/avatar/avatar_tester_standalone.gd
@@ -118,7 +118,7 @@ func _on_option_button_avatar_list_item_selected(index):
  var avatar_wf: DclAvatarWireFormat = profile.get_avatar()
 
  avatar_wf.set_wearables(PackedStringArray(avatar_list[avatar_i].wearables))
- avatar_wf.set_force_render(avatar_list[avatar_i].forceRender)
+ avatar_wf.set_force_render(avatar_list[avatar_i].get("forceRender", []))
  avatar_wf.set_body_shape(avatar_list[avatar_i].bodyShape)
 
  var skin_color = avatar_list[avatar_i].get("skin", {}).get("color", {})