refactor: minor code improvements and fixes (#446)

* add default value to texture quality

* clear warnings for shadowing and more

* better error message

* fix: avatar name and mic sprite billboard are different in xr

* format

* copy instead of move

.github/workflows/android-build.yml

@@ -46,15 +46,15 @@ jobs:
  if: success() || failure()
  run: |
  mkdir -p android-artifacts
- mv godot/lib/android/arm64/libdclgodot.so android-artifacts/
+ cp godot/lib/android/arm64/libdclgodot.so android-artifacts/
  mv android.apk android-artifacts/ || true
  mv android-unsigned.aab android-artifacts/ || true
 
  - name: Copy Meta Quest Artifacts
  if: success() || failure()
  run: |
  mkdir -p meta-quest-artifacts
- mv godot/lib/android/arm64/libdclgodot.so meta-quest-artifacts/
+ cp godot/lib/android/arm64/libdclgodot.so meta-quest-artifacts/
  mv meta-quest.apk meta-quest-artifacts/ || true
  mv meta-quest-unsigned.aab meta-quest-artifacts/ || true
 

godot/src/config/config_data.gd

@@ -331,35 +331,35 @@ func save_to_settings_file():
  if Global.testing_scene_mode:
  return
 
- var settings_file: ConfigFile = ConfigFile.new()
- settings_file.set_value("config", "gravity", self.gravity)
- settings_file.set_value("config", "jump_velocity", self.jump_velocity)
- settings_file.set_value("config", "walk_velocity", self.walk_velocity)
- settings_file.set_value("config", "run_velocity", self.run_velocity)
- settings_file.set_value("config", "process_tick_quota_ms", self.process_tick_quota_ms)
- settings_file.set_value("config", "scene_radius", self.scene_radius)
- settings_file.set_value("config", "limit_fps", self.limit_fps)
- settings_file.set_value("config", "skybox", self.skybox)
- settings_file.set_value("config", "shadow_quality", self.shadow_quality)
- settings_file.set_value("config", "anti_aliasing", self.anti_aliasing)
- settings_file.set_value("config", "graphic_profile", self.graphic_profile)
- settings_file.set_value("config", "local_content_dir", self.local_content_dir)
- settings_file.set_value("config", "max_cache_size", self.max_cache_size)
- settings_file.set_value("config", "show_fps", self.show_fps)
- settings_file.set_value("config", "window_mode", self.window_mode)
- settings_file.set_value("config", "ui_zoom", self.ui_zoom)
- settings_file.set_value("config", "resolution_3d_scale", self.resolution_3d_scale)
- settings_file.set_value("config", "audio_general_volume", self.audio_general_volume)
- settings_file.set_value("config", "audio_scene_volume", self.audio_scene_volume)
- settings_file.set_value("config", "audio_ui_volume", self.audio_ui_volume)
- settings_file.set_value("config", "audio_music_volume", self.audio_music_volume)
- settings_file.set_value("config", "audio_voice_chat_volume", self.audio_voice_chat_volume)
- settings_file.set_value("config", "audio_mic_amplification", self.audio_mic_amplification)
- settings_file.set_value("config", "texture_quality", self.get_texture_quality())
- settings_file.set_value("session", "account", self.session_account)
- settings_file.set_value("session", "guest_profile", self.guest_profile)
- settings_file.set_value("user", "last_parcel_position", self.last_parcel_position)
- settings_file.set_value("user", "last_realm_joined", self.last_realm_joined)
- settings_file.set_value("user", "last_places", self.last_places)
- settings_file.set_value("analytics", "user_id", self.analytics_user_id)
- settings_file.save(DclConfig.get_settings_file_path())
+ var new_settings_file: ConfigFile = ConfigFile.new()
+ new_settings_file.set_value("config", "gravity", self.gravity)
+ new_settings_file.set_value("config", "jump_velocity", self.jump_velocity)
+ new_settings_file.set_value("config", "walk_velocity", self.walk_velocity)
+ new_settings_file.set_value("config", "run_velocity", self.run_velocity)
+ new_settings_file.set_value("config", "process_tick_quota_ms", self.process_tick_quota_ms)
+ new_settings_file.set_value("config", "scene_radius", self.scene_radius)
+ new_settings_file.set_value("config", "limit_fps", self.limit_fps)
+ new_settings_file.set_value("config", "skybox", self.skybox)
+ new_settings_file.set_value("config", "shadow_quality", self.shadow_quality)
+ new_settings_file.set_value("config", "anti_aliasing", self.anti_aliasing)
+ new_settings_file.set_value("config", "graphic_profile", self.graphic_profile)
+ new_settings_file.set_value("config", "local_content_dir", self.local_content_dir)
+ new_settings_file.set_value("config", "max_cache_size", self.max_cache_size)
+ new_settings_file.set_value("config", "show_fps", self.show_fps)
+ new_settings_file.set_value("config", "window_mode", self.window_mode)
+ new_settings_file.set_value("config", "ui_zoom", self.ui_zoom)
+ new_settings_file.set_value("config", "resolution_3d_scale", self.resolution_3d_scale)
+ new_settings_file.set_value("config", "audio_general_volume", self.audio_general_volume)
+ new_settings_file.set_value("config", "audio_scene_volume", self.audio_scene_volume)
+ new_settings_file.set_value("config", "audio_ui_volume", self.audio_ui_volume)
+ new_settings_file.set_value("config", "audio_music_volume", self.audio_music_volume)
+ new_settings_file.set_value("config", "audio_voice_chat_volume", self.audio_voice_chat_volume)
+ new_settings_file.set_value("config", "audio_mic_amplification", self.audio_mic_amplification)
+ new_settings_file.set_value("config", "texture_quality", self.get_texture_quality())
+ new_settings_file.set_value("session", "account", self.session_account)
+ new_settings_file.set_value("session", "guest_profile", self.guest_profile)
+ new_settings_file.set_value("user", "last_parcel_position", self.last_parcel_position)
+ new_settings_file.set_value("user", "last_realm_joined", self.last_realm_joined)
+ new_settings_file.set_value("user", "last_places", self.last_places)
+ new_settings_file.set_value("analytics", "user_id", self.analytics_user_id)
+ new_settings_file.save(DclConfig.get_settings_file_path())

godot/src/decentraland_components/avatar/avatar.gd

@@ -50,6 +50,14 @@ var wearable_promises = null
 
 
 func _ready():
+ var billboard_mode = (
+ BaseMaterial3D.BillboardMode.BILLBOARD_FIXED_Y
+ if Global.is_xr()
+ else BaseMaterial3D.BillboardMode.BILLBOARD_ENABLED
+ )
+ sprite_3d_mic_enabled.billboard = billboard_mode
+ label_3d_name.billboard = billboard_mode
+
  emote_controller = AvatarEmoteController.new(self, animation_player, animation_tree)
  body_shape_skeleton_3d.bone_pose_changed.connect(self._attach_point_bone_pose_changed)
 

godot/src/decentraland_components/avatar/avatar.tscn

@@ -793,7 +793,7 @@ bone_idx = 61
 
 [node name="Label3D_Name" type="Label3D" parent="Armature/Skeleton3D/BoneAttachment3D_Name"]
 transform = Transform3D(-100, -1.2776e-06, 1.0215e-05, -1.14584e-06, 99.9906, 1.37115, -1.32296e-05, 1.37115, -99.9906, 0, 38.112, 0)
-billboard = 2
+billboard = 1
 font_size = 20
 outline_size = 6
 

godot/src/global.gd

@@ -222,11 +222,11 @@ func async_create_popup_warning(
 
 
 func async_get_texture_size(content_mapping, src, sender) -> void:
- var hash: String = content_mapping.get_hash(src)
- if hash.is_empty():
- hash = src
+ var texture_hash: String = content_mapping.get_hash(src)
+ if texture_hash.is_empty():
+ texture_hash = src
 
- var promise = Global.content_provider.fetch_texture_by_hash(hash, content_mapping)
+ var promise = Global.content_provider.fetch_texture_by_hash(texture_hash, content_mapping)
  var result = await PromiseUtils.async_awaiter(promise)
  if result is PromiseError:
  printerr(src, "couldn't get the size", result.get_error())

godot/src/ui/components/auth/magic_login.gd

@@ -20,8 +20,8 @@ func _ready():
  Global.dcl_tokio_rpc.magic_sign.connect(self._on_request_magic_sign)
 
 
-func set_lobby(lobby: Lobby):
- self.lobby = lobby
+func set_lobby(new_lobby: Lobby):
+ lobby = new_lobby
 
 
 func _on_magic_message_signed(signature: String):

godot/src/ui/components/backpack/avatar_preview.gd

@@ -119,8 +119,7 @@ func async_get_viewport_image(face: bool, dest_size: Vector2i, fov: Variant = nu
  if fov is float:
  camera_3d.fov = fov
 
- self.size = dest_size
- subviewport.size = dest_size
+ set_deferred("size", dest_size)
 
  await get_tree().process_frame
  await get_tree().process_frame

lib/src/content/resource_provider.rs

@@ -205,9 +205,12 @@ impl ResourceProvider {
  }
  }
 
- fs::rename(&tmp_dest, dest)
- .await
- .map_err(|e| format!("Failed to rename file: {:?}", e))?;
+ fs::rename(&tmp_dest, dest).await.map_err(|e| {
+ format!(
+ "Failed to rename file: {:?} from: {:?} to: {:?}",
+ e, tmp_dest, dest
+ )
+ })?;
 
  #[cfg(feature = "use_resource_tracking")]
  self.download_tracking.end(file_hash).await;
@@ -276,9 +279,12 @@ impl ResourceProvider {
  }
  }
 
- fs::rename(&tmp_dest, dest)
- .await
- .map_err(|e| format!("Failed to rename file: {:?}", e))?;
+ fs::rename(&tmp_dest, dest).await.map_err(|e| {
+ format!(
+ "Failed to rename file: {:?} from: {:?} to: {:?}",
+ e, tmp_dest, dest
+ )
+ })?;
 
  #[cfg(feature = "use_resource_tracking")]
  self.download_tracking.end(file_hash).await;
@@ -350,7 +356,12 @@ impl ResourceProvider {
  .map_err(|e| format!("File write error: {:?}", e))?;
  fs::rename(&tmp_dest, &absolute_file_path)
  .await
- .map_err(|e| format!("Failed to rename file: {:?}", e))?;
+ .map_err(|e| {
+ format!(
+ "Failed to rename file: {:?} from: {:?} to: {:?}",
+ e, tmp_dest, absolute_file_path
+ )
+ })?;
 
  // Update the cache map
  let file_size = bytes.len() as i64;

lib/src/godot_classes/dcl_config.rs

@@ -82,8 +82,11 @@ impl DclConfig {
  pub fn static_get_texture_quality() -> TextureQuality {
  let mut settings_file: Gd<ConfigFile> = ConfigFile::new();
  settings_file.load(DclConfig::get_settings_file_path());
- let texture_quality =
- settings_file.get_value("config".to_godot(), "texture_quality".to_godot());
+ let texture_quality = settings_file
+ .get_value_ex("config".to_godot(), "texture_quality".to_godot())
+ .default(Variant::from(TextureQuality::Medium.to_i32()))
+ .done();
+
  let texture_quality = texture_quality
  .try_to::<i32>()
  .unwrap_or(TextureQuality::Medium.to_i32());