Commit graph

2795 commits

Author SHA1 Message Date
Areloch 2c2c9659e1 Merge branch 'alpha40_HiddenHugs' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:17:24 -05:00
Areloch 638a515702 Merge branch 'alpha40_BandingBreakup' of https://github.com/Azaezel/Torque3D into Preview4_0_w_alph40_cleanups 2020-05-16 02:16:52 -05:00
Areloch 9b907e77ee Swaps some references from the windows SDK-specific FLT_MAX to T3D's F32_MAX
Takes the makeFullPath in findTSShapeConstructor and turn it into a string before passing it along to the Filename to make stricter compilers happy
Removed some referenced to fields that don't exist in the current build
Removed unneeded ASM language activation for the cmake files
Adjustments to material map assembling macros to better comply to stricter compilers
2020-05-13 02:10:11 -05:00
Areloch 39d9e6039c Merge branch 'alph40_cleanups' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-05-13 01:29:58 -05:00
AzaezelX ebb7ed1b78 uninitialized variables-math 2020-05-11 16:17:40 -05:00
AzaezelX 5f59ebbacc uninitialized variables-materials 2020-05-11 15:59:22 -05:00
AzaezelX 36cbc4c962 uninitialized variables-verve 2020-05-11 15:53:14 -05:00
AzaezelX 43259e29c1 uninitialized variables-util 2020-05-11 15:46:44 -05:00
AzaezelX 9e1c22204f uninitialized variables-ts 2020-05-11 15:40:55 -05:00
AzaezelX c2e74f375a uninitialized variables-terrain 2020-05-11 15:37:43 -05:00
AzaezelX fabd5864fa uninitialized variables-t3d 2020-05-11 15:30:21 -05:00
AzaezelX 87603029db uninitialized variables-sim 2020-05-11 15:26:52 -05:00
AzaezelX a1a6143e01 uninitialized variables-sfx 2020-05-11 15:24:49 -05:00
AzaezelX 7392d598da uninitialized variables-scene 2020-05-11 15:20:03 -05:00
AzaezelX 8aa03a4ac9 uninitialized variables-renderinstance
(cherry picked from commit dcbc22bf8450250f192ae56b303affd760f63db1)
2020-05-11 15:17:09 -05:00
AzaezelX 522578074c looks like distance needs to default to 0, not max, for raycast purposes.
(cherry picked from commit 00ee743559e19bc2dd3cbf92060b8bf089d5aceb)
2020-05-11 15:15:48 -05:00
AzaezelX bd8a72005e uninitialized variables-platform
(cherry picked from commit 36fd324de7a29a8f4bb84b7622ae925acb1d3760)
2020-05-11 15:15:01 -05:00
AzaezelX bfcc83638d uninitialized variables-core-2
(cherry picked from commit 7c329699e4e4d13a164b2483e174b5f555ea9344)
2020-05-11 15:13:29 -05:00
AzaezelX b6c33bdd2b uninitialized variables-persistence 2020-05-11 15:12:50 -05:00
AzaezelX a46bf3d7e5 uninitialized variables-navigation 2020-05-11 15:08:57 -05:00
AzaezelX f52c3d5ed2 uninitialized variables-lighting 2020-05-11 15:07:21 -05:00
AzaezelX 9fef1b3cd1 uninitialized variables-gui 2020-05-11 15:03:27 -05:00
AzaezelX b9c207765e uninitialized variables-gfx 2020-05-11 15:00:25 -05:00
AzaezelX 1efb687867 uninitialized variables-environment and forrest 2020-05-11 14:56:04 -05:00
AzaezelX 2c1508c169 uninitialized variables-console 2020-05-11 14:40:31 -05:00
AzaezelX e9415a0994 uninitialized variables-collision 2020-05-11 14:33:59 -05:00
AzaezelX 1cea8ffacb uninitialized variables-core 2020-05-11 14:00:35 -05:00
AzaezelX 3c0360fd2f uninitialized variables-afx 2020-05-11 13:54:23 -05:00
Areloch 4978538490 Includes required support functions for ImageAsset 2020-05-11 02:30:58 -05:00
Areloch 3e36dbb06f Finished out primary comment documentation and initPersistField hook-ins 2020-05-11 02:08:07 -05:00
Areloch fb31f9d1e5 Implements the Asset Importer integrated into the engine, avoiding the need for calldowns into the tool suite to import assets 2020-05-10 03:48:08 -05:00
Areloch 157b114ec7 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
AzaezelX 1a33d483a3 ensure we've got a known stateblock set for GeneratePrefilterMap 2020-04-14 12:40:31 -05:00
Areloch 4f1c0769b1 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2020-04-05 01:28:44 -05:00
Areloch 32d8acd1b3 Adds functionality to duplicate an existing asset, currently works with image and level. Other types to follow.
Adds editor setting for default target module, as well as if duplication of an asset should prompt for a new name, or proceed automatically with a default naming behavior.
Shifts collada loader logic back to collada from assimp until the oddities with the assimp DAE import configs is ironed out.
2020-04-05 01:28:34 -05:00
Areloch 8b0ca60b39 Merge pull request #152 from OTHGMars/assimp_scale
Assimp Importer: Shape format scales.
2020-04-02 12:56:38 -05:00
AzaezelX 112ad70328 crashfix for (some) gui elements
looks like we did in fact need to reapply shaders at the tail end of GFXD3D11Device::endReset or it looses track and crashes out
2020-04-01 21:10:40 -05:00
AzaezelX 9c71d5eace Merge branch 'Preview4_0' into alpha40_HiddenHugs 2020-03-29 17:40:22 -05:00
AzaezelX bf50af7954 show/hide children automagically for simgroups via inspector
operates by shifting oninspectpostapply callback further down the inheritance hieracrchy and add some scripts to trigger sethidden and setlocked for all sceneobjects in a given simgroup if the states are set for that group
2020-03-29 17:36:33 -05:00
OTHGMars 76550a5859 Adds a format scale multiplier for shape formats that use a default unit other than meters. 2020-03-22 02:25:12 -04:00
Areloch 9524e77596 Merge branch 'alpha40_zonePicker2' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-03-21 01:06:03 -05:00
Areloch 8b4d4633bc Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2020-03-21 00:54:30 -05:00
Areloch 7029024b8e Updated TSStatic to utilize the getShapeAsset utility functions, and shifted the loader logic to utilize ShapeAssets exclusively, having straight file names go through the utility function to find/process a relevent asset. 2020-03-21 00:36:49 -05:00
Areloch 6ade6f08ce 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
AzaezelX c9518f678a compilation correction 2020-03-15 00:15:58 -05:00
AzaezelX ef264083ae followuup to #837378a -safety checks for select within zone 2020-03-11 12:41:21 -05:00
Areloch 0e006b2264 Merge pull request #147 from Azaezel/alpha40_TranslucentShadows
adds alphatest shadows for translucent objects
2020-03-11 00:44:30 -05:00
AzaezelX a308261886 followup: convex shape translucent with alphatested shadow support 2020-03-10 16:11:41 -05:00
Areloch 0bf8eb5517 Merge pull request #145 from Azaezel/alpha40_zonePicker
select within zone pushbutton
2020-03-03 11:06:52 -06:00
Areloch 2d015bc426 Merge branch 'alpha40MakeMats' of https://github.com/Azaezel/Torque3D into Preview4_0 2020-03-03 10:48:07 -06:00