code review feedback 2

Signed-off-by: rhhong <rhhong@amazon.com>
monroegm-disable-blank-issue-2
rhhong 4 years ago
parent a448caea7c
commit 4d2f65c4d8

@ -137,5 +137,4 @@ namespace EMStudio
{
return ReinitAtomRenderPlugin();
}
}
}// namespace EMStudio

@ -53,10 +53,9 @@ namespace EMStudio
private:
MCORE_DEFINECOMMANDCALLBACK(ImportActorCallback);
MCORE_DEFINECOMMANDCALLBACK(RemoveActorCallback);
ImportActorCallback* m_importActorCallback;
RemoveActorCallback* m_removeActorCallback;
QWidget* m_innerWidget;
AnimViewportWidget* m_animViewportWidget;
ImportActorCallback* m_importActorCallback = nullptr;
RemoveActorCallback* m_removeActorCallback = nullptr;
QWidget* m_innerWidget = nullptr;
AnimViewportWidget* m_animViewportWidget = nullptr;
};
}
}// namespace EMStudio

@ -118,9 +118,9 @@ namespace EMotionFX
if (FindActorIndex(actorAsset.GetId()) != InvalidIndex)
{
MCore::LogWarning(
"EMotionFX::ActorManager::RegisterActor() - The actor at location 0x%x has already been registered as actor, most likely "
"EMotionFX::ActorManager::RegisterActor() - The actor %s has already been registered as actor, most likely "
"already by the LoadActor of the importer.",
actorAsset->GetActor());
actorAsset->GetActor()->GetName());
UnlockActors();
return;
}

@ -154,7 +154,7 @@ namespace EMStudio
void OnRemoveCommand(size_t historyIndex) override { MCORE_UNUSED(historyIndex); }
void OnSetCurrentCommand(size_t index) override { MCORE_UNUSED(index); }
};
EventProcessingCallback* m_eventProcessingCallback;
EventProcessingCallback* m_eventProcessingCallback = nullptr;
};
// Shortcuts

@ -28,7 +28,7 @@ namespace EMotionFX
AZ::Data::AssetId actorAssetId("{5060227D-B6F4-422E-BF82-41AAC5F228A5}");
m_actorAsset = TestActorAssets::CreateActorAssetAndRegister<JackNoMeshesActor>(actorAssetId);
m_actorInstance = ActorInstance::Create(m_actorAsset->GetActor());
m_actorInstance = ActorInstance::Create(GetActor());
}
void ActorFixture::TearDown()
@ -76,7 +76,7 @@ namespace EMotionFX
AZ::ObjectStream::FilterDescriptor loadFilter(nullptr, AZ::ObjectStream::FILTERFLAG_IGNORE_UNKNOWN_CLASSES);
SimulatedObjectSetup* setup = AZ::Utils::LoadObjectFromBuffer<EMotionFX::SimulatedObjectSetup>(data.data(), data.size(), serializeContext, loadFilter);
setup->InitAfterLoad(m_actorAsset->GetActor());
setup->InitAfterLoad(GetActor());
return setup;
}
@ -87,7 +87,7 @@ namespace EMotionFX
}
Actor* ActorFixture::GetActor()
Actor* ActorFixture::GetActor() const
{
return m_actorAsset->GetActor();
}

@ -30,7 +30,7 @@ namespace EMotionFX
AZStd::vector<AZStd::string> GetTestJointNames() const;
protected:
Actor* GetActor();
Actor* GetActor() const;
AZ::Data::Asset<Integration::ActorAsset> m_actorAsset;
ActorInstance* m_actorInstance = nullptr;

Loading…
Cancel
Save