xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Implemented Animation Clip asset and animation controller #410

Merged
XiaoQiDigipen merged 66 commits from SP3-22-AnimationController into main 2023-03-09 16:19:40 +08:00
Conversation 0 Commits 66 Files Changed 61 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69fa0d4da0 - Show all commits

2
SHADE_Engine/src/Editor/EditorWindow/RawAnimationInspector/SHRawAnimInspector.cpp
View File

@ -63,7 +63,7 @@ namespace SHADE
SHEditorUI::PopID(); SHEditorUI::PopID();
// Invalid values // Invalid values
const bool INVALID_CONFIG = newAssetName.empty() || firstIndex > lastIndex || lastIndex < firstIndex; const bool INVALID_CONFIG = newAssetName.empty() || firstIndex > lastIndex;
// Buttons // Buttons
ImGui::BeginDisabled(INVALID_CONFIG); ImGui::BeginDisabled(INVALID_CONFIG);

4
SHADE_Engine/src/Editor/EditorWindow/RawAnimationInspector/SHRawAnimInspector.h
View File

@ -43,8 +43,8 @@ namespace SHADE
/* Data Members */ /* Data Members */
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/
std::string newAssetName; std::string newAssetName;
int firstIndex; int firstIndex = 0;
int lastIndex; int lastIndex = 0;
Handle<SHRawAnimation> rawAnimation; Handle<SHRawAnimation> rawAnimation;
}; };