TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Torque3D/Engine/source/T3D/assets/ImageAsset.h

484 lines
45 KiB
C
Raw Normal View History

Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
#pragma once
//-----------------------------------------------------------------------------
// Copyright (c) 2013 GarageGames, LLC
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
#pragma once
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
#ifndef _ASSET_BASE_H_
#include "assets/assetBase.h"
#endif
#ifndef _ASSET_DEFINITION_H_
#include "assets/assetDefinition.h"
#endif
#ifndef _STRINGUNIT_H_
#include "string/stringUnit.h"
#endif
#ifndef _ASSET_FIELD_TYPES_H_
#include "assets/assetFieldTypes.h"
#endif
Updated Assimp Added initial behavior for ImageAssets to hold a list of GFX resources of different texture profiles to avoid mem leaks with incorrect-typed usages Added function to ImageAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found Added function to ShapeAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found Disabled fields for dynamic and static shadowmap refresh rates Moved noShape model to core/rendering/shapes to place it in a more logical module position Added an include to avoid undefined type compile error and removed unneeded semicolon from zone code Added call to reload probe textures when a reloadTextures call is made Adjusted default directional light shadowmap settings to not be as extreme Added utility function to probe manager to allow any class to request a 'best fit' list of probes that would affect a given location, allowing other classes such as fog or particles to utilize IBL. Also updated probeManager's forward rendering to utilize same function to reduce code duplication. Shifted shape loader code to utilize assimp for loader consistency and testing Changed render bin used for SSAO postfx so it runs at the right time Made Core_Rendering module scan for assets Updated loose file references to a number of assets to follow proper formatting Refactored asset import code to follow a more consistent object heirarchy structure on importing assets, allowing more reliable cross-referencing between inbound items Updated asset import logic for materials/images so that they properly utilize ImageType. Images correctly save out the assigned image type, materials reference the images' type to know what map slot they should be used in. Importer logic also updated to better find-and-add associated images based on type. Cleaned up a bunch of old, outdated code in the asset importer Added initial handling for in-place importing of files without needing to process them through the UI. Added ability to edit module script from RMB context menu if torsion path is set Updated list field code for variable inspector to utilize correct ownerObject field
2020-03-19 14:47:38 +00:00
#ifndef _ASSET_PTR_H_
#include "assets/assetPtr.h"
fully working
2024-12-14 01:18:46 +00:00
#endif
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
#ifndef _GBITMAP_H_
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
#include "gfx/bitmap/gBitmap.h"
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
#endif
#ifndef _GFXTEXTUREHANDLE_H_
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
#include "gfx/gfxTextureHandle.h"
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
#endif
#ifndef _NETCONNECTION_H_
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
#include "sim/netConnection.h"
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
#endif
#ifndef _GFXDEVICE_H_
dedicated server nulltexturemanager work also supress warning for imageassets not loading a texture in nulldevice, and early out of _determineFeatures shadergen methods under the same conditions
2022-10-01 17:44:45 +00:00
#include "gfx/gfxDevice.h"
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
#endif
fully working
2024-12-14 01:18:46 +00:00
#ifndef _MATTEXTURETARGET_H_
#include "materials/matTextureTarget.h"
#endif
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
#include "assetMacroHelpers.h"
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
//-----------------------------------------------------------------------------
class ImageAsset : public AssetBase
{
typedef AssetBase Parent;
asset load flow work add reloading state to asset tracking, convert most asset.isnull() checks on over to skipping out unless the errcode is ::Ok, or ::UsingFallback add more errstriongcodes to hook up skip load<type> execution if the asset loaded state is ::Ok
2023-10-08 18:19:43 +00:00
typedef AssetPtr<ImageAsset> ConcreteAssetPtr;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Added initial implement of Image Types for GFX resource management Added logic to intercept TSStatic setting shape to try and utilize a shapeAsset if it can find a matching loose file Added lookup logic for getting any textures inside collada files to streamline asset importing logic Fixed modal behavior for Import config and import window Initial implementation of loose file/legacy file importing Adjusted Asset Browser and Asset Import refreshing behavior to queue to improve performance by avoiding multiple refreshes as well as potential infinite loops Fixed volume visibility behavior Fixed physics world viz toggle
2020-02-17 06:32:50 +00:00
public:
is named target clear out texHandles on teardown of imageAssets.
2025-05-12 21:17:01 +00:00
typedef HashMap<GFXTextureProfile*, GFXTexHandle> ImageTextureMap;
Added initial implement of Image Types for GFX resource management Added logic to intercept TSStatic setting shape to try and utilize a shapeAsset if it can find a matching loose file Added lookup logic for getting any textures inside collada files to streamline asset importing logic Fixed modal behavior for Import config and import window Initial implementation of loose file/legacy file importing Adjusted Asset Browser and Asset Import refreshing behavior to queue to improve performance by avoiding multiple refreshes as well as potential infinite loops Fixed volume visibility behavior Fixed physics world viz toggle
2020-02-17 06:32:50 +00:00
/// The different types of image use cases
enum ImageTypes
{
Albedo = 0,
Normal = 1,
shift pbrconfig to ORM
2020-09-30 18:51:12 +00:00
ORMConfig = 2,
Added initial implement of Image Types for GFX resource management Added logic to intercept TSStatic setting shape to try and utilize a shapeAsset if it can find a matching loose file Added lookup logic for getting any textures inside collada files to streamline asset importing logic Fixed modal behavior for Import config and import window Initial implementation of loose file/legacy file importing Adjusted Asset Browser and Asset Import refreshing behavior to queue to improve performance by avoiding multiple refreshes as well as potential infinite loops Fixed volume visibility behavior Fixed physics world viz toggle
2020-02-17 06:32:50 +00:00
GUI = 3,
Roughness = 4,
AO = 5,
Metalness = 6,
Glow = 7,
Particle = 8,
Decal = 9,
Added ImageAsset type mode for cubemaps. Added new inspector type TypeShapeAssetId which is processed as a assetId string instead of an AssetPtr. Added utility function to ShapeAsset to getAssetIdByFilename, which lets you find - if any exist - the asset that utilizes a given loose file. If it doesn't find one, it can attempt to run an auto-import if the editor settings allow, then proceed. Fixed callback of the shapeAsset inspector fields so the Open in Shape Editor correctly binds the asset's shape to the editor for modification. Added function to open a shapeAssetId in the shape editor to facilitate the above. Added additional check to findShapeConstructor to look up the full path of the shape in the cases where a full path is provided instead of a local path. This prevents the shapeConstructor from not finding shapes that absolutely exist. Added beginnings of Datablock representation in Asset Browser. Fixed a few minor issues with asset auto import causing false positive errors, preventing Import or erroneous logging. Fixed issue where editing of asset import configs didn't save. Fixed logic of materials in asset browser so they will open in the material editor as expected. Re-enabled AutoImport of assets editor setting by default.
2020-04-15 17:15:12 +00:00
Cubemap = 10,
fully working
2024-12-14 01:18:46 +00:00
ImageTypeCount = 11
Added initial implement of Image Types for GFX resource management Added logic to intercept TSStatic setting shape to try and utilize a shapeAsset if it can find a matching loose file Added lookup logic for getting any textures inside collada files to streamline asset importing logic Fixed modal behavior for Import config and import window Initial implementation of loose file/legacy file importing Adjusted Asset Browser and Asset Import refreshing behavior to queue to improve performance by avoiding multiple refreshes as well as potential infinite loops Fixed volume visibility behavior Fixed physics world viz toggle
2020-02-17 06:32:50 +00:00
};
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
class Frame
{
public:
Frame(const S32 pixelOffsetX, const S32 pixelOffsetY,
const U32 pixelWidth, const U32 pixelHeight,
const F32 texelWidthScale, const F32 texelHeightScale,
StringTableEntry inRegionName = StringTable->EmptyString())
: regionName(inRegionName)
{
pixelOffset.set(pixelOffsetY, pixelOffsetY);
pixelSize.set(pixelWidth, pixelHeight);
texelLower.set(pixelOffsetX * texelWidthScale, pixelOffsetY * texelHeightScale);
texelSize.set(pixelWidth * texelWidthScale, pixelHeight * texelHeightScale);
texelUpper.set(texelLower.x + texelSize.x, texelLower.y + texelSize.y);
}
void setFlip(bool flipX, bool flipY)
{
if (flipX) mSwap(texelLower.x, texelUpper.x);
if (flipY) mSwap(texelLower.y, texelUpper.y);
}
Point2I pixelOffset;
Point2I pixelSize;
Point2F texelLower;
Point2F texelUpper;
Point2F texelSize;
StringTableEntry regionName;
};
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
static StringTableEntry smNoImageAssetFallback;
give named target a fallback we need to give named target a fallback image so references are kept when a named target is not ready.
2025-03-26 09:12:06 +00:00
static StringTableEntry smNamedTargetAssetFallback;
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
asset load flow work add reloading state to asset tracking, convert most asset.isnull() checks on over to skipping out unless the errcode is ::Ok, or ::UsingFallback add more errstriongcodes to hook up skip load<type> execution if the asset loaded state is ::Ok
2023-10-08 18:19:43 +00:00
enum ImageAssetErrCode
{
TooManyMips = AssetErrCode::Extended,
Extended
};
static const String mErrCodeStrings[U32(ImageAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(ConcreteAssetPtr checkAsset) { if (checkAsset) return checkAsset->mLoadedState; else return 0; }
static String getAssetErrstrn(U32 errCode)
{
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > ImageAssetErrCode::Extended) return "undefined error";
return mErrCodeStrings[errCode - Parent::Extended];
};
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
private:
asset load flow work add reloading state to asset tracking, convert most asset.isnull() checks on over to skipping out unless the errcode is ::Ok, or ::UsingFallback add more errstriongcodes to hook up skip load<type> execution if the asset loaded state is ::Ok
2023-10-08 18:19:43 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
StringTableEntry mImageFile;
bool mUseMips;
bool mIsHDRImage;
GFXTexHandle mTextureHandle;
ImageTypes mImageType;
is named target clear out texHandles on teardown of imageAssets.
2025-05-12 21:17:01 +00:00
ImageTextureMap mResourceMap;
null handling
2025-03-25 19:14:05 +00:00
bool mIsNamedTarget;
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
S32 mImageWidth;
S32 mImageHeight;
final rev add safeties to getters getTextureBitmap/ functions to return member variable that is collected when the image is set
2025-03-28 15:32:16 +00:00
S32 mImageDepth;
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
S32 mImageChannels;
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
void generateTexture(void);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
public:
ImageAsset();
virtual ~ImageAsset();
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
/// Set up some global script interface stuff.
static void consoleInit();
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
/// Engine.
static void initPersistFields();
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
/// Sim
bool onAdd() override;
void onRemove() override;
virtuals removed virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
2024-03-18 18:13:00 +00:00
void copyTo(SimObject* object) override;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
/// Declare Console Object.
DECLARE_CONOBJECT(ImageAsset);
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
void _onResourceChanged(const Torque::Path& path);
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
// asset Base load
U32 load() override;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
void setImageFile(StringTableEntry pImageFile);
inline StringTableEntry getImageFile(void) const { return mImageFile; };
fix asset refresh on materialAssets
2025-03-27 18:33:37 +00:00
inline StringTableEntry getRelativeImageFile(void) const { return collapseAssetFilePath(mImageFile); };
Updates the rest of the asset types to utilize separate expanded path variables to avoid breaking assetDef saving Fixes select mode for the Asset Browser to properly filter to the selecting type Fixes the imageType in the asset import window inspector to properly set to the importing image asset's discovered type if valid Fixes AssetBrowser asset selection return so it returns back a valid assetId Fixes TerrainMaterial save crash by ensuring we fill in the diffuseMapAsset Removes saving of TerrainMaterial being saved to a generic script file if one isn't found for an existing TerrainMaterialAssets
2020-08-09 06:32:27 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
void setGenMips(const bool pGenMips);
inline bool getGenMips(void) const { return mUseMips; };
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
void setTextureHDR(const bool pIsHDR);
inline bool getTextureHDR(void) const { return mIsHDRImage; };
Updated Assimp Added initial behavior for ImageAssets to hold a list of GFX resources of different texture profiles to avoid mem leaks with incorrect-typed usages Added function to ImageAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found Added function to ShapeAsset to get best-fit asset, allowing for fallbacks if the requested assetID is not found Disabled fields for dynamic and static shadowmap refresh rates Moved noShape model to core/rendering/shapes to place it in a more logical module position Added an include to avoid undefined type compile error and removed unneeded semicolon from zone code Added call to reload probe textures when a reloadTextures call is made Adjusted default directional light shadowmap settings to not be as extreme Added utility function to probe manager to allow any class to request a 'best fit' list of probes that would affect a given location, allowing other classes such as fog or particles to utilize IBL. Also updated probeManager's forward rendering to utilize same function to reduce code duplication. Shifted shape loader code to utilize assimp for loader consistency and testing Changed render bin used for SSAO postfx so it runs at the right time Made Core_Rendering module scan for assets Updated loose file references to a number of assets to follow proper formatting Refactored asset import code to follow a more consistent object heirarchy structure on importing assets, allowing more reliable cross-referencing between inbound items Updated asset import logic for materials/images so that they properly utilize ImageType. Images correctly save out the assigned image type, materials reference the images' type to know what map slot they should be used in. Importer logic also updated to better find-and-add associated images based on type. Cleaned up a bunch of old, outdated code in the asset importer Added initial handling for in-place importing of files without needing to process them through the UI. Added ability to edit module script from RMB context menu if torsion path is set Updated list field code for variable inspector to utilize correct ownerObject field
2020-03-19 14:47:38 +00:00
more merge conflicts fixed more merge conflicts (afxZodiac and MaterialDefinition) Updated cubemapdata to use refactor asset added new part to image_asset macro to create a private asset if the file exists. updated reflectionProbe errors to actual function name where the error occurs.
2025-03-24 21:50:04 +00:00
inline GFXTexHandle& getTexture(void) { load(); generateTexture(); return mTextureHandle; }
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
GFXTexHandle getTexture(GFXTextureProfile* requestedProfile);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
static StringTableEntry getImageTypeNameFromType(ImageTypes type);
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
static ImageTypes getImageTypeFromName(StringTableEntry name);
Includes required support functions for ImageAsset
2020-05-11 07:30:58 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
void setImageType(ImageTypes type) { mImageType = type; }
ImageTypes getImageType() { return mImageType; }
final rev add safeties to getters getTextureBitmap/ functions to return member variable that is collected when the image is set
2025-03-28 15:32:16 +00:00
inline U32 getTextureWidth(void) const { return isAssetValid() ? mTextureHandle->getWidth() : 0; }
inline U32 getTextureHeight(void) const { return isAssetValid() ? mTextureHandle->getHeight() : 0; }
inline U32 getTextureDepth(void) const { return isAssetValid() ? mTextureHandle->getDepth() : 0; }
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
final rev add safeties to getters getTextureBitmap/ functions to return member variable that is collected when the image is set
2025-03-28 15:32:16 +00:00
inline U32 getTextureBitmapWidth(void) const { return mImageWidth; }
inline U32 getTextureBitmapHeight(void) const { return mImageHeight; }
inline U32 getTextureBitmapDepth(void) const { return mImageDepth; }
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
bool isAssetValid(void) const override { return !mTextureHandle.isNull(); }
Includes required support functions for ImageAsset
2020-05-11 07:30:58 +00:00
null handling
2025-03-25 19:14:05 +00:00
bool isNamedTarget(void) const { return mIsNamedTarget; }
named target functionality
2025-03-25 18:22:26 +00:00
NamedTexTargetRef getNamedTarget(void) const { return NamedTexTarget::find(mImageFile + 1); }
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
static U32 getAssetByFilename(StringTableEntry fileName, AssetPtr<ImageAsset>* imageAsset);
Updates macromagic to properly set up for init'ing when image assets are set in material and terrain materials
2020-10-11 03:48:13 +00:00
static StringTableEntry getAssetIdByFilename(StringTableEntry fileName);
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
static U32 getAssetById(StringTableEntry assetId, AssetPtr<ImageAsset>* imageAsset);
static U32 getAssetById(String assetId, AssetPtr<ImageAsset>* imageAsset) { return getAssetById(assetId.c_str(), imageAsset); };
Corrects lookup/in-place auto import logic for ImageAssets Fixed sizing issue for material asset ptr fields Fixed type of comment in Particle Asset Hooked GLSL and HLSL shader files to be proper asset loose files for PostEffectAsset Adjusted some default values for default ImportConfig Corrected field type of multiple fields for the importConfig Corrected loading of PopulateMaterialMaps config setting from config file Corrected field types of multiple fields for AssetImportObjects Exposed several utility fields for the Importer to script Added ability to create an AssetImportObject in script and add it to the Importer's current session Ensured stable naming behavior(replacing spaces, -, and . in names with _ Improved getAssetTypeByFile logical lookup so it doesn't accidentally grab cached.dts files Added ability to hard reset an import session, wiping all inbound files for a full reset Added ability to process DTS files to shape import so it can parse out content such as materials for associated asset imports Added better handling for shape materials that are just colors Added callback hook-in so if the importer doesn't have a defined function for importing a given asset type, it'll try calling down into the editor Stabilized imageAsset processing logic when generating a material for it Improved imageType lookup/processing logic in Importer Improved logic for binding in associated image files to materialAssets Improved logic for processing shapes to get related materials and images, ensuring better likelyhood of finding and associating related assets Cleaned up validation logic Added ability to properly look up the editor's default import config if it's set to be used for autoimport Improved handling of originalFilePath logic, so if it's an in-place import, it doesn't bother populating the field Set default UP axis value on shape importing to ensure better default behavior
2020-07-11 21:20:10 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
const char* getImageInfo();
asset load refactor genral load method, now returns loadedstate across the board
2023-11-12 22:33:17 +00:00
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
protected:
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
// Asset Base callback
void initializeAsset(void) override;
void onAssetRefresh(void) override;
/// Taml callbacks.
void onTamlPreWrite(void) override;
void onTamlPostWrite(void) override;
get image metadata adds ability to get image metadata without loading the texture since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
void onTamlCustomWrite(TamlCustomNodes& customNodes) override;
void onTamlCustomRead(const TamlCustomNodes& customNodes) override;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
protected:
// Texture file
static bool setImageFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ImageAsset*>(obj)->setImageFile(data); return false; }
static const char* getImageFile(void* obj, StringTableEntry data) { return static_cast<ImageAsset*>(obj)->getImageFile(); }
static bool writeImageFile(void* obj, StringTableEntry pFieldName) { return static_cast<ImageAsset*>(obj)->getImageFile() != StringTable->EmptyString(); }
// Gen mips?
static bool setGenMips(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ImageAsset*>(obj)->setGenMips(dAtob(data)); return false; }
static bool writeGenMips(void* obj, StringTableEntry pFieldName) { return static_cast<ImageAsset*>(obj)->getGenMips() == true; }
// Texture Is Hdr?
static bool setTextureHDR(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ImageAsset*>(obj)->setTextureHDR(dAtob(data)); return false; }
static bool writeTextureHDR(void* obj, StringTableEntry pFieldName) { return static_cast<ImageAsset*>(obj)->getTextureHDR() == true; }
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
};
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
DECLARE_STRUCT(AssetPtr<ImageAsset>)
more cleanups cleanup the type removing the refactor tag materialManager restored to its original state
2025-03-27 08:59:50 +00:00
DefineConsoleType(TypeImageAssetPtr, AssetPtr<ImageAsset> )
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
Added initial implement of Image Types for GFX resource management Added logic to intercept TSStatic setting shape to try and utilize a shapeAsset if it can find a matching loose file Added lookup logic for getting any textures inside collada files to streamline asset importing logic Fixed modal behavior for Import config and import window Initial implementation of loose file/legacy file importing Adjusted Asset Browser and Asset Import refreshing behavior to queue to improve performance by avoiding multiple refreshes as well as potential infinite loops Fixed volume visibility behavior Fixed physics world viz toggle
2020-02-17 06:32:50 +00:00
typedef ImageAsset::ImageTypes ImageAssetType;
DefineEnumType(ImageAssetType);
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
#pragma region Refactor Asset Macros
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
#define DECLARE_IMAGEASSET(className, name, profile) \
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
private: \
Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
2025-05-27 22:12:03 +00:00
AssetPtr<ImageAsset> m##name##Asset;\
String m##name##File;\
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
public: \
cloud layer example
2024-12-21 12:23:57 +00:00
void _set##name(StringTableEntry _in){ \
if(m##name##Asset.getAssetId() == _in) \
return; \
purge assets and clear image image asset was missing a clear, passing a null value should clear the image asset and set it to null on materials.
2025-05-13 23:57:38 +00:00
if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset = NULL; \
return; \
} \
cloud layer example
2024-12-21 12:23:57 +00:00
if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \
more material def
2024-12-27 14:16:47 +00:00
StringTableEntry imageAssetId = StringTable->EmptyString(); \
cloud layer example
2024-12-21 12:23:57 +00:00
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
imageAssetId = query.mAssetList[0]; \
} \
Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
2025-05-27 22:12:03 +00:00
else if(Torque::FS::IsFile(_in)) \
more merge conflicts fixed more merge conflicts (afxZodiac and MaterialDefinition) Updated cubemapdata to use refactor asset added new part to image_asset macro to create a private asset if the file exists. updated reflectionProbe errors to actual function name where the error occurs.
2025-03-24 21:50:04 +00:00
{ \
Update ImageAsset.h update macros to share target functionality add extra check to see if image asset exists.
2025-03-26 15:07:07 +00:00
imageAssetId = ImageAsset::getAssetIdByFilename(_in); \
if (imageAssetId == ImageAsset::smNoImageAssetFallback) \
{ \
ImageAsset* privateImage = new ImageAsset(); \
privateImage->setImageFile(_in); \
imageAssetId = AssetDatabase.addPrivateAsset(privateImage); \
} \
more merge conflicts fixed more merge conflicts (afxZodiac and MaterialDefinition) Updated cubemapdata to use refactor asset added new part to image_asset macro to create a private asset if the file exists. updated reflectionProbe errors to actual function name where the error occurs.
2025-03-24 21:50:04 +00:00
} \
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
imageAssetId = ImageAsset::smNoImageAssetFallback; \
} \
cloud layer example
2024-12-21 12:23:57 +00:00
m##name##Asset = imageAssetId; \
} \
else \
{ \
m##name##Asset = _in; \
} \
}; \
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
\
inline StringTableEntry _get##name(void) const { return m##name##Asset.getAssetId(); } \
GFXTexHandle get##name() { return m##name##Asset.notNull() ? m##name##Asset->getTexture(&profile) : NULL; } \
AssetPtr<ImageAsset> get##name##Asset(void) { return m##name##Asset; } \
update macro Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
2025-05-13 23:30:47 +00:00
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data)); return false;} \
StringTableEntry get##name##File(){ return m##name##Asset.notNull() ? m##name##Asset->getImageFile() : ""; }
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
#define DECLARE_IMAGEASSET_NET(className, name, profile, mask) \
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
private: \
AssetPtr<ImageAsset> m##name##Asset; \
Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
2025-05-27 22:12:03 +00:00
String m##name##File;\
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
public: \
void _set##name(StringTableEntry _in){ \
if(m##name##Asset.getAssetId() == _in) \
return; \
purge assets and clear image image asset was missing a clear, passing a null value should clear the image asset and set it to null on materials.
2025-05-13 23:57:38 +00:00
if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset = NULL; \
setMaskBits(mask); \
return; \
} \
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \
more material def
2024-12-27 14:16:47 +00:00
StringTableEntry imageAssetId = StringTable->EmptyString(); \
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
imageAssetId = query.mAssetList[0]; \
} \
Update ImageAsset.h update macros to share target functionality add extra check to see if image asset exists.
2025-03-26 15:07:07 +00:00
else if(Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \
imageAssetId = ImageAsset::getAssetIdByFilename(_in); \
if (imageAssetId == ImageAsset::smNoImageAssetFallback) \
{ \
ImageAsset* privateImage = new ImageAsset(); \
privateImage->setImageFile(_in); \
imageAssetId = AssetDatabase.addPrivateAsset(privateImage); \
} \
} \
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
imageAssetId = ImageAsset::smNoImageAssetFallback; \
} \
Update ImageAsset.h
2025-03-26 15:41:53 +00:00
m##name##Asset = imageAssetId; \
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
} \
else \
{ \
Update ImageAsset.h
2025-03-26 15:41:53 +00:00
m##name##Asset = _in; \
all DECLARE_IMAGEASSET refactored
2024-12-21 17:34:16 +00:00
} \
setMaskBits(mask); \
}; \
\
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
inline StringTableEntry _get##name(void) const { return m##name##Asset.getAssetId(); } \
GFXTexHandle get##name() { return m##name##Asset.notNull() ? m##name##Asset->getTexture(&profile) : NULL; } \
AssetPtr<ImageAsset> get##name##Asset(void) { return m##name##Asset; } \
update macro Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
2025-05-13 23:30:47 +00:00
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data)); return false;} \
StringTableEntry get##name##File(){ return m##name##Asset.notNull() ? m##name##Asset->getImageFile() : ""; }
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
#define INITPERSISTFIELD_IMAGEASSET(name, consoleClass, docs) \
Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
2025-05-27 22:12:03 +00:00
addProtectedField(assetText(name, Asset), TypeImageAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.)); \
addProtectedField(assetText(name, File), TypeFilename, Offset(m##name##File, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, file docs.));
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
#define DECLARE_IMAGEASSET_ARRAY(className, name, profile, max) \
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
private: \
AssetPtr<ImageAsset> m##name##Asset[max]; \
Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
2025-05-27 22:12:03 +00:00
String m##name##File[max];\
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
public: \
void _set##name(StringTableEntry _in, const U32& index){ \
if(m##name##Asset[index].getAssetId() == _in) \
return; \
purge assets and clear image image asset was missing a clear, passing a null value should clear the image asset and set it to null on materials.
2025-05-13 23:57:38 +00:00
if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset[index] = NULL; \
return; \
} \
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \
more material def
2024-12-27 14:16:47 +00:00
StringTableEntry imageAssetId = StringTable->EmptyString(); \
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
imageAssetId = query.mAssetList[0]; \
} \
requirements for postfx update to handle posteffects with image_asset_refactor
2025-03-26 14:31:11 +00:00
else if(Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
more merge conflicts fixed more merge conflicts (afxZodiac and MaterialDefinition) Updated cubemapdata to use refactor asset added new part to image_asset macro to create a private asset if the file exists. updated reflectionProbe errors to actual function name where the error occurs.
2025-03-24 21:50:04 +00:00
{ \
Update ImageAsset.h update macros to share target functionality add extra check to see if image asset exists.
2025-03-26 15:07:07 +00:00
imageAssetId = ImageAsset::getAssetIdByFilename(_in); \
if (imageAssetId == ImageAsset::smNoImageAssetFallback) \
{ \
ImageAsset* privateImage = new ImageAsset(); \
privateImage->setImageFile(_in); \
imageAssetId = AssetDatabase.addPrivateAsset(privateImage); \
} \
more merge conflicts fixed more merge conflicts (afxZodiac and MaterialDefinition) Updated cubemapdata to use refactor asset added new part to image_asset macro to create a private asset if the file exists. updated reflectionProbe errors to actual function name where the error occurs.
2025-03-24 21:50:04 +00:00
} \
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
imageAssetId = ImageAsset::smNoImageAssetFallback; \
} \
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
m##name##Asset[index] = imageAssetId; \
} \
else \
{ \
m##name##Asset[index] = _in; \
} \
}; \
\
inline StringTableEntry _get##name(const U32& index) const { return m##name##Asset[index].getAssetId(); } \
null handling
2025-03-25 19:14:05 +00:00
GFXTexHandle get##name(const U32& index) { return get##name(&profile, index); } \
more material def
2024-12-27 14:16:47 +00:00
GFXTexHandle get##name(GFXTextureProfile* requestedProfile, const U32& index) { return m##name##Asset[index].notNull() ? m##name##Asset[index]->getTexture(requestedProfile) : NULL; }\
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
AssetPtr<ImageAsset> get##name##Asset(const U32& index) { return m##name##Asset[index]; } \
update macro Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
2025-05-13 23:30:47 +00:00
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data), dAtoi(index)); return false;}\
StringTableEntry get##name##File(const U32& idx){ return m##name##Asset[idx].notNull() ? m##name##Asset[idx]->getImageFile() : ""; }
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
#define DECLARE_IMAGEASSET_ARRAY_NET(className, name, profile, max, mask) \
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
private: \
AssetPtr<ImageAsset> m##name##Asset[max]; \
Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
2025-05-27 22:12:03 +00:00
String m##name##File[max];\
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
public: \
void _set##name(StringTableEntry _in, const U32& index){ \
if(m##name##Asset[index].getAssetId() == _in) \
return; \
purge assets and clear image image asset was missing a clear, passing a null value should clear the image asset and set it to null on materials.
2025-05-13 23:57:38 +00:00
if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset[index] = NULL; \
setMaskBits(mask); \
return; \
} \
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \
more material def
2024-12-27 14:16:47 +00:00
StringTableEntry imageAssetId = StringTable->EmptyString(); \
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
imageAssetId = query.mAssetList[0]; \
} \
Update ImageAsset.h update macros to share target functionality add extra check to see if image asset exists.
2025-03-26 15:07:07 +00:00
else if(Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \
imageAssetId = ImageAsset::getAssetIdByFilename(_in); \
if (imageAssetId == ImageAsset::smNoImageAssetFallback) \
{ \
ImageAsset* privateImage = new ImageAsset(); \
privateImage->setImageFile(_in); \
imageAssetId = AssetDatabase.addPrivateAsset(privateImage); \
} \
} \
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
imageAssetId = ImageAsset::smNoImageAssetFallback; \
} \
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
m##name##Asset[index] = imageAssetId; \
} \
else \
{ \
m##name##Asset[index] = _in; \
} \
setMaskBits(mask); \
}; \
\
inline StringTableEntry _get##name(const U32& index) const { return m##name##Asset[index].getAssetId(); } \
GFXTexHandle get##name(const U32& index) { return m##name##Asset[index].notNull() ? m##name##Asset[index]->getTexture(&profile) : NULL; } \
more material def
2024-12-27 14:16:47 +00:00
GFXTexHandle get##name(GFXTextureProfile* requestedProfile, const U32& index) { return m##name##Asset[index].notNull() ? m##name##Asset[index]->getTexture(requestedProfile) : NULL; }\
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
AssetPtr<ImageAsset> get##name##Asset(const U32& index) { return m##name##Asset[index]; } \
update macro Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
2025-05-13 23:30:47 +00:00
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data), dAtoi(index)); return false;}\
StringTableEntry get##name##File(const U32& idx){ return m##name##Asset[idx].notNull() ? m##name##Asset[idx]->getImageFile() : ""; }
various cleanups and fixes basicClouds refactored null dereference fixes in guiMenuBar
2024-12-26 14:36:05 +00:00
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
#define INITPERSISTFIELD_IMAGEASSET_ARRAY(name, arraySize, consoleClass, docs) \
more cleanups cleanup the type removing the refactor tag materialManager restored to its original state
2025-03-27 08:59:50 +00:00
addProtectedField(assetText(name, Asset), TypeImageAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.));
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
review notes from Az Should render fallback for namedTarget if namedTarget fails Add safety around namedtarget getTexture to stop assert Missing assets should revert to fallback image and print a warning to console Remove REFACTOR tag from all macros.
2025-03-30 10:22:42 +00:00
#define DEF_IMAGEASSET_ARRAY_BINDS(className,name, max)\
material definition changing the beast over to the refactor
2024-12-27 12:53:04 +00:00
DefineEngineMethod(className, get##name, const char*, (S32 index), , "get name")\
{\
return object->get##name##Asset(index).notNull() ? object->get##name##Asset(index)->getImageFile() : ""; \
}\
DefineEngineMethod(className, get##name##Asset, const char*, (S32 index), , assetText(name, asset reference))\
{\
if(index >= max || index < 0)\
return "";\
return object->_get##name(index); \
}\
DefineEngineMethod(className, set##name, void, (const char* map, S32 index), , assetText(name,assignment. first tries asset then flat file.))\
{\
object->_set##name(StringTable->insert(map), index);\
}
gui image asset refactor bitmap button popup ctrl ex
2024-12-22 17:03:44 +00:00
init commit start of attempt 3
2024-12-21 11:16:55 +00:00
#pragma endregion
Reference in a new issue Copy permalink