Commit graph

5378 commits

Author SHA1 Message Date
AzaezelX 3ec347b2bb followup to https://github.com/TorqueGameEngines/Torque3D/pull/1601 2025-12-09 18:46:00 -06:00
marauder2k7 74638c0f2c Asset data management
Added functions to AssetManager to pack/unpack assets using an id hash instead of their id string this cuts down how much data is sent across the network for assets

All asset macros updated to use this new functionality.
2025-12-09 10:05:39 +00:00
Brian Roberts 42e8687067
Merge pull request #1596 from Areloch/ReflectProbeDataCleanupFix
Some checks failed
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
Add cleanup of irradience and prefilter cubemap datas in reflection probes when the probe is deleted
2025-12-03 06:46:25 -06:00
JeffR 1741108a5b Add cleanup of irradience and prefilter cubemap datas in reflection probes when the probe is deleted 2025-12-03 00:47:00 -06:00
JeffR 66f924ebd4 Updates TerrainMaterialAsset to utilize similar macros to everything else
Updates groundCover to utilize TerrainMaterialAsset macros in place of straight StringTableEntry for type layers
Fixes formatting for several asset types' inspector fields so they correctly call down into prompting the AssetBrowser being shown with correct field naming, thus allowing fields that are arrays to have the right index when setting the target variable
Updates several asset helper macros to handle blank values for network traffic to actually be sent to client, thus allowing setting an asset to blank on the client, rather than only falling back
2025-12-03 00:33:14 -06:00
Brian Roberts 9fe2eec813
Merge pull request #1587 from marauder2k9-torque/development
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
Placeholder function argument vars
2025-11-26 02:08:42 -06:00
AzaezelX 9bcf8a90b2 dsq detection filters 2025-11-25 19:03:38 -06:00
marauder2k7 891ede5d59 Update assimpAppNode.cpp 2025-11-25 10:09:18 +00:00
marauder2k7 f817d7d903 further assimp fixes
AppMesh position was being scaled twice since the node is now being scaled
Try and resolve fps from file instead of default 30
maxKeyTime should be outside the loop
2025-11-25 08:34:00 +00:00
marauder2k7 a5ed09fa57 fix assimp import
Assimp importer now sets the collada options to fix up axis transformation
bounds are now created by tsmesh
top level nodes are now added to the processNodes stack so bounds and other root nodes can be found correctly
2025-11-24 07:54:53 +00:00
Brian Roberts aa9a8154e1
Merge pull request #1592 from Azaezel/alpha41/crashTestDummies
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
crashfixes
2025-11-23 20:55:41 -06:00
AzaezelX 2b8d7855e4 crashfixes
IRangeValidatorScaled display was looking in the wrong var
afxMagicMissileData was misconverted and lacked a NULL initializer
2025-11-23 15:10:37 -06:00
Areloch f2da4ac828
Merge pull request #1588 from marauder2k9-torque/XM-Document-Blind-Traversal
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
XML Document Blind element traversal
2025-11-21 22:06:29 -06:00
Areloch 91e354fe99
Merge pull request #1591 from Azaezel/alpha41/thumbsSideways
scroll thumb safety
2025-11-21 21:55:57 -06:00
Areloch b8ae99e70e
Merge pull request #1590 from Azaezel/alpha41/glCVBSafety
circular volatile buffer safety
2025-11-21 21:55:47 -06:00
AzaezelX 75883f74cf scroll thumb safety
avoid divnull
2025-11-20 20:56:18 -06:00
AzaezelX 473a45fbca circular volatile buffer safety
add padding to the circular volative buffer overlap test to avoid loop artifacting
2025-11-20 10:04:20 -06:00
marauder2k7 fe982c730c Revert "Update astNodes.cpp"
This reverts commit 9d9fe0db77.
2025-11-16 14:17:14 +00:00
marauder2k7 9d9fe0db77 Update astNodes.cpp 2025-11-16 06:02:53 +00:00
marauder2k7 c53d79a8cf XML Document element traversal
Allows traversing an xml document by element without needing to know the element name
Blind traversal allows more dynamic loading of xml docs and logic to wrap different outcomes

new script functions:
prevElement
nextElement
nextChildElement

<main> <--- we are here
  <child> <-- nextChildElement will take us here
  </child>
  <child2> <-- after nextChildElement nextElement will take us here
  </child2>
</main>
<main2> <-- next element will bring us here
</main2>
2025-11-15 19:02:45 +00:00
marauder2k7 b0f8a5f9bd tscript change
Adds the ability to declare defaults for function arguments

eg
function testFunc(%x = 1, %y = 1)
{
    return %x + %y;
}

can now be called as
testFunc(10) and it will return the value of 11.
2025-11-15 17:38:13 +00:00
Brian Roberts 7e64493dbf
Merge pull request #1586 from Azaezel/alpha41/missionMarkerFilter
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
add conditional filter for missionmarker autospawn
2025-11-13 15:24:33 -06:00
Brian Roberts 8c0e7492f6
Merge pull request #1585 from Azaezel/alpha41/miscFixes11.13.25
misc fixes
2025-11-13 15:24:09 -06:00
AzaezelX cbf407bc10 add conditional filter for missionmarker autospawn 2025-11-13 14:58:36 -06:00
AzaezelX cce40efd35 fix particle glow
multiple preloads were failing to return false or mesages on failure of mandatory entries.
clear out redundant isScriptFile definition
fix default order of /scripts/managedData script files
2025-11-13 14:29:25 -06:00
marauder2k7 320b91fe34 link libs 2025-10-29 01:47:22 +00:00
marauder2k7 873fbbf1fe usse vcpkg just for the libsndfile build chain 2025-10-29 01:40:27 +00:00
marauder2k7 a577d36679 Update CMakeLists.txt 2025-10-28 17:11:25 +00:00
marauder2k7 574ca023d9 update libsndfile to fix linux build 2025-10-28 17:10:28 +00:00
marauder2k7 d4cc9a8324 Update CMakeLists.txt 2025-10-28 16:33:33 +00:00
marauder2k7 cbd3edf872 Update CMakeLists.txt 2025-10-28 16:26:15 +00:00
marauder2k7 44921231a6 Update CMakeLists.txt 2025-10-28 16:24:01 +00:00
marauder2k7 20c0d0c940 Update CMakeLists.txt 2025-10-28 16:19:35 +00:00
marauder2k7 582c20fbce Update CMakeLists.txt 2025-10-28 15:44:45 +00:00
Brian Roberts ca2c502269
Merge pull request #1581 from Azaezel/alpha41/netpipeNarrowing
Alpha41/netpipe narrowing
2025-10-23 14:47:40 -05:00
AzaezelX 3ff3a5eef4 sceneobject xform transmission review 2025-10-23 09:42:47 -05:00
AzaezelX 4579f327b4 network reductons
first pass, tsstatic
sceneobject under review
2025-10-22 23:35:35 -05:00
AzaezelX c0bd8de143 shift glow logic to use a bool. we'll likely make that a scalar at some point, but not at the last second
gl math parity. for proper *command* parity we'll need to hunt down why it' forcing it to version 110
2025-10-20 12:11:56 -05:00
AzaezelX ab80a842aa fix particle glow 2025-10-20 10:56:19 -05:00
Brian Roberts 5d260bc58f
Merge pull request #1578 from Azaezel/development
PROFILE_START_IF profiler macro
2025-10-16 19:37:48 -05:00
AzaezelX ba18fdbe6d PROFILE_START_IF profiler macro
sig is an action, a stringtable variable, and an unquoted string to compare against
demonstrated with bitmapSTB
2025-10-16 18:11:29 -05:00
JeffR 6b3fcd8e74 Shifts the console method for manually invoking load() from being ShapeAsset specific to being generalized to AssetBase 2025-10-13 08:13:37 -05:00
Brian Roberts 1277b1a347
Merge pull request #1573 from marauder2k9-torque/Taml-Json
Taml Binary compilation and JSON format
2025-10-13 07:26:42 -05:00
Brian Roberts 10ac5cc293
Merge pull request #1574 from Areloch/MiscShapeEdFixups
Fixes various reported issues with the ShapeEd update
2025-10-13 07:26:08 -05:00
JeffR e02981c848 Fixes various reported issues with the ShapeEd update
- Updates addSequence for the TSShapeConstructor so it can properly understand if it's handed an assetId or not, and if it is, stores that as the source data for use later
- Has the added benefit of ensuring no erroneous double-ups of data causing accidental overwrites when saving the shapeConstructor because it thinks the data 'changed'
- Fixed saving of new added sequences in shape constructor to properly trip whitespace
- Adds ability to manually trigger a ShapeAsset to load the shape data
- Adjusted the logic for getting a shape/animation asset's constructor when adding a new sequence to avoid false reporting of no constructor existing(by manually loading it)
- Fixed formatting on ShapeEd Anim window to properly scale
- Added onWake calls for the ShapeEd select and properties windows to better prep them position/extents-wise so they should behave more consistently
- Fixed issue of Not closing material editor if it was opened via the Edit Selected Material button in the ShapeEd
- Fixed issue of highlighting of material not going away when ShapeEditor is closed
2025-10-13 00:07:46 -05:00
marauder2k7 e1bcced905 Update assetManager.cpp
load compiled binary if it exists and is newer than the asset file
2025-10-12 19:43:50 +01:00
marauder2k7 48680700ab Update taml_ScriptBinding.h
even simpler
2025-10-12 19:43:48 +01:00
marauder2k7 efe8c184d4 Update taml_ScriptBinding.h
fix spam on saving, we only care about compression when baml is being written out. set it to false for all apart from where specified as binary, if the format is specified then turn off auto format. This warning was also wrong its binary format
2025-10-12 19:43:46 +01:00
marauder2k7 b074b9fc1f binary parsing working
finally....
2025-10-12 19:43:44 +01:00
marauder2k7 140e9dbfc6 taml binary parsing
added taml binary parser
2025-10-12 19:43:42 +01:00
marauder2k7 55afef7b3d Update assetManager.cpp
fs
2025-10-12 19:43:41 +01:00
marauder2k7 91fc70f15a Update assetManager.cpp 2025-10-12 19:43:39 +01:00
marauder2k7 64605a5c00 Update assetManager_ScriptBinding.h 2025-10-12 19:43:38 +01:00
marauder2k7 f1658d2e1e add compile options to asset manager
CompileAll - allows us to compile all assets to binary
CompileModuleAssets - allows us to just compile assets for a specific module
CompileAsset - compile a single asset
2025-10-12 19:43:36 +01:00
marauder2k7 7d497383da adds json back to taml
Allow taml to be compiled and read as json

All of this was already there just was hidden from cmake and code was commented out so just a commit to reapply this. The rest is just some cleanup
2025-10-12 19:43:35 +01:00
AzaezelX bb41fd76c1 cmake cleanups
skip out on building zlib examples
set skip_install_rules to true to better support some pending third party libraries
2025-10-08 14:53:32 -05:00
Brian Roberts 7a0ae4c7af
Merge pull request #1570 from Azaezel/alpha41/consoleCleanupos
misc cleanups related to ranges
2025-10-07 18:07:05 -05:00
Brian Roberts 432318224e
Merge pull request #1571 from Azaezel/alpha41/evalExtension
eval echo aug
2025-10-07 18:06:55 -05:00
AzaezelX 9b65bf866c eval echo aug
allow endusers to dump out the contents of an eval'd string being attempted
2025-10-07 16:33:13 -05:00
AzaezelX bd44ee5341 misc cleanups related to ranges
gui padding is a >=0 element
guitabbookctrl.selectedPage defaults to -1
shape editor triggers derived from textrows must ensure they are actually loking aty an entry. -1 is the return value of" not found"
2025-10-07 16:31:24 -05:00
AzaezelX da2fd36dd2 add safeties for GuiShapeEdPreview animthread
bunch of spots we were assuming no one would ever script an invalid entry.
2025-10-06 17:47:11 -05:00
Brian Roberts 191e69e589
Merge pull request #1568 from Areloch/ShapeEditorFixupsAndImprovements
Updates the ShapeEditor with various fixes and QoL changes
2025-10-06 07:42:49 -05:00
JeffR c5a810ae06 Updates the ShapeEditor with various fixes and QoL changes
- Updates the position/extent of most of the labels and fields so they no longer cut off or overlap
- Added a new button for explicitly added sequences based on existing sequences. This lets the Add Sequence button be exclusive for adding in new sequences from external assets improving stability and making the general behavior more consistent
- Adding new sequence now prompts a window to pre-fill data like the sequence name, source sequence name and start/end frames
- Made the shapeConstruct handle the adding of sequences handle the lookup of external assets consistent to the rest of the engine
- Fixes name presentation for ShapeAnimationAssets in AB
- Adds separate dropdown for the sequence properties section for picking the desired source sequence name. This makes it possible to pick an external animation source AND the internal sequence name via the UI, instead of needing to script it by hand
- Fixed saving behavior to properly restore the playback thread
- Fixed saving behavior to not needlessly save the asset def when editing sequences but before you clicked the save button
- Made it so clicking the Assets tab in the select window opens the AB, but re-selects the Scene tab so you're not fighting which tab is selected
- Adjusted positioning defaults of all the windows so be more standard
- Fixed openShapeInShapeEditor behavior
2025-10-06 03:14:12 -05:00
Brian Roberts 4e266ecab8
Merge pull request #1567 from Azaezel/alpha41/zlibUpdate
upgrade zlib to 1.3.1
2025-10-05 23:33:00 -05:00
Brian Roberts 071de73021
Merge pull request #1566 from TristonC13/development
addressed some refBase.h warns
2025-10-05 23:32:50 -05:00
Brian Roberts a107273e0b
Merge pull request #1561 from Azaezel/alpha41/playerPoking
player extendabilty flexpoints
2025-10-05 23:32:40 -05:00
AzaezelX 8a54622bd7 upgrade zlib to 1.3.1 2025-10-05 14:16:49 -05:00
Triston Caton c24d0211bd more constexprs
# Conflicts:
#	Engine/source/core/util/refBase.h
2025-10-05 13:24:54 -04:00
Triston Caton 8d1e95b3f3 resolved constexpr constructor not mem-initializing member variables 2025-10-04 19:38:30 -04:00
Triston Caton 4fc85ba717 addressed some refBase.h warns 2025-10-04 17:18:38 -04:00
Brian Roberts ed717abaf7
Merge pull request #1565 from Azaezel/alpha41/DisMaxDist
change per slot maxdistance to maxSlotDistance
2025-09-30 17:14:56 -05:00
AzaezelX 2316c164e9 change per slot maxdistance to maxSlotDistance
it conflicts with the general xaxDisance
2025-09-30 17:14:30 -05:00
AzaezelX 5989bca127 playaudio related fixes
soundassets in general: initialize the ease to default
for the ShapeBase::updateAudioState, we never call that without first checking if the asset is defined, *and* isvalid is not valid if it's never tried loading it. so that's both redundant *and* actively counterproductive for a filter
2025-09-29 22:13:12 -05:00
AzaezelX b8e135759f player extendabilty flexpoints
set several variables and methods to prtected instead of private for ease of inheritance
2025-09-27 15:38:08 -05:00
Brian Roberts f1723bbb28
Merge pull request #1560 from marauder2k9-torque/assimp-armature-fixes
DSQ Fixes
2025-09-23 13:22:34 -05:00
marauder2k7 10acab1b07 more fixes
DSQ Fixes
2025-09-23 19:09:20 +01:00
AzaezelX b69c0d2a0f even more precice filtering for dts vs dsq 2025-09-23 11:52:50 -05:00
marauder2k7 2606b6366b Assimp just armature tests
Remove the check for incomplete scene
Move child recursion to assimpAppNode in BuildChildList
same for meshes
2025-09-23 15:59:24 +01:00
AzaezelX f5875dd5a2 reinforce dsq or dts filter 2025-09-23 08:51:24 -05:00
Brian Roberts a8d370038a
Merge pull request #1556 from Azaezel/alpha41/addMeshAug
allow the addmesh command to take shapeassets as an entry
2025-09-23 08:41:57 -05:00
AzaezelX d813be4ea0 allow the addmesh command to take shapeassets as an entry 2025-09-23 08:41:38 -05:00
marauder2k7 e55247e015 Update CMakeLists.txt
Skip adding properties to precompiled libs
2025-09-23 14:31:15 +01:00
Brian Roberts eb380e58a3
Merge pull request #1554 from Azaezel/alpha41/decalAtlasWipWork
decal atlas and decal editor corrections
2025-09-22 08:49:42 -05:00
AzaezelX 19822e119a take uv coordinates into account for decal projection box 2025-09-20 12:25:16 -05:00
Brian Roberts ba56a8861b
Merge pull request #1553 from Azaezel/alpha41/reskinShank
remove redundant reskin
2025-09-19 09:46:43 -05:00
AzaezelX 7f1b83f1c6 remove redundant reskin 2025-09-19 09:36:46 -05:00
AzaezelX 82435693dd decal atlas support work
allow a textureCoordCount to be used raw when texrows and coumns are not >1 in order to let the transmitted vector actually be used

correct and augment editDecalDetails to now read
      DecalEditorGui.editDecalDetails( %this.instanceId, %pos, %tan, %size, %uvID  );
it needed the word split to begin with, and also added the uvID for instance frame tracking/overriding
same token added a  getDecalFrame(%this.instanceId); method

todos: add a frame lookup and selector for the instance tab, modify decal display to account for non-square uv portions
2025-09-19 09:09:55 -05:00
JeffR 11548d2630 Added early-out check if we're already successfully loaded 2025-09-15 21:26:56 -05:00
JeffR ce1be5e881 Makes sure the loading code for terrain assets is properly assigned.
This ensures stuff like saving works properly.
2025-09-15 21:16:34 -05:00
AzaezelX cd5f897e55 dsqs area subset of dts data
ensure if an input file contains mesh data *and* an animation, thats a dts, if it's *just* an armature, that's dsq
also fix shapeanimation tooltip display
and for furutere utility,  TSShape::isShapeFileType(Torque::Path filePath); is now static since it only requires a path, not an object instance per-se
2025-09-14 15:18:03 -05:00
Brian Roberts dae9642ef8
Merge pull request #1549 from Azaezel/alpha41/filterForFBX
expand TSShape::addSequence filetype filtercheck
2025-09-13 17:08:31 -05:00
AzaezelX caae061b0e expand TSShape::addSequence filetype filtercheck
if we're going to be looking into additional file formats for animation sources, need to check all of the extensions
2025-09-13 10:14:52 -05:00
Areloch d7d64fdd9f
Merge pull request #1548 from Azaezel/alpha41/eventManagerSafeties
reformulation of subscriber message consumer
2025-09-12 00:46:56 -05:00
AzaezelX 6389b32f9b reformulation of subscriber message consumer
add extra safeties to subscriber message recipts

and just for good measure, don't bother listening for an event that will never be triggered
2025-09-11 22:28:44 -05:00
Brian Roberts 3bb948b431
Merge pull request #1547 from Azaezel/alpha41/nixFixProbePoke
fix filename referencing for isfile on unix derivative o/s's
2025-09-11 15:51:21 -05:00
AzaezelX 20924fb38d fix filename referencing for isfile on unix derivative o/s's 2025-09-11 14:57:56 -05:00
JeffR 50e05800f4 Fixes issues with shifting the gui selection dropdown to be searchable via the Ex control. 2025-09-06 19:28:14 -05:00
AzaezelX ba32094b7b update openal-soft to 1.24.3
keeping the alt 87514151c4 (diff-73a8dc1ce58605f6c5ea53548454c3bae516ec5132a29c9d7ff7edf9730c75be)
2025-09-03 11:09:27 -05:00
Brian Roberts 12db0500e8
Merge pull request #1543 from Azaezel/alpha41/curdledCurl
redundant file cleanup
2025-08-26 18:40:23 -05:00
Brian Roberts 9b266cc6bd
Merge pull request #1542 from Azaezel/alpha41/stabbyStabilizers
hovervehicle stabilizer fix for groundplane (and other things)
2025-08-26 18:40:14 -05:00