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

4926 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
a71b8864cf Merge branch 'development' into SnapToMenu 2019-03-31 14:32:17 -05:00
Areloch
15e50f58d6 Merge pull request #2313 from OTHGMars/MousePos 
Switches to absolute position for mouse tracking.
 2019-03-31 14:16:52 -05:00
Areloch
6daf0c8d34 Merge pull request #2338 from Areloch/MoreMenubarFixes 
Fixes some outstanding menubar problems.
 2019-03-31 12:39:31 -05:00
Areloch
67060e5c38 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
fc93bc229c 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
f71db60e78 Merge pull request #2336 from wcbx/wcbx-cloudtexprofile 
Fixes artifacts in Cloud Layer.
 2019-03-31 12:31:37 -05:00
Areloch
42d3c8b5e5 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
2977fc1415 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
69b7ffc3af Merge pull request #2335 from Azaezel/navmeshNoNo 
rewrite of NavMeshUpdateAll/NavMeshUpdateAroundObject
 2019-03-31 12:20:16 -05:00
Areloch
c7b542a875 Merge pull request #2331 from Bloodknight/PR_PlayerZRotation 
Set contrsaints for Player Z rotation
 2019-03-31 03:47:41 -05:00
Areloch
f104fac305 Merge pull request #2322 from Areloch/add3dProjectionCtrl 
Adds gui3DProjectionCtrl
 2019-03-31 02:14:45 -05:00
Areloch
1ec048f41d Merge pull request #2220 from irei1as/development 
Changes for SFXSound::setPosition(time)
 2019-03-30 18:42:19 -05:00
Areloch
2b62796525 Merge pull request #2332 from Bloodknight/PR_DedicatedLinuxCrashFix 
Fixes a crash that occurs on linux headless servers
 2019-03-30 16:41:36 -05:00
Areloch
80c036b9b0 Merge pull request #2327 from Areloch/loadCachedDTS 
Adds ability to skip loading of cached dts in enumColladaForImport
 2019-03-30 16:33:37 -05:00
Areloch
5facfe5b61 Merge pull request #2326 from Areloch/colorblindnessVisualizers 
Adds visualizers for various types of colorblindness
 2019-03-30 16:32:06 -05:00
Areloch
b445b74bb2 Merge pull request #2325 from Areloch/fileDialogReturnBuffer 
Moves the path return from fileDialog through the returnBuffer
 2019-03-30 16:31:44 -05:00
Areloch
9ae6a5bfa7 Merge pull request #2320 from Areloch/setFieldHeight 
Allows special inspectorFields to override their height
 2019-03-30 16:31:21 -05:00
Areloch
7756c4a762 Merge pull request #2319 from Areloch/Scenes 
Initial implementation of the Scene object
 2019-03-30 16:30:34 -05:00
Areloch
0f22f2b20a Merge pull request #2310 from Azaezel/vertColorCorrection 
Vert color correction
 2019-03-30 16:30:01 -05:00
Areloch
18f4e3172e Merge pull request #2323 from Areloch/getFieldValueCrashfix 
Sanity check for calling getFieldValue
 2019-03-30 16:07:53 -05:00
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