Commit graph

8207 commits

Author SHA1 Message Date
AzaezelX
8ac9da0e9f fix spawn failure reports
also force the fallbacks on failures
2025-04-01 20:48:50 -05:00
AzaezelX
d82e8dbec4 clean up (some) shader variation redundencies
don't need to use macros for the shader textfile hashkeys
several no longer used GFXVertexFormats removed
2025-04-01 18:23:29 -05:00
JeffR
0bf38aacf3 Made the Asset Properties inspector ctrl be a regular GuiInspector control
Standardized the image asset action menu and editing callbacks while leaving it open for modification/expansion later as needed
2025-04-01 02:10:13 -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
79e046d379 Update processedShaderMaterial.cpp
requires extra safety when the diffusemap asset is null, this is something that will be fixed by the material asset refactor
2025-03-30 12:22:17 +01: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
Brian Roberts
0546eae408
Merge pull request #1428 from Azaezel/sgCleanups
clean up shadergen ambient handling
2025-03-29 14:58:01 -05:00
AzaezelX
b92b5b34fd clean up shadergen ambient handling
fallback needs to a) set the same value as elswhere. b) treat uniforms the same. c) exist on both ends to ensure order of ops doesn't mangle things
2025-03-29 14:43:03 -05: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
6eac6d767b cleanup areas checking for named tex target in materials 2025-03-28 14:05:03 +00:00
marauder2k7
435462c738 fix the other previewss 2025-03-28 13:00:25 +00:00
marauder2k7
9cf17ae9a0 Update assetBrowser.tscript
remove spam from debug echos
2025-03-28 12:41:42 +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
4d14610753 Update materialEditor.ed.tscript
cleanup materialEditor script
2025-03-27 09:22:22 +00:00
marauder2k7
fad397d914 always cleanup -_- 2025-03-27 09:11:40 +00:00
marauder2k7
ea49af52a5 Update materialManager.cpp 2025-03-27 09:00:12 +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
a8d7664fc2 named target material reload clean
clean up the previous requirements for namedTarget to display on a material
2025-03-27 08:31:28 +00:00
Brian Roberts
85c7a68f46
Merge pull request #1427 from Azaezel/alpha41/riverRun
flowMagnitude and ripplespeed can go negative
2025-03-26 22:16:23 -05:00
AzaezelX
289d42cc10 flowMagnitude and ripplespeed can go negative 2025-03-26 22:12:19 -05: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
b630442683 Update assetManager.cpp
stop crash when dumping declared assets if the asset is private
2025-03-26 17:34:25 +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
Brian Roberts
a4dcfb0cc2
Merge pull request #1426 from Azaezel/alpha41/wetwipes
fix wetness
2025-03-26 06:22:19 -05:00
AzaezelX
9f11f132d3 fix wetness 2025-03-26 06:22:01 -05:00
marauder2k7
e1a2a6d9f9 fix material editor
material editor now handles named targets propertly when loading
also update preview image in material editor
2025-03-26 10:55:54 +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
9f2ab5a64e Update particleEmitter.cpp
null check around asset
2025-03-26 07:57:14 +00:00
marauder2k7
9ff4c84bc8 Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-03-25 21:02:57 +00:00
Brian Roberts
5436429e05
Merge pull request #1425 from Azaezel/alpha41/forwardFix
fix forward cubemip
2025-03-25 14:28:01 -05:00
Brian Roberts
6ffe7500cd
Merge pull request #1423 from Olathuss/gametsctrl-mouserefactor
Gametsctrl mouserefactor
2025-03-25 14:25:49 -05:00
AzaezelX
5e79c01208 fix forward cubemip
in case of temporary loss of the probe array, fall back to a (slightly) less arbitrary probemanager mip level as oposed to assuming 1 mip exists
2025-03-25 14:25:29 -05: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
Olathuss
3dabbc83ff Fixed callbacks to replace char* with Point classes
Replacing char* in callbacks with Point2I and Point3F classes for better readability and overhead
2025-03-25 11:07:14 -06:00
Olathuss
df5ffd9e10 Remove extraneous function
Remove extraneous function makeScriptCall which is no longer used.
2025-03-25 10:47:35 -06:00
marauder2k7
6640cae0d7 Update cubemapData.cpp
missed checks, and loop should be inner
2025-03-25 14:34:28 +00:00
Brian Roberts
42eda97364
Merge pull request #1424 from Azaezel/alpha41/brdfFixes
unmangle brdfTexture. again.
2025-03-24 18:18:29 -05:00
AzaezelX
5666373447 unmangle brdfTexture. again.
also correct roughnessToMipLevel, specular tinting and missing horizon correction
2025-03-24 18:18:12 -05:00
marauder2k7
15503cbf7c Update cubemapData.cpp 2025-03-24 22:18:18 +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