TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 04:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3827 commits 6 branches 33 tags 1,009 MiB
Commit graph

3827 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
AzaezelX
bf10d48287 specify lod (mip) 0 for the brdf texture 2019-04-18 19:31:33 -05:00
AzaezelX
f871b965cd specify samplerstates for all input textures to resolve odd 'edgeing' effect on skylights 2019-04-18 19:30:50 -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
AzaezelX
63bc2215fd no point in resetting effectiveprobecount or mipcount in the compute4probes method. the latter is going to remain a fixed global var to support the cubemap arrays while the latter isn't even used by forward lit (though it likely should be, rather than trying to cook up 2 bound vectors) 2019-04-16 11:47:21 -05:00
AzaezelX
3c57954308 cleanups 2019-04-16 09:36:00 -05:00
AzaezelX
28f55b9cc8 Merge branch 'PBR_ProbeArrayForward' into PBR_ProbeArrayGLWIP 
# Conflicts:
#	Engine/source/renderInstance/renderProbeMgr.cpp
 2019-04-16 09:34:01 -05:00
Areloch
95962cbcbc GL work 2019-04-15 23:11:18 -05: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
AzaezelX
b79cff7530 resource count and type sync with the computeForwardProbes call-insertion for shadergen. probly going to need to cook up a cubearray type 2019-04-11 12:31:15 -05:00
AzaezelX
7f2c57f18b use the right recreation when lacking a composite map (still need to do up matinfo flags) 2019-04-11 12:30:03 -05:00
AzaezelX
33b3798bc2 removed extraneous finalcolor set mangling specular input 2019-04-10 17:47:56 -05:00
AzaezelX
c3ea3593ea typofix+ *add* computeForwardProbes to replicate the stateblock used in deferred 2019-04-10 17:46:42 -05:00
AzaezelX
8be413d53a stray var killoffs 2019-04-10 17:44:54 -05:00
AzaezelX
4730dfcf3f leverage the macros for a bit more legibility 2019-04-10 14:14:10 -05:00
AzaezelX
dac25f1e2c conform some of the "specularColor" entries (TODO: matinfo flags, like emissive/glow ect) 2019-04-10 12:56:20 -05:00
AzaezelX
07827b8032 cleanup duplicate var, and constructor-init skylight shaderconsts 2019-04-10 12:54:46 -05:00
AzaezelX
b64b84b843 defaults for diffusecolor, specularcolor (reminder todo: shift that to composite) and normal for createForwardSurface 2019-04-10 11:48:22 -05:00
AzaezelX
ce4220ad55 enhanced stage check 2019-04-10 11:43:45 -05: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
ec9e8c3563 Majority of forward work. Some state/register count issues and further testing required. 
Also requires proper binding of forward probe values, as well as scoring probes for forward selection.
 2019-04-07 23:57:05 -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
283348f7bc Cleanup/consolidation of shader logic. moved the common methods over to lighting.hlsl 
Did all the setup work to feed data for forward probestuffs, just have to rewrite the shaderFeature to replicate the regular probe array logic.
 2019-04-03 00:13:58 -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