Commit graph

3453 commits

Author SHA1 Message Date
OTHGMars
2638559f94 Fixes import dialog display after showing the shape changed prompt in the ShapeEditor. 2019-04-25 16:05:21 -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
6be2989bbc 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
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
6694d5f206 Adds Force Update Materials to import options gui. 2019-04-22 00:09:29 -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
Areloch
73cb9343d2 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
dbd48cdbc1 WIP of the rapidJson update 2019-04-20 18:52:24 -05:00
Areloch
af27fea500 Merge pull request #45 from OTHGMars/Assimp_Anim
Assimp animations
2019-04-20 03:08:48 -05:00
OTHGMars
93e7f8da84 Initial value selections for import options gui. 2019-04-18 16:49:51 -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
698b7dddc2 Fix required for loading the binary gltf files included in the assimp unit test shapes. 2019-04-15 19:05:14 -04:00
OTHGMars
55c01fc4ca 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
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
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
Areloch
5a93bfd39b Merge pull request #42 from OTHGMars/Assimp_WIP
Node transform and vertex weight fixes.
2019-03-28 14:25:34 -05: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
161bf7f83b Updated assimp to latest 2019-03-05 14:39:38 -06:00
Areloch
25ce4477ce Just the functional assimp lib rather than the entire assimp repository unnecessarily. 2019-02-28 16:37:15 -06:00
Areloch
bf170ffbca WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Areloch
32c7f2c7a7 Merge pull request #2286 from Azaezel/NFD_Update
Nfd update
2019-02-01 19:34:38 -06:00
Areloch
9afb5e5105 Merge pull request #2298 from jmdejong/traviscompile
Travis Compile
2019-02-01 19:34:21 -06:00
Areloch
a77eb37f9a Merge pull request #2292 from Azaezel/highlightHax
afxRenderHighlightMgr: account for hardware skinning
2019-01-21 15:18:19 -06:00
Areloch
8717c6a376 Merge pull request #2300 from OTHGMars/SDL_Joystick2
Sdl joystick2
2019-01-21 15:17:31 -06:00
Areloch
72af45ef69 Merge pull request #2294 from OTHGMars/GuiInputCtrl
Adds features to GuiInputCtrl
2019-01-21 15:14:37 -06:00
Areloch
4d400bb206 Merge pull request #2296 from CouleeApps/patch-1
Fix SDL Input::getKeyCode on software keyboard layouts
2019-01-21 15:14:19 -06:00
OTHGMars
3af77bbf15 Adds support for SDL joystick and game controllers. 2019-01-10 20:09:05 -05:00
OTHGMars
0ae675839e Adds event codes for 2 POV hat masks, 2 trackballs and the guide button. 2019-01-10 20:06:54 -05:00
OTHGMars
2add57079d Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
troido
1226acc318 travis test whether compilation works on mac and linux
This checks both gcc and clang on linux, but only clang on mac

Becuse there are so many debug warnings they are supressed in a very hacky way:
Make is run first with error output ignored.
Then an incremental build is run which has the error output, but will only build the files that errored the first time (and will error again).
If anyone knows a better way to ignore the warnings that would be great.
2019-01-10 12:39:27 +01:00
Glenn Smith
a78235dd06 Fix Input::getKeyCode on software keyboard layouts
Input::getAscii goes Torque keyCode -> SDL Scancode -> SDL Keycode -> SDL ascii key name
Input::getKeycode used to be SDL ascii key name -> SDL Scancode -> Torque keyCode

This mismatch made software keyboard layouts behave incorrectly in different places. For example, you would bind a key to an ActionMap and it would activate with a different button than specified.
2019-01-10 04:15:22 -05:00
Areloch
8633884145 Merge pull request #2287 from Azaezel/macUpdates2
corrects compilation errors on mac
2019-01-09 09:42:19 -06:00
Brian Roberts
6e4ed303f6 Update afxRenderHighlightMgr.cpp 2019-01-07 11:41:17 -06:00
Azaezel
7939d08c6a afxRenderHighlightMgr: account for hardware skinning 2019-01-07 06:22:24 -06:00
Azaezel
9a7ae06721 tabspace 2019-01-06 15:50:19 -06:00
Azaezel
7900783163 constant consistency creates continuums 2019-01-06 15:42:18 -06:00
Azaezel
6ee436382f zenity backend file filter fix 2019-01-06 14:24:33 -06:00
Areloch
d74a25540f Merge pull request #2282 from OTHGMars/CanvasResize
Fixes CanvasSizeChangeSignal and Canvas::onResize()  under SDL
2019-01-06 04:51:18 -06:00
Areloch
cb8b993953 Merge pull request #2288 from Azaezel/unixUpdates
corrects compilation errors on non-mac unix derivatives
2019-01-06 02:12:45 -06:00