Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-07 11:28:35 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update License

Browse Source
This commit is contained in:
ousttrue
2018-04-06 21:46:15 +09:00
parent c3ea3c3db1
commit 83dea51fac
6 changed files with 171 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Scripts/Meta/Editor/VRMMetaEditor.cs
View File

@@ -1,4 +1,5 @@
using UnityEditor;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
@@ -7,11 +8,42 @@ namespace VRM
[CustomEditor(typeof(VRMMeta))]
public class VRMMetaEditor : Editor
{
//VRMMeta m_target;
SerializedProperty m_ScriptProp;
SerializedProperty m_VRMMetaObjectProp;
SerializedProperty VRMMetaObjectProp
{
get { return m_VRMMetaObjectProp; }
set
{
if (m_VRMMetaObjectProp == value) return;
m_VRMMetaObjectProp = value;
// get props
Debug.Log("clear");
m_propMap.Clear();
}
}
Dictionary<string, SerializedProperty> m_propMap = new Dictionary<string, SerializedProperty>();
void InitMap(SerializedObject so)
{
if (VRMMetaObjectProp == null) return;
//if (m_propMap.Count > 0) return;
m_propMap.Clear();
for (var it = so.GetIterator(); it.NextVisible(true);)
{
if (it.name == "m_Script") continue;
//Debug.LogFormat("{0}", it.name);
m_propMap.Add(it.name, so.FindProperty(it.name));
}
}
private void OnEnable()
{
//m_target = (VRMMeta)target;
m_ScriptProp = serializedObject.FindProperty("m_Script");
m_VRMMetaObjectProp = serializedObject.FindProperty("Meta");
}
@@ -19,49 +51,67 @@ namespace VRM
public override void OnInspectorGUI()
{
serializedObject.Update();
EditorGUILayout.PropertyField(m_ScriptProp, true);
EditorGUILayout.PropertyField(m_VRMMetaObjectProp, true);
serializedObject.ApplyModifiedProperties();
EditorGUILayout.Space();
#if true
if (m_VRMMetaObjectProp.objectReferenceValue != null)
{
VRMMetaObjectGUI(new SerializedObject(m_VRMMetaObjectProp.objectReferenceValue));
}
serializedObject.ApplyModifiedProperties();
#else
if(m_target!=null && m_target.Meta != null)
{
VRMMetaObjectGUI(new SerializedObject(m_target.Meta));
}
#endif
}
bool m_foldoutInfo = true;
bool m_foldoutPersmission=true;
bool m_foldoutDistribution=true;
void VRMMetaObjectGUI(SerializedObject so)
{
InitMap(so);
if (m_propMap == null || m_propMap.Count==0) return;
so.Update();
int i = 0;
for (SerializedProperty iterator = so.GetIterator();
iterator.NextVisible(true);
++i
)
m_foldoutInfo = EditorGUILayout.Foldout(m_foldoutInfo, "Information");
if (m_foldoutInfo)
{
if (i == 0) continue;
/*
Debug.LogFormat("{0}: {1}({2}) = {3}",
iterator.depth,
iterator.name,
iterator.displayName,
iterator.propertyType
);
*/
if (iterator.name == "Thumbnail")
{
iterator.objectReferenceValue=TextureField(iterator.name, (Texture2D)iterator.objectReferenceValue, 100);
}
else {
EditorGUILayout.PropertyField(iterator, false);
}
EditorGUILayout.PropertyField(m_propMap["Version"]);
EditorGUILayout.PropertyField(m_propMap["Author"]);
EditorGUILayout.PropertyField(m_propMap["ContactInformation"]);
EditorGUILayout.PropertyField(m_propMap["Reference"]);
EditorGUILayout.PropertyField(m_propMap["Title"]);
var thumbnail = m_propMap["Thumbnail"];
thumbnail.objectReferenceValue = TextureField("", (Texture2D)thumbnail.objectReferenceValue, 100);
}
m_foldoutPersmission = EditorGUILayout.Foldout(m_foldoutPersmission, "Personation / Characterization Permission");
if (m_foldoutPersmission)
{
EditorGUILayout.PropertyField(m_propMap["AllowedUser"], new GUIContent("A person who can perform with this avatar"), false);
EditorGUILayout.PropertyField(m_propMap["ViolentUssage"], new GUIContent("Violent acts using this avatar"));
EditorGUILayout.PropertyField(m_propMap["SexualUssage"], new GUIContent("Sexuality acts using this avatar"));
EditorGUILayout.PropertyField(m_propMap["CommercialUssage"], new GUIContent("For commercial use"));
EditorGUILayout.PropertyField(m_propMap["OtherPermissionUrl"], new GUIContent("Other License Url"));
}
m_foldoutDistribution = EditorGUILayout.Foldout(m_foldoutDistribution, "Redistribution / Modifications License");
if (m_foldoutDistribution)
{
var licenseType = m_propMap["LicenseType"];
EditorGUILayout.PropertyField(licenseType);
if ((LicenseType)licenseType.intValue == LicenseType.Other)
{
EditorGUILayout.PropertyField(m_propMap["OtherLicenseUrl"]);
}
}
so.ApplyModifiedProperties();
}

31
Scripts/Meta/VRMMetaObject.cs
View File

@@ -6,7 +6,7 @@ namespace VRM
public class VRMMetaObject : ScriptableObject
{
#region Info
[SerializeField, Header("Information")]
[SerializeField]
public string Version;
[SerializeField]
@@ -26,27 +26,31 @@ namespace VRM
#endregion
#region Permission
[SerializeField, Header("Permission")]
public AllowedUser allowedUser;
[SerializeField, Tooltip("A person who can perform with this avatar")]
public AllowedUser AllowedUser;
[SerializeField]
public bool allowImmoralUssage;
[SerializeField]
public bool allowCcertainBeliefsUssage;
[SerializeField]
public bool allowPoliticalUssage;
[SerializeField]
public bool allowCommercialUssage;
[SerializeField, Tooltip("Violent acts using this avatar")]
public UssageLicense ViolentUssage;
[SerializeField, Tooltip("Sexuality acts using this avatar")]
public UssageLicense SexualUssage;
[SerializeField, Tooltip("For commercial use")]
public UssageLicense CommercialUssage;
[SerializeField, Tooltip("Other License Url")]
public string OtherPermissionUrl;
#endregion
#region License
[SerializeField, Header("Distribution License")]
#region Distribution License
[SerializeField]
public LicenseType LicenseType;
[SerializeField]
public string OtherLicenseUrl;
#endregion
/*
public bool Equals(VRMMetaObject other)
{
return
@@ -55,5 +59,6 @@ namespace VRM
&& UniGLTF.MonoBehaviourComparator.AssetAreEquals(Thumbnail, other.Thumbnail)
;
}
*/
}
}