Merge pull request #3587 from aws-lumberyard-dev/MPWeaponSQ2
LYN-5558 Fixed Blast assets loading in the Launcher
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <Asset/BlastAsset.h>
|
#include <Asset/BlastAsset.h>
|
||||||
|
#include <AzCore/Serialization/SerializeContext.h>
|
||||||
#include <AzCore/std/parallel/lock.h>
|
#include <AzCore/std/parallel/lock.h>
|
||||||
#include <Blast/BlastSystemBus.h>
|
#include <Blast/BlastSystemBus.h>
|
||||||
#include <NvBlastExtAssetUtils.h>
|
#include <NvBlastExtAssetUtils.h>
|
||||||
@@ -27,6 +28,17 @@ namespace Blast
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BlastAsset::Reflect(AZ::ReflectContext* context)
|
||||||
|
{
|
||||||
|
if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
|
||||||
|
{
|
||||||
|
serializeContext->Class<BlastAsset, AZ::Data::AssetData>()
|
||||||
|
->Version(0)
|
||||||
|
;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool BlastAsset::LoadFromBuffer(void* buffer, size_t bytesSize)
|
bool BlastAsset::LoadFromBuffer(void* buffer, size_t bytesSize)
|
||||||
{
|
{
|
||||||
Nv::Blast::ExtSerialization* serialization = nullptr;
|
Nv::Blast::ExtSerialization* serialization = nullptr;
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ namespace Blast
|
|||||||
|
|
||||||
BlastAsset(Nv::Blast::ExtPxAsset* pxAsset = nullptr, NvBlastExtDamageAccelerator* damageAccelerator = nullptr);
|
BlastAsset(Nv::Blast::ExtPxAsset* pxAsset = nullptr, NvBlastExtDamageAccelerator* damageAccelerator = nullptr);
|
||||||
|
|
||||||
|
static void Reflect(AZ::ReflectContext* context);
|
||||||
|
|
||||||
bool LoadFromBuffer(void* buffer, size_t bytesSize);
|
bool LoadFromBuffer(void* buffer, size_t bytesSize);
|
||||||
|
|
||||||
const Nv::Blast::ExtPxAsset* GetPxAsset() const
|
const Nv::Blast::ExtPxAsset* GetPxAsset() const
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ namespace Blast
|
|||||||
BlastFamilyComponentNotificationBusHandler::Reflect(context);
|
BlastFamilyComponentNotificationBusHandler::Reflect(context);
|
||||||
BlastActorConfiguration::Reflect(context);
|
BlastActorConfiguration::Reflect(context);
|
||||||
BlastActorData::Reflect(context);
|
BlastActorData::Reflect(context);
|
||||||
|
BlastAsset::Reflect(context);
|
||||||
|
|
||||||
if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
|
if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user