From b98ceda13d23e3c553493701db557886a5fe8ea8 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 7 Mar 2023 19:50:25 +0900 Subject: [PATCH] fix copyright --- .../VRM10Viewer/VRM10Viewer.unity | 211 +++++++++++++++--- .../VRM10Viewer/VRM10ViewerUI.cs | 31 +-- 2 files changed, 204 insertions(+), 38 deletions(-) diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity b/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity index bd211cd41..ec6186e61 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity @@ -962,7 +962,7 @@ RectTransform: m_Children: - {fileID: 800895692} m_Father: {fileID: 644517400} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1041,7 +1041,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 644517400} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1304,6 +1304,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 339774396} m_CullTransparentMesh: 0 +--- !u!1 &427963460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 427963461} + - component: {fileID: 427963463} + - component: {fileID: 427963462} + m_Layer: 5 + m_Name: Copyright (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &427963461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427963460} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1434602809} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: -100, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &427963462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427963460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: copyright +--- !u!222 &427963463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427963460} + m_CullTransparentMesh: 0 --- !u!1 &450042403 GameObject: m_ObjectHideFlags: 0 @@ -2052,6 +2131,7 @@ RectTransform: - {fileID: 1636340564} - {fileID: 2105159132} - {fileID: 827174941} + - {fileID: 1434602809} - {fileID: 1922159876} - {fileID: 806723449} - {fileID: 284921871} @@ -2168,7 +2248,7 @@ RectTransform: m_Children: - {fileID: 852999695} m_Father: {fileID: 644517400} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2432,7 +2512,7 @@ RectTransform: m_Children: - {fileID: 1181308132} m_Father: {fileID: 644517400} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2825,7 +2905,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 644517400} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2905,7 +2985,7 @@ RectTransform: m_Children: - {fileID: 933018278} m_Father: {fileID: 644517400} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3064,7 +3144,7 @@ RectTransform: m_Children: - {fileID: 1242458543} m_Father: {fileID: 644517400} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3309,7 +3389,7 @@ RectTransform: m_Children: - {fileID: 1476033061} m_Father: {fileID: 644517400} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4018,7 +4098,7 @@ RectTransform: m_Children: - {fileID: 1289294208} m_Father: {fileID: 644517400} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4252,7 +4332,7 @@ RectTransform: m_Children: - {fileID: 1104290797} m_Father: {fileID: 644517400} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4901,6 +4981,86 @@ MonoBehaviour: blendDistance: 0 weight: 1 priority: 0 +--- !u!1 &1434602808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1434602809} + - component: {fileID: 1434602811} + - component: {fileID: 1434602810} + m_Layer: 5 + m_Name: Copyright + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1434602809 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434602808} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 427963461} + m_Father: {fileID: 644517400} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 297, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1434602810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434602808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: copyright +--- !u!222 &1434602811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434602808} + m_CullTransparentMesh: 0 --- !u!1 &1438613463 GameObject: m_ObjectHideFlags: 0 @@ -5354,7 +5514,7 @@ RectTransform: m_Children: - {fileID: 1322834810} m_Father: {fileID: 644517400} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5513,7 +5673,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 644517400} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5938,19 +6098,20 @@ MonoBehaviour: m_target: {fileID: 802105000} m_motion: {fileID: 4900000, guid: 08df5151e71aed748b13547492fb8b9a, type: 3} m_texts: - m_textModelTitle: {fileID: 1636340565} - m_textModelVersion: {fileID: 2105159133} - m_textModelAuthor: {fileID: 827174942} - m_textModelContact: {fileID: 1922159877} - m_textModelReference: {fileID: 806723450} + m_textModelTitle: {fileID: 1111491925} + m_textModelVersion: {fileID: 1045380263} + m_textModelAuthor: {fileID: 854014595} + m_textModelCopyright: {fileID: 427963462} + m_textModelContact: {fileID: 587234270} + m_textModelReference: {fileID: 1181308133} m_thumbnail: {fileID: 800895694} - m_textPermissionAllowed: {fileID: 1633219309} - m_textPermissionViolent: {fileID: 935554082} - m_textPermissionSexual: {fileID: 928757302} - m_textPermissionCommercial: {fileID: 773923920} - m_textPermissionOther: {fileID: 1172469240} - m_textDistributionLicense: {fileID: 1007924637} - m_textDistributionOther: {fileID: 1199975014} + m_textPermissionAllowed: {fileID: 1322834811} + m_textPermissionViolent: {fileID: 1242458544} + m_textPermissionSexual: {fileID: 933018279} + m_textPermissionCommercial: {fileID: 852999696} + m_textPermissionOther: {fileID: 1289294209} + m_textDistributionLicense: {fileID: 1476033062} + m_textDistributionOther: {fileID: 1104290798} m_ui: ToggleMotionTPose: {fileID: 1791103380} ToggleMotionBVH: {fileID: 1311520910} @@ -6227,7 +6388,7 @@ RectTransform: m_Children: - {fileID: 587234269} m_Father: {fileID: 644517400} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs index 6537bc35c..187d636e7 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs @@ -73,6 +73,8 @@ namespace UniVRM10.VRM10Viewer [SerializeField] Text m_textModelAuthor = default; [SerializeField] + Text m_textModelCopyright = default; + [SerializeField] Text m_textModelContact = default; [SerializeField] Text m_textModelReference = default; @@ -98,20 +100,21 @@ namespace UniVRM10.VRM10Viewer public void Reset() { var texts = GameObject.FindObjectsOfType(); - m_textModelTitle = texts.First(x => x.name == "Title"); - m_textModelVersion = texts.First(x => x.name == "Version"); - m_textModelAuthor = texts.First(x => x.name == "Author"); - m_textModelContact = texts.First(x => x.name == "Contact"); - m_textModelReference = texts.First(x => x.name == "Reference"); + m_textModelTitle = texts.First(x => x.name == "Title (1)"); + m_textModelVersion = texts.First(x => x.name == "Version (1)"); + m_textModelAuthor = texts.First(x => x.name == "Author (1)"); + m_textModelCopyright = texts.First(x => x.name == "Copyright (1)"); + m_textModelContact = texts.First(x => x.name == "Contact (1)"); + m_textModelReference = texts.First(x => x.name == "Reference (1)"); - m_textPermissionAllowed = texts.First(x => x.name == "AllowedUser"); - m_textPermissionViolent = texts.First(x => x.name == "Violent"); - m_textPermissionSexual = texts.First(x => x.name == "Sexual"); - m_textPermissionCommercial = texts.First(x => x.name == "Commercial"); - m_textPermissionOther = texts.First(x => x.name == "Other"); + m_textPermissionAllowed = texts.First(x => x.name == "AllowedUser (1)"); + m_textPermissionViolent = texts.First(x => x.name == "Violent (1)"); + m_textPermissionSexual = texts.First(x => x.name == "Sexual (1)"); + m_textPermissionCommercial = texts.First(x => x.name == "Commercial (1)"); + m_textPermissionOther = texts.First(x => x.name == "Other (1)"); - m_textDistributionLicense = texts.First(x => x.name == "LicenseType"); - m_textDistributionOther = texts.First(x => x.name == "OtherLicense"); + m_textDistributionLicense = texts.First(x => x.name == "LicenseType (1)"); + m_textDistributionOther = texts.First(x => x.name == "OtherLicense (1)"); var images = GameObject.FindObjectsOfType(); m_thumbnail = images.First(x => x.name == "RawImage"); @@ -122,6 +125,7 @@ namespace UniVRM10.VRM10Viewer m_textModelTitle.text = ""; m_textModelVersion.text = ""; m_textModelAuthor.text = ""; + m_textModelCopyright.text = ""; m_textModelContact.text = ""; m_textModelReference.text = ""; @@ -144,12 +148,13 @@ namespace UniVRM10.VRM10Viewer m_textModelTitle.text = meta.Name; m_textModelVersion.text = meta.Version; m_textModelAuthor.text = meta.Authors[0]; + m_textModelCopyright.text = meta.CopyrightInformation; m_textModelContact.text = meta.ContactInformation; if (meta.References != null && meta.References.Count > 0) { m_textModelReference.text = meta.References[0]; } - // m_textPermissionAllowed.text = meta.AllowedUser.ToString(); + m_textPermissionAllowed.text = meta.AvatarPermission.ToString(); m_textPermissionViolent.text = meta.AllowExcessivelyViolentUsage.ToString(); m_textPermissionSexual.text = meta.AllowExcessivelySexualUsage.ToString(); m_textPermissionCommercial.text = meta.CommercialUsage.ToString();