Commit graph

117 commits

Author SHA1 Message Date
Areloch
dd3422b5a2 Added ability to pass ints to post effect shader consts
Reorg'd probe init to flow better and be more robust on load
Cleaned up various parts of the probe render manager to be more stable
Fixed issue with crash on release due to numProbe in loops being 0
Updated glsl probe array shader
Beginning of rework of editor settings
Beginning of conversion of asset import config to similar system as editor settings
2019-06-13 00:37:12 -05:00
Areloch
b40d33a663 WIP of shifting the skylight cubemap to be packed into the cubemap array 2019-06-05 01:04:47 -05:00
Areloch
27b304eec3 Various fixes
Separated baked cubemap load/processing logic into a separate function for clarity
various corrections for when fields change so it properly notifies down to the client
Fixed enable flag logic to actually work
Fixed skylight enable flag so it properly disables if flipped off
2019-06-05 00:07:46 -05:00
Areloch
a552471e4e Reorg of the probe initialization/update code to streamline parts of it, and make it flow more obviously
Added some initial asset stuffs for Das Boot for building out a better testing level.
2019-06-04 00:21:52 -05:00
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
a5a13de04c Merge pull request #54 from Azaezel/alpha40CompilerCorrection
shader compiler correction
2019-05-30 23:57:42 -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
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
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
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
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
Areloch
ebb51bb178 Catch the template files up and add the improved convex editor bits. 2019-05-19 21:30:45 -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
82c74b4511 Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development 2019-05-06 01:49:58 -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
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
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
OTHGMars
2638559f94 Fixes import dialog display after showing the shape changed prompt in the ShapeEditor. 2019-04-25 16:05:21 -04:00
OTHGMars
70bbad8411 Sequence timing options.
This commit deals with the problem that the keyframe timestamps are not standardized. Seconds, milliseconds and ticks are used depending on the import format. There is no metadata or property that specifies the format used, so the option is exposed to the user as part of the import options gui.
2019-04-22 06:52:59 -04:00
OTHGMars
6694d5f206 Adds Force Update Materials to import options gui. 2019-04-22 00:09:29 -04:00
OTHGMars
93e7f8da84 Initial value selections for import options gui. 2019-04-18 16:49:51 -04:00
OTHGMars
bd486bab66 Changes default winding order to be CCW. 2019-04-15 23:04:47 -04:00
OTHGMars
55c01fc4ca Enables the assimp import options gui when loaded from the shape editor.
Adds new assimp options to the importer gui.
Copies the importer gui to the BaseGame template.
2019-04-15 19:03:10 -04:00
Areloch
5cefad72b3 Failed to get the Scene changes for the Full template rolled up. This corrects that. 2019-03-31 22:12:38 -05:00
Areloch
59b6e67ecf Merge pull request #2043 from John3/toolShapes_3
cleaning the modules
2019-03-31 14:41:35 -05:00
Areloch
a71b8864cf Merge branch 'development' into SnapToMenu 2019-03-31 14:32:17 -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
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
5facfe5b61 Merge pull request #2326 from Areloch/colorblindnessVisualizers
Adds visualizers for various types of colorblindness
2019-03-30 16:32:06 -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
Areloch
87ee749801 (Mostly) updated verve implementation. 2019-03-07 16:23:41 -06:00
Areloch
1ccf1e62b4 Cleanup and minor tweaks to the core dir structure. 2019-03-04 22:07:55 -06:00
Areloch
23182eb2a1 Adds some in-progress gameObject recreation of various legacy game classes, such as PlayerObject, AIPlayerObject, Sound Emitter and Static Shape. 2019-03-04 21:44:00 -06:00
Areloch
34d05ff16f Updates to various components, added a few new ones. 2019-02-24 01:50:38 -06:00
Areloch
a7a5463ad1 Adds a filter for materials to never import when importing a shape 2019-02-23 22:04:17 -06:00
Areloch
1f58050e47 Adds visualizers for various types of colorblindness to help calibrate scene's visual clarity given certain vision impairments.
(Also corrects some erroneous pathing in the other render visualizers to match)
2019-02-23 20:28:59 -06:00
Areloch
9bf8337e4a Initial implementation of the Scene object for handling scenes/levels in a more consistent and deliberate way. 2019-02-23 15:55:28 -06:00
Areloch
2721732b5c Merge pull request #2272 from Areloch/CoreModuleification
Core module-ification
2018-10-12 00:39:48 -05:00
Areloch
c17ae94745 Moved VR module from core to a regular module, as not all games are necessarily going to use VR.
Also corrected some of the default posteffect settings for the levels.
2018-09-19 16:03:58 -05:00