Release v1.2.2

Editor/Core/Constants.cs

@@ -27,7 +27,7 @@ public static class Constants
         public static string LastBuildAndroidKey => "LastBuildAndroid";
         public static string LastBuildIOSKey => "LastBuildIOS";
         public static string LastExportPackageKey => "LastExportPackage";
-        public static string OpenWorldDetailPageAfterUploadKey => "OpenWorldDetailPageAfterUpload";
+        public static string OpenWorldManagementPageAfterUploadKey => "OpenWorldManagementPageAfterUpload";
 
         // package の version (SemVer)
         public static string GetCreatorKitVersion()

Editor/Core/EditorPrefsUtils.cs

@@ -39,10 +39,10 @@ public static string LastExportPackage
             set => EditorPrefs.SetString(Constants.LastExportPackageKey, value);
         }
 
-        public static bool OpenWorldDetailPageAfterUpload
+        public static bool OpenWorldManagementPageAfterUpload
         {
-            get => EditorPrefs.GetBool(Constants.OpenWorldDetailPageAfterUploadKey, true);
-            set => EditorPrefs.SetBool(Constants.OpenWorldDetailPageAfterUploadKey, value);
+            get => EditorPrefs.GetBool(Constants.OpenWorldManagementPageAfterUploadKey, true);
+            set => EditorPrefs.SetBool(Constants.OpenWorldManagementPageAfterUploadKey, value);
         }
     }
 }

Editor/Core/Venue/Json/PostNotifyFinishedUploadPayload.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace ClusterVR.CreatorKit.Editor.Core.Venue.Json
+{
+    [Serializable]
+    public class PostNotifyFinishedUploadPayload
+    {
+        public bool isPublish;
+    }
+}

Editor/Core/Venue/Json/StringValueObject.cs

@@ -36,5 +36,7 @@ public StringValueObject(string value)
         {
             Value = value;
         }
+
+        public override string ToString() => Value;
     }
 }

Editor/Core/Venue/PostNotifyFinishedUploadService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Text;
 using ClusterVR.CreatorKit.Editor.Core.Venue.Json;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -11,6 +12,7 @@ public class PostNotifyFinishedUploadService
         readonly string accessToken;
         readonly VenueID venueId;
         readonly UploadRequestID uploadRequestId;
+        readonly bool isPublish;
         readonly Action<VenueUploadRequestCompletionResponse> onSuccess;
         readonly Action<Exception> onError;
 
@@ -21,13 +23,15 @@ public class PostNotifyFinishedUploadService
             string accessToken,
             VenueID venueId,
             UploadRequestID uploadRequestId,
+            bool isPublish,
             Action<VenueUploadRequestCompletionResponse> onSuccess = null,
             Action<Exception> onError = null
         )
         {
             this.accessToken = accessToken;
             this.venueId = venueId;
             this.uploadRequestId = uploadRequestId;
+            this.isPublish = isPublish;
             this.onSuccess = onSuccess;
             this.onError = onError;
         }
@@ -40,9 +44,12 @@ public void Run()
         IEnumerator PostNotifyFinishedUpload()
         {
             isProcessing = true;
-            var notifyFinishedUrl = $"{Constants.VenueApiBaseUrl}/v1/venues/{venueId.Value}/upload/{uploadRequestId.Value}/done";
+            // 互換性のためRequestParameterとBody両方に入れる
+            var notifyFinishedUrl = $"{Constants.VenueApiBaseUrl}/v1/venues/{venueId.Value}/upload/{uploadRequestId.Value}/done?isPublish={isPublish}";
             var notifyFinishedRequst = ClusterApiUtil.CreateUnityWebRequest(accessToken, notifyFinishedUrl,UnityWebRequest.kHttpVerbPOST);
             notifyFinishedRequst.downloadHandler = new DownloadHandlerBuffer();
+            var payload = new PostNotifyFinishedUploadPayload {isPublish = isPublish};
+            notifyFinishedRequst.uploadHandler = new UploadHandlerRaw(Encoding.UTF8.GetBytes(JsonUtility.ToJson(payload)));
 
             notifyFinishedRequst.SendWebRequest();
 

Editor/Core/Venue/UploadVenueService.cs

@@ -277,6 +277,7 @@ IEnumerator UploadVenue()
                     accessToken,
                     venue.VenueId,
                     uploadRequestId,
+                    false,
                     request =>
                     {
                         Debug.Log($"notify finished upload request, Request ID : {request.UploadRequestId}");

Editor/Preview/Bootstrap.cs

@@ -1,9 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using ClusterVR.CreatorKit.Editor.Preview.EditorSettings;
 using ClusterVR.CreatorKit.Editor.Preview.EditorUI;
 using ClusterVR.CreatorKit.Editor.Preview.World;
 using ClusterVR.CreatorKit.Editor.Venue;
+using ClusterVR.CreatorKit.Item;
+using ClusterVR.CreatorKit.Preview.Item;
 using ClusterVR.CreatorKit.World;
 using UnityEditor;
 using UnityEngine;
@@ -29,9 +32,15 @@ static Bootstrap()
                 await OnChangePlayModeAsync(playMode);
                 OnChangePlayMode(playMode);
             };
+            SetupProject();
 #endif
         }
 
+        static void SetupProject()
+        {
+            ProjectSettingsConfigurer.Setup();
+        }
+
         static void OnChangePlayMode(PlayModeStateChange playMode)
         {
             switch (playMode)
@@ -60,6 +69,8 @@ static void OnChangePlayMode(PlayModeStateChange playMode)
                     PlayerPresenter = new PlayerPresenter(PermissionType.Audience, enterDeviceType);
                     new AvatarRespawner(despawnHeight, PlayerPresenter);
 
+                    new ItemRespawner(despawnHeight, GetComponentsInGameObjectsChildren<IMovableItem>(rootGameObjects));
+
                     var mainScreenViews = GetComponentsInGameObjectsChildren<IMainScreenView>(rootGameObjects);
                     MainScreenPresenter = new MainScreenPresenter(mainScreenViews);
 

Editor/Preview/ClusterVR.CreatorKit.Editor.Preview.asmdef

@@ -5,7 +5,8 @@
         "ClusterVR.CreatorKit.World",
         "ClusterVR.CreatorKit.Preview",
         "Unity.Postprocessing.Runtime",
-        "ClusterVR.CreatorKit.Constants"
+        "ClusterVR.CreatorKit.Constants",
+        "ClusterVR.CreatorKit.Item"
     ],
     "includePlatforms": [
         "Editor"

Editor/Preview/EditorSettings/ProjectSettingsConfigurer.cs

@@ -0,0 +1,12 @@
+using UnityEngine;
+
+namespace ClusterVR.CreatorKit.Editor.Preview.EditorSettings
+{
+    public static class ProjectSettingsConfigurer
+    {
+        public static void Setup()
+        {
+            Physics.autoSyncTransforms = true;
+        }
+    }
+}

Editor/Venue/UploadVenueView.cs

@@ -15,6 +15,7 @@ public class UploadVenueView
         readonly UserInfo userInfo;
         readonly Core.Venue.Json.Venue venue;
         string worldDetailUrl;
+        readonly string worldManagementUrl;
 
         bool executeUpload;
         string errorMessage;
@@ -28,6 +29,7 @@ public UploadVenueView(UserInfo userInfo, Core.Venue.Json.Venue venue, ImageView
             this.venue = venue;
             this.thumbnail = thumbnail;
             worldDetailUrl = venue.WorldDetailUrl;
+            worldManagementUrl = ClusterVR.CreatorKit.Editor.Core.Constants.WebBaseUrl + "/account/worlds";
         }
 
         public VisualElement CreateView()
@@ -69,9 +71,9 @@ void Process()
                     {
                         errorMessage = "";
                         worldDetailUrl = completionResponse.Url;
-                        if (EditorPrefsUtils.OpenWorldDetailPageAfterUpload)
+                        if (EditorPrefsUtils.OpenWorldManagementPageAfterUpload)
                         {
-                            Application.OpenURL(completionResponse.Url);
+                            Application.OpenURL(worldManagementUrl);
                         }
                     },
                     exception =>
@@ -88,7 +90,7 @@ void Process()
         void DrawUI()
         {
             EditorGUILayout.Space();
-            EditorPrefsUtils.OpenWorldDetailPageAfterUpload = EditorGUILayout.ToggleLeft("アップロード後にワールドページを開く", EditorPrefsUtils.OpenWorldDetailPageAfterUpload);
+            EditorPrefsUtils.OpenWorldManagementPageAfterUpload = EditorGUILayout.ToggleLeft("アップロード後にワールド管理ページを開く", EditorPrefsUtils.OpenWorldManagementPageAfterUpload);
             EditorGUILayout.HelpBox("アップロードするシーンを開いておいてください。", MessageType.Info);
 
             if (thumbnail.IsEmpty)
@@ -103,18 +105,16 @@ void DrawUI()
                 {
                     executeUpload = EditorUtility.DisplayDialog(
                         "ワールドをアップロードする",
-                        $"公開ワールド'{venue.Name}'としてアップロードします。よろしいですか？",
+                        $"'{venue.Name}'としてアップロードします。よろしいですか？",
                         "アップロード",
                         "キャンセル"
                     );
                 }
             }
-            using (new EditorGUI.DisabledGroupScope(string.IsNullOrEmpty(worldDetailUrl)))
+
+            if (GUILayout.Button("ワールド管理ページを開く"))
             {
-                if (GUILayout.Button("ワールドページを開く"))
-                {
-                    Application.OpenURL(worldDetailUrl);
-                }
+                Application.OpenURL(worldManagementUrl);
             }
 
             EditorGUILayout.Space();

Runtime/Item/IMovableItem.cs

@@ -11,5 +11,6 @@ public interface IMovableItem
         void SetPositionAndRotation(Vector3 position, Quaternion rotation);
         // Physics を使う Item の場合は有効化する
         void EnablePhysics();
+        void Respawn();
     }
 }

Runtime/Item/Implements/MovableItem.cs

@@ -19,6 +19,8 @@ enum State
         }
 
         bool isInitialized;
+        Vector3 initialPosition;
+        Quaternion initialRotation;
         bool initialIsKinematic;
 
         State state = State.Free;
@@ -32,13 +34,15 @@ enum State
         void CacheInitialValue()
         {
             if (isInitialized) return;
+            initialPosition = transform.position;
+            initialRotation = transform.rotation;
             initialIsKinematic = rb.isKinematic;
             isInitialized = true;
         }
 
         void Start()
         {
-            StartCoroutine(Rewind());
+            CacheInitialValue();
         }
 
         public void SetPositionAndRotation(Vector3 position, Quaternion rotation)
@@ -60,39 +64,24 @@ public void SetPositionAndRotation(Vector3 position, Quaternion rotation)
             setAt = Time.realtimeSinceStartup;
             interpolateDurationSeconds = Time.deltaTime;
             state = State.Controlled;
-        }
-
-        void LateUpdate()
-        {
-            if (state == State.Controlled)
-            {
-                transform.position = targetPosition;
-                transform.rotation = targetRotation;
-            }
-        }
-
-        IEnumerator Rewind()
-        {
-            while (true)
-            {
-                yield return new WaitForEndOfFrame();
-                if (state == State.Controlled)
-                {
-                    transform.position = currentPosition;
-                    transform.rotation = currentRotation;
-                }
-            }
+            transform.position = targetPosition;
+            transform.rotation = targetRotation;
         }
 
         void FixedUpdate()
         {
-            if (state != State.Free)
+            if (state == State.Free) return;
+
+            if (state == State.Controlled)
             {
-                var interpolateRate = (Time.realtimeSinceStartup - setAt) / interpolateDurationSeconds;
-                rb.MovePosition(Vector3.Lerp(currentPosition, targetPosition, interpolateRate));
-                rb.MoveRotation(Quaternion.Slerp(currentRotation, targetRotation, interpolateRate));
+                rb.position = currentPosition;
+                rb.rotation = currentRotation;
                 state = State.Interpolated;
             }
+
+            var interpolateRate = (Time.realtimeSinceStartup - setAt) / interpolateDurationSeconds;
+            rb.MovePosition(Vector3.Lerp(currentPosition, targetPosition, interpolateRate));
+            rb.MoveRotation(Quaternion.Slerp(currentRotation, targetRotation, interpolateRate));
         }
 
         public void EnablePhysics()
@@ -112,6 +101,14 @@ static Vector3 GetAngularVelocity(Quaternion from, Quaternion to, float deltaTim
             else return deltaAngle * Mathf.Deg2Rad / deltaTime * (from * deltaAngleAxis);
         }
 
+        public void Respawn()
+        {
+            transform.position = initialPosition;
+            transform.rotation = initialRotation;
+            rb.velocity = Vector3.zero;
+            rb.angularVelocity = Vector3.zero;
+        }
+
         void Reset()
         {
             item = GetComponent<Item>();

Runtime/Preview/Item/ItemRespawner.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ClusterVR.CreatorKit.Item;
+using UnityEngine;
+
+namespace ClusterVR.CreatorKit.Preview.Item
+{
+    public sealed class ItemRespawner
+    {
+        readonly float despawnHeight;
+        readonly List<IMovableItem> movableItems;
+
+        public ItemRespawner (float despawnHeight, IEnumerable<IMovableItem> movableItems)
+        {
+            this.despawnHeight = despawnHeight;
+            this.movableItems = movableItems.ToList();
+            CheckHeight();
+        }
+
+        async void CheckHeight()
+        {
+            while (Application.isPlaying)
+            {
+                foreach (var movableItem in movableItems)
+                {
+                    if (movableItem.Position.y < despawnHeight) movableItem.Respawn();
+                }
+                await Task.Delay(300);
+            }
+        }
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu.cluster.cluster-creator-kit",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "displayName": "Cluster Creator Kit",
   "unity": "2019.2",
   "description": "Cluster Creator Kit \u3067\u30d0\u30fc\u30c1\u30e3\u30eb\u7a7a\u9593\u3092\u69cb\u7bc9\u3059\u308b\u3068\u3001 cluster \u3092\u901a\u3057\u3066\u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30f3\u3084PC/VR\u30d8\u30c3\u30c9\u30de\u30a6\u30f3\u30c8\u30c7\u30a3\u30b9\u30d7\u30ec\u30a4\u306a\u3069\u69d8\u3005\u306a\u30c7\u30d0\u30a4\u30b9\u304b\u3089\u4f53\u9a13\u3067\u304d\u307e\u3059\u3002",