Commit graph

3997 commits

Author SHA1 Message Date
AzaezelX bd21a207ef largely based on work by @rextimmy: add premultiplied alpha 2019-11-22 10:02:01 -06:00
Areloch c1e99364b7 Adds in missing assimp OBJ importer/exporter folder
Corrects highlighting behavior on ToolsGuiTextEditProfile
2019-11-18 21:42:55 -06:00
Areloch 19eff7c616 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0 2019-11-18 03:31:07 -06:00
Areloch 7b5e1c3c58 @rextimmy fix for GuiWindowCtrl so they snap correctly again
Added asset loose files for editor and bake level files on level asset
Correct return of ConsoleGetType on TypeShapeAssetPtr
Adds shape asset support to TSStatic, now will support either raw shape file or ShapeAsset
Adds onInspect function behavior, so when object is inspected, it can do special editor behavior
Adds callback for when editTSCtrl is resized
Added editor setting to force the world editor sidebar(scene tree and inspector windows) to resize to fit to the right side of the screen automatically instead of float
If assimp loader encounters error, it's output into the console log
Makes root Data item in folder hierarchy tree in Asset Browser able to support right mouse popup menu action
Material and Shape assets now correctly base on current browsed folder
Material asset generation now more properly fills out common maps, as well as handles skipped dependencies better
More theme corrections
Updated TestGrid images asset defs to have proper loose file handling
2019-11-18 03:30:04 -06:00
Areloch a6f41f271d Merge pull request #125 from Azaezel/alpha40_spotlightSlimdown
shifts spotlightparams to the actually used float2/vec2 entries
2019-11-18 03:17:47 -06:00
Areloch 715d8af3df Merge pull request #126 from Bloodknight/UpdateAssimp
Update assimp
2019-11-18 03:17:35 -06:00
Areloch 28a1befb7d Merge pull request #127 from Azaezel/alpha40_blendstateFix
from @rextimmy: corrections for stateblock blending support
2019-11-18 03:16:57 -06:00
Areloch 7ff451ec89 Merge branch 'alpha40_SetVdeoShenanigans' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:15:39 -06:00
Areloch 883420d21b Merge branch 'alpha40_spotlightSlimdown' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:15:07 -06:00
Areloch f1846c0389 Merge branch 'alpha40_blendstateFix' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-16 10:14:50 -06:00
Areloch e2728036e9 Merge branch 'UpdateAssimp' of https://github.com/Bloodknight/Torque3D into Preview4_0 2019-11-16 10:14:21 -06:00
Areloch 796a95b8a5 Adds isSRGB and invertSmoothness checkboxes to terrain material editor
Added ability for assimp loader to ignore cached DTS shapes on demand when building shape data
Added assimp importer options to asset import config settings set
Moved variableInspector field types folder from tools/assetBrowser/scripts to tools/guis
2019-11-11 01:40:55 -06:00
AzaezelX c2e018c6a7 from @rextimmy: corrections for stateblock blending support 2019-11-10 20:05:14 -06:00
Marc Chapman 413cb8ecfd Updated cmake file to list all import/export options 2019-11-10 14:45:13 +00:00
Marc Chapman c2018ad3de Upgrade to Assimp 5.0 2019-11-10 14:40:50 +00:00
AzaezelX 2e56645f13 shifts spotlightparams to the actually used float2/vec2 entries (stops debug screaming every frame) 2019-11-07 23:18:14 -06:00
Areloch d8cc73f5a1 Added utility methods to AssetBase:
getAssetDependencyFieldCount
clearAssetDependencyFields
addAssetDependencyField
saveAsset

Updated the saveAsset function for terrain block to utilize utility methods to ensure the terrain asset's material dependencies, so they will load properly.
2019-11-07 00:42:55 -06:00
Areloch 906c7095f1 Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0_terrain_edit_update 2019-11-07 00:40:18 -06:00
AzaezelX a8b6327091 conforms platformWindow<implementations> to use _setVideoMode internals so that those are called by
void PlatformWindow::setVideoMode(const GFXVideoMode &mode)
{
   _setVideoMode(mode);
 getScreenResChangeSignal().trigger(this, true);
}

allowing the resize trigger to go off, as well as any other shared functionality we want to slim the per-implementation specs down to later down the line
2019-11-06 22:24:12 -06:00
Areloch 22249bf4d4 WIP of updating terrain editor to work with assets
Fix minor UI issues for asset browser
included folder 'asset type' script
2019-11-06 00:23:07 -06:00
Areloch ed53f3cf76 Merge pull request #115 from Azaezel/alpha40MatUnmangle
materials.cs files are still being automatically executed reguardless…
2019-11-04 00:43:25 -06:00
Areloch aa259753f9 Merge pull request #120 from Azaezel/alpha40VCFixFrame
from @rextimmy: clamps the vc workaround now that later versions fixe…
2019-11-04 00:42:38 -06:00
Areloch fd4c65ad0d Merge pull request #122 from Azaezel/Preview4_0
from @rextimmy: ssao work
2019-11-04 00:42:30 -06:00
Areloch c6a6e72f66 Merge pull request #121 from Azaezel/alpha40MonoColorMayhem
getChanelValueAt 'correction'
2019-11-04 00:42:20 -06:00
Areloch a85bc7bae0 Merge branch 'Preview4_0' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:57 -05:00
Areloch ab2057c9d3 Merge branch 'alpha40MonoColorMayhem' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:37 -05:00
Areloch 3c0b7b2086 Merge branch 'alpha40VCFixFrame' of https://github.com/Azaezel/Torque3D into Preview4_0 2019-11-01 01:24:20 -05:00
AzaezelX 501990c3b6 from @rextimmy: ssao work
shifts ssao from the vectorlight to ibl-only via the reflectionProbearray postfx shader
2019-10-31 19:06:40 -05:00
AzaezelX 047a45c82d getChanelValueAt 'correction'
when feeding a u8 value from a 16 bit format, best to look up the red chanel for minimal artifacting
2019-10-30 21:39:20 -05:00
AzaezelX 8cb018fb44 from @rextimmy: clamps the vc workaround now that later versions fixed that bug 2019-10-29 06:57:13 -05:00
Areloch 3af902c911 Merge pull request #114 from Azaezel/alpha40DBCache
Alpha40 db cache
2019-10-26 23:19:19 -05:00
Areloch fde83b7058 Merge pull request #111 from Bloodknight/MinorFixes
Minor fixes
2019-10-26 23:19:07 -05:00
Areloch 0b282c6947 Merge pull request #99 from Azaezel/alpha40ModuleDependencyResolvers
Alpha40 module dependency resolvers
2019-10-26 23:18:49 -05:00
Areloch 25a117159f Merge pull request #113 from Azaezel/alpha40VolfogTriggerTrip
set volfog to use the standard window-resized trigger for it's update
2019-10-24 21:20:53 -05:00
AzaezelX 4f31dea023 materials.cs files are still being automatically executed reguardless of location twice. shifted the ribbonshader shaderdata defines from new to singleton to avoid attempts at duplicated creation. 2019-10-21 19:22:13 -05:00
AzaezelX 8b4f3fea31 misc formatting fixes, and a removal of the
bool LightningData::preload(bool server, String &errorStr)
{...
dQsort(thunderSounds, MaxThunders, sizeof(SFXTrack*), cmpSounds);
...}
call causing network stream corruption
2019-10-21 18:58:15 -05:00
AzaezelX 0b21072b10 datablock caching, and dependency-object vs hooked up class method segregation
1) relies on https://github.com/Areloch/Torque3D/pull/99 for modular resolvers (re-included for ease of testing)
2) adds a new module::onServerScriptExec(%this) callback executed after datablock transmission
3) bypasses DB transmission in favor of a straight file read if the resulting network data would (via CRC compare) match what a client already has saved off under data\cache\<client or server>
2019-10-21 18:55:15 -05:00
Marc Chapman 723125695d Un Mirrored these green textures... again 2019-10-20 14:05:09 +01:00
Marc Chapman 626a656bcb MIssed settings 2019-10-20 09:48:57 +01:00
Marc Chapman 47f60f9272 Added TerrainSnapOffsetZ back to editor settings 2019-10-20 09:16:16 +01:00
Areloch cba14c035f Change Asset Browser logic to utilize folder heirarchy instead of strict Asset Type filtration
Added navigation history to AB, as well as ability to navigate via forward and backward buttons and breadcrumb buttons
Added folder 'asset type', allowing you to create, rename, delete and move folders via the asset browser for better organization
Adjusted various behaviors to work with the address-driven navigation/organization of the AB
Expanded visibility options for the AB and integrated them into editor settings so they are retained
Added Search field for searching the folder structure, in addition to the existing preview tiles search
Adjusted drag-n-drop behavior of the platform code so it accepts dropping folders
Added ability to dump active PostEffects list to see what is currently running
Added ability to mark specific items in GuiTreeViewCtrl as hidden
Made reflection probe bounds boxes translucent rather than wireframe to improve editing visibility
Added expanded loose file references to LevelAsset for common companion files like decals and posteffect scrips
Added editor setting for Editor Layout Mode, allowing you to set the editor into 'Modern' layout.
Added editor settings to set default import config ruleset, and also ability to set auto-import. If both of these are set, then as long as the importing assets have no errors, they will auto-process and the user doesn't need to manually check and confirm them via the asset import window
2019-10-20 02:47:15 -05:00
Marc Chapman 326908aa3d Fixed bug in display options UI writing incorrect values. 2019-10-18 04:25:49 +01:00
AzaezelX 27d6665d21 set volumetric fog to use the standard window-resized trigger for it's update 2019-10-17 09:54:38 -05:00
Marc Chapman 40cdc29e0c GFXStateBlockData new -> singleton 2019-10-16 19:26:45 +01:00
Marc Chapman 27d2f63986 Shaderdata new->singleton 2019-10-16 19:23:32 +01:00
Marc Chapman 4aed48697d typos 2019-10-16 19:22:56 +01:00
Marc Chapman 7ddf6cd4f2 Fix shader path and added console.log in cleanup.bat 2019-10-16 19:22:34 +01:00
AzaezelX f44cb01249 looks like arrayObjects return count() as size+1;
one of these days should really do a consistency pass on those...
2019-10-06 11:08:49 -05:00
Areloch e621e362f4 Corrected the logic for the GenerateComposite import config rule so it only applies if there's any of the ORM maps detected
Added new import config rule: AlwaysPresentImageMaps so it will add entries for the regular map inputs on a material, even if they weren't actually found
Disabled a number of inactive popup menu items
Added Create New Module to normal add asset popup for more obvious/simplified use-flow
Adjusted the editor loading logic so it will properly display the loading splash to inform loading is happening instead of just lagging
Adjusted the assimp shape loader code so if it doesn't find a texture, and thus just sets a material value as the material color, it has a more parsable formatting
2019-10-06 01:29:12 -05:00
AzaezelX 9229c21788 adds an optional entry to registerDatablock that sets a flag in the datablock files to-be-executed DatablockFilesList ArrayObject that erases relative-path duplicates and surpresses overwrites. setting it again in a sucessively executed module will take ownership of the exclusivity. otherwise, all script files follwing the same general path will be executed.
adds an unRegisterDatablock to remove a given "relativePath / file" from the list
sets up an automatically-cleaned ExecFilesList  ArrayObject following a similar pattern, and executed for each callOnModules call, so that for instance all module::initServer(%this) entries are parsed, %this.queueExec feeds the vector, and opon completion of gathering the list, all are then executed in module-dependency order
2019-10-05 08:03:13 -05:00