Skip to content

Commit

Permalink
engine optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
Storm committed Feb 8, 2025
1 parent f7598c8 commit 534c909
Show file tree
Hide file tree
Showing 81 changed files with 1,681 additions and 1,011 deletions.
Binary file removed SilkSong/Asset/Animations/0.png
View file
Binary file not shown.
Binary file removed SilkSong/Asset/Animations/1.png
View file
Binary file not shown.
Binary file removed SilkSong/Asset/Animations/2.png
View file
Binary file not shown.
Binary file modified SilkSong/Asset/Images/Menu/title.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed SilkSong/Asset/Images/Menu/title_.png
View file
Binary file not shown.
16 changes: 11 additions & 5 deletions SilkSong/SilkSong.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Source\Engine\Core\Box2D.h" />
<ClInclude Include="Source\Engine\Core\Vector2D.h" />
<ClInclude Include="Source\Project\DamageResponseComponent.h" />
<ClInclude Include="Source\Project\DamageSystem.h" />
<ClInclude Include="Source\Project\GameMode.h" />
<ClInclude Include="Source\Project\PropertyComponent.h" />
<ClInclude Include="Source\Project\SceneUI.h" />
<ClInclude Include="Source\Engine\Components\WidgetComponent.h" />
<ClInclude Include="Source\Engine\Core\Interfaces.h" />
<ClInclude Include="Source\Project\Chair.h" />
<ClInclude Include="Source\Project\DieParticle.h" />
<ClInclude Include="Source\Project\MenuController.h" />
Expand Down Expand Up @@ -70,9 +75,9 @@
<ClInclude Include="Source\Engine\Objects\Actor.h" />
<ClInclude Include="Source\Engine\Objects\Controller.h" />
<ClInclude Include="Source\Engine\Tools\CollisionManager.h" />
<ClInclude Include="Source\Engine\Tools\Delegate.h" />
<ClInclude Include="Source\Engine\Core\Delegate.h" />
<ClInclude Include="Source\Engine\Tools\LevelManager.h" />
<ClInclude Include="Source\Engine\Tools\Math.h" />
<ClInclude Include="Source\Engine\Core\Math.h" />
<ClInclude Include="Source\Engine\Tools\ResourceManager.h" />
<ClInclude Include="Source\Engine\Tools\Timer.h" />
<ClInclude Include="Source\Engine\Tools\VisualInterface.h" />
Expand All @@ -82,8 +87,9 @@
<ClInclude Include="Source\Project\RainProducer.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Source\Project\DamageSystem.cpp" />
<ClCompile Include="Source\Project\GameMode.cpp" />
<ClCompile Include="Source\Engine\Components\WidgetComponent.cpp" />
<ClCompile Include="Source\Engine\Core\Interfaces.cpp" />
<ClCompile Include="Source\Project\Chair.cpp" />
<ClCompile Include="Source\Project\DieParticle.cpp" />
<ClCompile Include="Source\Project\MenuController.cpp" />
Expand Down Expand Up @@ -128,7 +134,7 @@
<ClCompile Include="Source\Engine\Tools\CollisionManager.cpp" />
<ClCompile Include="Source\Engine\Tools\GameplayStatics.cpp" />
<ClCompile Include="Source\Engine\Tools\LevelManager.cpp" />
<ClCompile Include="Source\Engine\Tools\Math.cpp" />
<ClCompile Include="Source\Engine\Core\Math.cpp" />
<ClCompile Include="Source\Engine\Tools\Timer.cpp" />
<ClCompile Include="Source\Engine\Tools\VisualInterface.cpp" />
<ClCompile Include="Source\Engine\UI\UserInterface.cpp" />
Expand Down
111 changes: 72 additions & 39 deletions SilkSong/SilkSong.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
<Filter Include="Engine\UI">
<UniqueIdentifier>{21e56afb-03c6-4f2b-91eb-2a6f4302545b}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Level">
<UniqueIdentifier>{dd038ebc-6bba-46c7-aec5-853f4a5792d5}</UniqueIdentifier>
</Filter>
<Filter Include="源文件">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
Expand All @@ -43,15 +40,33 @@
<Filter Include="Project\Player">
<UniqueIdentifier>{45fe38e1-51d6-4082-be35-478f584689a9}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Item">
<UniqueIdentifier>{5964909f-c428-494e-97cf-5d3cd60ea484}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Components">
<UniqueIdentifier>{f5a18231-81b7-4800-b146-4be2853b95db}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Menu">
<UniqueIdentifier>{1f40607f-32e2-44a8-9e4f-f6bf9acbf927}</UniqueIdentifier>
</Filter>
<Filter Include="Project\GameDefault">
<UniqueIdentifier>{bdb6336b-8818-4056-8524-6725685587c6}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Components\GameMode">
<UniqueIdentifier>{e59d10c3-cd98-41de-ae28-9fab602cfde6}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Components\Actor">
<UniqueIdentifier>{7b3cb827-1a0c-44c3-80ec-fc1776dcb26c}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Strategies">
<UniqueIdentifier>{e474fab7-5a80-40a0-8ecd-4cdebc034819}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Items">
<UniqueIdentifier>{5964909f-c428-494e-97cf-5d3cd60ea484}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Levels">
<UniqueIdentifier>{dd038ebc-6bba-46c7-aec5-853f4a5792d5}</UniqueIdentifier>
</Filter>
<Filter Include="Project\Interfaces">
<UniqueIdentifier>{cd7204fb-7069-40ee-8bff-a857fc42cf33}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Source\Engine\Components\ActorComponent.h">
Expand Down Expand Up @@ -81,15 +96,9 @@
<ClInclude Include="Source\Engine\Components\SpriteRenderer.h">
<Filter>Engine\Components</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Tools\Delegate.h">
<Filter>Engine\Tools</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Tools\LevelManager.h">
<Filter>Engine\Tools</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Tools\Math.h">
<Filter>Engine\Tools</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Tools\ResourceManager.h">
<Filter>Engine\Tools</Filter>
</ClInclude>
Expand Down Expand Up @@ -127,7 +136,7 @@
<Filter>Engine</Filter>
</ClInclude>
<ClInclude Include="Source\Project\TearCityLevel.h">
<Filter>Project\Level</Filter>
<Filter>Project\Levels</Filter>
</ClInclude>
<ClInclude Include="Source\Project\PlatForm.h">
<Filter>Project</Filter>
Expand Down Expand Up @@ -166,7 +175,7 @@
<Filter>Project\Player</Filter>
</ClInclude>
<ClInclude Include="Source\Project\RainProducer.h">
<Filter>Project\Level</Filter>
<Filter>Project\Levels</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Components\AudioPlayer.h">
<Filter>Engine\Components</Filter>
Expand All @@ -181,25 +190,25 @@
<Filter>Project</Filter>
</ClInclude>
<ClInclude Include="Source\Project\Chest.h">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClInclude>
<ClInclude Include="Source\Project\Geo.h">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClInclude>
<ClInclude Include="Source\Project\RockParticle.h">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClInclude>
<ClInclude Include="Source\Project\CloseSkillBox.h">
<Filter>Project\Player</Filter>
</ClInclude>
<ClInclude Include="Source\Project\Dart.h">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClInclude>
<ClInclude Include="Source\Project\Needle.h">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClInclude>
<ClInclude Include="Source\Project\MenuLevel.h">
<Filter>Project\Level</Filter>
<Filter>Project\Levels</Filter>
</ClInclude>
<ClInclude Include="Source\Project\Pointer.h">
<Filter>Project\Menu</Filter>
Expand All @@ -210,14 +219,11 @@
<ClInclude Include="Source\Project\MenuController.h">
<Filter>Project\Menu</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Core\Interfaces.h">
<Filter>Engine\Core</Filter>
</ClInclude>
<ClInclude Include="Source\Project\DieParticle.h">
<Filter>Project\Player</Filter>
</ClInclude>
<ClInclude Include="Source\Project\Chair.h">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClInclude>
<ClInclude Include="Source\Project\NewTheme.h">
<Filter>Project\Menu</Filter>
Expand All @@ -237,6 +243,30 @@
<ClInclude Include="Source\Project\SilkParticle.h">
<Filter>Project\Enemies</Filter>
</ClInclude>
<ClInclude Include="Source\Project\GameMode.h">
<Filter>Project\GameDefault</Filter>
</ClInclude>
<ClInclude Include="Source\Project\DamageSystem.h">
<Filter>Project\Components\GameMode</Filter>
</ClInclude>
<ClInclude Include="Source\Project\DamageResponseComponent.h">
<Filter>Project\Components\Actor</Filter>
</ClInclude>
<ClInclude Include="Source\Project\PropertyComponent.h">
<Filter>Project\Components\Actor</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Core\Math.h">
<Filter>Engine\Core</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Core\Delegate.h">
<Filter>Engine\Core</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Core\Vector2D.h">
<Filter>Engine\Core</Filter>
</ClInclude>
<ClInclude Include="Source\Engine\Core\Box2D.h">
<Filter>Engine\Core</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Source\Engine\Components\ActorComponent.cpp">
Expand Down Expand Up @@ -269,9 +299,6 @@
<ClCompile Include="Source\Engine\Tools\GameplayStatics.cpp">
<Filter>Engine\Tools</Filter>
</ClCompile>
<ClCompile Include="Source\Engine\Tools\Math.cpp">
<Filter>Engine\Tools</Filter>
</ClCompile>
<ClCompile Include="Source\Engine\Tools\Timer.cpp">
<Filter>Engine\Tools</Filter>
</ClCompile>
Expand Down Expand Up @@ -303,7 +330,7 @@
<Filter>Engine</Filter>
</ClCompile>
<ClCompile Include="Source\Project\TearCityLevel.cpp">
<Filter>Project\Level</Filter>
<Filter>Project\Levels</Filter>
</ClCompile>
<ClCompile Include="Source\Project\PlatForm.cpp">
<Filter>Project</Filter>
Expand Down Expand Up @@ -336,7 +363,7 @@
<Filter>Project\Player</Filter>
</ClCompile>
<ClCompile Include="Source\Project\RainProducer.cpp">
<Filter>Project\Level</Filter>
<Filter>Project\Levels</Filter>
</ClCompile>
<ClCompile Include="Source\Engine\Components\AudioPlayer.cpp">
<Filter>Engine\Components</Filter>
Expand All @@ -354,25 +381,25 @@
<Filter>Project</Filter>
</ClCompile>
<ClCompile Include="Source\Project\Chest.cpp">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClCompile>
<ClCompile Include="Source\Project\Geo.cpp">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClCompile>
<ClCompile Include="Source\Project\RockParticle.cpp">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClCompile>
<ClCompile Include="Source\Project\CloseSkillBox.cpp">
<Filter>Project\Player</Filter>
</ClCompile>
<ClCompile Include="Source\Project\Dart.cpp">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClCompile>
<ClCompile Include="Source\Project\Needle.cpp">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClCompile>
<ClCompile Include="Source\Project\MenuLevel.cpp">
<Filter>Project\Level</Filter>
<Filter>Project\Levels</Filter>
</ClCompile>
<ClCompile Include="Source\Project\Pointer.cpp">
<Filter>Project\Menu</Filter>
Expand All @@ -383,14 +410,11 @@
<ClCompile Include="Source\Project\MenuController.cpp">
<Filter>Project\Menu</Filter>
</ClCompile>
<ClCompile Include="Source\Engine\Core\Interfaces.cpp">
<Filter>Engine\Core</Filter>
</ClCompile>
<ClCompile Include="Source\Project\DieParticle.cpp">
<Filter>Project\Player</Filter>
</ClCompile>
<ClCompile Include="Source\Project\Chair.cpp">
<Filter>Project\Item</Filter>
<Filter>Project\Items</Filter>
</ClCompile>
<ClCompile Include="Source\Project\OldTheme.cpp">
<Filter>Project\Menu</Filter>
Expand All @@ -410,5 +434,14 @@
<ClCompile Include="Source\Project\SilkParticle.cpp">
<Filter>Project\Enemies</Filter>
</ClCompile>
<ClCompile Include="Source\Engine\Core\Math.cpp">
<Filter>Engine\Core</Filter>
</ClCompile>
<ClCompile Include="Source\Project\GameMode.cpp">
<Filter>Project\GameDefault</Filter>
</ClCompile>
<ClCompile Include="Source\Project\DamageSystem.cpp">
<Filter>Project\Components\GameMode</Filter>
</ClCompile>
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion SilkSong/Source/Engine/Components/ActorComponent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@

#pragma once
#include"CoreMinimal.h"
#include"Tools/Timer.h"

class Actor;


/*----------------------------------
组件基类
----------------------------------*/
class ActorComponent : public Object, public ITimerHandler
class ActorComponent : public Object, public TimerHandler
{
public:
virtual ~ActorComponent() {}

//获取绑定游戏对象
Actor* GetOwner();

Expand All @@ -33,6 +36,7 @@ class ActorComponent : public Object, public ITimerHandler

//组件是否启用
bool GetEnabled()const { return bIsEnabled; }

protected:
Actor* pOwner = nullptr;//处理控制逻辑

Expand Down
24 changes: 12 additions & 12 deletions SilkSong/Source/Engine/Components/Animator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void Animation::Tick()

void Animation::Load(std::string name, FVector2D delta)
{
AnimationResource aniRes = mainWorld.resourcePool->FetchAnimation(name);
ArtyEngine::FAnimationResource aniRes = mainWorld.resourcePool->FetchAnimation(name);
num = aniRes.num;
images = aniRes.images;
offset = delta;
Expand Down Expand Up @@ -226,7 +226,7 @@ void Animator::AddParamater(std::string paramName, ParamType type)
}
}

void Animator::SetInteger(std::string paramName, int value)
void Animator::SetInteger(std::string paramName, int32 value)
{
if (paramatersInteger.find(paramName) != paramatersInteger.end())
{
Expand Down Expand Up @@ -264,31 +264,31 @@ bool Animator::CheckConditions(AnimEdge* edge)
for (const auto& condition : edge->integerConditions) {

if (paramatersInteger.find(condition.paramName) == paramatersInteger.end())continue;
result = TransitionCondition::GetComparisonResult(paramatersInteger[condition.paramName], condition.value, condition.comparison);
if (result && edge->comparisonMode == TransitionCondition::OR)return true;
if (!result && edge->comparisonMode == TransitionCondition::AND)return false;
result = AnimTransition::GetComparisonResult(paramatersInteger[condition.paramName], condition.value, condition.comparison);
if (result && edge->comparisonMode == AnimTransition::OR)return true;
if (!result && edge->comparisonMode == AnimTransition::AND)return false;
}
for (const auto& condition : edge->floatConditions) {

if (paramatersFloat.find(condition.paramName) == paramatersFloat.end())continue;
result = TransitionCondition::GetComparisonResult(paramatersFloat[condition.paramName], condition.value, condition.comparison);
if (result && edge->comparisonMode == TransitionCondition::OR)return true;
if (!result && edge->comparisonMode == TransitionCondition::AND)return false;
result = AnimTransition::GetComparisonResult(paramatersFloat[condition.paramName], condition.value, condition.comparison);
if (result && edge->comparisonMode == AnimTransition::OR)return true;
if (!result && edge->comparisonMode == AnimTransition::AND)return false;
}
for (const auto& condition : edge->boolConditions) {

if (paramatersBool.find(condition.paramName) == paramatersBool.end())continue;
result = (paramatersBool[condition.paramName] == condition.value);
if (result && edge->comparisonMode == TransitionCondition::OR)return true;
if (!result && edge->comparisonMode == TransitionCondition::AND)return false;
if (result && edge->comparisonMode == AnimTransition::OR)return true;
if (!result && edge->comparisonMode == AnimTransition::AND)return false;
}
for (const auto& condition : edge->triggerConditions) {

if (paramatersTrigger.find(condition.paramName) == paramatersTrigger.end())continue;
result = (paramatersTrigger[condition.paramName] == true);
paramatersTrigger[condition.paramName] = false;
if (result && edge->comparisonMode == TransitionCondition::OR)return true;
if (!result && edge->comparisonMode == TransitionCondition::AND)return false;
if (result && edge->comparisonMode == AnimTransition::OR)return true;
if (!result && edge->comparisonMode == AnimTransition::AND)return false;
}
return result;
}
Expand Down
Loading

0 comments on commit 534c909

Please sign in to comment.