birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Legacy code cleanup - part 3 (#3903)

Browse Source 
* Legacy cleanup - part 3

Not much is left that can be easily removed,
so I think this will be last cleanup before the legacy functionality is replaced.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix windows build, remove a few more things, re-add one file

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove legacy RenderBus + more cleanups

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove MaterialOwnerBus.h

Clean-up in Cry_Matrix34/33

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-09-07 20:14:16 +02:00
committed by GitHub
parent 4d5b047c1b
commit 2a2847b15d
161 changed files with 894 additions and 16076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp
+15 -15
View File
@@ -6,20 +6,19 @@
*
*/
#include <AzCore/Serialization/SerializeContext.h>
#include "MaterialNode.h"
#include "AnimTrack.h"
#include <AzCore/Serialization/SerializeContext.h>
#include <ISystem.h>
#include <IRenderer.h>
#include <IShader.h>
#include <ISystem.h>
#include "AnimSplineTrack.h"
#include "CompoundSplineTrack.h"
#include "Maestro/Types/AnimNodeType.h"
#include "Maestro/Types/AnimValueType.h"
#include "Maestro/Types/AnimParamType.h"
#include "Maestro/Types/AnimValueType.h"
// Don't remove or the console builds will break!
#define s_nodeParamsInitialized s_nodeParamsInitializedMat
@@ -39,11 +38,11 @@ namespace
param.valueType = valueType;
s_nodeParams.push_back(param);
}
}
} // namespace
enum EMaterialNodeParam
{
MTL_PARAM_SHADER_PARAM1 = static_cast<int>(AnimParamType::User) + 100,
MTL_PARAM_SHADER_PARAM1 = static_cast<int>(AnimParamType::User) + 100,
};
//////////////////////////////////////////////////////////////////////////
@@ -105,7 +104,7 @@ void CAnimMaterialNode::UpdateDynamicParamsInternal()
m_nameToDynamicShaderParam.clear();
const char* pName = GetName();
_smart_ptr<IMaterial> pMtl = GetMaterialByName(pName);
IMaterial* pMtl = GetMaterialByName(pName);
if (!pMtl)
{
@@ -123,7 +122,7 @@ void CAnimMaterialNode::UpdateDynamicParamsInternal()
for (int i = 0; i < shaderParams.size(); ++i)
{
SShaderParam& shaderParam = shaderParams[i];
m_nameToDynamicShaderParam[ shaderParams[i].m_Name.c_str() ] = i;
m_nameToDynamicShaderParam[shaderParams[i].m_Name.c_str()] = i;
CAnimNode::SParamInfo paramInfo;
@@ -184,8 +183,9 @@ CAnimParamType CAnimMaterialNode::GetParamType(unsigned int nIndex) const
{
return s_nodeParams[nIndex].paramType;
}
else if (nIndex >= (unsigned int)s_nodeParams.size() &&
nIndex < ((unsigned int)s_nodeParams.size() + (unsigned int)m_dynamicShaderParamInfos.size()))
else if (
nIndex >= (unsigned int)s_nodeParams.size() &&
nIndex < ((unsigned int)s_nodeParams.size() + (unsigned int)m_dynamicShaderParamInfos.size()))
{
return m_dynamicShaderParamInfos[nIndex - (int)s_nodeParams.size()].paramType;
}
@@ -264,7 +264,7 @@ void CAnimMaterialNode::Animate(SAnimContext& ec)
// Find material.
const char* pName = GetName();
_smart_ptr<IMaterial> pMtl = GetMaterialByName(pName);
IMaterial* pMtl = GetMaterialByName(pName);
if (!pMtl)
{
@@ -348,7 +348,8 @@ void CAnimMaterialNode::Animate(SAnimContext& ec)
}
}
void CAnimMaterialNode::AnimateNamedParameter(SAnimContext& ec, IRenderShaderResources* pShaderResources, const char* name, IAnimTrack* pTrack)
void CAnimMaterialNode::AnimateNamedParameter(
SAnimContext& ec, IRenderShaderResources* pShaderResources, const char* name, IAnimTrack* pTrack)
{
TDynamicShaderParamsMap::iterator findIter = m_nameToDynamicShaderParam.find(name);
if (findIter != m_nameToDynamicShaderParam.end())
@@ -387,7 +388,7 @@ void CAnimMaterialNode::AnimateNamedParameter(SAnimContext& ec, IRenderShaderRes
}
}
_smart_ptr<IMaterial> CAnimMaterialNode::GetMaterialByName(const char*)
IMaterial* CAnimMaterialNode::GetMaterialByName(const char*)
{
return nullptr;
}
@@ -404,8 +405,7 @@ void CAnimMaterialNode::Reflect(AZ::ReflectContext* context)
{
if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
{
serializeContext->Class<CAnimMaterialNode, CAnimNode>()
->Version(1);
serializeContext->Class<CAnimMaterialNode, CAnimNode>()->Version(1);
}
}