Skip to content

Commit 7308806

Browse files
committed
Merge branch 'release/v5.0.0' into main
2 parents 73c5462 + c5210b1 commit 7308806

File tree

861 files changed

+46044
-191538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

861 files changed

+46044
-191538
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ If applicable, add screenshots to help explain your problem.
3737

3838
**Desktop (please complete the following information):**
3939
- Ready Player Me Core version
40-
- Ready Player Me Avatar Loader version
4140
- Ready Player Me WebView version
4241
- glTFast version
4342
- Unity Editor version [e.g. 2021.2.1f1]

.github/latest.md

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,38 @@
22
## Changelog
33

44
### Updated
5-
- replaced API URLs with model URLs for shortcodes by @rk132 in [#152](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/152)
6-
- updated render api and samples @rYuuk in [#147](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/147)
5+
- refactor and extracted shared logic from network packages @harrisonhough in [#148](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/148)
6+
- replaced api urls in samples with models urls by @rk132 in [#152](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/152)
7+
- added com.unity.cloud.gltfast as a dependency and removed auto install of gltfast from git url by @harrisonhough in [#155](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/155)
8+
- updated to GLTFast 6.0.1 by @harrisonhough in by @harrisonhough in [#157](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/157)
9+
- replaced use of ienumerator coroutines with async/await by @rYuuk in [#172](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/172)
10+
- request class names updated to be more uniform by @MaxAndreassenRPM in [#173](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/173)
11+
- endpoint classes removed and refactored by @MaxAndreassenRPM in [#174](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/174)
12+
- added avatar creator POC sample using new elements by @ryuuk in [#182](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/182)
13+
- removed "I don't have an account" checkbox from setup guide by @rk132 in [#184](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/184)
14+
- restructure of avatar creator samples by @rYuuk in [#185](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/185)
15+
- class and folder restructure to match Unity package standards by @harrisonhough in [#190](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/190)
16+
- namespaces added to some scripts to meet asset store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
17+
- Ready Player Me top toolbar menu is under `Tools/Ready Player Me` to comply with Asset Store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
18+
- samples renamed for Asset Store version of package and paths updated accordingly by @harrisonhough in [#198](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/198)
19+
- quick start sample animations updated by @rYuuk in [#200](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/200)
20+
- draco compression package version updated by @harrisonhough in [#202](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/202)
721

822
### Added
9-
- Added app id to setup guide by @ryuuk in [#145](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/145)
23+
- add gender select element for Avatar Creator by @harrisonhough in [#159](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/159)
24+
- basic login element for Avatar Creator by @harrisonhough in [#160](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/160)
25+
- photo capture element for Avatar Creator by @ryuuk in [#162](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/162)
26+
- avatar template element for Avatar Creator by @harrisonhough in [#164](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/164)
27+
- selfie element for Avatar Creator by @ryuuk in [#166](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/166)
28+
- asset panel element for Avatar Creator by @harrisonhough in [#175](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/175)
29+
- account creation element for Avatar Creator by @ryuuk in [#178](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/178)
30+
- avatar preview element for Avatar Creator by @ryuuk in [#181](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/181)
31+
32+
- fixed some issues related to paths like in the Graphics Setting Utility by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
33+
- shader override property added to avatar config by @ryuuk in [#199](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/199)
34+
35+
### Fixed
36+
- fix for handling pasted url text in subdomain field by @harrisonhough in [#183](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/183)
37+
- added permission and orientation fix to photo capture element by @ryuuk in [#192](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/192)
38+
- added Panel Switcher clear functionality to fix issues related to relaunching the creator by @ryuuk in [#194](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/194)
39+
- namespaces added to some scripts to meet asset store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)

.github/workflows/pr-test-runner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run Tests
22

33
on:
44
pull_request:
5-
types: [ opened, reopened ]
5+
types: [ opened, reopened, edited ]
66
workflow_dispatch:
77

88
jobs:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ sysinfo.txt
5353

5454
# Builds
5555
*.apk
56-
*.unitypackage
5756

5857
# Crashlytics generated file
5958
crashlytics-build.properties

CHANGELOG.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,45 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6+
## [5.0.0] - 2024.01.12
7+
8+
### Updated
9+
- refactor and extracted shared logic from network packages @harrisonhough in [#148](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/148)
10+
- replaced api urls in samples with models urls by @rk132 in [#152](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/152)
11+
- added com.unity.cloud.gltfast as a dependency and removed auto install of gltfast from git url by @harrisonhough in [#155](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/155)
12+
- updated to GLTFast 6.0.1 by @harrisonhough in by @harrisonhough in [#157](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/157)
13+
- replaced use of ienumerator coroutines with async/await by @rYuuk in [#172](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/172)
14+
- request class names updated to be more uniform by @MaxAndreassenRPM in [#173](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/173)
15+
- endpoint classes removed and refactored by @MaxAndreassenRPM in [#174](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/174)
16+
- added avatar creator POC sample using new elements by @ryuuk in [#182](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/182)
17+
- removed "I don't have an account" checkbox from setup guide by @rk132 in [#184](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/184)
18+
- restructure of avatar creator samples by @rYuuk in [#185](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/185)
19+
- class and folder restructure to match Unity package standards by @harrisonhough in [#190](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/190)
20+
- namespaces added to some scripts to meet asset store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
21+
- Ready Player Me top toolbar menu is under `Tools/Ready Player Me` to comply with Asset Store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
22+
- samples renamed for Asset Store version of package and paths updated accordingly by @harrisonhough in [#198](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/198)
23+
- quick start sample animations updated by @rYuuk in [#200](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/200)
24+
- draco compression package version updated by @harrisonhough in [#202](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/202)
25+
26+
### Added
27+
- add gender select element for Avatar Creator by @harrisonhough in [#159](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/159)
28+
- basic login element for Avatar Creator by @harrisonhough in [#160](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/160)
29+
- photo capture element for Avatar Creator by @ryuuk in [#162](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/162)
30+
- avatar template element for Avatar Creator by @harrisonhough in [#164](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/164)
31+
- selfie element for Avatar Creator by @ryuuk in [#166](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/166)
32+
- asset panel element for Avatar Creator by @harrisonhough in [#175](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/175)
33+
- account creation element for Avatar Creator by @ryuuk in [#178](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/178)
34+
- avatar preview element for Avatar Creator by @ryuuk in [#181](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/181)
35+
36+
- fixed some issues related to paths like in the Graphics Setting Utility by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
37+
- shader override property added to avatar config by @ryuuk in [#199](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/199)
38+
39+
### Fixed
40+
- fix for handling pasted url text in subdomain field by @harrisonhough in [#183](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/183)
41+
- added permission and orientation fix to photo capture element by @ryuuk in [#192](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/192)
42+
- added Panel Switcher clear functionality to fix issues related to relaunching the creator by @ryuuk in [#194](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/194)
43+
- namespaces added to some scripts to meet asset store requirements by @harrisonhough in [#195](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/195)
44+
645
## [4.1.2] - 2023.12.20
746

847
### Fixed

Editor/UI/AvatarConfigEditor.meta renamed to Editor/AvatarCreator.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using UnityEditor;
4+
using UnityEngine;
5+
6+
namespace ReadyPlayerMe.AvatarCreator.Editor
7+
{
8+
[CustomPropertyDrawer(typeof(AssetTypeFilterAttribute))]
9+
public class AssetTypeFilterDrawer : PropertyDrawer
10+
{
11+
public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
12+
{
13+
var assetTypeAttribute = attribute as AssetTypeFilterAttribute;
14+
15+
if (property.propertyType == SerializedPropertyType.Enum)
16+
{
17+
EditorGUI.BeginProperty(position, label, property);
18+
19+
EditorGUI.BeginChangeCheck();
20+
21+
// Get the current enum value
22+
var currentEnumValue = (AssetType) property.enumValueIndex;
23+
24+
var filteredEnumNames = new List<string>();
25+
foreach (var enumName in Enum.GetNames(typeof(AssetType)))
26+
{
27+
var enumFieldInfo = typeof(AssetType).GetField(enumName);
28+
var enumAttribute = (AssetTypeFilterAttribute) Attribute.GetCustomAttribute(enumFieldInfo, typeof(AssetTypeFilterAttribute));
29+
if (enumAttribute == null) continue;
30+
31+
var filter = (AssetFilter) Enum.Parse(typeof(AssetFilter), enumAttribute.filter.ToString());
32+
if (filter == assetTypeAttribute?.filter)
33+
{
34+
filteredEnumNames.Add(enumName);
35+
}
36+
}
37+
38+
// Display the dropdown with filtered enum values
39+
var newIndex = EditorGUI.Popup(position, label.text, Array.IndexOf(filteredEnumNames.ToArray(), currentEnumValue.ToString()), filteredEnumNames.ToArray());
40+
41+
// Set the new enum value if it has changed
42+
if (EditorGUI.EndChangeCheck())
43+
{
44+
property.enumValueIndex = (int) Enum.Parse(typeof(AssetType), filteredEnumNames[newIndex]);
45+
}
46+
47+
EditorGUI.EndProperty();
48+
}
49+
else
50+
{
51+
EditorGUI.LabelField(position, label.text, "Use AssetType with Enum.");
52+
}
53+
}
54+
55+
}
56+
}

Editor/AvatarCreator/AssetTypeFilterDrawer.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"name": "ReadyPlayerMe.Core.AvatarCreatorSample.Editor",
2+
"name": "ReadyPlayerMe.AvatarCreator.Editor",
33
"rootNamespace": "",
44
"references": [
5-
"ReadyPlayerMe.Core.AvatarCreator",
65
"ReadyPlayerMe.Core",
7-
"ReadyPlayerMe.Core.AvatarCreatorSample"
6+
"ReadyPlayerMe.AvatarCreator"
87
],
98
"includePlatforms": [
109
"Editor"
@@ -17,4 +16,4 @@
1716
"defineConstraints": [],
1817
"versionDefines": [],
1918
"noEngineReferences": false
20-
}
19+
}
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)