Areloch
d9f80140f1
Include materialball shape asset info
...
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
2019-05-25 03:37:18 -05:00
Areloch
dfa0f30572
Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-05-25 01:12:20 -05:00
Areloch
c1d67c5561
Merge branch 'Alpha40ReskinRevamp' of https://github.com/Azaezel/Torque3D into Preview4_0
2019-05-25 01:11:13 -05:00
Areloch
ef226f6a65
Merge branch 'Assimp_Settings' of https://github.com/OTHGMars/Torque3D into Preview4_0
2019-05-25 01:08:16 -05:00
Brian Roberts
2c3ab893c7
specify 4.0 core profile usage. see: https://en.wikipedia.org/wiki/OpenGL_Shading_Language#Versions
2019-05-24 19:06:38 -05:00
AzaezelX
4ee8df8863
windows and linux AL_ALEXT_PROTOTYPES blocks, as well as exposed the defining of it cmake side for the adventurous (windows and linux on by default, mac off till we sort why dylibs are freaking out)
2019-05-24 14:12:04 -05:00
Brian Roberts
518cd593b2
revert to using the stock mac framework, and encapsulate nonstandard openal extensions usage under a set of #if defined(AL_ALEXT_PROTOTYPES) blocks
2019-05-24 11:11:09 -05:00
AzaezelX
afa52850c3
Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork
...
# Conflicts:
# Engine/source/materials/materialDefinition.cpp
# Engine/source/materials/processedFFMaterial.h
# Engine/source/materials/processedShaderMaterial.cpp
# Engine/source/renderInstance/renderBinManager.cpp
# Engine/source/renderInstance/renderGlowMgr.cpp
# Engine/source/renderInstance/renderMeshMgr.cpp
# Engine/source/renderInstance/renderPassManager.h
# Engine/source/renderInstance/renderTranslucentMgr.cpp
# Engine/source/shaderGen/customShaderFeature.cpp
# Engine/source/shaderGen/customShaderFeature.h
2019-05-22 23:36:15 -05:00
Areloch
f9371bfc2e
Proper splitting of D3D and OpenGL sides of the CSF.
2019-05-22 21:44:07 -05:00
Brian Roberts
6c6bd7596b
conformed the function pointer table fill-out pattern to prior usage cases mac side, though it would appear we've still got issues finding the methods to bind
2019-05-21 23:27:59 -05:00
Brian Roberts
a5f2848b0d
(partial) mac compilation correction -
...
1) correct cmake to look to the included openal-soft, not the system framework.
2) (incorrect) stubb-ins for library to function table binds
2019-05-21 21:31:30 -05:00
Brian Roberts
47640420ca
mac compilation correction - don't use Class:Class constructors
2019-05-21 21:29:19 -05:00
Brian Roberts
c32345fcd1
verve mac compilation corrections - defaults for script bindings (return for one case, lack of input for the other)
2019-05-21 19:36:30 -05:00
Brian Roberts
2e1fe56815
verve compilation correction - need to cast to char *, not use the raw string for the con:: series of methods
2019-05-21 19:34:51 -05:00
Brian Roberts
9592275fb8
mac compilation correction - verve templates order of operation compiles
2019-05-21 19:33:35 -05:00
Brian Roberts
f79265089a
mac compilation correction - casting flaw
2019-05-21 19:32:17 -05:00
AzaezelX
76dbedb02f
reskinning fixes
...
1) falls back to assuming the word "base" is what is to be replaced if no "oldSkin = newSkin" entry exists
2) falls back to *using* base if the entry is left entriely blank
2019-05-21 12:03:19 -05:00
OTHGMars
2eaa917e00
Import settings persistence
...
Adds new settings to ColladaUtils::ImportSettings and TSShapeConstructor::ImportSettings for persistence. Shape will now be re-imported with the original settings if the source art is newer or the cached.dts file has been deleted.
Fixes material transparency blend mode assignment.
Adds implementation for override scale, material prefix and always/never import options.
Reads and applies metadata fields for scale and up axis from formats that provide it.
Eliminates the assimp.log file and redirects log messages to console.log. Verbose logging is enabled in debug builds.
2019-05-21 01:18:27 -04:00
Areloch
8d3821219f
Added practicing's openAL eax fix
2019-05-19 21:33:58 -05:00
Areloch
ebb51bb178
Catch the template files up and add the improved convex editor bits.
2019-05-19 21:30:45 -05:00
Areloch
529558f671
Initial implementation of Custom Shader Features
2019-05-17 01:20:19 -05:00
Areloch
3697737498
Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development
2019-05-13 00:28:23 -05:00
Areloch
c283295f22
Merge branch 'CustomShaderFeatures' of https://github.com/Areloch/Torque3D into development
2019-05-11 21:53:08 -05:00
Areloch
3fa7a0d4fa
Various fixes
2019-05-11 21:42:27 -05:00
Areloch
60a29777fa
WIP updated UI
...
WIP dark editor theme
fixed multiwindow
2019-05-09 00:11:49 -05:00
Areloch
cedbd387d9
Updating BaseGame to work with PBR, and a PBR example module
2019-05-08 01:27:51 -05:00
Areloch
e83ec69292
Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development
2019-05-06 01:50:45 -05:00
Areloch
82c74b4511
Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development
2019-05-06 01:49:58 -05:00
AzaezelX
57ee1882fa
strip out unused pixspecular to cut down on sources of confusion
2019-05-05 20:10:14 -05:00
AzaezelX
80c9f35ee1
go back to using raw wsNormal with a few additional prep-lines for if that hasn't been made a var for that shader yet
2019-05-05 18:34:39 -05:00
AzaezelX
ae752a04e8
remed out stray code cleanups, added more remmed out code for referencing the way defered calculates bbminmax (as a percentage of the probes actual scale so folks can just copypaste most times)
2019-05-05 18:30:40 -05:00
Areloch
951594259f
Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development
2019-05-04 16:25:16 -05:00
Areloch
bac0b2e8df
Merge branch 'GameObjectExamples' of https://github.com/Areloch/Torque3D into development
2019-05-04 16:25:00 -05:00
Areloch
7f37aced90
Merge branch 'ExpandsComponents' of https://github.com/Areloch/Torque3D into development
2019-05-04 16:09:09 -05:00
Areloch
ace58e2c28
Merge branch 'ExpandedAssetsPR' of https://github.com/Areloch/Torque3D into development
2019-05-04 16:08:11 -05:00
Areloch
13fb5cd5b9
Merge pull request #2311 from Bloodknight/TerrainSnapOffsetZ
...
Snap to terrain Z offset.
2019-05-04 14:25:03 -05:00
Areloch
4e9b9b4724
Merge pull request #2328 from Areloch/neverImportMat
...
Adds a filter for materials to never import when importing a shape
2019-05-04 11:51:21 -05:00
Areloch
5d1ff71525
Merge pull request #2324 from Areloch/TweakedguiTreeViewObjectHandling
...
Tweaks some object handling of guiTreeViewObj
2019-05-04 11:51:03 -05:00
Areloch
ddfc416418
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 11:49:42 -05:00
Areloch
ba2e9f1547
Merge pull request #2342 from Azaezel/volFogFix
...
fix(es) for volumetric fog when dealing with dedicated servers.
2019-05-04 11:24:18 -05:00
AzaezelX
432a927884
Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP
2019-05-03 00:40:57 -05:00
Areloch
446d094b03
uncommented a bit that was done up for debugging/testing
2019-05-03 00:30:05 -05:00
AzaezelX
fccd2117cf
Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP
2019-05-03 00:21:01 -05:00
Areloch
bd170b5abe
WIP of forward probe scoring.
2019-05-03 00:03:58 -05:00
Areloch
4e557aec83
Added fetch for BRDF texture for forward rendering use, re-enabled brdf logic in the lighting shader and got the probe arrays properly sampling into forward as well.
...
TODO: core::rendering pref on the BRDF texture instead of hardcode path, add best-pick logic for forward probes and double-check ogl forward is playing nice.
2019-05-02 00:05:12 -05:00
AzaezelX
dd1470202d
Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP
...
# Conflicts:
# Engine/source/gfx/D3D11/gfxD3D11Device.cpp
# Engine/source/lighting/lightManager.cpp
# Templates/Full/game/levels/Empty Room.mis
# Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
AzaezelX
98a3ff604a
nonbreaking 'specularcolor' to 'pbrConfig' var conversion. (TODO: specularMap entries)
2019-04-29 19:40:22 -05:00
AzaezelX
d519479562
shifted forward lit probe lighting to pre-rt lighting in keeping with the deferred methodologies. in diong so, also needed to add a vertex feature for in/out tangent space normals detection. also in keeping with the fact we sample the deferred albedo result-buffer, fed the createForwardSurface the output target so that can take color multiplication et al instead of just raw albedo
2019-04-29 17:39:47 -05:00
AzaezelX
de385bc220
Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayGLWIP
2019-04-29 00:32:40 -05:00
Areloch
65fb8bc5f3
Ongoing fiddling with correcting the forward render behavior.
2019-04-29 00:07:38 -05:00
