Commit graph

157 commits

Author SHA1 Message Date
Tony e3ea4c549c Added fix for #365 from PR #367 - buffer overrun 2021-01-21 18:38:00 -05:00
Areloch d1e28f4872
Merge pull request #2328 from Areloch/neverImportMat
Adds a filter for materials to never import when importing a shape
2019-05-04 11:51:21 -05:00
Areloch b759bde0c0
Merge pull request #2043 from John3/toolShapes_3
cleaning the modules
2019-03-31 14:41:35 -05:00
Areloch c1dabd4bd6
Merge pull request #2327 from Areloch/loadCachedDTS
Adds ability to skip loading of cached dts in enumColladaForImport
2019-03-30 16:33:37 -05:00
Areloch 0c1288f86c Adds a filter for materials to never import when importing a shape 2019-02-23 22:04:17 -06:00
Areloch 892077973b Adds ability to skip loading of cached dts in enumColladaForImport 2019-02-23 21:34:11 -06:00
Areloch 1c2f90a190 Initial implementation of the Scene object for handling scenes/levels in a more consistent and deliberate way. 2019-02-23 15:55:28 -06:00
suncaller 7f7e402c42 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
Areloch 3a71c75596
Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Areloch 36db8eacc3
Merge pull request #2236 from Azaezel/memberMess
cleans up all 'hides' warnings (at time of writing)
2018-05-30 20:36:43 -05:00
Areloch 2d03a29814
Merge pull request #2104 from OTHGMars/ScaleCollision
Sets scale for collision primitives created in the shape editor.
2018-04-30 23:39:33 -05:00
Areloch 9b47463875
Merge pull request #2108 from Azaezel/reskinRedux
allows for arbitrary reskinning
2018-04-30 23:37:36 -05:00
Azaezel 59130078e2 Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
2018-04-23 10:08:14 -05:00
Lukas Joergensen 5bde18143f Eliminate DefineConsoleFunction 2018-04-17 20:54:08 +02:00
Areloch 037d089c4d
Merge pull request #2146 from Azaezel/specializationShenanigans
changes find, swap, for_each, and delete_pointer from global to t3d namespace
2018-04-17 03:02:03 -05:00
Azaezel f6b7d3711d slimmed down shadowvar cleanups, plus removal of an unused membervar. 2018-04-02 03:06:58 -05:00
Azaezel c84bd23e17 Revert "collada/ts chain shadowvar and member var clenaups"
This reverts commit 3ce15b33eb.
2018-04-02 03:01:52 -05:00
Azaezel 47c62677ac void ColladaUtils::ExportData::processData() var clarifications 2018-03-28 17:50:17 -05:00
Azaezel 28e509af1a Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
2018-03-28 15:42:34 -05:00
Azaezel 3ce15b33eb collada/ts chain shadowvar and member var clenaups 2018-03-16 18:40:32 -05:00
Azaezel ae514ef808 animation clarification 2018-03-13 17:54:35 -05:00
Azaezel 3ceaa0ed50 cleaned up member::radius 2018-03-13 15:31:00 -05:00
Azaezel 4615bd6db8 more compiler compliant cleanups plus a full set of tsMesh::foo to tsmesh::mFoo class var conversions for consistency 2018-03-13 14:53:23 -05:00
Azaezel b55db9a143 TSMesh::castRayOpcode method var clarifications/match for .h file 2018-03-13 14:26:17 -05:00
Azaezel 57af794ee3 clarified the texture-atlas varnames a bit. (shadow vars cleanup) 2018-03-13 12:16:17 -05:00
Azaezel ef0a4bee08 tsmesh: parentMesh and indicies to mParentMesh and mIndicies (usual deal, complaints about method vars or temp ones potentially conflicting with class vars) 2018-03-13 11:36:36 -05:00
Azaezel 242a51eefe bounds to mBounds conflict avoidance 2018-03-13 01:05:15 -05:00
Azaezel f08339c534 many *many* generic is and js 2018-03-13 00:57:31 -05:00
Azaezel f10e5d5933 pos to mSeqPos to resolve a method entry vs class entry 2018-03-12 23:09:20 -05:00
Azaezel 35d5e8178e overgeneralised variable 'name' clarified between use-cases 2018-03-12 04:04:41 -05:00
Areloch 43ca2c5bc2 Cleanup of export function to remove redundant arg
Removed unused var
Cleaned up collision export on convexShape
Added prefab export functionality
2018-03-04 16:03:39 -06:00
Areloch 501a322435 Adds handling for the proper updated exporting of mesh for convexShapes 2018-03-04 15:10:44 -06:00
Areloch f309b736ca Expanded mesh baking functionality, now supporting baking of LODs and Collision meshes 2018-03-01 01:51:18 -06:00
Areloch 5ad9ae30bb Bugfixes and improvements for the animation component and related asset behavior.
Adds in ability to establish a shape animation asset as being cyclic or blended.
Adds functionality for blended animations to integrated into shapeAssets.
2018-02-04 14:31:28 -06:00
Azaezel 491a7dcfdd tAlgorythm fed namespace T3D for better library interoperability. resulted in the need to specify usage in... a few places. 2017-12-27 22:57:47 -06:00
Azaezel 0079899281 new method: TSShapeInstance::resetMaterialList(). Sets all object-instance mapto values back to initial state. reskin now does so to avoid having to track origional values independently. (so say, if you've already got skin1 plugged in to one, and nothing in to another, no need to set skin1=skin2 on the first and skin2 or base=skin2 on the second to swap both on over to skin2).
also by request, went ahead and killed case sensitivity for mapto string replacement when reskinning.
2017-11-12 23:58:34 -06:00
Azaezel 5408a5eade allows arbitrary material name string replacement, rather than forcing folks to start with base. ie: an entry of skin = "blue; area=fire"; would replace base_area_grid with blue_fire_grid as the used material 2017-10-24 19:15:54 -05:00
OTHGMars c61d71a17c Sets scale for collision primitives created in the shape editor. 2017-10-18 03:25:05 -04:00
Areloch 35d649b57e Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -05:00
Azaezel aa31f862cd Sanity check to ensure detail levels shift in tandem for skinned meshes 2017-09-13 14:58:54 -05:00
Marc Chapman 9682ba318b triggers -- exposes trigger states to other code. 2017-07-27 01:34:44 +01:00
Johxz e7c98e504b corrected shape path 2017-07-10 20:02:06 -05:00
Areloch 0801a3cca8 Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Areloch 87283640b7 Removed the unneeded PPC And Altivec elements, and removed the LOCBUILD flag 2017-04-09 23:26:35 -05:00
Areloch 26fd24fbab Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Thomas "elfprince13" Dickerson d64e2a7019 Removed constexpr use to support VS2013 2017-01-10 23:22:05 -05:00
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Thomas "elfprince13" Dickerson 39bea37fa0 minor fixes, and converted the type table 2017-01-06 17:19:36 -05:00
Thomas "elfprince13" Dickerson 500383591c TSShapeConstruct commands converted 2017-01-06 17:19:27 -05:00
Johxz f610c7ab24 fix atlas texture, extra info for opencollada 2016-12-09 16:29:23 -06:00