Commit graph

5287 commits

Author SHA1 Message Date
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