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

3833 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Areloch
8631302e81
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
fd7cd77af8
Merge pull request #2335 from Azaezel/navmeshNoNo 
rewrite of NavMeshUpdateAll/NavMeshUpdateAroundObject
 2019-03-31 12:20:16 -05:00
Areloch
5cefefd55b
Merge pull request #2331 from Bloodknight/PR_PlayerZRotation 
Set contrsaints for Player Z rotation
 2019-03-31 03:47:41 -05:00
Areloch
b43dacc7d3
Merge pull request #2322 from Areloch/add3dProjectionCtrl 
Adds gui3DProjectionCtrl
 2019-03-31 02:14:45 -05:00
Areloch
b6185370be
Merge pull request #2220 from irei1as/development 
Changes for SFXSound::setPosition(time)
 2019-03-30 18:42:19 -05:00
Areloch
d636e4d4e0
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
c1dabd4bd6
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
8f8df99433
Merge pull request #2326 from Areloch/colorblindnessVisualizers 
Adds visualizers for various types of colorblindness
 2019-03-30 16:32:06 -05:00
Areloch
a0c24207ca
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
3c14ec2413
Merge pull request #2320 from Areloch/setFieldHeight 
Allows special inspectorFields to override their height
 2019-03-30 16:31:21 -05:00
Areloch
8ee1f92ba4
Merge pull request #2319 from Areloch/Scenes 
Initial implementation of the Scene object
 2019-03-30 16:30:34 -05:00
Areloch
c4e10825f4
Merge pull request #2310 from Azaezel/vertColorCorrection 
Vert color correction
 2019-03-30 16:30:01 -05:00
Areloch
847618f4af
Merge pull request #2323 from Areloch/getFieldValueCrashfix 
Sanity check for calling getFieldValue
 2019-03-30 16:07:53 -05:00
Areloch
9a760c721e
Merge pull request #2321 from Areloch/textApplyFocus 
Updates TextEdit value when focus is lost.
 2019-03-30 16:07:18 -05:00
Areloch
bf988be859
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
60f4e82cce
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
ed6046c0f5
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
2311120cbc
Update guiSplitContainer.cpp 
Corrected typo.
 2019-03-30 14:40:58 -05:00
Areloch
2742558c6f
Merge pull request #2281 from marauder2k7/OpenALDevBuildBranch 
OpenALEffects
 2019-03-30 14:39:06 -05:00
Azaezel
f722e06980 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
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
Azaezel
9c933425d5 not even using this method 2019-03-29 01:15:24 -05:00
Azaezel
24cdf025f7 method sig cleanup 2019-03-29 01:13:42 -05:00
Azaezel
a91dbb08e4 typofix 2019-03-29 00:55:42 -05:00
Azaezel
e7c3987fa1 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
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
Azaezel
6350e4240b 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
799df44a89 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
9b2b87c569 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
679c2c7fb0 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
255242db41 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
4c959e1fa1 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
501b2f52c3 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
e241cbc7c9 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
e3d9c71d4b cleanups. don't really want to be multiplying the color itsself by contribution ammount 2019-03-24 19:28:51 -05:00
Azaezel
a29a728e3d 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
66f8aa9b7c 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
466914e97f 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
07ff3ee8aa 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
5165d9c868 from tim: no need for mip for the diffuse contribution. the prefilter handles that 2019-03-24 18:38:14 -05:00
Areloch
399088d09e WIP of timmy's changes merged in. Not properly initializing the probes/array slots just yet. 2019-03-24 18:18:44 -05:00