From 75565f040ef6cc7ace86303293973c8deba3a973 Mon Sep 17 00:00:00 2001 From: Pasha Date: Sat, 11 Apr 2026 14:15:12 +0100 Subject: [PATCH] Made the fans be annimated --- Assets/Art/Annimations.meta | 8 +++ .../FanAnnimationController.controller | 43 +++++++++++++++ .../FanAnnimationController.controller.meta | 8 +++ Assets/Art/Annimations/FanSpin.anim | 53 +++++++++++++++++++ Assets/Art/Annimations/FanSpin.anim.meta | 8 +++ Assets/Prefabs/Buildings/FanBuilding.prefab | 22 ++++++++ Assets/Scripts/UI/GridViewController.cs | 5 +- 7 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 Assets/Art/Annimations.meta create mode 100644 Assets/Art/Annimations/FanAnnimationController.controller create mode 100644 Assets/Art/Annimations/FanAnnimationController.controller.meta create mode 100644 Assets/Art/Annimations/FanSpin.anim create mode 100644 Assets/Art/Annimations/FanSpin.anim.meta diff --git a/Assets/Art/Annimations.meta b/Assets/Art/Annimations.meta new file mode 100644 index 0000000..3d02bf9 --- /dev/null +++ b/Assets/Art/Annimations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ed87c8060364c64587b1c485f94f8d5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Annimations/FanAnnimationController.controller b/Assets/Art/Annimations/FanAnnimationController.controller new file mode 100644 index 0000000..c2d25d2 --- /dev/null +++ b/Assets/Art/Annimations/FanAnnimationController.controller @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-177642466061944451 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FanAnnimationController + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -177642466061944451} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Art/Annimations/FanAnnimationController.controller.meta b/Assets/Art/Annimations/FanAnnimationController.controller.meta new file mode 100644 index 0000000..18078ff --- /dev/null +++ b/Assets/Art/Annimations/FanAnnimationController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1db4e49f39669b4aa6b3141eff8f1de +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Annimations/FanSpin.anim b/Assets/Art/Annimations/FanSpin.anim new file mode 100644 index 0000000..b03fab9 --- /dev/null +++ b/Assets/Art/Annimations/FanSpin.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FanSpin + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Annimations/FanSpin.anim.meta b/Assets/Art/Annimations/FanSpin.anim.meta new file mode 100644 index 0000000..6cb7ba1 --- /dev/null +++ b/Assets/Art/Annimations/FanSpin.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 498c3bddab78b0443935202550916333 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/FanBuilding.prefab b/Assets/Prefabs/Buildings/FanBuilding.prefab index cb5390e..01579cd 100644 --- a/Assets/Prefabs/Buildings/FanBuilding.prefab +++ b/Assets/Prefabs/Buildings/FanBuilding.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 546461529234046531} - component: {fileID: 3321531399837876958} - component: {fileID: 512124502862012575} + - component: {fileID: 1099873069624310322} - component: {fileID: 2938597077917375806} - component: {fileID: -6667291122109179156} m_Layer: 0 @@ -61,6 +62,27 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8624048914473773482} m_CullTransparentMesh: 1 +--- !u!95 &1099873069624310322 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624048914473773482} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e1db4e49f39669b4aa6b3141eff8f1de, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &2938597077917375806 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/GridViewController.cs b/Assets/Scripts/UI/GridViewController.cs index 809cf85..fa7325a 100644 --- a/Assets/Scripts/UI/GridViewController.cs +++ b/Assets/Scripts/UI/GridViewController.cs @@ -32,7 +32,10 @@ namespace Fruitomation.UI { int srcW = source.width; int srcH = source.height; - Texture2D result = new(srcW * cols, srcH * rows); + Texture2D result = new(srcW * cols, srcH * rows) + { + filterMode = FilterMode.Point + }; Color[] srcPixels = source.GetPixels();