From bcd5d5d7b96d6d4404760aa6b3fe5e124496110a Mon Sep 17 00:00:00 2001 From: desktop-maesty/steve Date: Tue, 8 May 2018 19:53:44 +1000 Subject: [PATCH] Added GetKey fungus command. -Supports positive and negative keybindings output to a bool, float or int -Supports checking for pressed, release and current state -Uses keycode with optional fallback to key name Updated playground demos -Football uses GetKey instead of GetAxis (get axis was failing in some packages as inputmanager axis were not imported) -Defender had a bug due to a change in how unity syncs 'up' between transform and rb2d --- .../Fungus/Scripts/Commands/Input/GetKey.cs | 174 +++++++ .../Scripts/Commands/Input/GetKey.cs.meta | 11 + .../FungusExamples/Playground/Defender.unity | 324 ++++++++++++- .../FungusExamples/Playground/Football.unity | 304 +++++++++++- Assets/FungusExamples/Playground/Lander.unity | 433 +++++++++++++++++- .../Playground/Prefabs/Laser.prefab | 73 +-- .../Playground/Prefabs/P1.prefab | 147 +++--- Docs/command_ref/input_commands.md | 13 + 8 files changed, 1332 insertions(+), 147 deletions(-) create mode 100644 Assets/Fungus/Scripts/Commands/Input/GetKey.cs create mode 100644 Assets/Fungus/Scripts/Commands/Input/GetKey.cs.meta diff --git a/Assets/Fungus/Scripts/Commands/Input/GetKey.cs b/Assets/Fungus/Scripts/Commands/Input/GetKey.cs new file mode 100644 index 00000000..341fd99d --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/Input/GetKey.cs @@ -0,0 +1,174 @@ +using UnityEngine; + +namespace Fungus +{ + // + /// Store Input.GetKey in a variable. Supports an optional Negative key input. A negative value will be overridden by a positive one, they do not add. + /// + [CommandInfo("Input", + "GetKey", + "Store Input.GetKey in a variable. Supports an optional Negative key input. A negative value will be overridden by a positive one, they do not add.")] + [AddComponentMenu("")] + public class GetKey : Command + { + [SerializeField] + protected KeyCode keyCode = KeyCode.None; + + [Tooltip("Optional, secondary or negative keycode. For booleans will also set to true, for int and float will set to -1.")] + [SerializeField] + protected KeyCode keyCodeNegative = KeyCode.None; + + [SerializeField] + [Tooltip("Only used if KeyCode is KeyCode.None, expects a name of the key to use.")] + protected StringData keyCodeName = new StringData(string.Empty); + + [SerializeField] + [Tooltip("Optional, secondary or negative keycode. For booleans will also set to true, for int and float will set to -1." + + "Only used if KeyCode is KeyCode.None, expects a name of the key to use.")] + protected StringData keyCodeNameNegative = new StringData(string.Empty); + + public enum InputKeyQueryType + { + Down, + Up, + State + } + + [Tooltip("Do we want an Input.GetKeyDown, GetKeyUp or GetKey")] + [SerializeField] + protected InputKeyQueryType keyQueryType = InputKeyQueryType.State; + + [Tooltip("Will store true or false or 0 or 1 depending on type. Sets true or -1 for negative key values.")] + [SerializeField] + [VariableProperty(typeof(FloatVariable), typeof(BooleanVariable), typeof(IntegerVariable))] + protected Variable outValue; + + public override void OnEnter() + { + FillOutValue(0); + + if (keyCodeNegative != KeyCode.None) + { + DoKeyCode(keyCodeNegative, -1); + } + else if (!string.IsNullOrEmpty(keyCodeNameNegative)) + { + DoKeyName(keyCodeNameNegative, -1); + } + + + if (keyCode != KeyCode.None) + { + DoKeyCode(keyCode, 1); + } + else if (!string.IsNullOrEmpty(keyCodeName)) + { + DoKeyName(keyCodeName, 1); + } + + Continue(); + } + + private void DoKeyCode(KeyCode key, int trueVal) + { + switch (keyQueryType) + { + case InputKeyQueryType.Down: + if (Input.GetKeyDown(key)) + { + FillOutValue(trueVal); + } + break; + case InputKeyQueryType.Up: + if (Input.GetKeyUp(key)) + { + FillOutValue(trueVal); + } + break; + case InputKeyQueryType.State: + if (Input.GetKey(key)) + { + FillOutValue(trueVal); + } + break; + default: + break; + } + } + + private void DoKeyName(string key, int trueVal) + { + switch (keyQueryType) + { + case InputKeyQueryType.Down: + if (Input.GetKeyDown(key)) + { + FillOutValue(trueVal); + } + break; + case InputKeyQueryType.Up: + if (Input.GetKeyUp(key)) + { + FillOutValue(trueVal); + } + break; + case InputKeyQueryType.State: + if (Input.GetKey(key)) + { + FillOutValue(trueVal); + } + break; + default: + break; + } + } + + private void FillOutValue(int v) + { + FloatVariable fvar = outValue as FloatVariable; + if (fvar != null) + { + fvar.Value = v; + return; + } + + BooleanVariable bvar = outValue as BooleanVariable; + if (bvar != null) + { + bvar.Value = v == 0 ? false : true; + return; + } + + IntegerVariable ivar = outValue as IntegerVariable; + if (ivar != null) + { + ivar.Value = v; + return; + } + } + + public override string GetSummary() + { + if (outValue == null) + { + return "Error: no outvalue set"; + } + + return (keyCode != KeyCode.None ? keyCode.ToString() : keyCodeName) + " in " + outValue.Key; + } + + public override Color GetButtonColor() + { + return new Color32(235, 191, 217, 255); + } + + public override bool HasReference(Variable variable) + { + if (keyCodeName.stringRef == variable || outValue == variable || keyCodeNameNegative.stringRef == variable) + return true; + + return false; + } + + } +} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Commands/Input/GetKey.cs.meta b/Assets/Fungus/Scripts/Commands/Input/GetKey.cs.meta new file mode 100644 index 00000000..d821cc16 --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/Input/GetKey.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: abf9e2e4334293449850759c812dd9db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/Playground/Defender.unity b/Assets/FungusExamples/Playground/Defender.unity index 5da00645..af850401 100644 --- a/Assets/FungusExamples/Playground/Defender.unity +++ b/Assets/FungusExamples/Playground/Defender.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -77,15 +77,18 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -107,6 +110,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &69847124 GameObject: @@ -179,11 +184,11 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &69847129 Transform: m_ObjectHideFlags: 0 @@ -195,7 +200,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &119136498 GameObject: @@ -338,7 +343,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4839343606506310, guid: 5192b1b391d8cd54f84d39d06a4a3dc8, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 114094183539183980, guid: 5192b1b391d8cd54f84d39d06a4a3dc8, type: 2} @@ -546,7 +551,7 @@ Prefab: type: 2} propertyPath: selectedBlocks.Array.data[0] value: - objectReference: {fileID: 1624045262} + objectReference: {fileID: 1624045260} - target: {fileID: 114567745504451066, guid: 5db9b59ebaddb664eac17f8dd52f454a, type: 2} propertyPath: nodeRect.x @@ -918,6 +923,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026868 MonoBehaviour: m_ObjectHideFlags: 2 @@ -945,6 +986,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: 'Score: {$score}' + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026869 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1000,6 +1077,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: '{$hp} : Health' + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026872 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1230,6 +1343,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026883 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1301,6 +1450,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026886 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1420,6 +1605,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026892 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1447,6 +1668,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: You Win! + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026893 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1474,6 +1731,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: Game Over + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1267026894 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1607,7 +1900,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 114619489782507194, guid: cf9a0515785714a49b2d12090c78828f, + selectedFlowchart: {fileID: 114526636883379746, guid: a63bb7c0f4cb0df429c8364816dc7b20, type: 2} --- !u!4 &1569219821 Transform: @@ -1747,9 +2040,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1762,6 +2057,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1897,7 +2193,7 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 545255773} m_Script: {fileID: 11500000, guid: bb3e86f556e074b84af1cc7eb8f8e5e7, type: 3} ---- !u!114 &1624045262 stripped +--- !u!114 &1624045260 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 114980758164341790, guid: 5db9b59ebaddb664eac17f8dd52f454a, type: 2} diff --git a/Assets/FungusExamples/Playground/Football.unity b/Assets/FungusExamples/Playground/Football.unity index 0e9ef072..b2d59f8e 100644 --- a/Assets/FungusExamples/Playground/Football.unity +++ b/Assets/FungusExamples/Playground/Football.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -77,15 +77,18 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -107,6 +110,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &44679669 GameObject: @@ -383,6 +388,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &53095143 MonoBehaviour: m_ObjectHideFlags: 2 @@ -430,6 +471,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &53095145 MonoBehaviour: m_ObjectHideFlags: 2 @@ -563,6 +640,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &53095151 MonoBehaviour: m_ObjectHideFlags: 2 @@ -590,6 +703,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &53095152 MonoBehaviour: m_ObjectHideFlags: 2 @@ -677,7 +826,7 @@ MonoBehaviour: version: 1 scrollPos: {x: 91, y: -1} variablesScrollPos: {x: 0, y: 0} - variablesExpanded: 1 + variablesExpanded: 0 blockViewHeight: 400 zoom: 1 scrollViewRect: @@ -687,7 +836,7 @@ MonoBehaviour: width: 0 height: 0 selectedBlocks: - - {fileID: 53095145} + - {fileID: 53095155} selectedCommands: [] variables: - {fileID: 53095153} @@ -937,6 +1086,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: Player 1 Wins! + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &53095170 MonoBehaviour: m_ObjectHideFlags: 2 @@ -964,6 +1149,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: Player 2 Wins! + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &53095171 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1224,9 +1445,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1239,6 +1462,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1383,9 +1607,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1398,6 +1624,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1480,9 +1707,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1495,6 +1724,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1609,11 +1839,11 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &723296036 Transform: m_ObjectHideFlags: 0 @@ -1780,7 +2010,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 53095156} + selectedFlowchart: {fileID: 1357939927} --- !u!4 &912903173 Transform: m_ObjectHideFlags: 1 @@ -1858,9 +2088,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1873,6 +2105,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1997,9 +2230,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2012,6 +2247,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2206,9 +2442,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2221,6 +2459,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2291,9 +2530,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2306,6 +2547,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2349,6 +2591,12 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!114 &1357939927 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114126325013622294, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, + type: 2} + m_PrefabInternal: {fileID: 2117275492} + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} --- !u!1 &1509177893 GameObject: m_ObjectHideFlags: 0 @@ -2495,13 +2743,11 @@ Prefab: propertyPath: m_Name value: P2 objectReference: {fileID: 0} - - target: {fileID: 114337264207455518, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, - type: 2} + - target: {fileID: 0} propertyPath: axisName.stringVal value: p2xAxis objectReference: {fileID: 0} - - target: {fileID: 114314477038342724, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, - type: 2} + - target: {fileID: 0} propertyPath: axisName.stringVal value: p2yAxis objectReference: {fileID: 0} @@ -2612,9 +2858,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2627,6 +2875,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2684,9 +2933,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2699,6 +2950,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2870,6 +3122,26 @@ Prefab: propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 114128824974302672, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, + type: 2} + propertyPath: keyCode + value: 275 + objectReference: {fileID: 0} + - target: {fileID: 114128824974302672, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, + type: 2} + propertyPath: keyCodeNegative + value: 276 + objectReference: {fileID: 0} + - target: {fileID: 114595299051009690, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, + type: 2} + propertyPath: keyCode + value: 273 + objectReference: {fileID: 0} + - target: {fileID: 114595299051009690, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, + type: 2} + propertyPath: keyCodeNegative + value: 274 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4ecd3eccefa01ca4da38d03c8e7c2a8d, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/FungusExamples/Playground/Lander.unity b/Assets/FungusExamples/Playground/Lander.unity index c729ea04..af6b7140 100644 --- a/Assets/FungusExamples/Playground/Lander.unity +++ b/Assets/FungusExamples/Playground/Lander.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -54,11 +55,10 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -77,15 +77,18 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -107,6 +110,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &15251662 GameObject: @@ -314,9 +319,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -329,6 +336,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -418,11 +426,11 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &109228320 Transform: m_ObjectHideFlags: 0 @@ -815,9 +823,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -830,6 +840,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1161,6 +1172,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &510833775 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1188,6 +1235,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &510833776 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1420,9 +1503,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1435,6 +1520,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1759,9 +1845,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1774,6 +1862,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1909,9 +1998,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1924,6 +2015,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2029,8 +2121,7 @@ MonoBehaviour: y: 0 width: 0 height: 0 - selectedBlocks: - - {fileID: 1179951679} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 1179951657} @@ -2137,9 +2228,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2152,6 +2245,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2345,6 +2439,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951661 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2445,6 +2575,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951666 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2475,7 +2641,7 @@ MonoBehaviour: value: {x: 0, y: 0, z: 0} --- !u!114 &1179951668 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1179951648} @@ -2494,7 +2660,7 @@ MonoBehaviour: inOutVar: {fileID: 1179951666} --- !u!114 &1179951669 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1179951648} @@ -2576,7 +2742,7 @@ MonoBehaviour: messageOLD: --- !u!114 &1179951673 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1179951648} @@ -2595,7 +2761,7 @@ MonoBehaviour: inOutVar: {fileID: 1179951666} --- !u!114 &1179951674 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1179951648} @@ -2851,6 +3017,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951686 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2891,6 +3093,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951688 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2918,6 +3156,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951689 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3065,6 +3339,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951696 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3092,6 +3402,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951697 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3119,6 +3465,42 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + textureData: + textureRef: {fileID: 0} + textureVal: {fileID: 0} + transformData: + transformRef: {fileID: 0} + transformVal: {fileID: 0} + vector2Data: + vector2Ref: {fileID: 0} + vector2Val: {x: 0, y: 0} + vector3Data: + vector3Ref: {fileID: 0} + vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &1179951698 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3249,9 +3631,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3264,6 +3648,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3399,9 +3784,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3414,6 +3801,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3624,9 +4012,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3639,6 +4029,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3774,9 +4165,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3789,6 +4182,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3924,9 +4318,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3939,6 +4335,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4061,9 +4458,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -4076,6 +4475,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4224,9 +4624,11 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -4239,6 +4641,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/FungusExamples/Playground/Prefabs/Laser.prefab b/Assets/FungusExamples/Playground/Prefabs/Laser.prefab index a1f2615e..98266291 100644 --- a/Assets/FungusExamples/Playground/Prefabs/Laser.prefab +++ b/Assets/FungusExamples/Playground/Prefabs/Laser.prefab @@ -43,7 +43,6 @@ GameObject: - component: {fileID: 114602407226986924} - component: {fileID: 114487163524766562} - component: {fileID: 114979932131573080} - - component: {fileID: 114216864803211772} - component: {fileID: 114751314740007556} - component: {fileID: 114455382144078078} - component: {fileID: 114182131449558960} @@ -72,12 +71,12 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4591436351563906 Transform: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1942691996823588} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.648, y: 0.214, z: 0} + m_LocalPosition: {x: 15.526983, y: -0.36546326, z: 0} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_Children: - {fileID: 4506692581060478} @@ -87,7 +86,7 @@ Transform: --- !u!50 &50266752063846120 Rigidbody2D: serializedVersion: 4 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1942691996823588} @@ -106,7 +105,7 @@ Rigidbody2D: m_Constraints: 0 --- !u!60 &60745726664901920 PolygonCollider2D: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1942691996823588} @@ -192,9 +191,11 @@ TrailRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -207,6 +208,7 @@ TrailRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -222,18 +224,24 @@ TrailRenderer: widthCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 @@ -276,16 +284,18 @@ TrailRenderer: --- !u!96 &96390674517467256 TrailRenderer: serializedVersion: 2 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1942691996823588} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -298,6 +308,7 @@ TrailRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -313,18 +324,24 @@ TrailRenderer: widthCurve: serializedVersion: 2 m_Curve: - - serializedVersion: 2 + - serializedVersion: 3 time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - serializedVersion: 2 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 @@ -389,20 +406,6 @@ MonoBehaviour: eventHandler: {fileID: 114250531415154764} commandList: - {fileID: 114299940920854140} ---- !u!114 &114216864803211772 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1942691996823588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5571f032eb722324fac0fc908bc370bc, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: rb - value: {fileID: 50266752063846120} --- !u!114 &114250531415154764 MonoBehaviour: m_ObjectHideFlags: 2 @@ -464,8 +467,8 @@ MonoBehaviour: itemId: 1 indentLevel: 0 rb: - rigidbody2DRef: {fileID: 114216864803211772} - rigidbody2DVal: {fileID: 0} + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 50266752063846120} forceMode: 1 forceFunction: 2 force: @@ -479,7 +482,7 @@ MonoBehaviour: vector2Val: {x: 0, y: 0} --- !u!114 &114526636883379746 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1942691996823588} @@ -492,7 +495,7 @@ MonoBehaviour: scrollPos: {x: 62, y: -35} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 400 + blockViewHeight: 339 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -500,11 +503,12 @@ MonoBehaviour: y: 0 width: 0 height: 0 - selectedBlocks: [] - selectedCommands: [] + selectedBlocks: + - {fileID: 114593477394275294} + selectedCommands: + - {fileID: 114487163524766562} variables: - {fileID: 114979932131573080} - - {fileID: 114216864803211772} - {fileID: 114455382144078078} description: stepPause: 0 @@ -554,7 +558,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 114593477394275294} - waitForFrames: 1 + waitForFrames: 3 --- !u!114 &114751314740007556 MonoBehaviour: m_ObjectHideFlags: 2 @@ -591,16 +595,18 @@ MonoBehaviour: value: {x: 0, y: 10} --- !u!212 &212200396344711462 SpriteRenderer: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1942691996823588} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -613,6 +619,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Assets/FungusExamples/Playground/Prefabs/P1.prefab b/Assets/FungusExamples/Playground/Prefabs/P1.prefab index 40076df4..f8084d44 100644 --- a/Assets/FungusExamples/Playground/Prefabs/P1.prefab +++ b/Assets/FungusExamples/Playground/Prefabs/P1.prefab @@ -32,13 +32,13 @@ GameObject: - component: {fileID: 114348338108346498} - component: {fileID: 114465925968467040} - component: {fileID: 114409838832793244} - - component: {fileID: 114337264207455518} - - component: {fileID: 114314477038342724} - component: {fileID: 114573728990135962} - component: {fileID: 114326212544484044} - component: {fileID: 114081283549603066} - component: {fileID: 114085027684436294} - component: {fileID: 114862459103620794} + - component: {fileID: 114128824974302672} + - component: {fileID: 114595299051009690} m_Layer: 0 m_Name: P1 m_TagString: Untagged @@ -48,7 +48,7 @@ GameObject: m_IsActive: 1 --- !u!4 &4164059856041556 Transform: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -62,7 +62,7 @@ Transform: --- !u!50 &50485926042586766 Rigidbody2D: serializedVersion: 4 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -81,7 +81,7 @@ Rigidbody2D: m_Constraints: 4 --- !u!58 &58545323045532278 CircleCollider2D: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -96,7 +96,7 @@ CircleCollider2D: m_Radius: 0.5 --- !u!114 &114024079056778752 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -106,11 +106,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scope: 0 - key: x + key: x1 value: 0 --- !u!114 &114081283549603066 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -133,7 +133,7 @@ MonoBehaviour: operation: 2 --- !u!114 &114085027684436294 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -159,7 +159,7 @@ MonoBehaviour: floatVal: 0 --- !u!114 &114126325013622294 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -200,9 +200,32 @@ MonoBehaviour: hideCommands: [] luaEnvironment: {fileID: 0} luaBindingName: flowchart +--- !u!114 &114128824974302672 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1404956649453682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: abf9e2e4334293449850759c812dd9db, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 11 + indentLevel: 0 + keyCode: 100 + keyCodeNegative: 97 + keyCodeName: + stringRef: {fileID: 0} + stringVal: + keyCodeNameNegative: + stringRef: {fileID: 0} + stringVal: + keyQueryType: 2 + outValue: {fileID: 114024079056778752} --- !u!114 &114177047531498962 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -224,8 +247,8 @@ MonoBehaviour: description: eventHandler: {fileID: 114201986544531680} commandList: - - {fileID: 114337264207455518} - - {fileID: 114314477038342724} + - {fileID: 114128824974302672} + - {fileID: 114595299051009690} - {fileID: 114085027684436294} - {fileID: 114409838832793244} - {fileID: 114862459103620794} @@ -234,7 +257,7 @@ MonoBehaviour: - {fileID: 114334667391765546} --- !u!114 &114188004173552184 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -244,11 +267,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scope: 0 - key: y + key: y1 value: 0 --- !u!114 &114201986544531680 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -259,29 +282,9 @@ MonoBehaviour: m_EditorClassIdentifier: parentBlock: {fileID: 114177047531498962} FireOn: 2 ---- !u!114 &114314477038342724 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1404956649453682} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bb18ee740f55ba24680c15466ff13ece, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 6 - indentLevel: 0 - axisName: - stringRef: {fileID: 0} - stringVal: p1yAxis - axisRaw: 0 - outValue: - floatRef: {fileID: 114188004173552184} - floatVal: 0 --- !u!114 &114326212544484044 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -291,11 +294,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scope: 0 - key: forceScaleVec3 + key: forceScaleVec31 value: {x: 0, y: 0, z: 0} --- !u!114 &114334667391765546 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -320,29 +323,9 @@ MonoBehaviour: atPosition: vector2Ref: {fileID: 0} vector2Val: {x: 0, y: 0} ---- !u!114 &114337264207455518 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1404956649453682} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bb18ee740f55ba24680c15466ff13ece, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 5 - indentLevel: 0 - axisName: - stringRef: {fileID: 0} - stringVal: p1xAxis - axisRaw: 0 - outValue: - floatRef: {fileID: 114024079056778752} - floatVal: 0 --- !u!114 &114348338108346498 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -352,11 +335,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scope: 0 - key: Force + key: Force1 value: {x: 0, y: 0} --- !u!114 &114409838832793244 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -375,7 +358,7 @@ MonoBehaviour: vector3Val: {x: 0, y: 0, z: 0} --- !u!114 &114465925968467040 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -394,7 +377,7 @@ MonoBehaviour: vector2Val: {x: 0, y: 0} --- !u!114 &114573728990135962 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -404,11 +387,34 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scope: 0 - key: forceScale + key: forceScale1 value: 60 +--- !u!114 &114595299051009690 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1404956649453682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: abf9e2e4334293449850759c812dd9db, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 12 + indentLevel: 0 + keyCode: 119 + keyCodeNegative: 115 + keyCodeName: + stringRef: {fileID: 0} + stringVal: + keyCodeNameNegative: + stringRef: {fileID: 0} + stringVal: + keyQueryType: 2 + outValue: {fileID: 114188004173552184} --- !u!114 &114777688141419168 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -418,11 +424,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scope: 0 - key: vec3 + key: vec31 value: {x: 0, y: 0, z: 0} --- !u!114 &114862459103620794 MonoBehaviour: - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} @@ -448,16 +454,18 @@ MonoBehaviour: floatVal: 0 --- !u!212 &212462972284088668 SpriteRenderer: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404956649453682} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -470,6 +478,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 diff --git a/Docs/command_ref/input_commands.md b/Docs/command_ref/input_commands.md index e64e3b4f..23d4556c 100644 --- a/Docs/command_ref/input_commands.md +++ b/Docs/command_ref/input_commands.md @@ -11,3 +11,16 @@ Property | Type | Description Axis Raw | System.Boolean | If true, calls GetAxisRaw instead of GetAxis Out Value | Fungus.FloatData | Float to store the value of the GetAxis +# GetKey # {#GetKey} +Store Input.GetKey in a variable. Supports an optional Negative key input. A negative value will be overridden by a positive one, they do not add. + +Defined in Fungus.GetKey + +Property | Type | Description + --- | --- | --- +Key Code Negative | UnityEngine.KeyCode | Optional, secondary or negative keycode. For booleans will also set to true, for int and float will set to -1. +Key Code Name | Fungus.StringData | Only used if KeyCode is KeyCode.None, expects a name of the key to use. +Key Code Name Negative | Fungus.StringData | Optional, secondary or negative keycode. For booleans will also set to true, for int and float will set to -1.Only used if KeyCode is KeyCode.None, expects a name of the key to use. +Key Query Type | Fungus.GetKey+InputKeyQueryType | Do we want an Input.GetKeyDown, GetKeyUp or GetKey +Out Value | Fungus.Variable | Will store true or false or 0 or 1 depending on type. Sets true or -1 for negative key values. +