Legacy cleanup, part 2 (#3659)
* Legacy cleanup, part 2 There are still things that can be removed, those will be likely done in part three: `The Return of the Cleanup` :) Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix windows build Somehow there were some unfixed errors from enabled warnings? I'm unsure if I've pulled repo in unstable state, or those were somehow missed. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
@@ -13,7 +13,6 @@
|
||||
#include <HMDBus.h>
|
||||
#include "View.h"
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
#include <IStereoRenderer.h>
|
||||
#include <AzCore/Component/TransformBus.h>
|
||||
#include <AzCore/Component/Entity.h>
|
||||
#include <Random.h>
|
||||
@@ -541,13 +540,13 @@ void CView::GetMemoryUsage(ICrySizer* s) const
|
||||
s->AddObject(m_shakes);
|
||||
}
|
||||
|
||||
void CView::Serialize(TSerialize ser)
|
||||
{
|
||||
if (ser.IsReading())
|
||||
{
|
||||
ResetShaking();
|
||||
}
|
||||
}
|
||||
//void CView::Serialize(TSerialize ser)
|
||||
//{
|
||||
// if (ser.IsReading())
|
||||
// {
|
||||
// ResetShaking();
|
||||
// }
|
||||
//}
|
||||
|
||||
void CView::PostSerialize()
|
||||
{
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <Cry_Camera.h>
|
||||
|
||||
class CGameObject;
|
||||
struct ISystem;
|
||||
|
||||
namespace LegacyViewSystem
|
||||
{
|
||||
@@ -106,7 +107,6 @@ public:
|
||||
virtual void SetActive(const bool bActive);
|
||||
// ~IView
|
||||
|
||||
void Serialize(TSerialize ser) override;
|
||||
void PostSerialize() override;
|
||||
CCamera& GetCamera() override { return m_camera; }
|
||||
const CCamera& GetCamera() const override { return m_camera; }
|
||||
|
||||
@@ -617,16 +617,16 @@ void CViewSystem::GetMemoryUsage(ICrySizer* s) const
|
||||
s->AddContainer(m_views);
|
||||
}
|
||||
|
||||
void CViewSystem::Serialize(TSerialize ser)
|
||||
{
|
||||
TViewMap::iterator iter = m_views.begin();
|
||||
TViewMap::iterator iterEnd = m_views.end();
|
||||
while (iter != iterEnd)
|
||||
{
|
||||
iter->second->Serialize(ser);
|
||||
++iter;
|
||||
}
|
||||
}
|
||||
//void CViewSystem::Serialize(TSerialize ser)
|
||||
//{
|
||||
// TViewMap::iterator iter = m_views.begin();
|
||||
// TViewMap::iterator iterEnd = m_views.end();
|
||||
// while (iter != iterEnd)
|
||||
// {
|
||||
// iter->second->Serialize(ser);
|
||||
// ++iter;
|
||||
// }
|
||||
//}
|
||||
|
||||
void CViewSystem::PostSerialize()
|
||||
{
|
||||
|
||||
@@ -53,7 +53,6 @@ public:
|
||||
virtual unsigned int GetViewId(IView* pView);
|
||||
virtual unsigned int GetActiveViewId();
|
||||
|
||||
virtual void Serialize(TSerialize ser);
|
||||
virtual void PostSerialize();
|
||||
|
||||
virtual IView* GetViewByEntityId(const AZ::EntityId& id, bool forceCreate);
|
||||
|
||||
Reference in New Issue
Block a user