TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3854 commits 5 branches 33 tags 958 MiB
Commit graph

3854 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch 17cec11b97 Added refactor of Editor Settings window 
Various fixes for asset handling.
WIP of crash tracking
 2019-06-03 02:47:30 -05:00
Areloch d4e55c1bf3 Merge pull request #55 from Azaezel/alpha40_createCompositeCorrection 
Alpha40 create composite correction
 2019-05-30 23:58:13 -05:00
Areloch a5a13de04c Merge pull request #54 from Azaezel/alpha40CompilerCorrection 
shader compiler correction
 2019-05-30 23:57:42 -05:00
Areloch f2ea040a0e Merge pull request #53 from OTHGMars/assimp_gltf_mats 
Assimp Importer: Activates assignment for material light maps.
 2019-05-30 23:57:27 -05:00
Areloch ae857faae2 Adds test shapes of Kork and SpaceOrc 
Sidestep of memleak from CSF at the moment
Minor fixes and corrections with asset importing and loose files
WIP of updated options menu
 2019-05-28 17:24:29 -05:00
AzaezelX 35ea209827 corrects a leak found with createcomposite 2019-05-28 17:13:05 -05:00
Areloch 98c4606b3c Removed test custom shader bindings until memleak is corrected. 2019-05-27 13:06:15 -05:00
AzaezelX 5c806d7183 specifies floating point for a few entries some shader compilers were treating as int's 2019-05-26 17:19:27 -05:00
Areloch 8196ad9d32 Removed old code that set the BRDF texture and caused a texture profile conflict with the probe array post effect, leading to a crash. 
Renamed hasSkylight to mHasSkylight to avoid var ambiguity.
 2019-05-26 03:13:16 -05:00
OTHGMars 2320b59bed Activates assignment for material light maps. 2019-05-26 03:21:42 -04:00
Areloch 0887683925 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-05-25 03:37:56 -05:00
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 882a0d5380 Merge pull request #52 from Azaezel/Alpha40ReskinRevamp 
reskinning fixes
 2019-05-25 03:34:54 -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 cffda16000 Merge branch 'Alpha40LevelUpdate' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-05-25 01:09:58 -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 0842e4e4f5 (did this before the core profile specification update so may be unnecessary): shift surface class method on out to a global with an inout to modify a passed one. 2019-05-24 19:07:50 -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
Brian Roberts c0c8ecf521 Merge branch 'alpha40Macwork' of https://github.com/Azaezel/Torque3D into alpha40Macwork 2019-05-23 02:27:22 -05:00
Brian Roberts 5ca2a5eb51 shift openal-soft directory add plus various cmake set(values) on over to an o/s agnostic block, rather than only including that if used on windows 2019-05-23 02:27:02 -05:00
AzaezelX 3ee19052be Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork 2019-05-22 23:38:20 -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 3cb084cf16 Proper bracketing for shaderGen.cpp 2019-05-22 23:20:29 -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 2d1f78858f Fixed text formatting 2019-05-21 07:10:05 -04:00
Areloch 7bedf48046 Added missed lines to init the reflection probe baking gui 2019-05-21 01:25:24 -05:00
Areloch 805557ea1c Fixed up behavior of the new functions of convex editor. 2019-05-21 00:29:44 -05:00
OTHGMars 9a1766479d Import Options gui Update 
Updated import options gui with tree view, additional shape statistics and settings load/save options. See /Engine/lib/assimp/t3d_usage.md for usage tips.
 2019-05-21 01:19:35 -04: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
OTHGMars 45f631b5e5 Prevents engine crash when loading shapes using the KHR_draco_mesh_compression extension. 2019-05-21 01:06:01 -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