TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-02 02:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4572 commits 5 branches 33 tags 958 MiB
Commit graph

221 commits

Author SHA1 Message Date
Areloch 59b6e67ecf Merge pull request #2043 from John3/toolShapes_3 
cleaning the modules
 2019-03-31 14:41:35 -05:00
Areloch 80c036b9b0 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
OTHGMars d8bfe6073f Fixes a crash from importing shapes with unnamed bones. 2019-03-29 04:02:41 -04:00
OTHGMars 7c2baf51d6 Adds the aiProcess_FlipUVs flag setting. 2019-03-29 03:57:36 -04:00
OTHGMars 71a5f9498b Fixes primitive assignment. AppMesh::primitives in this case is a purely collada/dts concept and is not indices or faces. Any mesh with more than 2^16 vertices should be split into multiple primitives to avoid indexing across a 16 bit boundary. Mesh division into primitives has not been implemented for assimp yet. 2019-03-28 04:16:22 -04:00
OTHGMars bc722a353d Fixes vertex weight assignments. 
Adds upaxis override option to match collada importer.
 2019-03-27 12:46:43 -04:00
OTHGMars 2d795b2493 Fixes indexing for vertex weights. 2019-03-24 07:08:24 -04:00
OTHGMars 0be93d6cf5 Implements ignore filter for assimp fbx dummy nodes. 
Adds gltf binary to list of supported extensions.
 2019-03-24 06:25:38 -04:00
OTHGMars 1d073e0b09 Changes ObjectOffset parameter name to prevent confusion/conflict with the base class member AppMesh::objectOffset. 
Error checking for meshes that do not have stored normals.
Incorrect first attempt at vertex weights.
 2019-03-24 06:23:58 -04:00
OTHGMars 1a7e6699c9 Adds conversion functions and changes implementation of getTransform(). 2019-03-24 06:18:20 -04:00
Areloch 25ce4477ce Just the functional assimp lib rather than the entire assimp repository unnecessarily. 2019-02-28 16:37:15 -06:00
Areloch a7a5463ad1 Adds a filter for materials to never import when importing a shape 2019-02-23 22:04:17 -06:00
Areloch 05909cf897 Adds ability to skip loading of cached dts in enumColladaForImport 2019-02-23 21:34:11 -06:00
Areloch 9bf8337e4a 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
Areloch bf170ffbca WIP of assimp integration. 2019-02-08 16:25:43 -06:00
suncaller 31d0eb16f8 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
Azaezel 1eed979a9c Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Areloch 6cf0c9e360 Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Areloch b4a1d18f42 Core implementation of Physical Based Rendering. 2018-09-15 20:19:57 -05:00
Areloch 5a1af9ccd7 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 de67b30edc 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 1f2847bc11 Merge pull request #2108 from Azaezel/reskinRedux 
allows for arbitrary reskinning
 2018-04-30 23:37:36 -05:00
Azaezel 13334b4d5c 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 e718841467 Eliminate DefineConsoleFunction 2018-04-17 20:54:08 +02:00
Areloch bc1b506205 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 0e3c128ec4 slimmed down shadowvar cleanups, plus removal of an unused membervar. 2018-04-02 03:06:58 -05:00
Azaezel 0c316dab46 Revert "collada/ts chain shadowvar and member var clenaups" 
This reverts commit 3ce15b33eb.
 2018-04-02 03:01:52 -05:00
Azaezel 9fbeb3e2d0 void ColladaUtils::ExportData::processData() var clarifications 2018-03-28 17:50:17 -05:00
Azaezel cbce2ee805 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 53ce915dcf collada/ts chain shadowvar and member var clenaups 2018-03-16 18:40:32 -05:00
Azaezel 190a647254 animation clarification 2018-03-13 17:54:35 -05:00
Azaezel 1c62080f7f cleaned up member::radius 2018-03-13 15:31:00 -05:00
Azaezel c98f257cae 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 e5a6f4ee3d TSMesh::castRayOpcode method var clarifications/match for .h file 2018-03-13 14:26:17 -05:00
Azaezel 4915db0a32 clarified the texture-atlas varnames a bit. (shadow vars cleanup) 2018-03-13 12:16:17 -05:00
Azaezel e2d27952aa 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 654fc29dc2 bounds to mBounds conflict avoidance 2018-03-13 01:05:15 -05:00
Azaezel 2b6b1acdd6 many *many* generic is and js 2018-03-13 00:57:31 -05:00
Azaezel a5ab4acd01 pos to mSeqPos to resolve a method entry vs class entry 2018-03-12 23:09:20 -05:00
Azaezel fa2ee65d33 overgeneralised variable 'name' clarified between use-cases 2018-03-12 04:04:41 -05:00
Areloch 8dedcf456a 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 787b8be82c Adds handling for the proper updated exporting of mesh for convexShapes 2018-03-04 15:10:44 -06:00
Areloch 49639a908f Expanded mesh baking functionality, now supporting baking of LODs and Collision meshes 2018-03-01 01:51:18 -06:00
Areloch 14ae287c0c 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 01f0d5cfca 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 f9bf4fca4b 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
Areloch 39f86d8c30 asdasd 2017-10-26 17:06:27 -05:00
Azaezel 9e435a3f34 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 4310ab3b27 Sets scale for collision primitives created in the shape editor. 2017-10-18 03:25:05 -04:00
Areloch 7219899287 Working on shader const binding 2017-10-17 08:48:31 -05:00
Areloch e023cf3a60 Merge pull request #2056 from Bloodknight/afx_merge_main 
Afx merge main
 2017-10-11 08:47:47 -05:00
Areloch 70c154c7d3 Implement of the shader consts binding. 2017-10-10 15:54:54 -05:00
Areloch 5019478aad begun adding uniform hooks 2017-10-07 14:36:58 -05:00
Azaezel debfd9b780 Sanity check to ensure detail levels shift in tandem for skinned meshes 2017-09-13 14:58:54 -05:00
Marc Chapman eeac02545a triggers -- exposes trigger states to other code. 2017-07-27 01:34:44 +01:00
Johxz 39e5fe689b corrected shape path 2017-07-10 20:02:06 -05:00
Areloch 25686ed4be 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 214aae7277 Removed the unneeded PPC And Altivec elements, and removed the LOCBUILD flag 2017-04-09 23:26:35 -05:00
Areloch ed14b6fced 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
Johxz c43de8881f added materials, better compatibility with maya and 3ds max, better collada spec for compliance 2016-12-03 16:59:17 -06:00
Johxz 6cc1c27fd2 missing to load the texture 2016-11-29 19:49:41 -06:00
Johxz b2f615915e remove old colladamax format, fixed up bad coordinates, added new collada format, valid against the COLLADA 1.4.1 schema, added to load textures and UVs. 2016-11-26 14:13:54 -06:00
Anis bd4f2b002d Merge pull request #1801 from Azaezel/registerRemoval 
clang: register type modifier deprecated
 2016-10-21 20:04:42 +02:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight 
clang: constructor initialization order
 2016-10-19 08:39:12 -05:00
Azaezel fbfd3ed8ed clang: constructor initialization order 
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
 2016-10-14 18:16:55 -05:00
Azaezel cc9955e102 unused variable cleanup 2016-10-14 17:49:56 -05:00
Azaezel dd0b7914e6 clang: register type modifier deprecated 2016-10-14 17:37:00 -05:00
Areloch ab68a19a8b Merge pull request #1750 from Azaezel/LODloss 
short term LOD correction
 2016-09-14 01:47:23 -05:00
Areloch f88975121d Merge pull request #1761 from Bloodknight/intrinsicsfix 
Intrinsicsfix
 2016-09-13 21:43:18 -05:00
James Urquhart a46779fad6 Defer re-init'ing the shape when TSShapeConstructor is loading a shape 2016-09-03 10:41:25 +01:00
Marc Chapman 00cf5ab577 Added x64 check for SSE Intrinsic functions 2016-09-02 05:10:46 +01:00
James Urquhart 0e717ea707 Fix edge case where an editable shape without a vbo is saved 2016-09-01 00:36:17 +01:00
James Urquhart 18031f09b1 Fix edge-case with version 24 shapes 2016-09-01 00:30:29 +01:00
James Urquhart 12019173af Fix load with DTS shapes introduced with HW skinning changes 2016-08-30 19:07:02 +01:00
Azaezel a50ff1b054 short term LOD correction to preserve current widescreen vs 4:3 windows while closer matching prior release results 2016-08-25 19:17:37 -05:00
James Urquhart e7db0d7956 Fix mesh load issue & merge issue 2016-08-21 02:15:26 +01:00
Azaezel 41dfb64210 hardware skinning and instancing are mutually exclusive 2016-08-21 01:43:30 +01:00
James Urquhart 3496c549b5 Hardware Skinning Support 
- Supports GL, D3D9 & D3D11
- Extends vertex formats & shadergen to support blend indices and weights
- Adds basic support for using 4x3 matrices for shader constants
- Supports software fallback
 2016-08-21 01:43:30 +01:00
Azaezel 3553ed0bf1 accutex was left out of the copy constructor for TSRenderState. 
caused issues with https://github.com/GarageGames/Torque3D/pull/1711
 2016-08-08 09:03:16 -05:00
Azaezel c67ba876d0 raycast division safety - corrects issues with awesomium and the guionobject resources relating to WYSIWYG casts. 2016-06-27 13:48:11 -05:00
rextimmy 41e5caf22b Direct3D11 Engine/source changes 2016-03-20 21:52:11 +10:00
Alex Piola d2d5b8d834 Fix zipped dts loading 2016-03-04 10:45:55 +01:00
Azaezel 0f173df0d4 setDetailFromDistance aspect ratio friendly adjustment 2016-01-28 00:42:08 -06:00
Marc Chapman ac7d6e6691 Updated paths for collada tdictionary.h 2015-12-13 03:33:39 +00:00
Areloch 165cdb64e9 Merge pull request #1322 from Areloch/String_isEmpty_Convert 
Replace uses of dStrIsEmpty with new String::isEmpty
 2015-10-31 23:40:13 -05:00
Areloch b1d2ba8412 Merge pull request #1379 from Azaezel/C4189 
C4189 warning cleanups
 2015-09-02 19:46:28 -05:00
Azaezel 5bc926e97c warning C4005: 'WIN32' : macro redefinition 2015-08-06 21:01:20 -05:00
Azaezel 5615b642df suggested revision 2015-07-29 08:41:36 -05:00
Azaezel 555610f69f Addresses roughly half of the C4189 errors though the following methodologies: 
1) truly unused vars removed
2) vars leading to remmed out code for debugging remmed in turn.

left out:
vars in macros.
 2015-07-29 03:03:27 -05:00
Daniel Buckmaster e10b421641 C4458 declaration hides class member. 
There are plenty more of these, but they should be fixed by revising the
names of members to start with m, instead of fixing the local violations.
There was a previous PR for that but it went badly. Will retry again one
day.
 2015-07-23 20:13:04 +10:00
Areloch 2002d74b78 Issue found with PVS-Studio: 
Many instances of a function or expression being used repeatedly, which can lower performance.

Fixed it in these cases by creating on local var, reference or pointer that's used instead.
 2015-07-13 22:51:17 -05:00
Areloch 6e8fa7215a Moves from using dStrIsEmpty to the new String::isEmpty static function. Keeps things cleaner, consistent, and works with intellisense. 2015-06-06 17:40:49 -05:00
Daniel Buckmaster 84e8cbb4ee Revert recent style cleanup changes. 2015-03-04 11:58:36 +11:00
Azaezel c84051fc60 typofix for void ColladaAppMesh::lockMesh(F32 t, const MatrixF& objOffset) which was preventing level load. 2015-03-02 00:25:40 -06:00
Daniel Buckmaster 33fcc59543 Merge remote-tracking branch 'origin/style-cleanup' into development 
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
 2015-03-01 22:30:22 +11:00