Commit graph

3572 commits

Author SHA1 Message Date
Areloch
00b958aff9 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -05:00
Areloch
a928744b73 Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:16 -05:00
Areloch
471254ac0c Merge branch 'GameObjectExamples' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:25:00 -05:00
Areloch
b4a744a366 Merge branch 'ExpandsComponents' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:09:09 -05:00
Areloch
2c89fea69f Merge branch 'ExpandedAssetsPR' of https://github.com/Areloch/Torque3D into development 2019-05-04 16:08:11 -05:00
Areloch
54b4d2eaaf
Merge pull request #2311 from Bloodknight/TerrainSnapOffsetZ
Snap to terrain Z offset.
2019-05-04 14:25:03 -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
9c46187082
Merge pull request #2324 from Areloch/TweakedguiTreeViewObjectHandling
Tweaks some object handling of guiTreeViewObj
2019-05-04 11:51:03 -05:00
Areloch
4422082035 Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing 2019-05-04 11:49:42 -05:00
Areloch
a366f65047
Merge pull request #2342 from Azaezel/volFogFix
fix(es) for volumetric fog when dealing with dedicated servers.
2019-05-04 11:24:18 -05:00
Areloch
ae8c964b95
Merge pull request #47 from OTHGMars/Assimp_Mats
Material Update.
2019-04-27 11:26:52 -05:00
OTHGMars
9c8271a64b 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
4ee5fbfc12 Fixes import dialog display after showing the shape changed prompt in the ShapeEditor. 2019-04-25 16:05:21 -04:00
OTHGMars
241846bc69 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
e7f89cebb2 glTF2 Importer Update.
Vertex weights are now correctly assigned for skinned meshes. Portions of the vertex weight fix were taken from: https://github.com/ConfettiFX/The-Forge/blob/master/Common_3/ThirdParty/OpenSource/assimp/4.1.0/code/glTF2Importer.cpp#L823-L860.
Inverse bind matrices have been adjusted to be consistent with the other importers.
All nodes, joints and meshes are now named so T3D can cross reference when loading animations.
All T3D specific changes have been bracketed in //T3D_CHANGE_BEGIN and //T3D_CHANGE_END tags to make them easier to find when the assimp library is updated.
2019-04-25 15:41:01 -04:00
OTHGMars
bc98c2e85b Additional filters for material names. 2019-04-22 06:53:29 -04:00
OTHGMars
98c22d0f1b 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
a75116e6aa 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
a3b4e527c4 Adds Force Update Materials to import options gui. 2019-04-22 00:09:29 -04:00
OTHGMars
8d6a98b0be 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
c1726dc1d1 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
Areloch
d2bae1c72b Tweaks to the rapidjson stuff so it all plays nice, as well as minor additions to Filestream so it works with the rapidjson stuff. 2019-04-21 04:19:38 -05:00
Areloch
ec3a2368f9 WIP of the rapidJson update 2019-04-20 18:52:24 -05:00
Areloch
57526bd060
Merge pull request #45 from OTHGMars/Assimp_Anim
Assimp animations
2019-04-20 03:08:48 -05:00
Areloch
7daa243057
Merge pull request #2345 from Areloch/FullSceneFixaroo
Full template Scene conversion
2019-04-20 01:46:07 -05:00
Areloch
534746b8fe
Merge pull request #2354 from Areloch/isRenderEnabledOptimization
Modification of #2145
2019-04-20 01:45:27 -05:00
OTHGMars
b32289b618 Initial value selections for import options gui. 2019-04-18 16:49:51 -04:00
OTHGMars
9dfc3497d9 Adds animated node transforms for animation importing.
Fixes sequence timing variables.
2019-04-18 16:45:52 -04:00
OTHGMars
b92b7a3ade Changes default winding order to be CCW. 2019-04-15 23:04:47 -04:00
OTHGMars
88306e5f87 Adds verbose logging in debug builds.
Properly disconnects the logging stream.
2019-04-15 23:00:27 -04:00
OTHGMars
04f5eb6b68 Fix required for loading the binary gltf files included in the assimp unit test shapes. 2019-04-15 19:05:14 -04:00
OTHGMars
6111eb466e Enables the assimp import options gui when loaded from the shape editor.
Adds new assimp options to the importer gui.
Copies the importer gui to the BaseGame template.
2019-04-15 19:03:10 -04:00
OTHGMars
2d20995867 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
2d2f66f388 Modification of #2145
Original PR broke class-type visibility toggles in the editor, so this adjustment on the same setup keeps the optimized path, but also enables the original class-based render toggle if the editor is open.
(Also adds TORQUE_TOOLS check to have it be even leaner if the project doesn't have tool support at all)
2019-04-08 10:20:13 -05:00
Areloch
861308ae57
Merge pull request #2352 from Azaezel/lightCullKill
adress  #2344
2019-04-06 15:37:53 -05:00
Azaezel
ae8bc232a2 surpress nonrendered lights killoff method till we've time to revisit that 2019-04-04 20:56:57 -05:00
Areloch
8d85a56095 Failed to get the Scene changes for the Full template rolled up. This corrects that. 2019-03-31 22:12:38 -05:00
Areloch
852f82b8a5
Merge pull request #2000 from saxonschmauderer/patch-3
Fix for bug #1975
2019-03-31 14:45:15 -05:00
Areloch
b759bde0c0
Merge pull request #2043 from John3/toolShapes_3
cleaning the modules
2019-03-31 14:41:35 -05:00
Areloch
fa6bdd9027
Merge pull request #2024 from John3/SnapToMenu
snapTo Menu
2019-03-31 14:32:50 -05:00
Areloch
03f6c8c57f
Merge branch 'development' into SnapToMenu 2019-03-31 14:32:17 -05:00
Areloch
14fdd84d2f
Merge pull request #2313 from OTHGMars/MousePos
Switches to absolute position for mouse tracking.
2019-03-31 14:16:52 -05:00
Areloch
d96b07e230
Merge pull request #2338 from Areloch/MoreMenubarFixes
Fixes some outstanding menubar problems.
2019-03-31 12:39:31 -05:00
Areloch
e7c485b113
Merge pull request #2340 from Areloch/popupMenuBGFix
Makes the popups correctly operate anywhere in the space of the canvas
2019-03-31 12:36:15 -05:00
Areloch
0dfad8f072
Merge pull request #2339 from Areloch/MountedCollisionsFix
Adds logic to temporarily disable collisions of mounted objects on Players
2019-03-31 12:31:57 -05:00
Areloch
ce5c7db364
Merge pull request #2336 from wcbx/wcbx-cloudtexprofile
Fixes artifacts in Cloud Layer.
2019-03-31 12:31:37 -05:00
Areloch
94feab1f8c
Merge pull request #2334 from Areloch/tweakedCoreDir
Cleanup and minor tweaks to the core dir structure.
2019-03-31 12:30:40 -05:00
Areloch
8631302e81
Merge pull request #2144 from RichardsGameStudio/development
Allow correct display of widescreen resolutions (16:9 and 16:10 ratio) on a 4:3 ratio display
2019-03-31 12:22:09 -05:00
Areloch
fd7cd77af8
Merge pull request #2335 from Azaezel/navmeshNoNo
rewrite of NavMeshUpdateAll/NavMeshUpdateAroundObject
2019-03-31 12:20:16 -05:00
Areloch
5cefefd55b
Merge pull request #2331 from Bloodknight/PR_PlayerZRotation
Set contrsaints for Player Z rotation
2019-03-31 03:47:41 -05:00