From c3bedbc66d5bc74418fb4e736fac67f5d5d742fa Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Mon, 27 Apr 2020 23:13:06 +1000 Subject: [PATCH 1/8] Add boat input abstraction --- .../BoatDev/Scripts/BoatAlignNormal.cs | 27 ++++++++----------- .../BoatDev/Scripts/BoatControlBiased.cs | 13 +++++++++ .../BoatDev/Scripts/BoatControlBiased.cs.meta | 11 ++++++++ .../BoatDev/Scripts/BoatControlPlayer.cs | 19 +++++++++++++ .../BoatDev/Scripts/BoatControlPlayer.cs.meta | 11 ++++++++ .../Crest/Scripts/Interaction/BoatControl.cs | 10 +++++++ .../Scripts/Interaction/BoatControl.cs.meta | 11 ++++++++ .../Crest/Scripts/Interaction/BoatProbes.cs | 27 ++++++++++--------- 8 files changed, 100 insertions(+), 29 deletions(-) create mode 100644 crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs create mode 100644 crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs.meta create mode 100644 crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs create mode 100644 crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs.meta create mode 100644 crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs create mode 100644 crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs.meta diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs index d17d3c1a3..fb17724b7 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs @@ -39,11 +39,7 @@ public class BoatAlignNormal : FloatingObjectBase [Header("Controls")] [SerializeField] - bool _playerControlled = true; - [Tooltip("Used to automatically add throttle input"), SerializeField] - float _throttleBias = 0f; - [Tooltip("Used to automatically add turning input"), SerializeField] - float _steerBias = 0f; + BoatControl _boatControl; [Header("Debug")] [SerializeField] @@ -72,6 +68,11 @@ void Start() enabled = false; return; } + + if (!_boatControl) + { + _boatControl = GetComponent(); + } } void FixedUpdate() @@ -135,17 +136,11 @@ void FixedUpdate() _rb.AddForceAtPosition(transform.right * Vector3.Dot(transform.right, -velocityRelativeToWater) * _dragInWaterRight, forcePosition, ForceMode.Acceleration); _rb.AddForceAtPosition(transform.forward * Vector3.Dot(transform.forward, -velocityRelativeToWater) * _dragInWaterForward, forcePosition, ForceMode.Acceleration); - float forward = _throttleBias; - float rawForward = Input.GetAxis("Vertical"); - if (_playerControlled) forward += rawForward; - _rb.AddForceAtPosition(transform.forward * _enginePower * forward, forcePosition, ForceMode.Acceleration); - - float reverseMultiplier = (rawForward < 0f ? -1f : 1f); - float sideways = _steerBias; - if (_playerControlled) sideways += - (Input.GetKey(KeyCode.A) ? reverseMultiplier * -1f : 0f) + - (Input.GetKey(KeyCode.D) ? reverseMultiplier * 1f : 0f); - _rb.AddTorque(transform.up * _turnPower * sideways, ForceMode.Acceleration); + // Get input. X is steer and Z is throttle. Ignore Y. + var input = _boatControl ? _boatControl.Input : Vector3.zero; + + _rb.AddForceAtPosition(transform.forward * _enginePower * input.z, forcePosition, ForceMode.Acceleration); + _rb.AddTorque(transform.up * _turnPower * input.x, ForceMode.Acceleration); FixedUpdateOrientation(collProvider, normal); diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs new file mode 100644 index 000000000..9b89f4b84 --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs @@ -0,0 +1,13 @@ +using UnityEngine; +using Crest; + +public class BoatControlBiased : BoatControl +{ + [Tooltip("Used to automatically add throttle input"), SerializeField] + float _throttle = 0; + + [Tooltip("Used to automatically add turning input"), SerializeField] + float _steer = 0; + + void Update() => Input = new Vector3(_steer, 0, _throttle); +} diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs.meta b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs.meta new file mode 100644 index 000000000..745e53df8 --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 97ebca8e7448b432788bf5cb107fb1d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs new file mode 100644 index 000000000..26ad09836 --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using Crest; + +public class BoatControlPlayer : BoatControl +{ + [Tooltip("The input axis name for steering."), SerializeField] + string _steerInputAxisName = "Horizontal"; + + [Tooltip("The input axis name for throttle."), SerializeField] + string _throttleInputAxisName = "Vertical"; + + void Update() + { + var throttle = UnityEngine.Input.GetAxis(_throttleInputAxisName); + var steer = UnityEngine.Input.GetAxis(_steerInputAxisName); + if (throttle < 0f) steer *= -1f; + Input = new Vector3(steer, 0, throttle); + } +} diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs.meta b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs.meta new file mode 100644 index 000000000..4f152263c --- /dev/null +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a6c15b5f79d9e4d829e474ae0bb5a632 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs new file mode 100644 index 000000000..d3e19cec9 --- /dev/null +++ b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs @@ -0,0 +1,10 @@ + +namespace Crest +{ + using UnityEngine; + + public abstract class BoatControl : MonoBehaviour + { + public Vector3 Input { get; protected set; } + } +} diff --git a/crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs.meta b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs.meta new file mode 100644 index 000000000..fcdeeae00 --- /dev/null +++ b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6f16fd4d90e8c4de4838305d46d7c25b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs index a0aee2638..fa93d4d2b 100644 --- a/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs +++ b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs @@ -36,18 +36,15 @@ public class BoatProbes : FloatingObjectBase [SerializeField] float _dragInWaterForward = 1f; - [Header("Control")] + [Header("Engine Power")] [SerializeField, FormerlySerializedAs("EnginePower")] float _enginePower = 7; [SerializeField, FormerlySerializedAs("TurnPower")] float _turnPower = 0.5f; - [SerializeField] - bool _playerControlled = true; - [Tooltip("Used to automatically add throttle input"), SerializeField] - float _engineBias = 0f; - [Tooltip("Used to automatically add turning input"), SerializeField] - float _turnBias = 0f; + [Header("Controls")] + [SerializeField] + BoatControl _boatControl; private const float WATER_DENSITY = 1000; @@ -80,6 +77,11 @@ private void Start() return; } + if (!_boatControl) + { + _boatControl = GetComponent(); + } + CalcTotalWeight(); _queryPoints = new Vector3[_forcePoints.Length + 1]; @@ -144,14 +146,13 @@ void FixedUpdateEngine() { var forcePosition = _rb.position; - var forward = _engineBias; - if (_playerControlled) forward += Input.GetAxis("Vertical"); - _rb.AddForceAtPosition(transform.forward * _enginePower * forward, forcePosition, ForceMode.Acceleration); + // Get input. X is steer and Z is throttle. Ignore Y. + var input = _boatControl ? _boatControl.Input : Vector3.zero; + + _rb.AddForceAtPosition(transform.forward * _enginePower * input.z, forcePosition, ForceMode.Acceleration); - var sideways = _turnBias; - if (_playerControlled) sideways += (Input.GetKey(KeyCode.A) ? -1f : 0f) + (Input.GetKey(KeyCode.D) ? 1f : 0f); var rotVec = transform.up + _turningHeel * transform.forward; - _rb.AddTorque(rotVec * _turnPower * sideways, ForceMode.Acceleration); + _rb.AddTorque(rotVec * _turnPower * input.x, ForceMode.Acceleration); } void FixedUpdateBuoyancy(ICollProvider collProvider) From f5eced7755eac0a2f93f8800aff6d57d32e8b138 Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Mon, 27 Apr 2020 23:15:19 +1000 Subject: [PATCH 2/8] Move "Engine Power" header down similar to BoatProbes --- .../BoatDev/Scripts/BoatAlignNormal.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs index fb17724b7..a1b5f0e87 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs @@ -16,12 +16,6 @@ public class BoatAlignNormal : FloatingObjectBase [Tooltip("Strength of torque applied to match boat orientation to water normal."), SerializeField] float _boyancyTorque = 8f; - [Header("Engine Power")] - [Tooltip("Vertical offset for where engine force should be applied."), SerializeField] - float _forceHeightOffset = -0.3f; - [SerializeField] float _enginePower = 11f; - [SerializeField] float _turnPower = 1.3f; - [Header("Wave Response")] [Tooltip("Width dimension of boat. The larger this value, the more filtered/smooth the wave response will be."), SerializeField] float _boatWidth = 3f; @@ -37,6 +31,12 @@ public class BoatAlignNormal : FloatingObjectBase [SerializeField] float _dragInWaterRight = 2f; [SerializeField] float _dragInWaterForward = 1f; + [Header("Engine Power")] + [Tooltip("Vertical offset for where engine force should be applied."), SerializeField] + float _forceHeightOffset = -0.3f; + [SerializeField] float _enginePower = 11f; + [SerializeField] float _turnPower = 1.3f; + [Header("Controls")] [SerializeField] BoatControl _boatControl; From 7dde432cf9e4464a37008fc9258479b5d56302fe Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Sat, 2 May 2020 20:17:54 +1000 Subject: [PATCH 3/8] Seal boat control concrete classes --- .../Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs | 2 +- .../Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs index 9b89f4b84..f0c2cf7bb 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs @@ -1,7 +1,7 @@ using UnityEngine; using Crest; -public class BoatControlBiased : BoatControl +public sealed class BoatControlBiased : BoatControl { [Tooltip("Used to automatically add throttle input"), SerializeField] float _throttle = 0; diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs index 26ad09836..855fbc043 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs @@ -1,7 +1,7 @@ using UnityEngine; using Crest; -public class BoatControlPlayer : BoatControl +public sealed class BoatControlPlayer : BoatControl { [Tooltip("The input axis name for steering."), SerializeField] string _steerInputAxisName = "Horizontal"; From c48d7da1704e98b4e414fc3a133b8388d668c695 Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Sat, 2 May 2020 20:23:11 +1000 Subject: [PATCH 4/8] Add comment about input latency --- .../Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs index 855fbc043..eb44f662b 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlPlayer.cs @@ -11,6 +11,7 @@ public sealed class BoatControlPlayer : BoatControl void Update() { + // The boat will read this input the next frame in FixedUpdate (one frame latency). var throttle = UnityEngine.Input.GetAxis(_throttleInputAxisName); var steer = UnityEngine.Input.GetAxis(_steerInputAxisName); if (throttle < 0f) steer *= -1f; From 7a25682b2e6456f809d3f43ed126ff15fbcfa17f Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Sun, 3 May 2020 22:28:23 +1000 Subject: [PATCH 5/8] Rename BoatControlBiased to BoatControlFixed --- .../Scripts/{BoatControlBiased.cs => BoatControlFixed.cs} | 2 +- .../{BoatControlBiased.cs.meta => BoatControlFixed.cs.meta} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/{BoatControlBiased.cs => BoatControlFixed.cs} (85%) rename crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/{BoatControlBiased.cs.meta => BoatControlFixed.cs.meta} (100%) diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlFixed.cs similarity index 85% rename from crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs rename to crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlFixed.cs index f0c2cf7bb..6e87c5341 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlFixed.cs @@ -1,7 +1,7 @@ using UnityEngine; using Crest; -public sealed class BoatControlBiased : BoatControl +public sealed class BoatControlFixed : BoatControl { [Tooltip("Used to automatically add throttle input"), SerializeField] float _throttle = 0; diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs.meta b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlFixed.cs.meta similarity index 100% rename from crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlBiased.cs.meta rename to crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatControlFixed.cs.meta From 11f6d0293cec4d823cef614e62626e4e6b3ad37b Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Tue, 18 Aug 2020 16:37:37 -0700 Subject: [PATCH 6/8] Add validation. Don't get BoatControl in Start --- .../BoatDev/Scripts/BoatAlignNormal.cs | 37 +++++++++++++++--- .../Crest/Scripts/Interaction/BoatProbes.cs | 38 ++++++++++++++++--- .../Scripts/Interaction/FloatingObjectBase.cs | 2 +- 3 files changed, 64 insertions(+), 13 deletions(-) diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs index 1195c0123..9dba88081 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scripts/BoatAlignNormal.cs @@ -5,10 +5,14 @@ using Crest; using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; +#endif + /// /// Simple type of buoyancy - takes one sample and matches boat height and orientation to water height and normal. /// -public class BoatAlignNormal : FloatingObjectBase +public partial class BoatAlignNormal : FloatingObjectBase { [Header("Buoyancy Force")] [Tooltip("Height offset from transform center to bottom of boat (if any)."), SerializeField] @@ -67,11 +71,6 @@ void Start() enabled = false; return; } - - if (!_boatControl) - { - _boatControl = GetComponent(); - } } void FixedUpdate() @@ -176,3 +175,29 @@ void FixedUpdateOrientation(Vector3 normalSideways) } } } + +#if UNITY_EDITOR +public partial class BoatAlignNormal : IValidated +{ + public override bool Validate(OceanRenderer ocean, ValidatedHelper.ShowMessage showMessage) + { + var isValid = base.Validate(ocean, showMessage); + + if (!_boatControl) + { + showMessage + ( + "BoatAlignNormal has no component deriving from BoatControl assigned. The boat will " + + "not respond to input. If this is not intentional, then please add one and assign it to this " + + "component.", + ValidatedHelper.MessageType.Warning, this + ); + } + + return isValid; + } +} + +[CustomEditor(typeof(BoatAlignNormal), true), CanEditMultipleObjects] +class BoatAlignNormalEditor : ValidatedEditor { } +#endif diff --git a/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs index 706306ab1..414d3df86 100644 --- a/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs +++ b/crest/Assets/Crest/Crest/Scripts/Interaction/BoatProbes.cs @@ -8,12 +8,16 @@ using UnityEngine; using UnityEngine.Serialization; +#if UNITY_EDITOR +using UnityEditor; +#endif + namespace Crest { /// /// Boat physics by sampling at multiple probe points. /// - public class BoatProbes : FloatingObjectBase + public partial class BoatProbes : FloatingObjectBase { [Header("Forces")] [Tooltip("Override RB center of mass, in local space."), SerializeField] @@ -76,11 +80,6 @@ private void Start() return; } - if (!_boatControl) - { - _boatControl = GetComponent(); - } - CalcTotalWeight(); _queryPoints = new Vector3[_forcePoints.Length + 1]; @@ -207,4 +206,31 @@ public class FloaterForcePoints public Vector3 _offsetPosition; } + +#if UNITY_EDITOR + public partial class BoatProbes : IValidated + { + public override bool Validate(OceanRenderer ocean, ValidatedHelper.ShowMessage showMessage) + { + var isValid = base.Validate(ocean, showMessage); + + if (!_boatControl) + { + showMessage + ( + "BoatProbes has no component deriving from BoatControl assigned. The boat will " + + "not respond to input. If this is not intentional, then please add one and assign it to this " + + "component.", + ValidatedHelper.MessageType.Warning, this + ); + } + + return isValid; + } + } + + [CustomEditor(typeof(BoatProbes), true), CanEditMultipleObjects] + class BoatProbesEditor : ValidatedEditor { } +#endif + } diff --git a/crest/Assets/Crest/Crest/Scripts/Interaction/FloatingObjectBase.cs b/crest/Assets/Crest/Crest/Scripts/Interaction/FloatingObjectBase.cs index 8691e3068..96b925a0b 100644 --- a/crest/Assets/Crest/Crest/Scripts/Interaction/FloatingObjectBase.cs +++ b/crest/Assets/Crest/Crest/Scripts/Interaction/FloatingObjectBase.cs @@ -23,7 +23,7 @@ public abstract partial class FloatingObjectBase : MonoBehaviour #if UNITY_EDITOR public abstract partial class FloatingObjectBase : IValidated { - public bool Validate(OceanRenderer ocean, ValidatedHelper.ShowMessage showMessage) + public virtual bool Validate(OceanRenderer ocean, ValidatedHelper.ShowMessage showMessage) { var isValid = true; From e9505410d9492d49bc83fa2dda6d09d3b36f3197 Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Wed, 19 Aug 2020 08:48:53 -0700 Subject: [PATCH 7/8] Add boat control to example scenes --- .../Scenes/Internal/BoatSceneCore.prefab | 331 +++++++++++++----- .../Internal/ThreeBoatsSceneCore.prefab | 239 +++++++++++-- 2 files changed, 463 insertions(+), 107 deletions(-) diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/BoatSceneCore.prefab b/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/BoatSceneCore.prefab index 024d94c9c..2c7c881b7 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/BoatSceneCore.prefab +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/BoatSceneCore.prefab @@ -83,6 +83,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512157696609 MonoBehaviour: @@ -98,8 +99,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -126,6 +125,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -137,6 +137,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -249,18 +250,14 @@ MonoBehaviour: _createShadowData: 0 _simSettingsShadow: {fileID: 0} _createClipSurfaceData: 1 + _defaultClippingState: 0 + _showOceanProxyPlane: 0 + _editModeFPS: 30 + _followSceneCamera: 1 _attachDebugGUI: 1 - _followViewpoint: 1 + _hideOceanTileGameObjects: 1 _uniformTiles: 0 _disableSkirt: 0 - _lodTransform: {fileID: 0} - _lodDataAnimWaves: {fileID: 0} - _lodDataSeaDepths: {fileID: 0} - _lodDataClipSurface: {fileID: 0} - _lodDataDynWaves: {fileID: 0} - _lodDataFlow: {fileID: 0} - _lodDataFoam: {fileID: 0} - _lodDataShadow: {fileID: 0} --- !u!1 &1709276512233510730 GameObject: m_ObjectHideFlags: 0 @@ -307,6 +304,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512233510726 MonoBehaviour: @@ -322,8 +320,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -350,6 +346,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -361,6 +358,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -419,6 +417,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512244294423 MonoBehaviour: @@ -434,8 +433,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -462,6 +459,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -473,6 +471,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -531,6 +530,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512279401647 MonoBehaviour: @@ -546,8 +546,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -574,6 +572,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -585,6 +584,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -651,6 +651,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -662,6 +663,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -766,6 +768,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -777,6 +780,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -857,6 +861,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -868,6 +873,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -935,6 +941,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -946,6 +953,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -970,8 +978,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26cbe8d1fc0a69249bc135d85739ad39, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 _octaveWavelength: 0 + _followHorizontalMotion: 1 _maxDisplacementVertical: 0 _maxDisplacementHorizontal: 0 _reportRendererBoundsToOceanSystem: 0 @@ -1032,6 +1042,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1043,6 +1054,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1164,6 +1176,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512438433994 MonoBehaviour: @@ -1179,8 +1192,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -1207,6 +1218,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1218,6 +1230,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1307,6 +1320,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512497236251 MonoBehaviour: @@ -1322,8 +1336,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -1350,6 +1362,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1361,6 +1374,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1419,6 +1433,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512513943406 MonoBehaviour: @@ -1434,8 +1449,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -1462,6 +1475,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1473,6 +1487,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1704,6 +1719,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1715,6 +1731,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1739,8 +1756,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26cbe8d1fc0a69249bc135d85739ad39, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 _octaveWavelength: 11 + _followHorizontalMotion: 1 _maxDisplacementVertical: 5.5 _maxDisplacementHorizontal: 0 _reportRendererBoundsToOceanSystem: 0 @@ -1842,6 +1861,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512808272740 MonoBehaviour: @@ -1857,8 +1877,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -1885,6 +1903,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1896,6 +1915,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1954,6 +1974,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512818193546 MonoBehaviour: @@ -1969,8 +1990,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -1997,6 +2016,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2008,6 +2028,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2075,6 +2096,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2086,6 +2108,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2199,6 +2222,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2210,6 +2234,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2313,6 +2338,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276512964091443 MonoBehaviour: @@ -2328,8 +2354,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -2356,6 +2380,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2367,6 +2392,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2559,6 +2585,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513084485791 MonoBehaviour: @@ -2574,8 +2601,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -2602,6 +2627,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2613,6 +2639,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2772,6 +2799,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2783,6 +2811,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2850,6 +2879,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2861,6 +2891,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2885,8 +2916,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26cbe8d1fc0a69249bc135d85739ad39, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 _octaveWavelength: 0 + _followHorizontalMotion: 1 _maxDisplacementVertical: 0 _maxDisplacementHorizontal: 0 _reportRendererBoundsToOceanSystem: 0 @@ -2989,6 +3022,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3000,6 +3034,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3073,6 +3108,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3084,6 +3120,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3187,6 +3224,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513386320555 MonoBehaviour: @@ -3202,8 +3240,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -3230,6 +3266,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3241,6 +3278,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3299,6 +3337,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513401815294 MonoBehaviour: @@ -3314,8 +3353,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -3342,6 +3379,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3353,6 +3391,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3452,6 +3491,7 @@ MeshRenderer: m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3463,6 +3503,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3487,9 +3528,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e66dbc64761412d41801763633a21b35, type: 3} m_Name: m_EditorClassIdentifier: - _localOffset: {x: 0, y: 0, z: 0} - _noiseFreq: 6 - _noiseAmp: 0 _weightUpDownMul: 0.3 _teleportSpeed: 500 _warnOnTeleport: 0 @@ -3508,6 +3546,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!1 &1709276513481094579 GameObject: @@ -3632,6 +3671,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3643,6 +3683,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3715,6 +3756,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513542739760 MonoBehaviour: @@ -3730,8 +3772,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -3758,6 +3798,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3769,6 +3810,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3827,6 +3869,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513546739013 MonoBehaviour: @@ -3842,8 +3885,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -3870,6 +3911,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3881,6 +3923,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3977,6 +4020,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513612569861 MonoBehaviour: @@ -3992,8 +4036,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -4020,6 +4062,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4031,6 +4074,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4208,6 +4252,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513790209468 MonoBehaviour: @@ -4223,8 +4268,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -4251,6 +4294,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4262,6 +4306,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4320,6 +4365,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276513809432409 MonoBehaviour: @@ -4335,8 +4381,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -4363,6 +4407,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4374,6 +4419,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4440,6 +4486,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4451,6 +4498,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4519,6 +4567,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4530,6 +4579,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4570,6 +4620,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!1 &1709276513975709553 GameObject: @@ -4659,6 +4710,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4670,6 +4722,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4779,6 +4832,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!114 &1709276514066741512 MonoBehaviour: @@ -4794,8 +4848,6 @@ MonoBehaviour: m_EditorClassIdentifier: _weight: 1 _weightUpDownMul: 0.5 - _noiseAmp: 0 - _noiseFreq: 6 _teleportSpeed: 500 _warnOnTeleport: 0 _maxSpeed: 100 @@ -4822,6 +4874,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4833,6 +4886,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4899,6 +4953,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4910,6 +4965,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4953,6 +5009,48 @@ Transform: m_Father: {fileID: 1709276513045204676} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1764472591654415558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710328059454620554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97ebca8e7448b432788bf5cb107fb1d0, type: 3} + m_Name: + m_EditorClassIdentifier: + _throttle: 1 + _steer: 1 +--- !u!114 &6884324570879391917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710929957084941739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6c15b5f79d9e4d829e474ae0bb5a632, type: 3} + m_Name: + m_EditorClassIdentifier: + _steerInputAxisName: Horizontal + _throttleInputAxisName: Vertical +--- !u!114 &4939720168841361829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710929957482201323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97ebca8e7448b432788bf5cb107fb1d0, type: 3} + m_Name: + m_EditorClassIdentifier: + _throttle: 1 + _steer: 0.8 --- !u!1 &3951424492669154611 GameObject: m_ObjectHideFlags: 0 @@ -5008,6 +5106,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5019,6 +5118,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -5043,6 +5143,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cdff4e1b753d044b5a7dcf91a7e7b863, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 _disableClipSurfaceWhenTooFarFromSurface: 0 _animatedWavesDisplacementSamplingIterations: 4 @@ -5093,6 +5194,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5104,6 +5206,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -5205,6 +5308,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114772648209712106, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 1764472591654415558} + - target: {fileID: 1459210513898229855, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3559931980440291151, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9de35a642561b7479e8ab40bb529e8c, type: 3} --- !u!4 &1705138506076335996 stripped @@ -5213,6 +5331,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1709276512690350552} m_PrefabAsset: {fileID: 0} +--- !u!1 &1710328059454620554 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1371779553471058, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + m_PrefabInstance: {fileID: 1709276512690350552} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1709276513273483773 PrefabInstance: m_ObjectHideFlags: 0 @@ -5268,6 +5392,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 23429759743720956, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 6884324570879391917} + - target: {fileID: 6795513849157194684, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} --- !u!4 &1709044165449915545 stripped @@ -5282,6 +5421,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1709276513273483773} m_PrefabAsset: {fileID: 0} +--- !u!1 &1710929957084941739 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1935509346245718, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + m_PrefabInstance: {fileID: 1709276513273483773} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1709276513278746923 PrefabInstance: m_ObjectHideFlags: 0 @@ -5289,11 +5434,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1709276513045204676} m_Modifications: - - target: {fileID: 6370312182862802037, guid: 0dde4b778082b1241ba64e4ad3e46fa1, - type: 3} - propertyPath: m_Name - value: AddBumpsToWater - objectReference: {fileID: 0} - target: {fileID: 6370312182862802033, guid: 0dde4b778082b1241ba64e4ad3e46fa1, type: 3} propertyPath: m_LocalPosition.x @@ -5364,6 +5504,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 258.85278 objectReference: {fileID: 0} + - target: {fileID: 6370312182862802035, guid: 0dde4b778082b1241ba64e4ad3e46fa1, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6370312182862802037, guid: 0dde4b778082b1241ba64e4ad3e46fa1, + type: 3} + propertyPath: m_Name + value: AddBumpsToWater + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0dde4b778082b1241ba64e4ad3e46fa1, type: 3} --- !u!4 &5755447229855075674 stripped @@ -5419,6 +5569,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 23429759743720956, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} propertyPath: _playerControlled @@ -5434,9 +5589,25 @@ PrefabInstance: propertyPath: _steerBias value: 0.8 objectReference: {fileID: 0} + - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 4939720168841361829} + - target: {fileID: 6795513849157194684, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} +--- !u!1 &1710929957482201323 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1935509346245718, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + m_PrefabInstance: {fileID: 1709276513671044285} + m_PrefabAsset: {fileID: 0} --- !u!4 &1709113576309914051 stripped Transform: m_CorrespondingSourceObject: {fileID: 4341219009766782, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, @@ -5450,11 +5621,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1709276513481094578} m_Modifications: - - target: {fileID: 5304508333967466499, guid: 37bbe23c17398419cbc8674f5c5dbccb, - type: 3} - propertyPath: m_Name - value: DemoLighting - objectReference: {fileID: 0} - target: {fileID: 1399345652565587599, guid: 37bbe23c17398419cbc8674f5c5dbccb, type: 3} propertyPath: m_LocalPosition.x @@ -5540,6 +5706,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -71 objectReference: {fileID: 0} + - target: {fileID: 5304508333967466499, guid: 37bbe23c17398419cbc8674f5c5dbccb, + type: 3} + propertyPath: m_Name + value: DemoLighting + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 37bbe23c17398419cbc8674f5c5dbccb, type: 3} --- !u!4 &915948055602687982 stripped @@ -5555,6 +5726,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1709276513029972002} m_Modifications: + - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: _lerpAlpha + value: 0.03 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: _targetPos + value: + objectReference: {fileID: 1709044165449915545} + - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: _targetLookatPos + value: + objectReference: {fileID: 1709113576438740099} - target: {fileID: 2452750316707852747, guid: cada5253abff1481b98c0880eb065d8e, type: 3} propertyPath: m_Name @@ -5620,26 +5811,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, - type: 3} - propertyPath: _lerpAlpha - value: 0.03 - objectReference: {fileID: 0} - - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, - type: 3} - propertyPath: _targetPos - value: - objectReference: {fileID: 1709044165449915545} - - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, - type: 3} - propertyPath: _targetLookatPos - value: - objectReference: {fileID: 1709113576438740099} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cada5253abff1481b98c0880eb065d8e, type: 3} --- !u!4 &1741912049970687794 stripped diff --git a/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/ThreeBoatsSceneCore.prefab b/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/ThreeBoatsSceneCore.prefab index 5b501632c..dd7f0f5a0 100644 --- a/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/ThreeBoatsSceneCore.prefab +++ b/crest/Assets/Crest/Crest-Examples/BoatDev/Scenes/Internal/ThreeBoatsSceneCore.prefab @@ -1,5 +1,75 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &2975533716821063840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120905589250834687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97ebca8e7448b432788bf5cb107fb1d0, type: 3} + m_Name: + m_EditorClassIdentifier: + _throttle: 1 + _steer: -0.4 +--- !u!114 &540525513515304016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4154601153325955917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97ebca8e7448b432788bf5cb107fb1d0, type: 3} + m_Name: + m_EditorClassIdentifier: + _throttle: 1 + _steer: -0.8 +--- !u!114 &3349631174183867602 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4154601154178345752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97ebca8e7448b432788bf5cb107fb1d0, type: 3} + m_Name: + m_EditorClassIdentifier: + _throttle: 1 + _steer: 1 +--- !u!114 &2449180985368339847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4154601154744854102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97ebca8e7448b432788bf5cb107fb1d0, type: 3} + m_Name: + m_EditorClassIdentifier: + _throttle: 1 + _steer: -0.7 +--- !u!114 &1698912917604135517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4155173504168027929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97ebca8e7448b432788bf5cb107fb1d0, type: 3} + m_Name: + m_EditorClassIdentifier: + _throttle: 1 + _steer: 1 --- !u!1 &4156536484320363218 GameObject: m_ObjectHideFlags: 0 @@ -148,6 +218,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -159,6 +230,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -199,6 +271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 942c4eeba14a7db4882e57488905e8eb, type: 3} m_Name: m_EditorClassIdentifier: + _checkShaderName: 1 _disableRenderer: 1 --- !u!1 &4156536484973950083 GameObject: @@ -269,18 +342,14 @@ MonoBehaviour: _createShadowData: 0 _simSettingsShadow: {fileID: 0} _createClipSurfaceData: 0 + _defaultClippingState: 0 + _showOceanProxyPlane: 0 + _editModeFPS: 30 + _followSceneCamera: 1 _attachDebugGUI: 1 - _followViewpoint: 1 + _hideOceanTileGameObjects: 1 _uniformTiles: 0 _disableSkirt: 0 - _lodTransform: {fileID: 0} - _lodDataAnimWaves: {fileID: 0} - _lodDataSeaDepths: {fileID: 0} - _lodDataClipSurface: {fileID: 0} - _lodDataDynWaves: {fileID: 0} - _lodDataFlow: {fileID: 0} - _lodDataFoam: {fileID: 0} - _lodDataShadow: {fileID: 0} --- !u!1 &4156536485153218112 GameObject: m_ObjectHideFlags: 0 @@ -386,11 +455,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4156536485153218113} m_Modifications: - - target: {fileID: 5304508333967466499, guid: 37bbe23c17398419cbc8674f5c5dbccb, - type: 3} - propertyPath: m_Name - value: DemoLighting - objectReference: {fileID: 0} - target: {fileID: 1399345652565587599, guid: 37bbe23c17398419cbc8674f5c5dbccb, type: 3} propertyPath: m_LocalPosition.x @@ -476,6 +540,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -71 objectReference: {fileID: 0} + - target: {fileID: 5304508333967466499, guid: 37bbe23c17398419cbc8674f5c5dbccb, + type: 3} + propertyPath: m_Name + value: DemoLighting + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 37bbe23c17398419cbc8674f5c5dbccb, type: 3} --- !u!4 &1277394908984322107 stripped @@ -491,6 +560,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4156536485464132325} m_Modifications: + - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: _targetPos + value: + objectReference: {fileID: 8227726505833482318} + - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, + type: 3} + propertyPath: _targetLookatPos + value: + objectReference: {fileID: 8689234882621092447} - target: {fileID: 2452750316707852747, guid: cada5253abff1481b98c0880eb065d8e, type: 3} propertyPath: m_Name @@ -551,16 +630,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, - type: 3} - propertyPath: _targetPos - value: - objectReference: {fileID: 8227726505833482318} - - target: {fileID: 2452750316707852745, guid: cada5253abff1481b98c0880eb065d8e, - type: 3} - propertyPath: _targetLookatPos - value: - objectReference: {fileID: 8689234882621092447} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cada5253abff1481b98c0880eb065d8e, type: 3} --- !u!4 &1092007478985191748 stripped @@ -616,6 +685,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} + - target: {fileID: 23429759743720956, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} propertyPath: _steerBias @@ -631,6 +705,16 @@ PrefabInstance: propertyPath: _playerControlled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 2449180985368339847} + - target: {fileID: 6795513849157194684, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} --- !u!4 &4152767155593305982 stripped @@ -639,6 +723,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4156536484674173440} m_PrefabAsset: {fileID: 0} +--- !u!1 &4154601154744854102 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1935509346245718, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + m_PrefabInstance: {fileID: 4156536484674173440} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4156536484942466379 PrefabInstance: m_ObjectHideFlags: 0 @@ -698,8 +788,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114772648209712106, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 1698912917604135517} + - target: {fileID: 1459210513898229855, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3559931980440291151, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9de35a642561b7479e8ab40bb529e8c, type: 3} +--- !u!1 &4155173504168027929 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1371779553471058, guid: a9de35a642561b7479e8ab40bb529e8c, + type: 3} + m_PrefabInstance: {fileID: 4156536484942466379} + m_PrefabAsset: {fileID: 0} --- !u!4 &4161242941272411119 stripped Transform: m_CorrespondingSourceObject: {fileID: 4872491186423460, guid: a9de35a642561b7479e8ab40bb529e8c, @@ -753,6 +864,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 23429759743720956, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} propertyPath: _throttleBias @@ -768,6 +884,16 @@ PrefabInstance: propertyPath: _steerBias value: 1 objectReference: {fileID: 0} + - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 3349631174183867602} + - target: {fileID: 6795513849157194684, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} --- !u!4 &4152767156159287856 stripped @@ -776,6 +902,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4156536485214992206} m_PrefabAsset: {fileID: 0} +--- !u!1 &4154601154178345752 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1935509346245718, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + m_PrefabInstance: {fileID: 4156536485214992206} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4156536485402715931 PrefabInstance: m_ObjectHideFlags: 0 @@ -823,6 +955,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 23429759743720956, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} propertyPath: _steerBias @@ -838,8 +975,24 @@ PrefabInstance: propertyPath: _playerControlled value: 0 objectReference: {fileID: 0} + - target: {fileID: 114101010989703450, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 540525513515304016} + - target: {fileID: 6795513849157194684, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, type: 3} +--- !u!1 &4154601153325955917 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1935509346245718, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, + type: 3} + m_PrefabInstance: {fileID: 4156536485402715931} + m_PrefabAsset: {fileID: 0} --- !u!4 &4152767154730107493 stripped Transform: m_CorrespondingSourceObject: {fileID: 4341219009766782, guid: 71ede3c2ab0b7cb43b7dad6ae3b6190b, @@ -853,6 +1006,27 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4156536484320363219} m_Modifications: + - target: {fileID: 96946131, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1518312016, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1843519205, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1863959132, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2014455076213309831, guid: fab3f04ce74996c4c806ab300d4abf45, + type: 3} + propertyPath: _boatControl + value: + objectReference: {fileID: 2975533716821063840} - target: {fileID: 4036194036648923335, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} propertyPath: m_Name @@ -918,17 +1092,28 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5808623283431529828, guid: fab3f04ce74996c4c806ab300d4abf45, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} +--- !u!4 &8227726505833482318 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5440412411261671542, guid: fab3f04ce74996c4c806ab300d4abf45, + type: 3} + m_PrefabInstance: {fileID: 4156536485826629688} + m_PrefabAsset: {fileID: 0} --- !u!4 &8689234882621092447 stripped Transform: m_CorrespondingSourceObject: {fileID: 4699689828683719271, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} m_PrefabInstance: {fileID: 4156536485826629688} m_PrefabAsset: {fileID: 0} ---- !u!4 &8227726505833482318 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5440412411261671542, guid: fab3f04ce74996c4c806ab300d4abf45, +--- !u!1 &120905589250834687 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4036194036648923335, guid: fab3f04ce74996c4c806ab300d4abf45, type: 3} m_PrefabInstance: {fileID: 4156536485826629688} m_PrefabAsset: {fileID: 0} From 0d13cfa0e0996097a01c6c58aed67fedee1c293b Mon Sep 17 00:00:00 2001 From: Dale Eidd Date: Wed, 19 Aug 2020 13:41:09 -0700 Subject: [PATCH 8/8] Add BoatControl to user guide --- USERGUIDE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/USERGUIDE.md b/USERGUIDE.md index 52c6e47ab..c513c2248 100644 --- a/USERGUIDE.md +++ b/USERGUIDE.md @@ -394,6 +394,7 @@ Setting up a boat with physics can be a dark art. The authors recommend duplicat * If, even after experimenting with the mass and drag, the boat is responding too much to small waves, increase these parameters (try doubling or quadrupling at first and then compensate). * There are power settings for engine turning which also help to give a feeling of weight * The dynamic wave interaction is driven by the object in the boat hierarchy called *WaterObjectInteractionSphere*. It can be scaled to match the dimensions of the boat. The *Weight* param controls the strength of the interaction. +* Add and assign a *BoatControl* component. You can use one we provide or create your own. We provide two: one for player control and one for fixed movement. To create your own, see the ones we provide as an example. The above steps should maintain a working boat throughout - we recommend testing after each step to catch issues early.