TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fully working

Browse source
This commit is contained in:
marauder2k7 2024-12-14 01:18:46 +00:00
parent 85463c85ac
commit f6dc694bd4
10 changed files with 88 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Engine/source/T3D/assets/ImageAsset.h
View file

@ -39,11 +39,7 @@
#endif
#ifndef _ASSET_PTR_H_
#include "assets/assetPtr.h"
#endif
#ifndef _MATTEXTURETARGET_H_
#include "materials/matTextureTarget.h"
#endif
#endif
#include "gfx/bitmap/gBitmap.h"
#include "gfx/gfxTextureHandle.h"
@ -54,6 +50,11 @@
#include "assetMacroHelpers.h"
#include "gfx/gfxDevice.h"
#ifndef _MATTEXTURETARGET_H_
#include "materials/matTextureTarget.h"
#endif
//-----------------------------------------------------------------------------
class ImageAsset : public AssetBase
{
@ -75,8 +76,7 @@ public:
Particle = 8,
Decal = 9,
Cubemap = 10,
Target = 11,
ImageTypeCount = 12
ImageTypeCount = 11
};
static StringTableEntry smNoImageAssetFallback;
@ -100,6 +100,7 @@ public:
protected:
StringTableEntry mImageFileName;
StringTableEntry mImagePath;
NamedTexTargetRef mNamedTarget;
bool mIsValidImage;
bool mUseMips;
@ -256,12 +257,10 @@ public: \
}\
\
if (get##name()[0] == '$' || get##name()[0] == '#') {\
NamedTexTarget* namedTarget = NamedTexTarget::find(get##name() + 1);\
if (namedTarget)\
NamedTexTargetRef namedTarget = NamedTexTarget::find(get##name() + 1);\
if (namedTarget.isValid())\
{\
m##name = namedTarget->getTexture(0);\
m##name##Name = get##name();\
m##name##AssetId = StringTable->EmptyString();\
}\
}\
else\
@ -306,6 +305,8 @@ public: \
}\
GFXTexHandle get##name##Resource() \
{\
if (m##name##Asset && (m##name##Asset->getImageFileName() != StringTable->EmptyString()))\
return m##name##Asset->getTexture(m##name##Profile);\
return m##name;\
}\
bool name##Valid() {return (get##name() != StringTable->EmptyString() && m##name##Asset->getStatus() == AssetBase::Ok); }
@ -341,7 +342,7 @@ if (m##name##AssetId != StringTable->EmptyString())\
#pragma region Arrayed Asset Macros
//Arrayed Assets
#define DECLARE_IMAGEASSET_ARRAY(className, name, max) public: \
#define DECLARE_IMAGEASSET_ARRAY(className, name, max, changeFunc) public: \
static const U32 sm##name##Count = max;\
GFXTexHandle m##name[max];\
StringTableEntry m##name##Name[max]; \
@ -412,13 +413,7 @@ public: \
if (get##name(index) != StringTable->EmptyString() && m##name##Name[index] != StringTable->insert("texhandle"))\
{\
if (get##name(index)[0] == '$' || get##name(index)[0] == '#') {\
NamedTexTarget* namedTarget = NamedTexTarget::find(get##name(index) + 1);\
if (namedTarget)\
{\
m##name[index] = namedTarget->getTexture(0);\
m##name##Name[index] = get##name(index);\
m##name##AssetId[index] = StringTable->EmptyString();\
}\
m##name##Asset[index]->getChangedSignal().notify(this, &className::changeFunc);\
}\
else\
m##name[index].set(get##name(index), m##name##Profile[index], avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));\
@ -469,6 +464,8 @@ public: \
{\
if(index >= sm##name##Count || index < 0)\
return nullptr;\
if (m##name##Asset[index] && (m##name##Asset[index]->getImageFileName() != StringTable->EmptyString()))\
return m##name##Asset[index]->getTexture(m##name##Profile[index]);\
return m##name[index];\
}\
bool name##Valid(const U32& id) {return (get##name(id) != StringTable->EmptyString() && m##name##Asset[id]->getStatus() == AssetBase::Ok); }