TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 05:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6156 commits 5 branches 33 tags 961 MiB
Commit graph

6156 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
a9707f09c3 Merge pull request #2321 from Areloch/textApplyFocus 
Updates TextEdit value when focus is lost.
 2019-03-30 16:07:18 -05:00
Areloch
40627afde8 Merge pull request #2318 from Areloch/AssetModuleEchoTweak 
Tweaks to the Asset/Module info echo behavior to spam the console less.
 2019-03-30 15:34:33 -05:00
Areloch
e7bfbe9133 Merge pull request #2317 from Areloch/setSplitPoint 
Adds ability to set the split point of a guiSplitContainer
 2019-03-30 15:33:57 -05:00
Areloch
669bfc24d8 Merge pull request #2315 from Azaezel/wireFrameFix 
corrects a parity flaw between wireframe and non wireframe box display
 2019-03-30 15:09:32 -05:00
Areloch
557ea101ec Update guiSplitContainer.cpp 
Corrected typo.
 2019-03-30 14:40:58 -05:00
Areloch
33f8a75529 Merge pull request #2281 from marauder2k7/OpenALDevBuildBranch 
OpenALEffects
 2019-03-30 14:39:06 -05:00
Azaezel
27a97fd273 remove struct ProbeData in favor of passing an ID along to various methods. one way to solve the 'halts for 30 seconds' compilation flaw, though can't escape the notion we're overlooking something specific to release mode, given it doesn't take nearly so long to compile the shader in debug... 2019-03-29 15:23:52 -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
Azaezel
552d0e4f4b not even using this method 2019-03-29 01:15:24 -05:00
Azaezel
a31c584687 method sig cleanup 2019-03-29 01:13:42 -05:00
Azaezel
0bc9d8023b typofix 2019-03-29 00:55:42 -05:00
Azaezel
837348d92f Merge branch 'PBR_ProbeArrayWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayWIP 
# Conflicts:
#	Templates/Full/game/shaders/common/lighting/advanced/reflectionProbeArrayP.hlsl
 2019-03-29 00:52:31 -05: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
Azaezel
6f82b6c264 properly determine probehits via sub-zero values form attenuation returns, skip out on blendings entirely when determining we're only applying 1 or fewer probes to a pixel. apply alpha subtraction in either case in keeping with the countdown notion. 2019-03-27 10:25:09 -05:00
Areloch
29660ce58b Ongoing tweaks to shaders to puzzle out good blending behavior. 
Also tried optimization by shifting all the brdf samples to a single one for the final add-up.
 2019-03-27 00:50:24 -05:00
Azaezel
1d36cf05b0 cleanups and perf: only need to subtract the alpha post-blending, not pre and post, contribution>1 shouldn't happen, so max(result,0) suffices, and no need for a for-all-probes-loop if we already know ya only got one probe hitting the pixel under examination. 2019-03-26 12:41:20 -05:00
Azaezel
5703618dc0 shift bbminmax to relative when sent to the gpu so folks can stick to realworld values 2019-03-26 06:48:56 -05:00
Azaezel
903efc7cfd Merge branch 'PBR_ProbeArrayWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayWIP 
# Conflicts:
#	Templates/Full/game/shaders/common/lighting/advanced/reflectionProbeArrayP.hlsl
 2019-03-26 01:06:59 -05:00
Areloch
e2b194182c Undid debug work, shifted logic over entirely to utilize the updateTexture methods. Refactored probe init'ing so they'll load correctly without nudging, properly sequestered skylights from the probe array and updated the shader to contain az's changes as well as skylight and probe array changes. 2019-03-25 23:17:53 -05:00
Azaezel
fdb4c5c964 Merge branch 'PBR_ProbeArrayWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayWIP 
# Conflicts:
#	Templates/Full/game/shaders/common/lighting/advanced/reflectionProbeArrayP.hlsl
 2019-03-25 01:21:00 -05:00
Areloch
1627cbabe6 ongoing WIP to sort out init'ing issues as well as correcting values so the probes actually correctly update data into the arrays 
Additional sanity checks on the updateTexture calls added by timmy
 2019-03-25 00:06:08 -05:00
Azaezel
f01c41a899 cleanups. don't really want to be multiplying the color itsself by contribution ammount 2019-03-24 19:28:51 -05:00
Azaezel
2c1a786e23 Revert "refactor: shift probe to probe blending logic itsself on out to it's own method to make thatg end easeier to deal with in isolation. (though does still depend on a bit of upstream calculation in the form of tracking how many probes hit a given pixel, and 'how hard' as it wetre from the attenuation calcs," 
This reverts commit 466914e97f.
 2019-03-24 18:53:02 -05:00
Azaezel
52e946405b do not need to account for blenFacSum for output. it's a straight overwrite of results. 2019-03-24 18:41:02 -05:00
Azaezel
3af1129e75 refactor: shift probe to probe blending logic itsself on out to it's own method to make thatg end easeier to deal with in isolation. (though does still depend on a bit of upstream calculation in the form of tracking how many probes hit a given pixel, and 'how hard' as it wetre from the attenuation calcs, 2019-03-24 18:38:34 -05:00
Azaezel
de8b267780 was improperly accounting for attenaution. needs a reversal for atten = 0 to be full unblended application fo a given projection. 2019-03-24 18:38:25 -05:00
Azaezel
b935b7b19f from tim: no need for mip for the diffuse contribution. the prefilter handles that 2019-03-24 18:38:14 -05:00
Areloch
26471aaa77 WIP of timmy's changes merged in. Not properly initializing the probes/array slots just yet. 2019-03-24 18:18:44 -05: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
Azaezel
ba8948a5b1 hook up attenuation value. todo: sort networkjing properly 2019-03-21 23:47:01 -05:00
Azaezel
003c79132e simplification 2019-03-20 08:38:48 -05:00
Azaezel
df6b7f3351 put probe.boxmax/min code back as it was prior to merge. still having that /4 oddness. 2019-03-20 07:38:14 -05:00
Azaezel
306bfb4718 defineBoxSpaceInfluence drastically simplified. please hook probeattenuationvalue up to the proper probe inputs. also need to peg down exactly why we needed to feed a baseVal = 0.25 instead of a proper 1.0 unit to avoid the thing casting beyond the defined bounds. 2019-03-19 11:28:52 -05:00
Azaezel
3aac1421cc getDistBoxToPoint max, not length nets us hard edges instea of drounded, float3 extents = probe.boxMax; isn't neded, can use unit space for that and put box min/max back to controlling the reflected boxe's scale. divnull safety 2019-03-18 17:07:43 -05:00
Azaezel
04a6130df8 sync correction 2019-03-18 04:09:34 -05:00
Azaezel
c615d3e822 git being a butt with language files. again. 2019-03-18 03:41:44 -05:00
Azaezel
caf73ea84f Merge branch 'PBR_ProbeArrayWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayWIP 
# Conflicts:
#	Templates/Full/game/shaders/common/lighting/advanced/reflectionProbeArrayP.hlsl
 2019-03-18 00:18:49 -05:00
Areloch
2bf67f7fa5 Corrections to make it use the correct transform, as well as passing along the scale as our extents in the bbMax. 
Adjusts the box influence logic to try the bsf method.
 2019-03-18 00:14:06 -05:00
Azaezel
edcdd21379 suggested alterations to the probe.worldToLocal math feeding and usage (and a divnull safety for attenuation) 2019-03-17 20:14:58 -05:00
Areloch
7d62d6249f Makes the popups correctly operate anywhere in the space of the canvas 
Also corrects a notional issue where if a poup extends past the bottom of the screen, it'll instead appear above the mouse so it doesn't ever get cut off.
 2019-03-17 02:33:54 -05:00
Areloch
87ef9bf15e Adds logic to temporarily disable collisions of mounted objects on Players so you don't try colliding with things that are mounted to you when moving. 2019-03-16 10:48:00 -05:00
Areloch
3a93a30ced Fixes a crash that comes from toggling the editors on and off, then clicking a menubar item 
Fixes the menubar not resizing with the Window
Fixes the Editors Menubar item not being repopulated if the editor was closed/reopened
Fixes the Physics menubar item not appearing if the editor was closed/reopened
Fixes issue where findMenu could fail if the StringTableEntry happened to trip against a different capitalization.
 2019-03-16 02:38:40 -05:00
wcbx
89989e08dd Fixes artifacts in Cloud Layer. 
Cloud Layer uses normal. This applies appropriate profile for normal texture.
 2019-03-10 23:08:50 -04:00
Azaezel
3afbdff871 changes a bit of the probecount logic to be based on probehit aka, how many probes specifically are hitting a given pixel. allows for attenuation-blended probe to probe, and full-override probe to skylight. 2019-03-08 06:34:51 -06:00