Merge pull request #16 from CyberAgentGameEntertainment/feature/updat…

…e-demos

Feature/update demos

Assets/Demo/Demo_01/Demo_01.unity

@@ -142,106 +142,6 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 4300006, guid: 29032ffe50eebbd41b9e5c4017762813, type: 3}
---- !u!1 &208776881
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 208776885}
-  - component: {fileID: 208776884}
-  - component: {fileID: 208776883}
-  - component: {fileID: 208776882}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &208776882
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 208776881}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &208776883
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 208776881}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!223 &208776884
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 208776881}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &208776885
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 208776881}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 1637744364}
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  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: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
 --- !u!1001 &260739067
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -275,7 +175,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400056, guid: e39dd657be7298d408f1a135c76c3d9a, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 400056, guid: e39dd657be7298d408f1a135c76c3d9a, type: 3}
       propertyPath: m_LocalScale.x
@@ -399,7 +299,7 @@ MonoBehaviour:
   shotDecalMaterials:
   - {fileID: 2100000, guid: 434c39936d241ab45a19d599d9a2785a, type: 2}
   - {fileID: 2100000, guid: eb066cf3a24312a488867b401db7fc67, type: 2}
-  - {fileID: 2100000, guid: b6f889dbd7278084687a4ed6207465ac, type: 2}
+  - {fileID: 2100000, guid: c39aabb158e252f478b6b033ba498310, type: 2}
   projectorSize:
   - {x: 0.12, y: 0.12, z: 10}
   - {x: 0.22848, y: 0.12, z: 10}
@@ -417,7 +317,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &454061090 stripped
 GameObject:
@@ -866,7 +766,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1237580665
 GameObject:
@@ -909,7 +809,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1344777569 stripped
 GameObject:
@@ -949,129 +849,6 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 4300000, guid: 29032ffe50eebbd41b9e5c4017762813, type: 3}
---- !u!1 &1489687158
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1489687160}
-  - component: {fileID: 1489687161}
-  m_Layer: 0
-  m_Name: DisplayLog
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1489687160
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1489687158}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 396.99567, y: 209.6732, z: -0.0012207031}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1489687161
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1489687158}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 828b9243caece5748acbda49d38f6f36, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  fpsTextGameObject: {fileID: 1637744363}
---- !u!1 &1637744363
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1637744364}
-  - component: {fileID: 1637744366}
-  - component: {fileID: 1637744365}
-  m_Layer: 5
-  m_Name: Log
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1637744364
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1637744363}
-  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: 208776885}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 221, y: -96.1}
-  m_SizeDelta: {x: 400, y: 160}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1637744365
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1637744363}
-  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: 1, g: 1, b: 1, 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: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 100
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: FPS
---- !u!222 &1637744366
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1637744363}
-  m_CullTransparentMesh: 1
 --- !u!1 &1961033288 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 100012, guid: e39dd657be7298d408f1a135c76c3d9a, type: 3}

Assets/Demo/Demo_03/Scripts/Rotate.cs → Assets/Demo/Demo_01/Scripts/Rotate.cs

@@ -11,7 +11,7 @@ public class Rotate : MonoBehaviour
         // Update is called once per frame
         private void Update()
         {
-            var rot = Quaternion.AngleAxis(0.25f, Vector3.up);
+            var rot = Quaternion.AngleAxis(40.0f * Time.deltaTime, Vector3.up);
             var transform1 = transform;
             transform1.localRotation = rot * transform1.localRotation;
         }

Assets/Demo/Demo_03/Demo_03.unity

@@ -881,7 +881,7 @@ MonoBehaviour:
   decalMaterials:
   - {fileID: 2100000, guid: 434c39936d241ab45a19d599d9a2785a, type: 2}
   - {fileID: 2100000, guid: eb066cf3a24312a488867b401db7fc67, type: 2}
-  - {fileID: 2100000, guid: b6f889dbd7278084687a4ed6207465ac, type: 2}
+  - {fileID: 2100000, guid: c39aabb158e252f478b6b033ba498310, type: 2}
   receiverObjects:
   - {fileID: 871373255}
   - {fileID: 289244484}
@@ -893,7 +893,7 @@ MonoBehaviour:
   - {x: 0.1, y: 0.1, z: 10}
   - {x: 0.2, y: 0.1, z: 10}
   - {x: 0.3, y: 0.1, z: 19}
-  _collectPolyInputFieldTextObject: {fileID: 1533493564}
+  _collectPolyInputFieldTextObject: {fileID: 69921758}
 --- !u!4 &341696256
 Transform:
   m_ObjectHideFlags: 0

Assets/Demo/Demo_03/Scripts/AgingTest.cs

@@ -68,7 +68,7 @@ private void ExecuteAction()
                 pos.y += Random.Range(-heightHalfRange, heightHalfRange);
                 _demo03.Launch(
                     pos,
-                    Random.Range(0, 6));
+                    Random.Range(0, 3));
                 TrianglePolygonsFactory.MaxGeneratedPolygonPerFrame = Random.Range(50, 100);
                 _launchCount++;
                 _frameCounter = 0;
@@ -84,11 +84,11 @@ private void ExecuteAction()
                     _demo03.SetNextReceiverObject();
                     if (_demo03.HasReceiverObjectsDeleted())
                         // Reset scene.
-                        SceneManager.LoadScene("Demo_00");
+                        SceneManager.LoadScene("Demo_03");
                 }
                 else if (t < 40)
                 {
-                    SceneManager.LoadScene("Demo_00");
+                    SceneManager.LoadScene("Demo_03");
                 }
 
                 _launchCount = 0;

Assets/Demo/Demo_03/Scripts/DemoGUIs.cs

@@ -73,7 +73,7 @@ public void OnClickRotate()
 
         public void OnClickResetScene()
         {
-            SceneManager.LoadScene("Demo_00");
+            SceneManager.LoadScene("Demo_03");
         }
 
         public void OnClickDeleteObject()

ProjectSettings/EditorBuildSettings.asset

@@ -5,10 +5,10 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
     path: Assets/Demo/Demo_03/Demo_03.unity
     guid: 18c3265a4537d2d47bf325ec1dada32f
-  - enabled: 0
+  - enabled: 1
     path: Assets/Demo/Demo_01/Demo_01.unity
     guid: f04d274fd8024694493b099e0c08127b
   - enabled: 1

ProjectSettings/RiderScriptEditorPersistedState.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 0}
   m_Name: 
   m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
-  lastWriteTicks: -8585190335258473498
+  lastWriteTicks: -8585167974886869431