Commit graph

327 commits

Author SHA1 Message Date
Brian Roberts
6cda97867c
Merge pull request #1452 from marauder2k9-torque/MEMORY-MANAGER-REFACTOR
Memory Manager Refactor
2025-05-12 15:31:06 -05:00
marauder2k7
e1c01cd49a Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-05-12 14:45:41 +01:00
marauder2k7
15ff382469 plugging found leaks
LEAK from G:\GameDev\GithubRepo\Torque3D\Engine\source\console/consoleObject.h:686
- leak around props remaining after the const_cast free it up

LEAK around sound asset
- assetEnumNameConcat was creating a leak.
2025-05-12 11:50:16 +01:00
Brian Roberts
798936ebd2
Merge pull request #1325 from Areloch/Standardized_AB_AssetManagement
Updates most of the handling of asset types to follow a more standardized type-registration system.
2025-04-29 13:19:50 -05:00
JeffR
f31acf774e Adds handling for datablocks to be reloaded if the assets they utilize have their files directly edited. 2025-04-24 00:58:20 -05:00
marauder2k7
7c4d41ee21 Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-04-05 15:59:02 +01:00
AzaezelX
b299b54467 encapsulate tool-only code for levelassets 2025-04-02 15:38:43 -05:00
JeffR
5566f8a396 Updated handling of subscenes in assets to be it's own distinct definition to avoid parsing and detection issues, as well as fields to be handled distinctly between the types 2025-03-30 16:36:15 -05:00
JeffR
c2af4e578b Merge branch 'Standardized_AB_AssetManagement' of https://github.com/Areloch/Torque3D into development 2025-03-30 15:03:43 -05:00
marauder2k7
774bd874b5 Update ImageAsset.cpp
early out of generateTexture
2025-03-30 11:44:55 +01:00
marauder2k7
73ad92b757 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 11:22:42 +01:00
marauder2k7
b707b2e2b7 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
marauder2k7
bfe2401ebb 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
marauder2k7
db8c565416 ID10T issue
we dont want both fileChanged and resourcechanged.... causes issues
2025-03-27 19:34:11 +00:00
marauder2k7
fc30d178af fix asset refresh on materialAssets 2025-03-27 18:33:37 +00:00
marauder2k7
c025ea86b4 more cleanups
cleanup the type removing the refactor tag
materialManager restored to its original state
2025-03-27 08:59:50 +00:00
marauder2k7
3b70689abc clean out old macros 2025-03-26 21:16:43 +00:00
marauder2k7
7af992970a Update ImageAsset.cpp
update getAssetIdByFilename to also check the imageFile of the asset
This helps match filenames for assets created privately such as probe bakes and targets
2025-03-26 18:51:44 +00:00
marauder2k7
086db03bbc Update ImageAsset.h 2025-03-26 15:42:26 +00:00
marauder2k7
f59ccc3f99 Update ImageAsset.h 2025-03-26 15:41:53 +00:00
marauder2k7
465c79f39d 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
marauder2k7
d86962d1fd requirements for postfx
update to handle posteffects with image_asset_refactor
2025-03-26 14:31:11 +00:00
marauder2k7
16d219769f set preview image
set the image asset preview image for namedTargets
2025-03-26 10:12:14 +00:00
marauder2k7
bab7878ca6 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
marauder2k7
6c2b4f8979 null handling 2025-03-25 19:14:05 +00:00
marauder2k7
987ff90467 named target functionality 2025-03-25 18:22:26 +00:00
marauder2k7
b2fe48ab8d 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
marauder2k7
0da0903599
Merge branch 'development' into imageAsset_refactor_rev3 2025-03-24 20:07:06 +00:00
marauder2k7
e16a66f363 Revert "sound asset refactor init"
This reverts commit 2bf2da74a0.
2025-03-24 19:58:52 +00:00
AzaezelX
fcd2d38deb further validator cleanups
bump default fidelity from 0,0001 to 0.01
fix F32Range. needs to go from - to +, not smallest to largest positive value
fix several misasigned validator ranges. most of which use some form of -1 default to do a Special Thing
2025-03-18 14:06:33 -05:00
AzaezelX
f633ef3a3d fill in the validated variables 2025-03-09 11:53:23 -05:00
AzaezelX
bc9ed3e10a prexisting material asset safety check
from steve_yorkshire
don't try and create a new suffixed materiaAsset if one already exists
2025-03-01 17:17:24 -06:00
JeffR
0d338f2d51 * Update levelAsset creation so it can be flagged to be creating a subScene preemptively, improving workflow when creating a SubScene level asset 'in place' via the inspector.
* Fixed issue of creating new SubScene using the full level template instead of a blank level file
* Fixed subScene inspector field handling so clicking the create new will mark the 'in place' created level asset as a subscene appropriately
* Changed up persistenceManager logic when parsing objects out - especially with specialty fields - to use Strings instead of const char* to simplify memory juggling and improve stability
* Rolled back specialty array field outputs for decal roads and convex shapes to have the field names in the output again
* Added sanity check for MeshRoad's when writing out via specialty array field to ensure there are profile nodes before trying to write any
* Added sanity check to avoid pointlessly writing out meshroad and river position field into subScene file as it could cause a transform double-up and cause them to move when loading from a subscene
2025-02-05 22:51:43 -06:00
marauder2k7
2bf2da74a0 sound asset refactor init 2025-01-23 22:16:35 +00:00
marauder2k7
d87655bb3a merge dev 2025-01-23 22:16:33 +00:00
marauder2k7
0f4d2d1689 material definition finished 2025-01-23 22:16:02 +00:00
marauder2k7
58119a4f82 more material def 2025-01-23 22:15:47 +00:00
marauder2k7
cebfdbc5ec material definition
changing the beast over to the refactor
2025-01-23 22:15:29 +00:00
marauder2k7
4d980e5406 various cleanups and fixes
basicClouds refactored
null dereference fixes in guiMenuBar
2025-01-23 22:14:05 +00:00
marauder2k7
eb746a1142 console spam
moved error printout in guiType guiControlProfile incLoadCount inside a check to make sure the profile has a bitmap asset set.

remove older typeImageAssetId from group and variable inspector classes
2025-01-23 22:13:49 +00:00
marauder2k7
22037bf94f moar refactors 2025-01-23 22:13:46 +00:00
marauder2k7
4d893f51cf gui image asset refactor
bitmap button popup ctrl ex
2025-01-23 22:13:21 +00:00
marauder2k7
fa8110ce8f all DECLARE_IMAGEASSET refactored 2025-01-23 22:12:55 +00:00
marauder2k7
24b374f545 cloud layer example 2025-01-23 22:12:54 +00:00
marauder2k7
eca0820134 init commit
start of attempt 3
2025-01-23 22:12:52 +00:00
Brian Roberts
69fa4b389f
Merge pull request #1340 from marauder2k9-torque/ImageAsset-NamedTexTarget
NamedTexTargets as ImageAssets
2024-12-23 03:12:22 -06:00
JeffR
81ac23fd35 Merge branch 'SubScenes_Gamemode_PR' of https://github.com/Areloch/Torque3D into development 2024-12-15 18:39:03 -06:00
marauder2k7
7b73ce7a2f Update ImageAsset.cpp 2024-12-14 16:26:02 +00:00
marauder2k7
f5f50723ed final cleanup 2024-12-14 14:47:46 +00:00
marauder2k7
1edfbcf447 fixes for reload and flush 2024-12-14 13:37:23 +00:00