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

3454 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
OTHGMars
186a44fab3 Fixes a crash from importing shapes with unnamed bones. 2019-03-29 04:02:41 -04:00
OTHGMars
d094137107 Adds the aiProcess_FlipUVs flag setting. 2019-03-29 03:57:36 -04:00
Areloch
3fa9a3fba1
Merge pull request #42 from OTHGMars/Assimp_WIP 
Node transform and vertex weight fixes.
 2019-03-28 14:25:34 -05:00
OTHGMars
08431347ea 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
2658debeb0 Fixes vertex weight assignments. 
Adds upaxis override option to match collada importer.
 2019-03-27 12:46:43 -04:00
OTHGMars
e1a68786ae Fixes indexing for vertex weights. 2019-03-24 07:08:24 -04:00
OTHGMars
90577661dc 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
4f7806fe8e 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
3da8c85e92 Adds conversion functions and changes implementation of getTransform(). 2019-03-24 06:18:20 -04:00
Areloch
8b40aa8c26 Updated assimp to latest 2019-03-05 14:39:38 -06:00
Areloch
e9ea38eda3 Just the functional assimp lib rather than the entire assimp repository unnecessarily. 2019-02-28 16:37:15 -06:00
Areloch
0f7641a282 WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Areloch
489689aed3
Merge pull request #2286 from Azaezel/NFD_Update 
Nfd update
 2019-02-01 19:34:38 -06:00
Areloch
e38eb34da6
Merge pull request #2298 from jmdejong/traviscompile 
Travis Compile
 2019-02-01 19:34:21 -06:00
Areloch
a469f2b0a5
Merge pull request #2292 from Azaezel/highlightHax 
afxRenderHighlightMgr: account for hardware skinning
 2019-01-21 15:18:19 -06:00
Areloch
77a316079a
Merge pull request #2300 from OTHGMars/SDL_Joystick2 
Sdl joystick2
 2019-01-21 15:17:31 -06:00
Areloch
e0cf7b8702
Merge pull request #2294 from OTHGMars/GuiInputCtrl 
Adds features to GuiInputCtrl
 2019-01-21 15:14:37 -06:00
Areloch
0e5a975df5
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
4fd6dfeaf0 Adds support for SDL joystick and game controllers. 2019-01-10 20:09:05 -05:00
OTHGMars
bc8796773c Adds event codes for 2 POV hat masks, 2 trackballs and the guide button. 2019-01-10 20:06:54 -05:00
OTHGMars
2f3b3e87c2 Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
troido
30d236cfb2 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
2739d8713a
Really, github? 2019-01-10 04:18:35 -05:00
Glenn Smith
c256ebdb5c
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
1acd8eb7c3
Merge pull request #2287 from Azaezel/macUpdates2 
corrects compilation errors on mac
 2019-01-09 09:42:19 -06:00
Brian Roberts
d640eeb228
Update afxRenderHighlightMgr.cpp 2019-01-07 11:41:17 -06:00
Azaezel
8d770c5609 afxRenderHighlightMgr: account for hardware skinning 2019-01-07 06:22:24 -06:00
Azaezel
aebbb1e3d8 tabspace 2019-01-06 15:50:19 -06:00
Azaezel
831e9db5a5 constant consistency creates continuums 2019-01-06 15:42:18 -06:00
Azaezel
95eb2fc626 zenity backend file filter fix 2019-01-06 14:24:33 -06:00
Areloch
6a0ef46c05
Merge pull request #2282 from OTHGMars/CanvasResize 
Fixes CanvasSizeChangeSignal and Canvas::onResize()  under SDL
 2019-01-06 04:51:18 -06:00
Areloch
480818795f
Merge pull request #2288 from Azaezel/unixUpdates 
corrects compilation errors on non-mac unix derivatives
 2019-01-06 02:12:45 -06:00
Azaezel
e4206c4ae3 no message 2019-01-02 17:53:17 -06:00
Azaezel
7695c56f08 use the newer c_controlInterface file 2019-01-02 17:52:20 -06:00
Azaezel
9d59caae35 corrects compilation errors on non-mac unix derivatives 2019-01-01 15:41:59 -06:00
Azaezel
8304168365 linux compilation, defaults to using the older gtk solution till more folks have a chance to beat up the zenity one. 2019-01-01 15:40:44 -06:00
Azaezel
a5bdbd47a2 corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
Azaezel
989662774e blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux 2019-01-01 11:00:05 -06:00