Merge pull request #10 from kirurobo/develop

UniVRM 0.44 に対応させました。

Author: kirurobo

Assets/UniWinApi/Examples/99_VrmViewerSample/CharacterBehaviour.cs

@@ -9,21 +9,22 @@ public class CharacterBehaviour : MonoBehaviour
 
 	private float lastBlinkTime = 0f;
 	private float nextBlinkTime = 0f;
-	private int blinkBlendShapeIndex = -1;
 	private int blinkState = 0; // まばたきの状態管理。 0:なし, 1:閉じ中, 2:開き中
 
 	private VRMLookAtHead lookAtHead;
 	private VRMBlendShapeProxy blendShapeProxy;
 
 	private GameObject targetObject;    // 視線目標オブジェクト
-	private Transform headTransform;	// Head transform
+	private Transform headTransform;    // Head transform
+	private bool isNewTargetObject = false;	// 新規に目標オブジェクトを作成したらtrue
 
 	// Use this for initialization
 	void Start()
 	{
 		if (!targetObject)
 		{
 			targetObject = new GameObject("LookAtTarget");
+			isNewTargetObject = true;
 		}
 
 		lookAtHead = GetComponent<VRMLookAtHead>();
@@ -34,14 +35,25 @@ void Start()
 			lookAtHead.Target = targetObject.transform;
 			lookAtHead.UpdateType = UpdateType.LateUpdate;
 
-			headTransform = lookAtHead.Head.Transform;
+			headTransform = lookAtHead.Head;
 		}
 		if (!headTransform)
 		{
 			headTransform = this.transform;
 		}
 	}
 
+	/// <summary>
+	/// Destroy created target object
+	/// </summary>
+	void OnDestroy()
+	{
+		if (isNewTargetObject)
+		{
+			GameObject.Destroy(targetObject);
+		}
+	}
+
 	/// <summary>
 	/// 毎フレーム呼ばれる
 	/// </summary>

Assets/UniWinApi/Examples/99_VrmViewerSample/VrmSample.cs

@@ -50,9 +50,6 @@ void Start () {
 			audioSource = FindObjectOfType<AudioSource>();
 		}
 
-		// Load the initial motion.
-		LoadMotion(Application.streamingAssetsPath + "/default_bvh.txt");
-
 		// Load the initial model.
 		string[] cmdArgs = System.Environment.GetCommandLineArgs();
 		if (cmdArgs.Length > 1)
@@ -63,8 +60,11 @@ void Start () {
 			LoadModel(Application.streamingAssetsPath + "/default_vrm.vrm");
 		}
 
+		// Load the initial motion.
+		LoadMotion(Application.streamingAssetsPath + "/default_bvh.txt");
+
 		// Initialize window manager
-		windowController =FindObjectOfType<WindowController>();
+		windowController = FindObjectOfType<WindowController>();
 		if (windowController)
 		{
 			// Add a file drop handler.
@@ -172,27 +172,44 @@ private void SetMotion(HumanPoseTransfer motion, HumanPoseTransfer model, VRMMet
 	/// <param name="path"></param>
 	private void LoadMotion(string path)
 	{
-		ImporterContext context = new ImporterContext
-		{
-			Path = path
-		};
+		if (!File.Exists(path)) return;
+
+		GameObject newMotionObject = null;
 
 		try
 		{
+			BvhImporterContext context = new BvhImporterContext();
+			//Debug.Log("Loading motion : " + path);
 
-			BvhImporter.Import(context);
-			motion = context.Root.GetComponent<HumanPoseTransfer>();
-			motion.GetComponent<Renderer>().enabled = false;
+			context.Parse(path);
+			context.Load();
+			newMotionObject = context.Root;
+
+			// Hide the motion model
+			Renderer renderer = newMotionObject.GetComponent<Renderer>();
+			if (renderer)
+			{
+				renderer.enabled = false;
+			}
 
-			SetMotion(motion, model, meta);
 		} catch (Exception ex)
 		{
 			if (uiController) uiController.SetWarning("Motion load failed.");
+			Debug.LogError("Failed loading " + path);
 			Debug.LogError(ex);
 			return;
 		}
-		finally
+
+		if (newMotionObject)
 		{
+			if (motion)
+			{
+				GameObject.Destroy(motion.gameObject);
+			}
+
+			motion = newMotionObject.GetComponent<HumanPoseTransfer>();
+			SetMotion(motion, model, meta);
+
 			// Play loaded audio if available
 			if (audioSource && audioSource.clip && audioSource.clip.loadState == AudioDataLoadState.Loaded)
 			{
@@ -209,35 +226,36 @@ private void LoadMotion(string path)
 	private void LoadModel(string path)
 	{
 		if (!File.Exists(path)) return;
-
-		GameObject newModel = null;
+		GameObject newModelObject = null;
 
 		try
 		{
 			// Load from a VRM file.
-			byte[] bytes = File.ReadAllBytes(path);
-			context = new VRMImporterContext(UniGLTF.UnityPath.FromFullpath(path));
-			context.ParseGlb(bytes);
-			VRMImporter.LoadFromBytes(context);
+			context = new VRMImporterContext();
+			//Debug.Log("Loading model : " + path);
 
-			newModel = context.Root;
+			context.Load(path);
+			newModelObject = context.Root;
 			meta = context.ReadMeta();
+
+			context.ShowMeshes();
 		}
 		catch (Exception ex)
 		{
 			if (uiController) uiController.SetWarning("Model load failed.");
+			Debug.LogError("Failed loading " + path);
 			Debug.LogError(ex);
 			return;
 		}
 
-		if (model)
+		if (newModelObject)
 		{
-			GameObject.Destroy(model.gameObject);
-		}
+			if (model)
+			{
+				GameObject.Destroy(model.gameObject);
+			}
 
-		if (newModel)
-		{
-			model = newModel.AddComponent<HumanPoseTransfer>();
+			model = newModelObject.AddComponent<HumanPoseTransfer>();
 			SetMotion(motion, model, meta);
 
 			model.gameObject.AddComponent<CharacterBehaviour>();

Assets/UniWinApi/Examples/99_VrmViewerSample/VrmViewerSample.unity

@@ -20,7 +20,7 @@ RenderSettings:
   m_FogDensity: 0.01
   m_LinearFogStart: 0
   m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 1, g: 1, b: 1, a: 1}
+  m_AmbientSkyColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
   m_AmbientIntensity: 1
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.4513998, g: 0.5008927, b: 0.5723166, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641407, b: 0.57481676, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -51,7 +51,7 @@ LightmapSettings:
     m_AlbedoBoost: 1
     m_TemporalCoherenceThreshold: 1
     m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
+    m_EnableBakedLightmaps: 0
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
     serializedVersion: 8
@@ -71,7 +71,7 @@ LightmapSettings:
     m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
+    m_MixedBakeMode: 0
     m_BakeBackend: 0
     m_PVRSampling: 1
     m_PVRDirectSampleCount: 32
@@ -89,7 +89,7 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
   m_LightingDataAsset: {fileID: 0}
-  m_ShadowMaskMode: 2
+  m_ShadowMaskMode: 0
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -546,7 +546,7 @@ GameObject:
   - component: {fileID: 339774399}
   - component: {fileID: 339774398}
   m_Layer: 5
-  m_Name: Panel
+  m_Name: MenuPanel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2385,7 +2385,7 @@ Light:
   m_Enabled: 1
   serializedVersion: 8
   m_Type: 1
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 0.5
   m_Range: 10
   m_SpotAngle: 30
@@ -2418,13 +2418,13 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 2141451816}
-  m_LocalRotation: {x: 0.25660488, y: 0.12607859, z: -0.03378266, w: 0.9576622}
+  m_LocalRotation: {x: 0.76328206, y: -0.3904523, z: -0.024150606, w: 0.5141636}
   m_LocalPosition: {x: -1.5, y: 4, z: -6}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1629460662}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 30, y: 15, z: 0}
+  m_LocalEulerAnglesHint: {x: 130, y: 43, z: 75}
 --- !u!114 &2141451819
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/UniWinApi/Examples/Utils/CameraController.cs

@@ -37,22 +37,39 @@ public enum ZoomMode
 
 	public Transform centerTransform;   // 回転中心
 
-	Vector3 rotation;
-	Vector3 translation;
+	internal Vector3 rotation;
+	internal Vector3 translation;
 
 	[SerializeField]
-	float distance;
+	internal float distance;
 
-	Vector3 relativePosition;
-	Quaternion relativeRotation;
-	float originalDistance;
-	float originalFieldOfView;
-	float dolly;
-	float zoom;
+	internal Vector3 relativePosition;
+	internal Quaternion relativeRotation;
+	internal float originalDistance;
+	internal float originalFieldOfView;
+	internal float dolly;
+	internal float zoom;
 
-	Camera currentCamera;
+	internal Camera currentCamera;
 
 	void Start()
+	{
+		Initialize();
+	}
+
+	void Update()
+	{
+		if (!currentCamera.isActiveAndEnabled) return;
+		if (!Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift))
+		{
+			HandleMouse();
+		}
+	}
+
+	/// <summary>
+	/// Initialize
+	/// </summary>
+	internal void Initialize()
 	{
 		if (!centerTransform)
 		{
@@ -98,7 +115,7 @@ public void ResetTransform()
 	/// <summary>
 	/// Apply rotation and translation
 	/// </summary>
-	private void UpdateTransform()
+	internal void UpdateTransform()
 	{
 		Quaternion rot = Quaternion.Euler(rotation);
 		transform.rotation = rot;
@@ -107,16 +124,7 @@ private void UpdateTransform()
 		currentCamera.fieldOfView = Mathf.Pow(10f, zoom);
 	}
 
-	void Update()
-	{
-		if (!currentCamera.isActiveAndEnabled) return;
-		if (!Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift))
-		{
-			HandleMouse();
-		}
-	}
-
-	internal void HandleMouse()
+	internal virtual void HandleMouse()
 	{
 		if (Input.GetMouseButton(1))
 		{

Assets/UniWinApi/Examples/Utils/LightController.cs

@@ -3,12 +3,48 @@
 using UnityEngine;
 
 public class LightController : CameraController {
-	
+
 	// Update is called once per frame
 	void Update () {
+		// [Shift]が押されていれば、照明の回転を行う
 		if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift))
 		{
 			HandleMouse();
 		}
 	}
+
+	internal override void HandleMouse()
+	{
+		if (Input.GetMouseButton(1))
+		{
+			// 右ボタンドラッグで照明を回転
+			if ((axes & RotationAxes.Yaw) > RotationAxes.None)
+			{
+				rotation.y += Input.GetAxis("Mouse X") * sensitivityX;
+				rotation.y = ClampAngle(rotation.y, minimumAngles.y, maximumAngles.y);
+			}
+			if ((axes & RotationAxes.Pitch) > RotationAxes.None)
+			{
+				rotation.x -= Input.GetAxis("Mouse Y") * sensitivityY;
+				rotation.x = ClampAngle(rotation.x, minimumAngles.x, maximumAngles.x);
+			}
+			UpdateTransform();
+		}
+		else
+		{
+			// ホイールで環境光の明るさを増減
+			float wheelDelta = Input.GetAxis("Mouse ScrollWheel") * wheelSensitivity;
+
+			if (wheelDelta != 0f)
+			{
+				//float intensity = RenderSettings.ambientIntensity;
+				//Mathf.Clamp(intensity - wheelDelta, 0f, 8f);
+				//RenderSettings.ambientIntensity = intensity;
+				Color color = RenderSettings.ambientLight;
+				float v = Mathf.Clamp(color.r + wheelDelta, 0f, 1f);
+				color.r = color.g = color.b = v;
+				RenderSettings.ambientLight = color;
+			}
+		}
+	}
 }