Commit graph

4223 commits

Author SHA1 Message Date
AzaezelX 454192ed02 from @rextimmy new isbackground shader feature. used the same z=w trick we've done before to force things to render behind everything else. applied to fog 2020-07-14 14:08:12 -05:00
Brian Roberts dda0cc9aa7
Merge pull request #249 from Areloch/InspectorGroupInserts
Adds additional functions for inserting inspectorGroups
2020-07-14 03:22:46 -05:00
Brian Roberts a6ba72bb82
Merge pull request #248 from Azaezel/alpha40_glowNONO
cleanup singlechannel glowmask leftovers (we use a full rgb map now)
2020-07-14 03:22:31 -05:00
Areloch 5b4af68793 Adds ability to get InspectorGroup index, as well as inserting a new inspectorGroup at a specific position in the list 2020-07-13 18:58:00 -05:00
AzaezelX f829303ded cleanup singlechannel glowmask leftovers (we use a full rgb map now) 2020-07-12 17:39:16 -05:00
Brian Roberts 56233410cf
Merge pull request #247 from Areloch/AssetEditorImprovements
Various improvements, fixes and enhancements to Asset editor stuffs
2020-07-12 14:08:16 -05:00
Brian Roberts 3cd5932cef
Merge pull request #246 from Areloch/AssetImporterUpdate
Various improvements, fixes and expansions for Asset Importing
2020-07-12 14:08:02 -05:00
Brian Roberts fbb11027b6
Merge pull request #245 from Areloch/PopupMenuBitmapArrays
Minor additions to popup menus
2020-07-12 14:07:49 -05:00
Brian Roberts 655abde39f
Merge pull request #244 from Areloch/TextEditPlaceholderText
Adds logic to guiTextEditCtrl to have placeholder text when the control is empty.
2020-07-12 13:52:30 -05:00
Areloch 7818b1ba49 Correct to make the getModuleFromPath function static again. 2020-07-11 21:57:40 -05:00
Areloch 4adcedcf28 Added/Improved some asset type icons
Renamed current default import config to DefaultConfig
Updated Asset Browser UI layout.
Fixed sizing behavior for Edit Asset window
Fixed sizing behavior for Edit Module window
Implemented Collection Sets system
Implemented handling of non-asset loose files for AB
Initial handling logic for prefabs for AB
Updated Asset Importer to hook into C++ AssetImporter
Made Add Module window properly reset module name field when opened
Overhauled entire AB search system so it can use phrases and compound search logic
Overhauled asset previews to utilize single guiIconButtonCtrl for efficiency and stability
Updated Asset Preview Drag-n-drop to work with new previews
Begun initial work with Tags integration into AB - currently only works with datablock categories
Bugin initial work with Creator classes - currently only populates category lists, no items
Added logic for scanning current AB directory for non-asset loose files, and activating an Auto-Import button if any are found
Added ability to drag-n-drop datablocks from AB and spawn requisite object
Stabilized drag-n-drop behavior of ShapeAssets, so when spawned, it'll find a much more sane drop position
Fixed shapeAsset fields for drag-n-drop behavior so it correctly sets field now
Adjusted folder and asset search fields in AB to utilize placeholder text
Added logic when creating new module to prompt auto-populating common default folders
Shifted preview size to slider
Added logic to MenuBuilder so popup menus can utilize bitmap arrays
Added editor setting for if to display loose files in AB
Minor theme color corrections for some profiles
2020-07-11 16:49:06 -05:00
Areloch a3d6afc197 Corrects lookup/in-place auto import logic for ImageAssets
Fixed sizing issue for material asset ptr fields
Fixed type of comment in Particle Asset
Hooked GLSL and HLSL shader files to be proper asset loose files for PostEffectAsset
Adjusted some default values for default ImportConfig
Corrected field type of multiple fields  for the importConfig
Corrected loading of PopulateMaterialMaps config setting from config file
Corrected field types of multiple fields for AssetImportObjects
Exposed several utility fields for the Importer to script
Added ability to create an AssetImportObject in script and add it to the Importer's current session
Ensured stable naming behavior(replacing spaces, -, and . in names with _
Improved getAssetTypeByFile logical lookup so it doesn't accidentally grab cached.dts files
Added ability to hard reset an import session, wiping all inbound files for a full reset
Added ability to process DTS files to shape import so it can parse out content such as materials for associated asset imports
Added better handling for shape materials that are just colors
Added callback hook-in so if the importer doesn't have a defined function for importing a given asset type, it'll try calling down into the editor
Stabilized imageAsset processing logic when generating a material for it
Improved imageType lookup/processing logic in Importer
Improved logic for binding in associated image files to materialAssets
Improved logic for processing shapes to get related materials and images, ensuring better likelyhood of finding and associating related assets
Cleaned up validation logic
Added ability to properly look up the editor's default import config if it's set to be used for autoimport
Improved handling of originalFilePath logic, so if it's an in-place import, it doesn't bother populating the field
Set default UP axis value on shape importing to ensure better default behavior
2020-07-11 16:20:10 -05:00
Areloch a71f5cfd9d Missed header changes 2020-07-11 15:58:39 -05:00
Areloch a5404ad216 Adds ability to utilize bitmap arrays and set entry indexes for popup menus
Also enables the ability to fetch the text of a popup menu item
2020-07-11 15:57:13 -05:00
Areloch 758dd20724 Adds logic to guiTextEditCtrl to have placeholder text when the control is empty. 2020-07-11 15:53:21 -05:00
Brian Roberts 67dbe4dfe2
Merge pull request #229 from Areloch/TerrainAssetFixup
Reworks the terrain loader code to work with the assets.
2020-07-10 17:30:27 -05:00
Brian Roberts ef6137ac6f
Merge pull request #242 from Azaezel/alpha40_stuckSpots
from practicing: aiplayer onstuck correction
2020-07-10 17:28:29 -05:00
Brian Roberts 7de3829d38
Merge pull request #243 from Azaezel/alpha40_triggerTricks2
from @practicing01: trigger mounting
2020-07-10 17:28:15 -05:00
AzaezelX b8c3b515f8 from @practicing01: trigger mounting 2020-07-10 15:50:25 -05:00
AzaezelX 1619b7cd23 from practicing: aiplayer onstuck correction 2020-07-10 12:15:46 -05:00
Brian Roberts 55c95a6146
Merge pull request #241 from Azaezel/alpha40_macCompile
comparison flaw in spotlight animation check.
2020-07-08 12:27:28 -05:00
AzaezelX 61db21aaaf comparison flaw in spotlight animation check. also, proper location of shadercache dir 2020-07-07 16:54:25 -05:00
Brian Roberts 9d42895b2e
Merge pull request #240 from JeffProgrammer/wincpu_detect
fixed cpu detection on 64bit windows
2020-07-07 01:47:02 -05:00
Jeff Hutchinson 7880c71d9a fixed cpu detection on 64bit windows (and removing nasty assembly for win32).
Note that this still works for 32bit windows.
2020-07-07 01:05:08 -04:00
Brian Roberts 1173c4f153
Merge pull request #239 from Azaezel/alpha40_compilefix
#include "console/typeValidators.h"
2020-07-05 20:39:07 -05:00
Brian Roberts d86c6aff35
Merge pull request #238 from Azaezel/alpha40_gl_cubemapWipwork
fix cubemap capture for gl
2020-07-05 20:38:53 -05:00
AzaezelX fcffca65e6 #include "console/typeValidators.h" 2020-07-03 22:58:27 -05:00
AzaezelX c57205b1f4 from @rextimmy: final fixes 2020-07-03 22:56:44 -05:00
Brian Roberts aa897d0242
Merge pull request #235 from chaigler/fix_gui_editor_crash
Fix crash due to GuiEditCanvas::save()
2020-07-02 16:23:59 -05:00
Brian Roberts 52c93ab5ea
Merge pull request #234 from chaigler/fix_gl_sreenies
Implements missing _captureBackBuffer method for GL gfx layer.
2020-07-02 16:18:00 -05:00
chaigler c682830dd5 Fix crash in GuiEditCanvas::save()
Fixes crash in GuiEditCanvas::save() if file location can't be written to.
2020-07-02 16:20:52 -04:00
Brian Roberts 9239101303
Merge pull request #233 from chaigler/terr_zoning_crash_fix
Fix for crash in _onZoningChanged methods when called by hidden objects.
2020-07-02 15:03:49 -05:00
chaigler e2bf5cb8fe Implements missing _captureBackBuffer method for GL gfx layer.
GL layer was missing _captureBackBuffer() implementation which caused screenShot() function to fail. Also caused ScreenShot::capture() to be called every frame afterward which caused significant performance issues.
2020-07-02 16:02:05 -04:00
chaigler c4e00be91a Fix for crash in _onZoningChanged methods when called by hidden objects.
Hidden objects are removed from the scene manager so calls to getSceneManager()->getZoneManager() crash and burn.
2020-07-02 15:50:29 -04:00
AzaezelX ce2b05e0e2 a) grab the source mipmap levels not the dest ones for copy. b) lets rely less on trusting sizeof*4 when we've gor a size per pixel lookup already there 2020-06-29 21:26:08 -05:00
Areloch 7b1c083839 Adjusts importer logic of assets to fill spaces in the names as underscores to avoid issues. 2020-06-26 23:28:53 -05:00
Brian Roberts 005f7f6fd2
Merge pull request #227 from Azaezel/alpha40_scatterskyCleanups
adress #116 and #179 (shaderside)
2020-06-26 20:51:59 -05:00
Brian Roberts bac3146054
Merge pull request #215 from Azaezel/alpha40_trigger_tricks
fixes for trigger onenter/onleave
2020-06-26 20:48:27 -05:00
Brian Roberts 7a10c42c40
Merge pull request #226 from Azaezel/alpha40_NamesapceNoNo
adress #225
2020-06-26 20:47:52 -05:00
Areloch 41277fe3b8 Fixes a mistake with setting the looseFilePath for the auto-created terrain asset. 2020-06-26 00:05:14 -05:00
Areloch 4ce558f042 Reworks the terrain loader code to work with the assets.
Fixes the terrain asset creation, makes the loading logic go through the asset auto-import behavior when a filename or assetid is bound that is not found.
Corrects terrain material binding to properly save and load
Makes the terrain asset inspector fields work as expected.
2020-06-25 23:33:01 -05:00
AzaezelX 24e6d8c73c partial followup to #202.
largely cleanups, though does include glCopyImageSubData for gl revs that support it
TODOS:
1) non glCopyImageSubData for `void GFXGLCubemapArray::copyTo(GFXCubemapArray *pDstCubemap)`
2) while we don't get corruption showing in >0 mips for irradiance maps using the newer code, it nevertheless renders wrong.
not 100% sure if renderdoc is showing blank mips because it expects it due to size, or if we are in fact generating em even though we don't use em in the end for irradiance references.
2020-06-25 17:34:48 -05:00
AzaezelX 5072a091a8 adress #116 and #179 (shaderside)
kills off code folks haven't been using for years now, as well as a clamp to force the color into a 0-1 range. (hdr relies on >1.0 values for it's blur effect to populate)
2020-06-23 17:41:56 -05:00
AzaezelX 6fde8dd4c3 adress #225 2020-06-23 13:43:04 -05:00
Brian Roberts 3e1795ba1d
Merge pull request #223 from Bloodknight/FontCleanup
Removal of old font files from basegame template
2020-06-20 13:32:36 -05:00
Marc Chapman d5bb385a7d Removal of old font files from basegame template 2020-06-20 19:21:16 +01:00
Brian Roberts b98d0a946b
Merge pull request #209 from Azaezel/alpha40_ScopeStackShenanigans
adress #203
2020-06-20 05:32:04 -05:00
Brian Roberts 9a0971cfe5
Merge pull request #211 from zfbx/patch-1
Updated links, added info from torque3d.org
2020-06-20 05:30:17 -05:00
Brian Roberts f6cedc8043
Merge pull request #210 from Azaezel/alpha40_spotlightBoundsFix
adress #162 based on work by Chad Hall
2020-06-20 05:29:47 -05:00
Brian Roberts cc0d4f4d6b
Merge pull request #222 from Azaezel/alpha40_kill_macroMaps
adress #221 crash surpress macromap
2020-06-20 05:28:33 -05:00