!B (CryEntitySystem) Fix inability to reliably query other Schematyc …

…components inside the Initialize call, we now add a Schematyc object's components without initializing them, and then go throguh all components again to initialize them in the added order.

Review: ID 67357 by Author: Filip Lundgren, Reviewer: Alexander Klinger, Observer: Thomas Wollenzin, Observer: Sebastien Laurent, Observer: Nico Moss, Observer: Dominique Mader
 (Approved by filipl)

Copied from Perforce
 Change: 1535890

Code/CryEngine/CryCommon/CryEntitySystem/IEntity.h

@@ -829,6 +829,9 @@ struct IEntity
 		std::shared_ptr<ComponentType> pComponent = std::make_shared<ComponentType>();
 		if (AddComponent(pComponent))
 		{
+			// Initialize the now added component
+			static_cast<IEntityComponent*>(pComponent.get())->Initialize();
+
 			return pComponent.get();
 		}
 

Code/CryEngine/CryCommon/CryEntitySystem/IEntityComponent.h

@@ -503,11 +503,12 @@ struct IEntityComponent : public ICryUnknown
 	//////////////////////////////////////////////////////////////////////////
 
 protected:
+	friend IEntity;
 	friend class CEntity;
 	// Needs access to OnShutDown to maintain legacy game object extension shutdown behavior
 	friend class CGameObject;
-	// Needs access to Run, remove when the function is gone
-	friend class CEntityObject;
+	// Needs access to Initialize
+	friend class Schematyc::CObject;
 
 	// Host Entity pointer
 	IEntity*       m_pEntity = nullptr;

Code/CryEngine/CryEntitySystem/Entity.cpp

@@ -1436,8 +1436,11 @@ void CEntity::LoadComponent(Serialization::IArchive& archive)
 		//classProperties.Apply(componentClassDesc, pComponent.get());
 		Schematyc::Utils::SerializeClass(archive, componentClassDesc, pComponent.get(), "properties", "properties");
 
-		// Finally Create and Initialize the component
+		// Add the component to the entity
 		AddComponentInternal(pComponent, typeGUID, &initParams, &componentClassDesc);
+
+		// Initialize the component
+		pComponent->Initialize();
 	}
 	else
 	{
@@ -1807,8 +1810,12 @@ IEntityComponent* CEntity::CreateComponentByInterfaceID(const CryInterfaceID& in
 	std::shared_ptr<IEntityComponent> pComponent = pEnvComponent != nullptr ? pEnvComponent->CreateFromPool() : cryinterface_cast<IEntityComponent>(pLegacyComponentFactory->CreateClassInstance());
 	CRY_ASSERT(pComponent != nullptr);
 
+	// Add the component to the entity
 	AddComponentInternal(pComponent, componentTypeID, pInitParams, pClassDescription);
 
+	// Initialize the component
+	pComponent->Initialize();
+
 	return pComponent.get();
 }
 
@@ -1865,12 +1872,8 @@ void CEntity::AddComponentInternal(std::shared_ptr<IEntityComponent> pComponent,
 	// Sorted insertion, all elements of the m_components are sorted by the proxyType
 	m_components.Add(componentRecord);
 
-	// Call initialization of the component
-	pComponent->Initialize();
-
 	// Entity has changed so make the state dirty
 	m_componentChangeState++;
-
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/CryEngine/CrySchematyc/Core/Impl/Object.cpp

@@ -612,6 +612,13 @@ bool CObject::CreateComponents()
 
 			pEntity->AddComponent(component.pComponent, &initParams);
 		}
+
+		// Now initialize all the components
+		// This is done in a separate iteration step from adding in order to allow components to query each other in the Initialize call.
+		for(const SComponent& component : m_components)
+		{
+			component.pComponent->Initialize();
+		}
 	}
 
 	return true;