TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 17:13:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
Torque3D/Engine/source/T3D/assets/ShapeAsset.h

491 lines
48 KiB
C
Raw Normal View History

Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
//-----------------------------------------------------------------------------
// 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.
//-----------------------------------------------------------------------------
Updates the include guard in ShapeAsset
2016-05-14 14:16:43 -05:00
#ifndef SHAPE_ASSET_H
#define SHAPE_ASSET_H
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05: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
#ifndef _TSSHAPE_H_
Fix case sensitivity and Platform::fileDelete for linux and OSX. Correct a couple of warnings and errors preventing builds on linux.
2016-01-09 00:37:41 -06:00
#include "ts/tsShape.h"
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
#endif
#ifndef __RESOURCE_H__
#include "core/resource.h"
#endif
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
#ifndef _ASSET_PTR_H_
#include "assets/assetPtr.h"
#endif
#ifndef MATERIALASSET_H
#include "MaterialAsset.h"
#endif
#ifndef SHAPE_ANIMATION_ASSET_H
#include "ShapeAnimationAsset.h"
#endif
variation on #387 that also introduces errorcodes
2020-12-01 19:16:36 -06:00
#ifdef TORQUE_TOOLS
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
#include "gui/editor/guiInspectorTypes.h"
variation on #387 that also introduces errorcodes
2020-12-01 19:16:36 -06:00
#endif
corrected and implemented a usage of shapeasset macros (and stray membervars touched). todo: shapebaseimage, debris.
2020-12-20 19:01:43 -06:00
#ifndef _BITSTREAM_H_
#include "core/stream/bitStream.h"
#endif
code duplication prune. should aid in stability
2021-10-03 02:56:26 -05:00
#include "assetMacroHelpers.h"
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
//-----------------------------------------------------------------------------
class ShapeAsset : 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 13:19:43 -05:00
typedef AssetPtr<ShapeAsset> ConcreteAssetPtr;
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
public:
variation on #387 that also introduces errorcodes
2020-12-01 19:16:36 -06:00
enum ShapeAssetErrCode
{
TooManyVerts = AssetErrCode::Extended,
TooManyBones,
error string interpreter, example of usage in shapebase::preload, plus flips the datablock filter back on to save some network bandwidth.
2020-12-03 15:37:51 -06:00
MissingAnimatons,
Extended
};
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 01:07:08 -05:00
static StringTableEntry smNoShapeAssetFallback;
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 13:19:43 -05:00
static const String mErrCodeStrings[U32(ShapeAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(ConcreteAssetPtr checkAsset) { if (checkAsset) return checkAsset->mLoadedState; else return 0; }
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 01:07:08 -05:00
error string interpreter, example of usage in shapebase::preload, plus flips the datablock filter back on to save some network bandwidth.
2020-12-03 15:37:51 -06:00
static String getAssetErrstrn(U32 errCode)
{
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > ShapeAssetErrCode::Extended) return "undefined error";
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 13:19:43 -05:00
return mErrCodeStrings[errCode - Parent::Extended];
variation on #387 that also introduces errorcodes
2020-12-01 19:16:36 -06:00
};
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
private:
StringTableEntry mShapeFile;
StringTableEntry mConstructorFileName;
StringTableEntry mDiffuseImposterFileName;
StringTableEntry mNormalImposterFileName;
//Material assets we're dependent on and use
Vector<StringTableEntry> mMaterialAssetIds;
Vector<AssetPtr<MaterialAsset>> mMaterialAssets;
//Animation assets we're dependent on and use
Vector<StringTableEntry> mAnimationAssetIds;
Vector<AssetPtr<ShapeAnimationAsset>> mAnimationAssets;
Resource<TSShape> mShape;
public:
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
ShapeAsset();
virtual ~ShapeAsset();
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 01:07:08 -05:00
/// Set up some global script interface stuff.
static void consoleInit();
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
/// Engine.
static void initPersistFields();
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;
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05: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 01:07:08 -05:00
virtual void setDataField(StringTableEntry slotName, StringTableEntry array, StringTableEntry value);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
/// Declare Console Object.
DECLARE_CONOBJECT(ShapeAsset);
crashfix work for hot-editing shape assets tied to tsstatics
2024-04-06 14:48:22 -05:00
U32 load() override;
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
try to load shapes during preload it's half the point of the protocol
2025-07-06 19:51:55 -05:00
TSShape* getShape() { load(); return mShape; }
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
asset load refactor genral load method, now returns loadedstate across the board
2023-11-12 16:33:17 -06:00
Resource<TSShape> getShapeResource() { load(); return mShape; }
Adds the ability to the ShapeAsset to get the resource of the shape.
2016-05-13 23:14:55 -05: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 14:48:02 -06:00
void SplitSequencePathAndName(String& srcPath, String& srcName);
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 01:07:08 -05:00
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
U32 getShapeFilenameHash() { return _StringTable::hashString(mShapeFile); }
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
Vector<AssetPtr<MaterialAsset>> getMaterialAssets() { return mMaterialAssets; }
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 01:07:08 -05:00
inline AssetPtr<MaterialAsset> getMaterialAsset(U32 matId)
{
if (matId >= mMaterialAssets.size())
dial back nullPtr usage while it still remains a good idea to port as many NULL compares and assignments over to nullPtr as feasable, we do still need to sort out how to better support scripted empty, false, and zero assigns for things like objectIDs. this means we'll need to both fully convert the backend of the parser to support that kind of thing, but also alter most if not all exisiting NULLs. up to and including things like SAFE_DELETE. while that's certainly feasable, given there's aproximatel 400 nullptr assigns/checks prior to this commit, and roughly 1800 of the prior, if it terminates in a script call and not an aip one direct, we'll be dialing that back until such time as fork fully fopcused on converting and resolving any lingering mismatches is completed.
2025-12-29 17:45:09 -06:00
return NULL;
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 01:07:08 -05:00
else
return mMaterialAssets[matId];
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
}
void clearMaterialAssets() { mMaterialAssets.clear(); }
void addMaterialAssets(AssetPtr<MaterialAsset> matPtr) { mMaterialAssets.push_back(matPtr); }
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
S32 getMaterialCount() { return mMaterialAssets.size(); }
S32 getAnimationCount() { return mAnimationAssets.size(); }
ShapeAnimationAsset* getAnimation(S32 index);
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 01:07:08 -05:00
void _onResourceChanged(const Torque::Path& path);
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
void setShapeFile(const char* pScriptFile);
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
inline StringTableEntry getShapeFile(void) const { return mShapeFile; };
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
Updated path handling for loose asset files for CPP, Image, Level, Material, PostFX, Shape, Terrain, TerrainMat and StateMachine assets to be more predictable in when and how they expando the loose file path into a full, useable path Fixed loose file bindings for all associated slots in level asset, such as postFX file, decals, etc Expanded TSStatic onInspect testcase to parse materialSlots and hook-in a specialized material field for editing/quick reference from the inspector Adjusted expand behavior of guiTree to be more reliable Added internal name 'stack' to inspectorGroup's stack child objects for easier access to add programatic fields Removed redundant PreMult translucency type code Added setting of feature so probes work when in forward/basic lit mode Corrected indexing error in SQLiteObject class so it properly parses with the updated console API Tweaked the FOV setting logic in GameConnection::onControlObjectChange to not be spammy Fixed var when trying to bind the camera to the client Added project setting field to dictate the default render mode between Forward or Deferred Integrated MotionBlur PostFX into updated PostFX Editor paradigm and exposed the samples uniform as an editable field Integrated DOF PostFX into updated PostFX Editor paradigm Updated setting group name for vignette postFX Shifted shaderCache to be in data/cache along with other cached files Added helper function to replace strings in a file Fixed ExampleCppObject asset to have correct loose file references Adjusted editor default level logic so it can be modifed and then stored, as well as reset back to the original default Fixed verve reference to root scene group Adjusted location of a nonmodal gui profile so it loads at the correct time Reorganized AssetBrowser loading and refresh logic so it doesn't stack multiple refresh requests back-to-back causing lag Updated the search behavior to search not just the current address, but all child folders as well, making it far more useful Initial work into zip and folder drag-and-drop asset importing support Removed the import config setting for 'always display material maps' as it is redundant with the new importer context menu actions Updated example asset type file Ensured all asset types have proper handling for move, rename and delete actions Fixed double-click behavior on folders in the AB Fixed CPP asset preview Added better logic to discern if a top-level folder belongs to a module or not in the AB directory browser Added ability to convert a non-module top-level folder in the AB into a module Added initial hooks for being able to generate a new Editor Tool, similar to how the AB can generate modules Renamed CPP asset template files to have the .template so they aren't accidentally picked up by cmake Fixed convex editor's material handling to work with AB and reference back properly Updated AB images for folder up/down navigation buttons, and the breadcrumb divider arrow Made PostFX Editor properly allow for input pass-through so you can still edit the level with it open Added some additional common text gui profiles Disabled calls to old editor settings logic in various editors to remove spam Added callOnModules call so tools can initialize properly when the world editor is opened Fixed logic test for visualizers Added ability for cmake to scan tools directory for any tools that add source files
2020-02-04 01:47:28 -06:00
void setShapeConstructorFile(const char* pScriptFile);
inline StringTableEntry getShapeConstructorFile(void) const { return mConstructorFileName; };
Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely.
2021-12-10 00:01:26 -06:00
//Imposter images
void setDiffuseImposterFile(const char* pImageFile);
inline StringTableEntry getDiffuseImposterFile(void) const { return mDiffuseImposterFileName; };
void setNormalImposterFile(const char* pImageFile);
keep same naming
2025-06-20 17:13:20 +01:00
inline StringTableEntry getNormalImposterFile(void) const { return mNormalImposterFileName; };
Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely.
2021-12-10 00:01:26 -06: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 01:07:08 -05:00
static U32 getAssetByFilename(StringTableEntry fileName, AssetPtr<ShapeAsset>* shapeAsset);
variation on #387 that also introduces errorcodes
2020-12-01 19:16:36 -06:00
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 12:15:12 -05:00
static StringTableEntry getAssetIdByFilename(StringTableEntry fileName);
variation on #387 that also introduces errorcodes
2020-12-01 19:16:36 -06:00
static U32 getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* shapeAsset);
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 09:47:38 -05:00
Implements shape preview caching for shape assets Also standardizes the loading gui overlay so it can be used to inform that the asset preview generation is happening
2021-01-27 01:54:26 -06:00
#ifdef TORQUE_TOOLS
Updates the handling of the baking of shape asset previews to generate them with support for view angle control to improve visibility, as well as supporting overriding of a material in the preview bake Also utilizes the updated bake handling to have material asset previews render as a sphere shape asset, overriding with the material asset's material, improving distinction of what is a material asset vs image asset Also updates the sphere preview mesh to be more generic and not only for reflection probes
2021-12-24 17:26:45 -06:00
const char* generateCachedPreviewImage(S32 resolution, String overrideMaterial = "");
Implements shape preview caching for shape assets Also standardizes the loading gui overlay so it can be used to inform that the asset preview generation is happening
2021-01-27 01:54:26 -06:00
#endif
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
protected:
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
// Asset Base callback
void initializeAsset(void) override;
void onAssetRefresh(void) override;
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
/// Taml callbacks.
void onTamlPreWrite(void) override;
void onTamlPostWrite(void) override;
protected:
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 01:07:08 -05:00
static bool setShapeFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ShapeAsset*>(obj)->setShapeFile(data); return false; }
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
static const char* getShapeFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getShapeFile(); }
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
static bool writeShapeFile(void* obj, StringTableEntry pFieldName) { return static_cast<ShapeAsset*>(obj)->getShapeFile() != StringTable->EmptyString(); }
Updated path handling for loose asset files for CPP, Image, Level, Material, PostFX, Shape, Terrain, TerrainMat and StateMachine assets to be more predictable in when and how they expando the loose file path into a full, useable path Fixed loose file bindings for all associated slots in level asset, such as postFX file, decals, etc Expanded TSStatic onInspect testcase to parse materialSlots and hook-in a specialized material field for editing/quick reference from the inspector Adjusted expand behavior of guiTree to be more reliable Added internal name 'stack' to inspectorGroup's stack child objects for easier access to add programatic fields Removed redundant PreMult translucency type code Added setting of feature so probes work when in forward/basic lit mode Corrected indexing error in SQLiteObject class so it properly parses with the updated console API Tweaked the FOV setting logic in GameConnection::onControlObjectChange to not be spammy Fixed var when trying to bind the camera to the client Added project setting field to dictate the default render mode between Forward or Deferred Integrated MotionBlur PostFX into updated PostFX Editor paradigm and exposed the samples uniform as an editable field Integrated DOF PostFX into updated PostFX Editor paradigm Updated setting group name for vignette postFX Shifted shaderCache to be in data/cache along with other cached files Added helper function to replace strings in a file Fixed ExampleCppObject asset to have correct loose file references Adjusted editor default level logic so it can be modifed and then stored, as well as reset back to the original default Fixed verve reference to root scene group Adjusted location of a nonmodal gui profile so it loads at the correct time Reorganized AssetBrowser loading and refresh logic so it doesn't stack multiple refresh requests back-to-back causing lag Updated the search behavior to search not just the current address, but all child folders as well, making it far more useful Initial work into zip and folder drag-and-drop asset importing support Removed the import config setting for 'always display material maps' as it is redundant with the new importer context menu actions Updated example asset type file Ensured all asset types have proper handling for move, rename and delete actions Fixed double-click behavior on folders in the AB Fixed CPP asset preview Added better logic to discern if a top-level folder belongs to a module or not in the AB directory browser Added ability to convert a non-module top-level folder in the AB into a module Added initial hooks for being able to generate a new Editor Tool, similar to how the AB can generate modules Renamed CPP asset template files to have the .template so they aren't accidentally picked up by cmake Fixed convex editor's material handling to work with AB and reference back properly Updated AB images for folder up/down navigation buttons, and the breadcrumb divider arrow Made PostFX Editor properly allow for input pass-through so you can still edit the level with it open Added some additional common text gui profiles Disabled calls to old editor settings logic in various editors to remove spam Added callOnModules call so tools can initialize properly when the world editor is opened Fixed logic test for visualizers Added ability for cmake to scan tools directory for any tools that add source files
2020-02-04 01:47:28 -06:00
static bool setShapeConstructorFile(void* obj, const char* index, const char* data) { static_cast<ShapeAsset*>(obj)->setShapeConstructorFile(data); return false; }
static const char* getShapeConstructorFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getShapeConstructorFile(); }
Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely.
2021-12-10 00:01:26 -06:00
static bool setDiffuseImposterFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ShapeAsset*>(obj)->setDiffuseImposterFile(data); return false; }
static const char* getDiffuseImposterFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getDiffuseImposterFile(); }
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely.
2021-12-10 00:01:26 -06:00
static bool setNormalImposterFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ShapeAsset*>(obj)->setNormalImposterFile(data); return false; }
keep same naming
2025-06-20 17:13:20 +01:00
static const char* getNormalImposterFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getNormalImposterFile(); }
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
};
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 12:15:12 -05:00
DefineConsoleType(TypeShapeAssetId, String)
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
DECLARE_STRUCT(AssetPtr<ShapeAsset>)
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
DefineConsoleType(TypeShapeAssetPtr, AssetPtr<ShapeAsset>)
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
fix TORQUE_TOOLS = off compilation
2022-06-13 12:38:08 -05:00
#ifdef TORQUE_TOOLS
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
class GuiInspectorTypeShapeAssetPtr : public GuiInspectorTypeFileName
{
typedef GuiInspectorTypeFileName Parent;
public:
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-08 20:00:55 -06:00
GuiTextCtrl* mLabel;
GuiBitmapButtonCtrl* mPreviewBorderButton;
GuiBitmapCtrl* mPreviewImage;
GuiButtonCtrl* mEditButton;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
DECLARE_CONOBJECT(GuiInspectorTypeShapeAssetPtr);
static void consoleInit();
virtuals removed virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
2024-03-18 18:13:00 +00:00
GuiControl* constructEditControl() override;
bool updateRects() override;
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-08 20:00:55 -06:00
virtuals removed virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
2024-03-18 18:13:00 +00:00
void updateValue() override;
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-08 20:00:55 -06:00
void updatePreviewImage();
void setPreviewImage(StringTableEntry assetId);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
};
Initial Implementation of the Taml, Asset and Modules systems. Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
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 12:15:12 -05:00
class GuiInspectorTypeShapeAssetId : public GuiInspectorTypeShapeAssetPtr
{
typedef GuiInspectorTypeShapeAssetPtr Parent;
public:
DECLARE_CONOBJECT(GuiInspectorTypeShapeAssetId);
static void consoleInit();
};
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 01:07:08 -05:00
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
#endif
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
//-----------------------------------------------------------------------------
// REFACTOR
//-----------------------------------------------------------------------------
#pragma region Refactor Asset Macros
#define DECLARE_SHAPEASSET_REFACTOR(className, name) \
private: \
AssetPtr<ShapeAsset> m##name##Asset; \
StringTableEntry m##name##File = StringTable->EmptyString(); \
public: \
void _set##name(StringTableEntry _in) { \
if (m##name##Asset.getAssetId() == _in) \
return; \
if(get##name##File() == _in) \
return; \
correct DECLARE_<foo>ASSET assigns use string compare there, not pointer compares
2025-08-21 15:40:07 -05:00
if(_in == NULL || !String::compare(_in,StringTable->EmptyString())) \
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
{ \
m##name##Asset = NULL; \
m##name##File = ""; \
return; \
} \
if (!AssetDatabase.isDeclaredAsset(_in)) \
{ \
StringTableEntry shapeAssetId = StringTable->EmptyString(); \
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
shapeAssetId = query.mAssetList[0]; \
} \
else if (Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \
shapeAssetId = ShapeAsset::getAssetIdByFilename(_in); \
if (shapeAssetId == ShapeAsset::smNoShapeAssetFallback) \
{ \
ShapeAsset* privateShape = new ShapeAsset(); \
privateShape->setShapeFile(_in); \
shapeAssetId = AssetDatabase.addPrivateAsset(privateShape); \
} \
} \
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
shapeAssetId = ShapeAsset::smNoShapeAssetFallback; \
} \
m##name##Asset = shapeAssetId; \
m##name##File = _in; \
} \
else \
{ \
m##name##Asset = _in; \
m##name##File = get##name##File(); \
} \
}; \
\
inline StringTableEntry _get##name##AssetId(void) const { return m##name##Asset.getAssetId(); } \
try to load shapes during preload it's half the point of the protocol
2025-07-06 19:51:55 -05:00
TSShape* get##name() { if (m##name##Asset.notNull()) return m##name##Asset->getShape(); else return NULL; } \
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
AssetPtr<ShapeAsset> get##name##Asset(void) { return m##name##Asset; } \
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data)); return false; } \
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
StringTableEntry get##name##File() { return m##name##Asset.notNull() ? m##name##Asset->getShapeFile() : ""; }
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
#define DECLARE_SHAPEASSET_NET_REFACTOR(className, name, mask) \
private: \
AssetPtr<ShapeAsset> m##name##Asset; \
StringTableEntry m##name##File = StringTable->EmptyString(); \
public: \
void _set##name(StringTableEntry _in) { \
if (m##name##Asset.getAssetId() == _in) \
return; \
if(get##name##File() == _in) \
return; \
correct DECLARE_<foo>ASSET assigns use string compare there, not pointer compares
2025-08-21 15:40:07 -05:00
if(_in == NULL || !String::compare(_in,StringTable->EmptyString())) \
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
{ \
m##name##Asset = NULL; \
m##name##File = ""; \
setMaskBits(mask); \
return; \
} \
if (!AssetDatabase.isDeclaredAsset(_in)) \
{ \
StringTableEntry shapeAssetId = StringTable->EmptyString(); \
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
shapeAssetId = query.mAssetList[0]; \
} \
else if (Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \
shapeAssetId = ShapeAsset::getAssetIdByFilename(_in); \
if (shapeAssetId == ShapeAsset::smNoShapeAssetFallback) \
{ \
ShapeAsset* privateShape = new ShapeAsset(); \
privateShape->setShapeFile(_in); \
shapeAssetId = AssetDatabase.addPrivateAsset(privateShape); \
} \
} \
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
shapeAssetId = ShapeAsset::smNoShapeAssetFallback; \
} \
m##name##Asset = shapeAssetId; \
m##name##File = _in; \
} \
else \
{ \
m##name##Asset = _in; \
m##name##File = get##name##File(); \
} \
setMaskBits(mask); \
}; \
\
inline StringTableEntry _get##name##AssetId(void) const { return m##name##Asset.getAssetId(); } \
try to load shapes during preload it's half the point of the protocol
2025-07-06 19:51:55 -05:00
TSShape* get##name() { if (m##name##Asset.notNull()) return m##name##Asset->getShape(); else return NULL; } \
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
AssetPtr<ShapeAsset> get##name##Asset(void) { return m##name##Asset; } \
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data)); return false; } \
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
StringTableEntry get##name##File() { return m##name##Asset.notNull() ? m##name##Asset->getShapeFile() : ""; }
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
try to load shapes during preload it's half the point of the protocol
2025-07-06 19:51:55 -05:00
#define INITPERSISTFIELD_SHAPEASSET_REFACTOR(name, consoleClass, docs) \
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
addProtectedField(assetText(name, Asset), TypeShapeAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.)); \
- Fixes the display of the preview in the MaterialAsset fields - Hides the special-case direct filepath field for ShapeAsset persist fields macro - Shifts the handling of TSStatics so the shape instance will load materials on the server as well as the client. This opens gameplay options as well as allowing rebaking of meshes functionality more easily - Expands AssetBase's isValidAsset utility function to actually check validity instead of just returning true - Adds isValid utility function to AssetPtr - Added new field flag that makes the field not write out to file - Removed legacy iconBitmap field from GuiIconButtonCtrl because it was causing errors - Fixed group filtering check of guiInspector to ignore case - Removed unneeded isFile checks for common datablock script files in Prototyping module script - Removed test datablocks from Prototyping module - Removed unnecessary container control from AssetBrowser - Adjusted preview regen logic of AssetBrowser so it doesn't trip if you're simply resizing the window - Fixed issue where row-vs-column layout logic for AssetBrowser when resizing window was fiddly - Added handling for when Dragging and Dropping datablock from AssetBrowser to spawn, it'll prompt if it spawns the actual object, or a spawnsphere that spawns said object. In the event of an PlayerData will also prompt if it should spawn an AIPlayer - Added ability to take a TSStatic that uses a baked down mesh and are able to restore it to the cache prefab, or trigger and in-place rebake to refresh it if something has changed in the original contents via RMB menu on the scene tree - Added ability to explode prefab to RMB menu on scene tree - Added ability to convert selection to prefab or bake to mesh in RMB menu on scene tree - Tweaked sizing of the DatablockEditorCreatePrompt window to not have cut off elements and easier to see/work with - Added sanity check to datablock editor creation - Fixed preview display of material in Decal Editor - Made compositeTextureEditor use the cached preview of images - Fixed sizing/spacing of gui selection dropdown as well as resolution dropdown of GuiEditor - Fixes MaterialEditor to properly save the group collapse state when editing - Adds ability to in-flow edit and create datablocks in the NavMesh Editor for the testing panel, and makes the datablock dropdown searchable - Fixed issue where opening the ShapeEditor via the edit button on a ShapeAsset field would cause the action buttons on the top bar to not show - Fixed error in shape editor where when exiting it was erroneously checking for a clear value of -1 rather than 0 - Removed unneeded top tabbook and tab page for main editor panel - Fixed issue where reset button of TerrainBrush Softness Curve editor didn't actually reset - Resized Object Builder window to not cut off elements and have enough width to show more data - Added a TypeCommand field type to Object Builder and changed spawnscript field of SpawnSphere to use it rather than a simple text edit field - Allow SpawnSphere in ObjectBuilder to be passed in spawn class and spawn datablock default info - Injects button to controllable objects when Inspecting them to make it easy to toggle if you're in control of it or not -
2025-08-25 23:35:28 -05:00
addProtectedField(assetText(name, File), TypeFilename, Offset(m##name##File, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, file docs.), AbstractClassRep::FIELD_HideInInspectors);
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
#define DECLARE_SHAPEASSET_ARRAY_REFACTOR(className, name, max) \
private: \
AssetPtr<ShapeAsset> m##name##Asset[max]; \
StringTableEntry m##name##File[max] = {StringTable->EmptyString() }; \
public: \
void _set##name(StringTableEntry _in, const U32& index){ \
if (m##name##Asset[index].getAssetId() == _in) \
return; \
if(get##name##File(index) == _in) \
return; \
correct DECLARE_<foo>ASSET assigns use string compare there, not pointer compares
2025-08-21 15:40:07 -05:00
if(_in == NULL || !String::compare(_in,StringTable->EmptyString())) \
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
{ \
m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \
return; \
} \
if (!AssetDatabase.isDeclaredAsset(_in)) \
{ \
StringTableEntry shapeAssetId = StringTable->EmptyString(); \
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
shapeAssetId = query.mAssetList[0]; \
} \
else if (Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \
shapeAssetId = ShapeAsset::getAssetIdByFilename(_in); \
if (shapeAssetId == ShapeAsset::smNoShapeAssetFallback) \
{ \
ShapeAsset* privateShape = new ShapeAsset(); \
privateShape->setShapeFile(_in); \
shapeAssetId = AssetDatabase.addPrivateAsset(privateShape); \
} \
} \
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
shapeAssetId = ShapeAsset::smNoShapeAssetFallback; \
} \
m##name##Asset[index] = shapeAssetId; \
m##name##File[index] = _in; \
} \
else \
{ \
m##name##Asset[index] = _in; \
m##name##File[index] = get##name##File(index); \
} \
player and ground cover
2025-06-19 14:10:00 +01:00
}; \
\
inline StringTableEntry _get##name##AssetId(const U32& index) const { return m##name##Asset[index].getAssetId(); } \
try to load shapes during preload it's half the point of the protocol
2025-07-06 19:51:55 -05:00
TSShape* get##name(const U32& index) { if (m##name##Asset[index].notNull()) return m##name##Asset[index]->getShape(); else return NULL; } \
player and ground cover
2025-06-19 14:10:00 +01:00
AssetPtr<ShapeAsset> get##name##Asset(const U32& index) { return m##name##Asset[index]; } \
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;}\
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
StringTableEntry get##name##File(const U32& idx) { return m##name##Asset[idx].notNull() ? m##name##Asset[idx]->getShapeFile() : ""; }
player and ground cover
2025-06-19 14:10:00 +01:00
#define DECLARE_SHAPEASSET_ARRAY_NET_REFACTOR(className, name, max, mask) \
private: \
AssetPtr<ShapeAsset> m##name##Asset[max]; \
StringTableEntry m##name##File[max] = {StringTable->EmptyString() }; \
public: \
void _set##name(StringTableEntry _in, const U32& index){ \
if (m##name##Asset[index].getAssetId() == _in) \
return; \
if(get##name##File(index) == _in) \
return; \
correct DECLARE_<foo>ASSET assigns use string compare there, not pointer compares
2025-08-21 15:40:07 -05:00
if (_in == NULL || !String::compare(_in,StringTable->EmptyString())) \
player and ground cover
2025-06-19 14:10:00 +01:00
{ \
m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \
setMaskBits(mask); \
return; \
} \
if (!AssetDatabase.isDeclaredAsset(_in)) \
{ \
StringTableEntry shapeAssetId = StringTable->EmptyString(); \
AssetQuery query; \
S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); \
if (foundAssetcount != 0) \
{ \
shapeAssetId = query.mAssetList[0]; \
} \
else if (Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \
shapeAssetId = ShapeAsset::getAssetIdByFilename(_in); \
if (shapeAssetId == ShapeAsset::smNoShapeAssetFallback) \
{ \
ShapeAsset* privateShape = new ShapeAsset(); \
privateShape->setShapeFile(_in); \
shapeAssetId = AssetDatabase.addPrivateAsset(privateShape); \
} \
} \
else \
{ \
Con::warnf("%s::%s: Could not find asset for: %s using fallback", #className, #name, _in); \
shapeAssetId = ShapeAsset::smNoShapeAssetFallback; \
} \
m##name##Asset[index] = shapeAssetId; \
m##name##File[index] = _in; \
} \
else \
{ \
m##name##Asset[index] = _in; \
m##name##File[index] = get##name##File(index); \
} \
setMaskBits(mask); \
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
}; \
\
inline StringTableEntry _get##name##AssetId(const U32& index) const { return m##name##Asset[index].getAssetId(); } \
try to load shapes during preload it's half the point of the protocol
2025-07-06 19:51:55 -05:00
TSShape* get##name(const U32& index) { if (m##name##Asset[index].notNull()) return m##name##Asset[index]->getShape(); else return NULL; } \
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
AssetPtr<ShapeAsset> get##name##Asset(const U32& index) { return m##name##Asset[index]; } \
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;}\
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
StringTableEntry get##name##File(const U32& idx) { return m##name##Asset[idx].notNull() ? m##name##Asset[idx]->getShapeFile() : ""; }
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
#define INITPERSISTFIELD_SHAPEASSET_ARRAY_REFACTOR(name, arraySize, consoleClass, docs) \
streamline shape asset shape asset now has the same import "@" as image asset cut out extra filename parameters that arent needed refresh hopefully fixed
2025-06-20 15:58:20 +01:00
addProtectedField(assetText(name, Asset), TypeShapeAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.));\
initial commit change the macro to use the refactor (exact same structure as the imageasset macro)
2025-06-19 13:34:07 +01:00
addProtectedField(assetText(name, File), TypeFilename, Offset(m##name##File, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.));
#pragma endregion
//-----------------------------------------------------------------------------
// REFACTOR END
//-----------------------------------------------------------------------------
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 01:07:08 -05:00
#endif
Reference in a new issue Copy permalink