Skip to content

Commit

Permalink
Hotfix/v3.2.2 (#112)
Browse files Browse the repository at this point in the history
### Fixed
- glTFast symbol check ahead of package import removed.
- glTFast class type check to prevent define symbol add is removed.
- Settings asset creation in class with `InitializeOnLoad` attribute,
refactored to create asset after asset indexing, using delayCall.

---------

Co-authored-by: Sercan Altundas <[email protected]>
  • Loading branch information
HarrisonHough and srcnalt authored Aug 30, 2023
1 parent 79a4ed8 commit 02678a2
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/latest.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
## Changelog

### Fixed
- issue of missing mesh references when prefabs were created by avatar loader window
- issue where order of operations caused scriptable object creation errors

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [3.2.2] - 2023.08.30

### Fixed
- issue where order of operations caused scriptable object creation errors

## [3.2.1] - 2023.08.28

### Fixed
Expand Down
10 changes: 6 additions & 4 deletions Editor/EditorAssetGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ public class EditorAssetGenerator

static EditorAssetGenerator()
{
if (!Resources.Load<AvatarLoaderSettings>(AvatarLoaderSettings.SETTINGS_PATH))
{
CreateSettingsAssets();
}
EditorApplication.delayCall += CreateSettingsAssets;
}

~EditorAssetGenerator()
{
EditorApplication.delayCall -= CreateSettingsAssets;
}

private static void CreateSettingsAssets()
Expand Down
9 changes: 3 additions & 6 deletions Editor/Module Management/ModuleInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,15 @@ public static class ModuleInstaller

private const float TIMEOUT_FOR_MODULE_INSTALLATION = 20f;
private const string AVATAR_LOADER_SUBSTRING = "avatarloader";
private const string GLTFAST_CLASS = "GLTFast.GltfAsset";


static ModuleInstaller()
{
#if !GLTFAST
AddGltfastSymbol();
#endif
Events.registeredPackages += OnRegisteredPackages;
Events.registeringPackages += OnRegisteringPackages;
}



/// <summary>
/// Called when a package is added, removed or changed.
/// </summary>
Expand All @@ -61,9 +58,9 @@ private static void OnRegisteredPackages(PackageRegistrationEventArgs args)
if (args.added != null && args.added.Any(p => p.name == CORE_MODULE_NAME))
{
InstallModules();
AddGltfastSymbol();
CoreSettingsHandler.CreateCoreSettings();
AddScriptingDefineSymbolToAllBuildTargetGroups(READY_PLAYER_ME_SYMBOL);
AddGltfastSymbol();
}
ValidateModules();
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.readyplayerme.core",
"version": "3.2.1",
"version": "3.2.2",
"displayName": "Ready Player Me Core",
"description": "This Module contains all the core functionality required for using Ready Player Me avatars in Unity, including features such as: \n - Module management and automatic package setup logic\n - Avatar loading from .glb files\n - Avatar and 2D render requests\n - Optional Analytics\n - Custom editor windows\n - Sample scenes and assets",
"unity": "2020.3",
Expand Down

0 comments on commit 02678a2

Please sign in to comment.