Merge pull request #61 from S1yGus/60-add-periodic-motion-to-the-food…

…-model Add periodic motion to the food model
S1yGus · Mar 14, 2024 · 8091669 · 8091669
2 parents 575e6ee + 9b303b6
commit 8091669
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 5 deletions.
diff --git a/Content/World/BP_Food.uasset b/Content/World/BP_Food.uasset
diff --git a/Source/Snake_Game/World/SG_BaseCellObject.cpp b/Source/Snake_Game/World/SG_BaseCellObject.cpp
@@ -70,5 +70,10 @@ void ASG_BaseCellObject::OnChangingScale()
     {
         Mesh->SetRelativeScale3D(TargetScale);
         GetWorldTimerManager().ClearTimer(ScaleTimerHandle);
+        OnScalingDone();
     }
 }
+
+void ASG_BaseCellObject::OnScalingDone()
+{
+}
diff --git a/Source/Snake_Game/World/SG_BaseCellObject.h b/Source/Snake_Game/World/SG_BaseCellObject.h
@@ -32,7 +32,7 @@ class SNAKE_GAME_API ASG_BaseCellObject : public AActor
     /**
      * Restarts the scale of the object from zero to the target scale
      */
-    void RestartScaling();
+    virtual void RestartScaling();
 
     /**
      * Reproduces the teardown effect
@@ -49,10 +49,10 @@ class SNAKE_GAME_API ASG_BaseCellObject : public AActor
     UPROPERTY(EditDefaultsOnly, Category = "Materials")
     FName MaterialColorParameterName{"Color"};
 
-    UPROPERTY(EditDefaultsOnly, Category = "Settings")
+    UPROPERTY(EditDefaultsOnly, Category = "Settings", Meta = (ClampMin = "0.0"))
     float ScaleInterpSpeed{1.0f};
 
-    UPROPERTY(EditDefaultsOnly, Category = "Settings")
+    UPROPERTY(EditDefaultsOnly, Category = "Settings", Meta = (ClampMin = "0.0"))
     float CellSizeFactor{1.0f};
 
     UPROPERTY(EditDefaultsOnly, Category = "Effects")
@@ -69,4 +69,5 @@ class SNAKE_GAME_API ASG_BaseCellObject : public AActor
     FLinearColor ObjectColor{FLinearColor::Black};
 
     void OnChangingScale();
+    virtual void OnScalingDone();
 };
diff --git a/Source/Snake_Game/World/SG_Food.cpp b/Source/Snake_Game/World/SG_Food.cpp
@@ -19,7 +19,13 @@ void ASG_Food::Tick(float DeltaTime)
 
     if (TSharedPtr<Food> Food = CoreFood.Pin(); Food.IsValid())
     {
-        SetActorLocation(GridOrigin + Utils::PosToVector(Food->position(), GridSize, CellSize));
+        FVector NewLocation = GridOrigin + Utils::PosToVector(Food->position(), GridSize, CellSize);
+        if (bScalingDone)
+        {
+            NewLocation.Z += FMath::Abs(FMath::Sin(PeriodicTime * PeriodicSpeed)) * CellSize * PeriodicAmplitudeFactor;
+            PeriodicTime += DeltaTime;
+        }
+        SetActorLocation(NewLocation);
     }
 }
 
@@ -46,3 +52,16 @@ void ASG_Food::UpdateMesh(UStaticMesh* NewMesh)
         Mesh->SetMaterial(0, NewMesh->GetMaterial(0));
     }
 }
+
+void ASG_Food::RestartScaling()
+{
+    Super::RestartScaling();
+
+    bScalingDone = false;
+}
+
+void ASG_Food::OnScalingDone()
+{
+    PeriodicTime = 0.0f;
+    bScalingDone = true;
+}
diff --git a/Source/Snake_Game/World/SG_Food.h b/Source/Snake_Game/World/SG_Food.h
@@ -36,9 +36,25 @@ class SNAKE_GAME_API ASG_Food : public ASG_BaseCellObject
      */
     void UpdateMesh(UStaticMesh* NewMesh);
 
+    /**
+     * Restarts the scale of the object from zero to the target scale
+     */
+    virtual void RestartScaling() override;
+
+protected:
+    UPROPERTY(EditDefaultsOnly, Category = "Settings", Meta = (ClampMin = "0.0", ClampMax = "1.0"))
+    float PeriodicAmplitudeFactor{0.2f};
+
+    UPROPERTY(EditDefaultsOnly, Category = "Settings", Meta = (ClampMin = "0.0"))
+    float PeriodicSpeed{2.0f};
+
 private:
     TWeakPtr<SnakeGame::Food> CoreFood;
     SnakeGame::Dim GridSize;
     uint32 CellSize;
     FVector GridOrigin;
+    bool bScalingDone{false};
+    float PeriodicTime{0.0f};
+
+    virtual void OnScalingDone() override;
 };
diff --git a/Source/Snake_Game/World/SG_Snake.h b/Source/Snake_Game/World/SG_Snake.h
@@ -53,7 +53,7 @@ class SNAKE_GAME_API ASG_Snake : public AActor
     UPROPERTY(EditDefaultsOnly, Category = "Settings")
     TSubclassOf<ASG_SnakeLink> SnakeLinkClass;
 
-    UPROPERTY(EditDefaultsOnly, Category = "Settings")
+    UPROPERTY(EditDefaultsOnly, Category = "Settings", Meta = (ClampMin = "0"))
     int32 ReservedLinksNumber{10};
 
 private: