Commit graph

5441 commits

Author SHA1 Message Date
AzaezelX 540e82b95c template mixins need this-> specified 2022-02-14 19:50:37 -06:00
AzaezelX 1f7d06542e doublesided material renderfix
as per the OG writeup, need to apply horizon trick strictly to the specular component
2022-02-14 14:42:15 -06:00
Brian Roberts e90419ab7f
Merge pull request #727 from Areloch/SingleProbeCapturingFix
Probe Bake Capturing flag toggle fix
2022-02-14 12:07:07 -06:00
JeffR 28bf6c5b8f Ensures that the capturing flag is toggled regardless of how we invoke for a probe to bake(previously it was only done with the batch bake) 2022-02-14 08:58:19 -06:00
Brian Roberts b9cd83a898
Merge pull request #726 from Areloch/DefaultValueSaveFix
Improves logical checks for the default value so it's more sane and stable
2022-02-14 01:11:56 -06:00
Brian Roberts b0251b9aec
Merge pull request #725 from Areloch/ProbeBinReworkPR
Rework of the Probes and Probe Bin
2022-02-14 01:11:47 -06:00
JeffR a0f8b29da7 Improves logical checks for the default value so it's more sane and stable
Allows creation of polyhedrons via constructor with a origin and vector format, allowing to have default polyhedron values on triggers and physical zones
2022-02-14 01:07:39 -06:00
JeffR e04f844240 Scaling correction to probes in deferred mode to improve parallax adjustment
Ensure that probes are masked to be rendered during bake passes so they can contribute during a bake allowing multibakes
Adjusted order of the connect data for the forward shaders to fix a mis-port issue
2022-02-13 19:24:01 -06:00
JeffR c1a88ec423 Complied connect var data in GL to D3D for the wsPosition
Made the use of ints for the cubemapIdx in the shaders consistent
2022-02-12 17:32:30 -06:00
JeffR 79eebdd5f3 Cleaned and repacked work to update the probe bin and reflection probe behavior to clean and standardize it. 2022-02-12 15:53:40 -06:00
Brian Roberts 68ae0ca96d
Merge pull request #723 from Areloch/MaterialAndTerrainMaterialPacking
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file
2022-02-02 04:46:35 -06:00
JeffR 696c2e2eec Add sanity check for default value results checking when filtering out default values
Add additional utility functions for updating parsed object data in the project importer
Adds logic to find and associate FX materials to their terrainMaterials and adding them to the terrian material asset if found on project importer
2022-02-02 01:11:33 -06:00
JeffR b4e346aa3f Adjustments to save out code when writing fields such that if the TAML writer is marked as not writing defaults, it doesn't. And makes the regular simobject save out not write default values as the default behavior 2022-01-31 20:57:57 -06:00
JeffR 5e1eb80bc1 Fixed handling issue where it would misparse lines that would contain new/singleton/datablock keywords
fixed incorrect getSubStr function invoke
2022-01-30 19:14:36 -06:00
JeffR 630285def6 Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file
Also updates importers to correctly handle this change
Adds ability for taml XML serialization to properly assign array'd fields
Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized
AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file
Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 11:50:16 -06:00
Brian Roberts 656475deaf
Merge pull request #722 from Azaezel/alpha40/ambiguousRef
clean up ambiguous reference
2022-01-22 13:16:13 -06:00
AzaezelX eeff4d858a clean up ambiguous reference 2022-01-22 03:27:22 -06:00
Brian Roberts 3b12fefdf1
Merge pull request #721 from OTHGMars/guiBmpFix
GuiBitmapCtrl named texture fixes.
2022-01-22 01:03:05 -06:00
OTHGMars bed3be278c GuiBitmapCtrl named texture fixes.
Adds StringTableEntry when bitmap is set via setBitmapHandle.
Prevents existing bitmap handles from being dropped in onWake (they are preserved in onSleep).
2022-01-21 19:47:41 -05:00
Brian Roberts 024dcfaabd
Merge pull request #720 from Areloch/SimGroupSimSetCheck
Changes the -> syntax check from exclusively checking simgroups to checking simsets, allowing both to be used
2022-01-21 17:45:35 -06:00
JeffR ed13bdfdd2 Changes the -> syntax check from exclusively checking simgroups to checking simsets, allowing both to be used 2022-01-21 16:01:44 -06:00
Brian Roberts d14ffc8714
Merge pull request #719 from Areloch/UpdatedProjectImporter
Updated project importer
2022-01-20 17:52:25 -06:00
JeffR 1952820ef2 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into UpdatedProjectImporter 2022-01-20 17:48:17 -06:00
JeffR 728aa83481 Comments and cleanup 2022-01-20 17:48:01 -06:00
JeffR ecd35df7e9 Implementation of updated handling of Legacy Project importer to better seperate out importer versions as well as more explicit processing of incoming content 2022-01-20 01:14:43 -06:00
Brian Roberts e2a2f26828
Merge pull request #717 from lukaspj/fix/improve-taml-xml-formatting-no-tampering
Improve tinyXml2 output formatting
2022-01-17 05:03:24 -06:00
Brian Roberts 33e3e41c8b
Merge pull request #718 from Areloch/SoundAssetFleshout
Sound Asset Fleshout
2022-01-03 20:58:55 -06:00
JeffR 15ef8b4fbe Cleaned up implementation of #712
Also updates other game classes like the shapebase to utilize the sound asset hooks properly.
2022-01-03 20:57:10 -06:00
Lukas Aldershaab 3ef57168b2 Cleanup fsTinyXml implementation 2022-01-03 21:16:34 +01:00
Lukas Aldershaab 5abd66dfa3 Split PrettyPrinting functionality from VFS printing 2022-01-03 21:10:26 +01:00
Lukas Aldershaab 165459c90b Improve tinyXml2 output formatting 2022-01-02 12:18:25 +01:00
Brian Roberts 3812ce2e82
Merge pull request #715 from Areloch/ConvexShapeSpawnFix
Fixes creation of convex shapes via editor
2021-12-25 17:11:08 -06:00
JeffR cde1d68f78 Fixes handling in the generic creator function to deal with commands formatted with "return " at the start AND without
Fixes assignment of default material to convex shape when the toolbar button is pressed to create a 1u cube automatically.
2021-12-25 12:30:31 -06:00
Brian Roberts c7342cc64f
Merge pull request #714 from Areloch/AssetPreviewUpdate
Updates the handling of the baking of shape asset previews
2021-12-24 17:34:42 -06:00
JeffR b70faae38f Updates the handling of the baking of shape asset previews to generate them with support for view angle control to improve visibility, as well as supporting overriding of a material in the preview bake
Also utilizes the updated bake handling to have material asset previews render as a sphere shape asset, overriding with the material asset's material, improving distinction of what is a material asset vs image asset
Also updates the sphere preview mesh to be more generic and not only for reflection probes
2021-12-24 17:26:45 -06:00
Brian Roberts d9bedbe31c
Merge pull request #711 from Azaezel/alpha40/audioWork
fix ServerPlaySound
2021-12-16 18:25:28 -06:00
AzaezelX 7c32abd026 fix ServerPlaySound 2021-12-16 18:25:14 -06:00
Brian Roberts f88e82c099
Merge pull request #705 from Azaezel/alpha40/playSoundAugs
augments playSoundAsset
2021-12-16 01:46:51 -06:00
Brian Roberts 09cfeb08a9
Merge pull request #707 from Ragora/bugfix-macos-install-build
WIP: BugFix: Correct 'make install' not working on MacOS
2021-12-16 01:41:19 -06:00
Brian Roberts 8be84f872d
Merge pull request #709 from rextimmy/gl_anisotropy_fix
fix opengl device not returning the correct anisotropic value
2021-12-16 01:12:49 -06:00
rextimmy e1398895b3 fix opengl device not returning the correct anisotropic value 2021-12-15 20:09:18 +10:00
Robert MacGregor bd979aa5cf * Adjustment: Minor formatting fix in basics.cmake. 2021-12-14 22:23:23 -05:00
Robert MacGregor 2746dcfe48 Merge remote-tracking branch 'main/Preview4_0' into bugfix-macos-install-build 2021-12-14 22:19:31 -05:00
Robert MacGregor d1dbfad0c7 * [MacOS] BugFix: Correct the MacOS executable not being output to the game directory when no build configuration is provided. 2021-12-14 22:06:47 -05:00
Brian Roberts c7bf58c0a7
Merge pull request #708 from Ragora/bugfix-unix-include-paths
BugFix: Correct a windows-only pathing issue in terrMaterial
2021-12-14 18:47:27 -06:00
Robert MacGregor deb994cb13 * BugFix: Correct a windows-only pathing issue in terrMaterial. 2021-12-14 19:44:44 -05:00
AzaezelX a76613604a augments playSoundAsset
adds hooks to the garbage collector
exposes an (optional) position.
adds a ServerPlaySound + clientCMDPlaySound command pair to trip that for all clients
2021-12-13 20:36:50 -06:00
Brian Roberts 3c95fa808e
Merge pull request #704 from Areloch/TerrainSideProjectFix
A clean implementation of Lukas' Fix side projection #684 PR with Az's addendum fix rolled in
2021-12-13 16:30:16 -06:00
JeffR 434c6c26fe A clean implementation of Lukas' Fix side projection #684 PR with Az's addendum fix rolled in 2021-12-13 15:56:14 -06:00
Brian Roberts 1f4c488640
Merge pull request #703 from Ragora/bugfix-allocation-size-mismatch
BugFix: Fix a Windows ASAN reported allocation/deallocation mismatch error.
2021-12-13 07:35:59 -06:00