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

191 commits

Author SHA1 Message Date
OTHGMars
2320b59bed Activates assignment for material light maps. 2019-05-26 03:21:42 -04:00
Areloch
ef226f6a65 Merge branch 'Assimp_Settings' of https://github.com/OTHGMars/Torque3D into Preview4_0 2019-05-25 01:08:16 -05:00
OTHGMars
2eaa917e00 Import settings persistence 
Adds new settings to ColladaUtils::ImportSettings and TSShapeConstructor::ImportSettings for persistence. Shape will now be re-imported with the original settings if the source art is newer or the cached.dts file has been deleted.
Fixes material transparency blend mode assignment.
Adds implementation for override scale, material prefix and always/never import options.
Reads and applies metadata fields for scale and up axis from formats that provide it.
Eliminates the assimp.log file and redirects log messages to console.log. Verbose logging is enabled in debug builds.
 2019-05-21 01:18:27 -04:00
Areloch
c283295f22 Merge branch 'CustomShaderFeatures' of https://github.com/Areloch/Torque3D into development 2019-05-11 21:53:08 -05:00
Areloch
cedbd387d9 Updating BaseGame to work with PBR, and a PBR example module 2019-05-08 01:27:51 -05:00
Areloch
e83ec69292 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch
951594259f Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:16 -05:00
Areloch
4e9b9b4724 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
AzaezelX
dd1470202d Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP 
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
 2019-05-01 23:18:31 -05:00
OTHGMars
8ecbe5992a Sanity check for sequence times. 
If the sequence end time is greater than 1000, millisecond timestamps are automatically assigned.
 2019-04-25 16:27:46 -04:00
OTHGMars
6660f253b5 Fix for importing animated skinned meshes. 
Scale is negated in inverse bind matrices.
Vertex weights are normalized (glTF importer is limited to 4 weights per vert).
Fixed interpolation for animations where the first frame is not at 0.0.
Allows cached.dts version of assimp imported shapes to be loaded.
 2019-04-25 16:02:22 -04:00
OTHGMars
a4a97cc3d3 Additional filters for material names. 2019-04-22 06:53:29 -04:00
OTHGMars
70bbad8411 Sequence timing options. 
This commit deals with the problem that the keyframe timestamps are not standardized. Seconds, milliseconds and ticks are used depending on the import format. There is no metadata or property that specifies the format used, so the option is exposed to the user as part of the import options gui.
 2019-04-22 06:52:59 -04:00
OTHGMars
04355156de Fixes crash from unnamed animation sequences. 
Unnamed sequences are now renamed 'ambient'. Crash found in shape models/glTF2/simple_skin/simple_skin.gltf.
 2019-04-22 00:12:49 -04:00
OTHGMars
ad29d3132e Material initialization. 
Fixes material initialization for texture and transparency assignments.
Lists all available material properties to console in debug builds.
Adds TORQUE_PBR_MATERIALS define for testing with PBR branches.
 2019-04-22 00:08:15 -04:00
OTHGMars
0859b29fa1 Embedded texture extraction. 
Caches textures to disk for shape formats that support embedded textures.
Only the compressed texture codepath has been tested. There are a large number of binary gltf files with embedded (and pbr) textures for testing here: https://github.com/KhronosGroup/glTF-Sample-Models
 2019-04-21 23:59:40 -04:00
OTHGMars
17a2e416ed Adds animated node transforms for animation importing. 
Fixes sequence timing variables.
 2019-04-18 16:45:52 -04:00
OTHGMars
bd486bab66 Changes default winding order to be CCW. 2019-04-15 23:04:47 -04:00
OTHGMars
f0ccd8d079 Adds verbose logging in debug builds. 
Properly disconnects the logging stream.
 2019-04-15 23:00:27 -04:00
OTHGMars
75440918e5 Copies Collada import options to Assimp. 
The lodType, singleDetailSize, adjustCenter and adjustFloor options been added to the importer.
Implementation of $Assimp::FlipNormals has been fixed.
$Assimp::FlipWindingOrder has been added to expose aiProcess_FlipWindingOrder.
Logging is now enabled and directed to assimp.log.
 2019-04-15 18:57:24 -04:00
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