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
5462 commits 5 branches 33 tags 958 MiB
Commit graph

3712 commits

Author SHA1 Message Date
Robert MacGregor 55063601e6 * [Projectile] BugFix: Correct the onAdd callback not being raised for projectiles. 2021-09-23 22:58:25 -04:00
Jeff Hutchinson e784b0140c Let's fix the texcoord alignment for RT Lighting. 2021-09-22 21:41:38 -04:00
Robert MacGregor 4cfb3c4f04 * [Linux] BugFix: Corrections to allow the Linux win console (Ie. the terminal you ran the game from) to act as a console input. 2021-09-22 20:28:39 -04:00
AzaezelX c523951e65 Merge branch 'Preview4_0' into alpha40/SGCleanups2 2021-09-22 18:47:31 -05:00
AzaezelX 5682bafb29 kills off that second buffer in terrain rendering when in forward mode 2021-09-22 18:28:19 -05:00
AzaezelX c86cc48945 use srgb sapce for backbuffer 2021-09-22 18:27:42 -05:00
AzaezelX 9775d69988 pad shader uniform length pipe by 1 to avoid a bug with some integrated chips clipping 2021-09-21 17:10:07 -05:00
Jeff Hutchinson 2d50f52cf1 Allow local variables to be used in eval. 2021-09-20 21:00:33 -04:00
AzaezelX 8ce207561e revert a bit causing crashes on certain 'nix boxes. 2021-09-20 16:56:53 -05:00
AzaezelX c150afebaa particle cleanups 
misc dupe code cleanup bits.
safeties for the varous flavors of void ParticleEmitter::setup
ideally we circle back to break some of that logic on out to shared steps
 2021-09-20 13:50:47 -05:00
marauder2k7 57aceb60fb QOC 
Code cleaning of unnecessary else'
Remove unnecessary dynamic_casts
 2021-09-20 17:57:16 +01:00
marauder2k7 e9d0f68b55 Preload all soundAsset 
-Fixed: Preloads need to preload all soundAssets not just the ones it was preloading before.
 2021-09-20 17:05:11 +01:00
marauder2k7 30b57c0f95 More turns 
-Flying Vehicle
-Proximinity Mine
 2021-09-20 14:17:10 +01:00
marauder2k7 704eb27600 More Implements 
-Most Vehicles and FX classes
-Vehicle classes may need more preloads for assets.
 2021-09-20 13:07:50 +01:00
marauder2k7 1ea693fea6 SoundAsset Array 
Few fixes to soundasset array to stop it complaining
 2021-09-20 10:49:34 +01:00
marauder2k7 3ad6d47ca9 Update SoundAsset.h 
-SoundAsset array setters getters and binds in place
 2021-09-20 09:55:36 +01:00
marauder2k7 c92cfe3e81 SoundAssetImplements 
-Explosion
-Lightning
-Splash

-Other sound asset implementations will require soundasset array if possible.
 2021-09-20 09:37:31 +01:00
Areloch 9a809dfb6b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-09-19 02:28:19 -05:00
Brian Roberts 2fe767f2cd
Merge pull request #578 from Azaezel/alpha40/dedicatedGFXnullouts 
dedicated gfx device suppression
 2021-09-19 01:57:22 -05:00
Brian Roberts c2d5df4c86
Merge pull request #583 from Ragora/bugfix-opengl-errors-during-load 
* [OpenGL] BugFix: Correct shader errors being thrown during load
 2021-09-19 01:57:04 -05:00
Brian Roberts c055276d21
Merge pull request #579 from Areloch/PrecipdataSoundConvert 
Converts precipitationData to use sound asset macros
 2021-09-19 01:56:43 -05:00
Areloch adec6e7c74 Adds load status to MaterialAsset for if the Script file itself has been loaded, but the material itself hasn't yet been processed. 
Fixed String -> StringTableEntry conversion in prefab file to correct corruption when setting the filename
Cleaned up message spam from the MaterialSlot fields on TSStatics
Added getter/setters for terrain file and assets
Removed unneeded exec of tools profiles for MainMenuGUI
Add logic to remove creators section of AB if in select mode
Fixed misc. messageBox invokes that were erroneously converted to 'toolsMessageBox'
Fix classname for NotesObject in AB Creator Entry
Fix issue where ConvexShapeEditor toolbar would hide after being seen once
Changed keybind for quick AB access from 'space' to 'shift space' to avoid input issues when typing in fields in some cases
Fixed default image assignments for River objects on foam/ripple/depth
Added handling for Material, Sound and Shape asset fields in Object Builder, and updated various objectBuilder class entries to utilize them now.
Updated various fields' defaults for ObjectBuilder to utilize correct assetId's
Fixed editor SceneTree tooltips for TSShape and GroundCovert to correctly reference assets as needed
Added logic to properly check terrain asset validity when prompting to save changes, which would break saving actions before
Added menubar items in the Object category to take control and release control of control objects quickly for testing
 2021-09-19 01:01:47 -05:00
Areloch 2a8f8c15f3 Shifted long-form check/fetch of sound asset's SFXProfile to a convenience function 
Fixed formatting on projectImporter.tscript file
 2021-09-18 02:46:15 -05:00
Robert MacGregor c8a5ccb191 * [OpenGL] BugFix: Correct shader errors being thrown during the load phase due to direct use of glUseProgram causing desync with GFXGLDevice. 2021-09-17 17:39:29 -04:00
AzaezelX 21c17d0ed1 cleanups for shadergen and the visibility feature 
math fixes, feature inclusion removal. will still need to circle back on why the crosshatch.. isn't
 2021-09-17 01:24:20 -05:00
Robert MacGregor f9b78597f7 * BugFix: Correct an error that causes the engine to crash when calling non-namespaced engine functions incorrectly. 2021-09-16 21:21:04 -04:00
Areloch 17d1253ba2 Converts precipitationData to use sound asset macros 
Adds handling for soundProfile fields and lookups of sound assets by SFXProfile name in project importer
 2021-09-15 00:41:23 -05:00
AzaezelX 98a4e7fb12 dedicated gfx device surpression 
augments $Video::forceDisplayAdapter = -1; to force usage of GFXAdapterType::NullDevice
skips trying to open a splash window for dedicated servers
bypasses guicanvas window display if window does not exist
 2021-09-14 17:49:27 -05:00
Jeff Hutchinson a7db690b59 Reimplement object copy failures. 2021-09-13 19:46:21 -04:00
Jeff Hutchinson a30f64506f
Merge pull request #570 from JeffProgrammer/remove_fmod 
remove FMODex from Torque3D
 2021-09-11 20:34:19 -04:00
Jeff Hutchinson 41bd5ef6b6 remove FMODex from Torque3D 
The current version of FMod in Torque3D uses the legacy ex plugin, which hasn't been around for a long time.
 2021-09-11 16:29:32 -04:00
Jeff Hutchinson 7f59bc6350 Forgot to null out the datablock after being deleted when it fails to preload. 2021-09-11 15:16:36 -04:00
Brian Roberts 86fbb3748b
Merge pull request #565 from Areloch/BugfixQOL_20210909 
Bugfix qol 20210909
 2021-09-11 01:52:19 -05:00
Brian Roberts eb7968538b
Merge pull request #564 from Azaezel/alpha40/macrocleanup 
macro cleanup
 2021-09-10 18:32:00 -05:00
Brian Roberts 1e7a932a9e
Merge pull request #566 from Azaezel/alpha40/previewPixelfix 
don't try to generate mipmaps for images that aren't n^2 dureing prev…
 2021-09-10 18:18:46 -05:00
AzaezelX 5f0551b831 don't try to generate mipmaps for images that aren't n^2 dureing preview map generation 2021-09-10 18:18:30 -05:00
Areloch b9c071b9fd Cleanup mismerge lines 2021-09-10 15:14:57 -05:00
Areloch dec9f54a9b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into BugfixQOL_20210909 2021-09-10 02:20:13 -05:00
Areloch 8781f2ab55 Add getScriptPath console function to GUIAsset 
Shifted tracking of importing asset status to an enum for more robust handling
Added logic to properly init freshly created shapeConstructors with the newly imported shapeAsset
Fixed handling of assets that have been marked to be skipped, but needed to fill in the parent's dependencies(UseForDependencies enum value)
Cleaned up redundant recursive logic for importing assets
Disable Create Game Objects button in inspector
Fixed material assignment for convex proxies
Updated asset icons for AB with WIP images to be more clear
Fixed issue where type-generic icons in the creator items in the AB weren't showing correctly.
Force AB to show creator entries in list mode for efficiency and avoid icon scaling issues
Moved creator functions for AB to separate file for convenience
Filled out GUIControls in the AB's creator mode, and context world editor and GUI creator entries based on active editor
Added drag-n-drop handling for guiControls via AB creator in guiEditor mode
Added more types' profiles in the AB gui profiles to give more unique border colors for better visual clarity of asset type
Added editor setting to indicate if the editor should load into the last edited level, or the editor default scene
Fixed setting of highlight material overlay in shapeEditor
Added global keybind for GUIEditor so space also toggles assetbrowser
Fixed up binding/finding of shapeConstructor by assetId, which also fixed displaying of shape's material listing
 2021-09-10 02:13:56 -05:00
Areloch 6487e2eede
Merge pull request #495 from JeffProgrammer/tsneo 
TorqueScript Interpreter 2.0
 2021-09-09 19:22:15 -05:00
AzaezelX e4d16a8c61 (re) add collision yo noshape.dts 
set all rigidshapedatas to default to noshape instead of blank to fix the lack of a basic collision mesh blocking datablock creation
 2021-09-09 18:33:03 -05:00
Jeff Hutchinson 35b33f1864 various fixes and memory corruption bug. 2021-09-09 19:30:32 -04:00
AzaezelX 3d488bbbf0 macro cleanup 2021-09-09 13:29:31 -05:00
Brian Roberts 753b6c7189
Merge pull request #561 from Areloch/SoundAssetInitRollin 
Sound asset initial rollin
 2021-09-08 00:17:38 -05:00
Jeff Hutchinson 27a4868b6e Fix buffer corruption. 2021-09-07 21:52:36 -04:00
Jeff Hutchinson 6d93e96dc3 NULL out an object variable if it fails to register. 2021-09-07 21:03:57 -04:00
Jeff Hutchinson 55c0a748b4 Don't generate op_inc whenever its used as an expression. 2021-09-07 19:43:39 -04:00
AzaezelX 252f1b65f3 followup to #531. fixes the same issue on mac 2021-09-05 14:54:41 -05:00
Areloch 0ca66b99db Added fix so if a looping sound is preview-playing in the AB and you edit the properties, it doesn't try to reload the asset while it's playing, causing a crash 
Added console method for looking up a soundAsset by filename
Added initial pass of project importer for sound assets content
 2021-09-05 03:43:41 -05:00
Jeff Hutchinson 9b2f4976c9 small regression fix. 2021-09-04 22:00:32 -04:00
Jeff Hutchinson c16b88d709 Fix temporary buffer for scripting conversions. 2021-09-04 21:25:11 -04:00
Jeff Hutchinson 478a04bea8 Fix DSOs and bump version! 2021-09-04 16:37:59 -04:00
Jeff Hutchinson 278bef8d1a Fix if to else if regression. 2021-09-04 16:23:20 -04:00
Areloch cd1fd1ccf4 Merge branch 'SoundAssetInitRollin' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-04 01:38:22 -05:00
Jeff Hutchinson 313c069ecb Fix xyz again by reverting previous commit and fixing the local variables from not resetting the object states. 2021-09-03 23:27:39 -04:00
Robert MacGregor 5cce344bb1 * BugFix: Fix a missing <vector> include for GCC. 
* BugFix: Correct some globally used local variables in the editor code.
 2021-09-03 00:26:48 -04:00
Jeff Hutchinson 7efe72aced More fixes with xyz lookup, and some cleanup and test cases. 2021-09-02 22:21:00 -04:00
Robert MacGregor d7ed88494e * BugFix: Correct placement of the TORQUE_NOINLINE statements for MSVC compat. 2021-09-01 22:38:55 -04:00
Jeff Hutchinson b0549118b6 various misc fixes from merge. 2021-09-01 22:36:59 -04:00
Jeff Hutchinson 17231ca9fb Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
 2021-09-01 22:26:23 -04:00
Jeff Hutchinson 8d75d60f91 Write out variable mapping table to DSO stream, and fix .dump() 2021-09-01 22:15:37 -04:00
Robert MacGregor 1b55dce613 * Workaround: Implement noinline attributes for problematic functions in str.cpp due to what appears to be GCC compiler bugs. 2021-09-01 21:12:12 -04:00
Jeff Hutchinson 9448256422 Fix console garbage error when evaluating strings. 2021-09-01 20:16:08 -04:00
Areloch 25a32cba2a Merge branch 'MiscQOLFixes20210828' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-01 17:44:43 -05:00
Brian Roberts 09492f0885
Merge pull request #558 from Areloch/MiscFixes20210901 
Misc Fixes and QOL improvements
 2021-09-01 17:38:24 -05:00
Brian Roberts c862edef25
Merge pull request #555 from JeffProgrammer/threadid 
Update thread ids for 64bit support.
 2021-09-01 17:36:49 -05:00
Areloch 683c438b09 Improves handling of rendering guiPopupCtrls where if the height extent is taller than the bitmap array height, it'll adjust the height to recenter the displayed bitmap elements. 
Streamlined the toolbar for the gui and world editors to utilize a stack, making the behavior and manipulation of toolbar elements significantly more consistent.
Added Settings and Asset Browser buttons to both gui and world editor toolbars for easier access.
Moved all tool toolbars over to work with the stack system to make them more consistent and better formatting
Added saving of asset browser's last position and extent so it remembers it on load.
Added editor setting to close the asset browser after completing a drag-n-drop action.
Added keybind to editor keybind list, making space toggle the asset browser
 2021-09-01 01:12:16 -05:00
Jeff Hutchinson f04aca9def Fix string stack issue returning from a foreach statement. 2021-08-31 22:18:08 -04:00
JeffR 56b0a0cb85 Initial hook-in of the sound asset's integration into sfxEmitter, as well as some fixups for editor/workflow usage. 2021-08-31 00:54:05 -05:00
Jeff Hutchinson 485330ec7a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-30 19:39:06 -04:00
Jeff Hutchinson 6e072dbf91 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-29 22:28:42 -04:00
Jeff Hutchinson 633bc040d0 Update thread ids for 64bit support. 2021-08-29 20:34:57 -04:00
AzaezelX ee3ef531e2 ironically, overly paranoid checks were tripping warnings 2021-08-29 18:32:44 -05:00
AzaezelX bdf6bd5c69 account for the possiblity of _set##name(StringTableEntry _in entries somehow getting punted nulls 2021-08-29 17:41:20 -05:00
Jeff Hutchinson 0287f7717b
Merge pull request #553 from Azaezel/alpha40/nodelistnonull 
sanity check nodelist presence
 2021-08-29 17:49:22 -04:00
AzaezelX ad05a78946 sanity check nodelist presence 2021-08-29 01:11:29 -05:00
Brian Roberts fdcb4c033c
Merge pull request #549 from Azaezel/alpha40/shadergenCleanups 
be clear where we're referencing gbuffer render targets
 2021-08-28 20:34:10 -05:00
Areloch ec85e9021c Misc Quality of Life and Bug fixes 
Added handling for if preview images on image assets fails to generate, will fallback to using the full image
Added handling for double clicking or drag-n-dropping terrain assets to create them
Improved handling of field labels in variable inspector by making the stringtable be case sensitive.
Added editor settings for handling of asset double click behavior. Can now select between Edit Asset and Spawn Asset. Support is asset type dependent.
Added editor setting for auto-importing loose files when navigating to a folder. If on and the user has flagged to also enable auto-import generally, will auto import all unaffiliated loose files in as assets.
Added editor setting for default module to use when creating new assets. Updated various tooling logic so when creating a new material, if this and the 'Always Prompt Module Target' setting is off, it will fill in the target module and target asset path info based on the default module.
Fixed issue with editors that use managedData scripts where if the path didn't exist, the script file wouldn't be made.
Fixed display issue in terrain editor where if you clear the detail map, the normal/macro/orm maps would disable, but not also clear.
Fixed handling of cleared maps in terrain editor so it no longer fills empty maps in with the no image image.
Fixed handling of creating new material where it would fill in the diffuse with a no texture image as the default.
Fixed issue where canceling out of creating a module would still prompt to create the common default folders.
Fixed issue where the Select Module window couldn't be closed via the cancel or x buttons.
Based on feedback, reduced default size of the Text Pad window.
Fixed issue where the Drop At menu list wouldn't correctly display which item was marked after it was changed.
Fixed spawning shape asset handling so it uses whatever the editor's Drop At setting is.
Improved themeing of regular bitmap buttons in the editor.
Based on feedback, flipped layout of Target Module and Target Path in the Create New Asset window.
Improved handling of setting up the Target Path for when creating new assets. If a path is not set, and the user has a Default Module, it will default the path to that module.
 2021-08-28 18:51:27 -05:00
AzaezelX 2287c28d32 be clear where we're referencing gbuffer render targets 2021-08-28 17:21:45 -05:00
Brian Roberts 458eac8474
Merge pull request #544 from JeffProgrammer/mac-font-stuff 
[PLEASE TEST BEFORE MERGE] Mac font stuff
 2021-08-27 14:29:48 -05:00
Brian Roberts a585c8736f
Merge pull request #546 from Areloch/AFXAssetify 
Converts most of AFX classes to utilize assets
 2021-08-23 19:22:30 -05:00
Brian Roberts 0a150e342f
Merge pull request #545 from Areloch/AssetFileCaseSensitivityFix 
Enforces filename string case sensitivity for assets' internal filenames
 2021-08-23 19:22:22 -05:00
Areloch 64b98b0c10 Converts most of AFX classes to utilize assets 
Adds modified classes to project importer convert logic
 2021-08-22 02:15:14 -05:00
Areloch cfe122f714 Enforces filename string case sensitivity for assets' internal filenames, which avoids the stringtable messing with the case preventing file name case sensitivity issues. 2021-08-21 23:12:37 -05:00
Jeff Hutchinson 8ebde0e916 Merge branch 'Preview4_0_Devhead' into mac-font-stuff 2021-08-21 21:12:02 -04:00
Jeff Hutchinson 37dc8626f5 MacOS fixes 
This fixes an issue where Con::getVariable can't be used in the global scope before the console system is initialized. I'm honestly surprised this error didn't happen on any other platform.
 2021-08-21 20:48:26 -04:00
Jeff Hutchinson eac0af2644 Merge commit 'c04f3ae166cf028aa005fb556906f935e52e71fb' into mac-font-stuff 2021-08-21 20:14:18 -04:00
Brian Roberts c04f3ae166
Merge pull request #533 from Ragora/bugfix-linux-release-builds 
Bugfix linux release builds for Clang
 2021-08-20 21:55:16 -05:00
Robert MacGregor 3ecdf292d7 * Adjustment: Remove some unnecessary ifdef logic in UUID headers. 2021-08-20 22:53:45 -04:00
Jeff Hutchinson 1b54162580 cleanup todos 2021-08-19 22:25:11 -04:00
Jeff Hutchinson 59312d7d52 debugger support 2021-08-19 22:05:43 -04:00
Jeff Hutchinson 98a2fa0f33 Fix bugs with internalName accessor 2021-08-17 20:52:59 -04:00
Jeff Hutchinson 838395840d script fixes from latest merge and more tests 2021-08-17 20:04:45 -04:00
AzaezelX 69abcb862c assetbase crashes: test (most) cases for mpAssetDefinition existing before returning values. return empty if it doesn't. 2021-08-17 15:32:05 -05:00
AzaezelX 0bf97ad2c8 decal safeties via if (mMaterialAsset.notNull() && mMaterialAsset->getStatus() == MaterialAsset::Ok) 2021-08-17 15:27:23 -05:00
AzaezelX 68fee78744 prefab safeties 2021-08-17 14:41:09 -05:00
Jeff Hutchinson ada1c5a021 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-16 22:50:02 -04:00
Jeff Hutchinson 6ec40e86da Fix bugs with certain properties (and .x .y .z accessors) and add tests. 2021-08-16 22:02:24 -04:00
Areloch 8ae8eeb2f9 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-08-15 03:07:51 -05:00
Areloch 48e994f7bd Shift file handling in importer to a standardized function 
Added santizing of strings to filenames, object names and asset names for the importer process
Added sanitizeString console function for above
Added processing of terrainBlock object's fields for importer
Added check to avoid updateTSShapeLoadProgress spam
Adjusted folderPrefix logic to walk up directory to find assetName that isn't already in use.
 2021-08-15 03:07:40 -05:00
Robert MacGregor 3f34c9020e * [ParticleEmitter] BugFix: Make GCC happy by removing the inline specification on updateKeyData. 2021-08-14 18:22:30 -04:00
Robert MacGregor eca3fbfa67 * [UUID] BugFix: Correct a memory mismanagement error in UUID programming due to the way xuuid_t is utilized. 2021-08-14 17:44:17 -04:00
Robert MacGregor b84c959c36 * [OpenAL, Linux] BugFix: Change the OpenAL library loaded on Linux systems to allow it to work without development packages installed for some Linux distros. 
* [OpenAL, Linux] Adjustment: Change the dlopen loading procedure for OpenAL to not perform lazy binding of symbols.
 2021-08-14 14:40:20 -04:00
Jeff Hutchinson a449fadde2 hacks to make thedebugger work again. 2021-08-14 01:37:01 -04:00
Brian Roberts 190343cbc7
Merge pull request #531 from Ragora/bugfix-asset-browser-linux 
Asset Browser on Linux Fixes
 2021-08-13 22:35:40 -05:00
Robert MacGregor 3a4f0e8808 * [x86UNIXFileio] BugFix: Correct an error in the initial call to recurseDumpDirectories that causes an empty list of directories to always be returned. 
* [UI Module] BugFix: Change module directory name to uppercase for matching the declared module name in its module file for asset tree browsing to work correctly on case sensitive systems.
 2021-08-13 23:31:29 -04:00
Jeff Hutchinson 717c7acca9 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
 2021-08-13 20:14:39 -04:00
AzaezelX 431fb05b6f get the splash screen on linux to stop corrupting the main window 2021-08-12 18:13:33 -05:00
Brian Roberts 9dd9e9fae5
Merge pull request #522 from Azaezel/alpha40/stringstringShenanigans 
bad constructor usage! bad! GCC no like!
 2021-08-10 22:31:21 -05:00
Brian Roberts 86a8fb5854
Merge pull request #523 from Azaezel/alpha40/windowWonk 
report if SDL_CreateWindow is unable to create a window at all
 2021-08-10 22:29:05 -05:00
AzaezelX a2ecbe53dd gcc seems to have an issue converting nullptr to Resource<TSShape>, so this will at least get it compiling 2021-08-10 03:13:46 -05:00
AzaezelX c7b44203ad sanity check 2021-08-10 03:11:52 -05:00
AzaezelX fc9d767256 report if SDL_CreateWindow is unable to create a window at all 2021-08-09 23:48:01 -05:00
AzaezelX 0285e073b9 wrap all the things! 2021-08-09 22:40:41 -05:00
AzaezelX cd6e027d1f nother specifier wrapper 2021-08-09 22:31:58 -05:00
AzaezelX 20e4f3c120 wrap to remove ambiguity 2021-08-09 22:24:20 -05:00
AzaezelX 1037b5d718 extraneous entry 2021-08-09 22:24:03 -05:00
AzaezelX 76386f433c fix eronous extra glue code in macro, fix slash direction in include 2021-08-09 22:08:55 -05:00
AzaezelX 594c4f65c7 bad constructor usage! bad! GCC no like! 2021-08-09 21:34:24 -05:00
AzaezelX a944b6435c give useful data when not finding a given shader var 2021-08-09 20:19:16 -05:00
Areloch 0dddeeb6dd Corrects preload logic for projectiles to only fail if shape is specified, but failed to load 
Corrects logic in Project Importer for if cubemapData is defined in material scripts, it can process them correctly.
 2021-08-09 18:55:05 -05:00
AzaezelX 11a29ef97a preload materials for shapebasedatas and debris 2021-08-09 16:14:10 -05:00
AzaezelX e7403197c7 yell when warningmaterial is undefined 2021-08-09 16:13:30 -05:00
Areloch 426f5974da Corrected ShapeAsset array initpersist macro to assign arraySize 
Uncommented line in preview build function for material assets so they generate the reduced preview image
Added cubeFace to cubemapData import processing vars checked
Updated ShapeBaseImageData convert vars to properly use asset var names
 2021-08-08 23:44:17 -05:00
Areloch 34f0f01cea Adds console function to compare file modified times 
Adds console function to save a scaled image
Improved logic of generating previews for shape, material and image assets to regen if original asset loose file was modified
Added logic to generate scaled preview image for material and image assets to improve load times of AB
 2021-08-08 16:20:58 -05:00
Areloch 555c563b39 More updating of editor icons to assets 
Fixed handling of convex shape editor's active and default materials
Fixed assignment of material for convex shapes via editor
Fixed material editor map assignment logic
Added utility function to detect possible duplicate files in project to ProjectImporter
Added conversion of legacy sky and water classes to importer
Fixed bufferLen issue with guiTreeViewCtrl
 2021-08-07 19:27:01 -05:00
Areloch 2f5f585aaf Fixed logic for parsing registerDatablock paths to trim script extensions during import conversion 
Fixed creation of materialAsset from AB to properly generate companion script file
Fixed logic in project import that if we import in a legacy module script, we get rid of the newly generated one in favor of the old one
 2021-08-07 02:36:38 -05:00
AzaezelX bdf32f4f7b texture profile cleanups 2021-08-06 03:33:02 -05:00
Areloch c76c5f7ee1 Removed unneeded duplicate of blank sky skybox 
Fixed various inspector field editor button icons
Fixed drag-n-drop apply logic for material assets
Fixed up some convex shape editor material references
Fixed tools overlay gui profile opaqueness flag
Fixed uvEditor image asset binding/lookups
Fixed decal editor preview display
Fixed shape editor would you like to save your changes prompt
Added additional sanity check for bad material reference in tsMesh
Fixed saving of terrain asset when working in editor default level
 2021-08-06 01:06:36 -05:00
AzaezelX c5d0310bc3 Merge branch 'EngineAssetify' of https://github.com/Areloch/Torque3D into EngineAssetify_Followups_XML2Check 
# Conflicts:
#	Engine/source/ts/tsShapeConstruct.cpp
 2021-08-02 13:54:51 -05:00
Areloch 88ae8a9665 Added getShapeConstructorFilePath console function on shapeAsset 
Fixed typo in import config settings for DuplicateAutoResolution
Converted TSShapeConstructor to utilize assets
Updated shape editor to work with assetified constructors
Converted guiBitmapButtonCtrl to use assets
 2021-08-02 04:20:27 -05:00
AzaezelX c43cee13ab Merge branch 'task/update-tinyxml' of https://github.com/lukaspj/Torque3D into EngineAssetify_Followups_XML2Check 2021-07-31 17:12:44 -05:00
AzaezelX b5b06c4a10 assettext/macrotext/assetdoc refinements ala https://github.com/TorqueGameEngines/Torque3D/pull/518 2021-07-31 17:06:19 -05:00
AzaezelX 59e162abe5 void floating point error clipping courtessy higuy and hutch 2021-07-31 17:05:29 -05:00
AzaezelX 33e78fd8a8 init reflection probes 2021-07-31 17:04:31 -05:00
Lukas Aldershaab 9a795e89f3 Update usage of TinyXML to use TinyXML2 2021-07-31 21:54:19 +02:00
Lukas Aldershaab cd170910b2 Replace TinyXML library with version 9.0.0 of TinyXML2 2021-07-31 21:53:10 +02:00
AzaezelX b73353a446 we want old direct-file references first, then asset macros, since those plug in the old entries to empty if valid. 2021-07-29 11:12:07 -05:00
AzaezelX 3fad050028 Merge branch 'Preview4_0' into EngineAssetify_Followups 2021-07-28 13:51:44 -05:00
Brian Roberts 8d2e806413
Merge pull request #507 from Azaezel/alpha40/pthreadPunishment 
adress #501 - thread oversight.
 2021-07-28 13:31:51 -05:00
Brian Roberts db842e7185
Merge pull request #514 from Azaezel/alpha40/GFXStringUnstrung 
adress #510 - missing GFXFormatR11G11B10 macrohook
 2021-07-28 13:31:17 -05:00
Areloch 52c83d19e1 Added shapeFile field to TSForestItemData convert setting 
Fixed modulePath not setting in some cases for project importer
Fixed not assigning drop and splash textures in precipitation
Fixed stringtable insert for sfxProfile
 2021-07-28 12:01:17 -05:00
Areloch abf5a09bc3 Removed duplicate checkbox image 
Added asset import conflict resolution option to prepend folder name
Cleanups of Project Importer and fixed importing of material and terrain materials, specifically, fallbacks in the event they are unnamed to utilize the mapTo and internalName fields, respectively
Fixed typos in guiTerrainMaterialDlg
Added AssetBrowser button to GuiEditor
Improved FileObject's PeekLine function to be able to peek forward further via an optional lineOffset argument
 2021-07-28 09:26:13 -05:00
AzaezelX 438e6cbb3c fix for diffuse map mangling in several cases, filter imposters out of real time lighting (for now?) fix the blankskybox via a resave, and filter "badfilereference" and "failed" assets out of variable replacement for the project converter 2021-07-25 17:18:55 -05:00
AzaezelX 36b31ae19d zip support followup 2021-07-22 21:27:13 -05:00
AzaezelX b8eaefc21e refactor new IsScriptFile method to be zip-safe 2021-07-22 20:55:46 -05:00
AzaezelX 8976250fdf remove fallback from INIT_SHAPEASSET / INIT_SHAPEASSET_ARRAY as it seems that was causing more harm than good somehow 2021-07-22 12:35:25 -05:00
AzaezelX f185bef8a3 leverage isScriptFile 
(also initialize  scattersky. mNightCubemapName = StringTable->EmptyString();)
 2021-07-22 12:02:23 -05:00
AzaezelX c41b8e00ff clean up the light.cookie entries 2021-07-22 11:57:41 -05:00
AzaezelX 059fb63487 set initial asset loaded state to not loaded 2021-07-22 11:57:11 -05:00
AzaezelX 38b565e12a new method isScriptfile. operates like isFIle, but also checks variations on extentions 2021-07-22 11:56:35 -05:00
AzaezelX 313466f57c new method from JeffH and Marauder: getClassHierarchy(classname). dumps a list of the class inhericance in reverse ancestor order (so that class first, next parent, *it's* parent, ect 2021-07-22 11:55:34 -05:00
Areloch 3e131f5b8e Added changes missed via merge failures. 
Removed some unused files/references that were causing errors, related to issues #502 & #512
 2021-07-20 20:05:49 -05:00
AzaezelX 1c0f234d3a adress #510 - missing GFXFormatR11G11B10 macrohook 2021-07-20 11:29:13 -05:00
AzaezelX 0c23599023 adress #501 - thread oversight. 
as discussed in the followup conversation to #500, seems like there's been a bit of command-drift since the writeup we were referencing to attempt consistentcy, so back to treating mac and nix differently on this front, looks like
 2021-07-19 09:58:14 -05:00
Areloch 5525f8ecdd Converts all game, gui editor, and system classes to utilize assets 
Processed core, tools and default modules to utilize assets
Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption
Removed unneeded MainEditor mockup module
Removed some unused/duplicate image assets from the tools
 2021-07-19 01:07:08 -05:00
Areloch 83b0432283
Merge pull request #489 from Azaezel/alpha40/zipPassPunt 
expose a zip file password cmake config option
 2021-07-17 11:03:26 -05:00
Areloch 4d40e3cab5
Merge pull request #449 from OTHGMars/Zip_Test2 
Loading from zipped game directories.
 2021-07-17 11:03:19 -05:00
Lukas Joergensen 91c985e518
Merge pull request #497 from Azaezel/alpha40/particleBounds 
particle emitter bounds box fix
 2021-07-14 14:46:01 +02:00
Robert MacGregor 6ad2876504 * BugFix: Correct 3 missing defines in the GCC types include file. 
* BugFix: Move several compiledEval declarations around to resolve ordering issues.
* BugFix: Experimentally remove the reference on an engineAPI template function to allow parameter types to match.
 2021-07-09 21:05:55 -04:00
Brian Roberts 18a7e31991
Merge pull request #499 from Azaezel/alpha40/macwork 
mac compilation and standarization fixes
 2021-07-05 17:56:22 -05:00
AzaezelX cddacf1c48 mac compilation and standarization fixes 
compresses void tc_spinloop() for both unix derivatives and apples to utilize pthread_yield_np();
mac only tweaks to Platform::getUserHomeDirectory() to return the ~/documents directory for parity with windows results
 2021-07-01 14:10:07 -05:00
Brian Roberts b02bead6ea
Merge pull request #493 from Azaezel/alpha40/shadowVarValidators 
shadowmap validator tweaks
 2021-06-22 12:05:02 -05:00
Brian Roberts 5ed7cda822
Merge pull request #492 from Azaezel/alpha40/simSetSupport 
report simset names for add/remove errors
 2021-06-22 12:04:48 -05:00
Brian Roberts 3aa0b8d236
Merge pull request #491 from Azaezel/alpha40/StreamSafetyString 
augment bitstream write error reporting
 2021-06-22 12:04:31 -05:00
Brian Roberts db4f4984ca
Merge pull request #490 from Azaezel/alpha40/StaticShapeUnmountFix 
connects staticshape::unmount to the parent chain so it can actually do so
 2021-06-22 12:01:56 -05:00
AzaezelX cf0c7a2d11 particle emitter bounds box fix 
take the distance particles can move over thier lifetime into account for emitter bounds.
in addition, don't zero out the y axis
 2021-06-19 15:15:12 -05:00
Jeff Hutchinson 464cb7ae29 Better error messages when compiling script. 2021-06-19 13:48:32 -04:00
Jeff Hutchinson 085af8e762 fix %obj.field op assign. 2021-06-19 12:28:32 -04:00
Jeff Hutchinson acde0c3f0b Merge branch 'Preview4_0_DevHead' into tsneo 
# Conflicts:
#	Engine/source/console/consoleInternal.cpp
 2021-06-18 21:13:49 -04:00
Jeff Hutchinson 2e8a0185b3 Fix buffer overflow issue in StringUnit::getWords. 
getWords("a b c d", 2); // "c d"

that turns into this inside the engine:

getWords("a b c d", 2, 1000000);

that code after parsing d goes string++ which passes over the null character. This now enforces that check. Found this with the new script interpreter...how this wasn't blowing up before is beyond me.
 2021-06-18 21:08:03 -04:00
Jeff Hutchinson 8fc0db21c1 Small fixes for the script interpreter. 2021-06-18 18:52:41 -04:00
bank 5d1c29f54b
Fix return value conversion when using SimObject::call() method from scripts. 2021-06-15 19:03:43 +03:00
AzaezelX 8f713d93f3 shadowmap validator tweaks 
set the minimum range to draw a shadow to 25 units, and the max to 10k (context, default draw distance is 1k)
'double' the max texture size allowed to 8192^2 (was 4096^2) to allow folks to throw more machine at it if they really *really* wish to
 2021-06-11 00:02:52 -05:00
AzaezelX 3caa83284c report simset names for add/remove errors 2021-06-07 17:34:38 -05:00
AzaezelX 1da711dc4f augment bitstream write error reporting 2021-06-07 15:07:54 -05:00
AzaezelX e3e2de7f7b connects staticshape::unmount to the parent chain so it can actually do so 2021-06-07 15:03:23 -05:00
AzaezelX a34aea55f7 expose a zip file password cmake config option 2021-06-02 16:08:51 -05:00
OTHGMars 9539a4a055 Adds comment explaining window position change in GuiCanvas. 2021-05-14 17:30:23 -04:00
OTHGMars 1ba7070bb6 Maintains window position when updating video mode for LightManager compatibility. 2021-05-14 03:52:43 -04:00
OTHGMars de1e6df64b Removes redundant ScreenResChangeSignal trigger. 2021-05-14 03:50:28 -04:00
Jeff Hutchinson c7711f633b some font changes for the macos platform. 2021-05-10 21:08:23 -04:00
Jeff Hutchinson 61fef8080b mend 2021-05-10 19:58:51 -04:00
Jeff Hutchinson e981fd2cc3 Add support for aarch64 / apple silicon 2021-05-10 15:55:56 -04:00
Jeff Hutchinson 69d7a2f4a1 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 
# Conflicts:
#	Engine/source/console/test/ScriptTest.cpp
#	Engine/source/console/test/consoleTest.cpp
 2021-05-06 21:08:53 -04:00
Jeff Hutchinson 6f7fdca87d lotsa fixes. 2021-05-04 21:18:15 -04:00
Jeff Hutchinson db047275f1 add fast int to object lookup. 2021-05-01 02:55:24 -04:00
Jeff Hutchinson ab4c0f0361 Add fast math optimization 2021-05-01 02:07:54 -04:00
Jeff Hutchinson 55b0ecb487 optimizations 2021-04-30 01:20:01 -04:00
Jeff Hutchinson dcd01e1231 move parameters instead of copying. 2021-04-30 00:24:03 -04:00
Jeff Hutchinson 964fde8f09 Goodbye String Stack! 2021-04-29 23:11:49 -04:00
Joseph 6f52b87360 Update TORQUE_GAME_ENGINE version number to reflect current version 4.0 2021-04-23 07:05:09 +01:00
Brian Roberts 2a2987869b
Merge pull request #478 from Bloodknight/SDL_OpenGL_BPP_Fix 
Fixes a resolution switching issue when the game uses **only** OpenGL…
 2021-04-22 19:51:14 -05:00
Brian Roberts 357abb3292
Merge pull request #480 from Azaezel/alpha40/bintoDec 
adds binary to decimal and vice versa methods
 2021-04-22 19:34:25 -05:00
Brian Roberts 369c06c24c
Merge pull request #485 from Azaezel/alpha40/stringtoChar 
make string to char* conversion automatic
 2021-04-22 19:34:05 -05:00
AzaezelX 2e3e4228b2 make string to char* conversion automatic 2021-04-21 14:45:10 -05:00
Jeff Hutchinson f056e181b7 remove unused code. 2021-04-20 19:55:35 -04:00
Jeff Hutchinson bb12638ea5 Added error checking for using a local variable in global scope, and added optimization to method object parameter. 2021-04-17 14:31:27 -04:00
Jeff Hutchinson bfc0109485 fixes and some minor bc adjustment. 2021-04-16 23:21:39 -04:00
Jeff Hutchinson bc0f5bd3a3 combine numeric stacks into one common stack. 2021-04-16 19:20:15 -04:00
Jeff Hutchinson c19bb29a16
Merge pull request #481 from Azaezel/alpha40/profileconflictreport 
report which profile usages are conflicting (was,is)
 2021-04-12 21:48:38 -04:00
Jeff Hutchinson 481c900d77
Merge pull request #482 from Azaezel/alpha40/sanitizerAug 
add additional chars to the flatfile->asset->objectID name santizatio…
 2021-04-12 21:46:22 -04:00
Jeff Hutchinson ef34210fef Implement Unit Test Suite for TorqueScript. 2021-04-12 21:43:57 -04:00
Jeff Hutchinson a2dea07d8b fixed internal types. 2021-04-12 21:42:18 -04:00
Jeff Hutchinson 93500b6ac4 more changes. 2021-04-12 21:26:26 -04:00
Jeff Hutchinson 960db74733 small fix. 2021-04-10 15:52:53 -04:00
AzaezelX ab1661a851 add additional chars to the flatfile->asset->objectID name santization chain 2021-04-06 15:17:06 -05:00
AzaezelX ab878eb312 report which profile usages are conflicting (was,is) 2021-04-06 14:54:53 -05:00
Jeff Hutchinson 4e678292e1 fix foreach/foreach$ loops. 2021-04-04 00:50:37 -04:00
Jeff Hutchinson 3e04196a53 make tests pass. 2021-04-03 01:53:40 -04:00
AzaezelX b7b4ced8d6 adds binary to decimal and vice versa methods 2021-04-02 14:08:26 -05:00
Jeff Hutchinson f776e73b04 cleanup 2021-04-02 00:57:49 -04:00
Jeff Hutchinson 02447f0996 compile fixes. 2021-03-31 22:12:58 -04:00
Jeff Hutchinson 50df52ecfc more console refactor. 2021-03-31 21:09:23 -04:00
Jeff Hutchinson 5e81c021f5 start cleaning up ConsoleValueRef's 2021-03-30 23:58:07 -04:00
Jeff Hutchinson 35500a87c6 initial port of the new interpreter 2021-03-30 19:33:19 -04:00
Jeff Hutchinson 5d2654b1ba Implement Unit Test Suite for TorqueScript. 2021-03-23 21:35:25 -04:00
Marc 3d2f3bda64 Fixes a resolution switching issue when the game uses **only** OpenGL as the renderer 
Canvas.tscript fixes provided by @OTHG_Mars
 2021-03-18 21:37:36 +00:00
Brian Roberts a8e2ec6df4
Merge pull request #475 from Areloch/importAssetSuffixes 
Adds import config settings for forcefully adding configurable suffixes for shapes, materials and images
 2021-03-14 01:12:29 -06:00
Brian Roberts 43391f0f10
Merge pull request #474 from Areloch/internalNameTreeDisplayFix 
Fixes display of internal names on objects shown in guiTreeViewCtrl
 2021-03-14 01:12:20 -06:00
Areloch a0c8a77043 Adds import config settings for forcefully adding configurable suffixes for shapes, materials and images 2021-02-27 02:43:37 -06:00
Areloch e428ecd6ab Fixes display of internal names on objects shown in guiTreeViewCtrl 2021-02-24 01:05:24 -06:00
Areloch 9a10d52e0b Added logic to correctly associate constructor script file for shape asset to asset as an assetfile 2021-02-21 02:21:50 -06:00
Brian Roberts f4982f3b7d
Merge pull request #464 from Azaezel/alpha40/ribbonParticles 
ribbon particle resource port
 2021-02-15 22:28:10 -06:00
AzaezelX 4c7535a9bc set perfab and makemesh origins to the biggest model 
allows one to preserve snap points
 2021-02-08 17:23:51 -06:00
AzaezelX e96624032f ribbon particle resource port 2021-02-07 13:43:21 -06:00
AzaezelX d4cd1edad7 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into fix/terrainpainting 
# Conflicts:
#	Engine/source/gui/worldEditor/terrainEditor.cpp
 2021-01-27 23:38:14 -06:00
AzaezelX 66db6ac376 terrain brush dragging cleanups 2021-01-27 23:36:23 -06:00
Areloch e11c5a7a02 Re-fixes terrain edit dragging without breaking paint actions 2021-01-27 15:10:20 -06:00
Brian Roberts e2f706cd94
Merge pull request #461 from Areloch/ShapeAssetPreviewGen 
Implements shape preview caching for shape assets
 2021-01-27 14:58:41 -06:00
Areloch 16438e1ab3 Added in needed normal map processing for preview render 2021-01-27 12:26:33 -06:00
Areloch 85a9a9b608 Implements shape preview caching for shape assets 
Also standardizes the loading gui overlay so it can be used to inform that the asset preview generation is happening
 2021-01-27 01:54:26 -06:00
AzaezelX 3603188b7f update openal-soft 
sync point: master-ac5d40e40a0155351fe1be4aab30017b6a13a859
 2021-01-26 13:01:35 -06:00
Lukas Aldershaab 9ccaa6d3ea Improve handling of non-default script filenames 2021-01-19 21:32:31 +01:00
Lukas Aldershaab 099dd4f1f3 Parametrize script extension, default to 'tscript' 2021-01-19 21:32:31 +01:00
Areloch c5cdba750e Fixes some minor errors on MacOS regarding compiling in clang 2021-01-14 18:00:56 -06:00
OTHGMars c77be80220 Zip usage notes and defines. 2021-01-11 05:04:36 -05:00
OTHGMars 8148bdfcdd ModuleManager and AssetManager updated for T3D mount system. 
Platform file calls replaced with Torque::FS calls when scanning for or loading files.
 2021-01-11 05:03:00 -05:00
OTHGMars fd85491ed7 Changes GuiIconButtonCtrl to relative paths that can be opened by the mount system. 2021-01-11 05:00:37 -05:00
OTHGMars 0ece989560 Updates SimXMLDocument, fsTiXmlDocument, Taml and TamlXmlParser for reading from zip. 2021-01-11 04:57:10 -05:00
OTHGMars 8765d3a46e Con::isBasePath() performs the same path expansion on both input paths. 2021-01-11 04:54:41 -05:00
OTHGMars 0484956a1f Enables pattern searches to enter zipped sub-directories. 2021-01-11 04:53:38 -05:00
OTHGMars 46b0aee637 NavMesh loading from zip file. 2021-01-11 04:51:21 -05:00
OTHGMars e808fc4407 Clone file handle for concurrent zip access. 2021-01-11 04:49:43 -05:00
AzaezelX 93cdc35a76 revert #401 as while it does surpress hieght painting touching the center of terrains, it also locks out terrain painting dragging 2021-01-05 03:14:27 -06:00
Brian Roberts 4de1449c4b
Merge pull request #442 from rextimmy/gfx_cleanup 
Removed old fixed function code from GFX.
 2021-01-05 03:00:04 -06:00
Brian Roberts 2ba8ccd333
Merge pull request #436 from Areloch/AssetificationPass01 
Assetifies MeshRoad, Decal Road, and the material slot of GroundCover
 2021-01-05 02:23:24 -06:00
rextimmy 028bf1df9b give afx the gfx cleanup treatment 2021-01-05 18:22:19 +10:00
Areloch 8585278fe4 Adds autoimport logic for materials if the materialDefinition already exists 
Adds some additional utility functions to AssetImporter for easier access to setup
Corrects handling for legacy field names with meshRoad
 2021-01-05 00:58:18 -06:00
rextimmy 6d71bec417 gfx enum correction 2021-01-05 13:04:53 +10:00
rextimmy 5a933c00d3 Removed old fixed function code from GFX. 2021-01-05 12:57:17 +10:00
rextimmy aad70af468 use const for consistency 2021-01-05 10:43:12 +10:00
rextimmy 511efcf462 Correct GFXD3D11TextureObject lock/unlock issues 2021-01-05 10:41:30 +10:00
Lukas Aldershaab 481e2a7230 Improve terrain rendering, handle bug with no detail 2021-01-04 20:06:17 +01:00
Brian Roberts 27641b16ca
Merge pull request #424 from lukaspj/feature/new-terrain-blending 
Height based terrain texture blending
 2021-01-04 05:36:50 -06:00
Areloch bf5b26f734 Assetifies MeshRoad, Decal Road, and the material slot of GroundCover 
Creates a networked and non-networked variant of DECLARE_MATERIALASSET macro
 2021-01-03 08:58:53 -06:00
Lukas Aldershaab 6f57aa51d2 Add 0.5f term back to contrast calculation 2021-01-03 11:43:13 +01:00
Lukas Aldershaab 9cac064be8 Avoid negative heights in texture blending 2021-01-03 11:35:08 +01:00
Lukas Aldershaab 10ed852dd2 Remove baseline component from contrast 2021-01-03 01:49:07 +01:00
Lukas Aldershaab 26f09d9a97 Fail hard on unrecoverable mistakes in GFXTextureArray 2021-01-03 01:32:39 +01:00
Lukas Aldershaab 60a10f4334 Add global blendDepth slider and update default blendDepth for mats 2021-01-03 01:26:19 +01:00
Lukas Aldershaab db496fa0c4 Make terrain texture settings global, add dialog to painter 2021-01-03 00:50:42 +01:00
Lukas Aldershaab d3996aec84 Add texture size fields to terrain textures and improve editor performance 2021-01-02 18:33:18 +01:00
Lukas Aldershaab 9caa08b7f0 Fix off-by-one in mip levels for OpenGL 2021-01-02 18:19:26 +01:00
Brian Roberts a0ba345095
Merge pull request #432 from Azaezel/alpha40/sdlwebGeneralization 
sdl usage standards proposal 3
 2021-01-02 11:09:52 -06:00
Brian Roberts 03e6b5b096
Merge pull request #433 from Azaezel/alpha40/shapeAssetErrorFollowups 
moar asset errorhandling
 2021-01-02 11:09:31 -06:00
Lukas Aldershaab 3c165b7d45 Update blendContrast, add glsl support 2021-01-02 03:30:08 +01:00
Lukas Aldershaab 1ffec9ab56 Add blend contrast slider 2021-01-02 03:20:18 +01:00
Lukas Aldershaab 3c8d07a03e Cleanup and fixes 2021-01-02 02:08:22 +01:00
Lukas Aldershaab 4f472bf402 New terrain blending 2021-01-01 21:07:12 +01:00
Lukas Aldershaab e92e945912 Refactor GFXTextureArray 2021-01-01 21:06:08 +01:00
Lukas Aldershaab 87dd7ffc4a Implement Singlepass Terrain Render 2021-01-01 21:06:01 +01:00
AzaezelX 5e8862dafc further info by request 2020-12-31 19:38:53 -06:00
AzaezelX 6495ee16c6 report shape file location that failed to load, set loaded status to badfilereference if getAssetById can't even find noshape 2020-12-31 18:54:31 -06:00
Brian Roberts 07b9887cdd
Merge pull request #430 from Azaezel/alpha40/macfixes 
mac fixes
 2020-12-31 14:50:59 -06:00
AzaezelX 254ac462b5 sdl usage standards proposal 3: 
again maintains fallbacks for folks that just don't want to use the lib (though if we do want to go that route, we'll likely want to re-review a few commits and put fallbacks, well, *back* at some point)
includes sdl in torqueconfig.h if in use to kill duplication.
adds a generic sdlPlatform.cpp for general methods, oneliners, and the like
 2020-12-31 14:44:39 -06:00
AzaezelX 6b53b6581a mac fixes 
1) add sdl token for referencing the parent directory of the aplication bundle when determining the root dir
2) shape and mateiral asset macro corrections for a few stray ## redundencies (space, ->, . ect are all conidered token sperators in and of themselves)
 2020-12-30 19:36:51 -06:00
Jeff Hutchinson 301bfb4ce7 Merge branch 'Preview4_0_DevHead' into high_resolution_timer 2020-12-30 16:18:56 -05:00
Brian Roberts 578846ab6f
Merge pull request #428 from Areloch/ConsolidatedTerrainCreation 
Consolidates and standardizes terrain creation between the editor, asset browser and creator panel
 2020-12-29 01:29:34 -06:00
Brian Roberts 1fbf46fa90
Merge pull request #425 from Areloch/MaterialMacroMagic 
Initial pass at implementing MaterialAsset macromagic utility functions
 2020-12-29 00:40:46 -06:00
Areloch f7ce1efd62 Consolidates and standardizes terrain creation between the editor, asset browser and creator panel 
Also shifts terrain data importing into the new terrain asset window instead of separate in the File menu
Also removes redundant loadMaterials call that caused duplicates in the Terrain Painter material list
 2020-12-28 23:43:56 -06:00
Brian Roberts 5eb99027d8
Merge pull request #418 from Azaezel/alpha40_sdl2_0_14 
update sdl2 to release 2.0.14
 2020-12-28 22:04:16 -06:00
AzaezelX 482e836797 membervar compile fix 2020-12-28 17:18:19 -06:00
Jeff Hutchinson dee89e25b8 Changes profiler to use the high precision timer built into windows. 
Also removes the legacy GetTickCount() fallback as that is no longer necessary in modern versions of windows (Windows XP and greater support QueryPerformanceCounter)
 2020-12-28 18:14:21 -05:00
Areloch 3b111b14cc
Merge pull request #417 from Azaezel/alpha40_shapeMacroMagic 
corrected and implemented a usage of shapeasset macros
 2020-12-28 00:15:04 -06:00
Areloch baeabb4a51
Merge pull request #413 from Azaezel/alpha40_ServerAssetValidator 
add validation flagging for server objects
 2020-12-28 00:14:46 -06:00
Areloch c1cd217557 Initial pass at implementing MaterialAsset macromagic utility functions and applies it to the renderMeshExample object as well as groundPlane 2020-12-27 23:24:29 -06:00
Lukas Aldershaab 49a8c0ad36 Fix ORM maps in terrain textures 
Fix default target for Composite Terrain GLSL
 2020-12-26 20:02:37 +01:00
Lukas Aldershaab 0594e13e07 OpenGL: Access viewtangent "DX" style for gbNormal in terrain textures 2020-12-26 12:49:34 +01:00
AzaezelX 80f184e73d obsolete file removal 2020-12-22 17:44:24 -06:00
AzaezelX 77fc164e96 update sdl2 to release https://github.com/spurious/SDL-mirror/tree/release-2.0.14 2020-12-22 14:33:44 -06:00
AzaezelX 516a05301f corrected and implemented a usage of shapeasset macros (and stray membervars touched). todo: shapebaseimage, debris. 2020-12-22 12:34:15 -06:00
Brian Roberts e9dba74891
Merge pull request #375 from Areloch/LoopmodePathManager 
Adds handling to the path manager so it can deal with both looping and non-looping paths
 2020-12-21 03:05:00 -06:00
Brian Roberts 52ecd8bb0f
Merge pull request #395 from Areloch/MarkActiveScene 
WIP of marking active scene in the scenetree
 2020-12-19 02:35:58 -06:00
Brian Roberts 7dc6fc8abf
Merge pull request #415 from Areloch/GroundPlaneAssetify 
Converts GroundPlane to utilize assets
 2020-12-19 02:35:32 -06:00
Brian Roberts 78a836e433
Merge pull request #409 from Azaezel/alpha40_assetPipeCleanups 
asset pipe cleanups
 2020-12-19 02:34:57 -06:00
Areloch fb5195dd44 Corrects groundplane assigned material in the example and editor levels 
Assetifies GroundPlane's handling of it's material field
 2020-12-19 01:43:52 -06:00
Areloch 3821ddd15a Merge branch 'GroundPlaneAssetify' of https://github.com/Areloch/Torque3D into Preview4_0 2020-12-18 14:12:54 -06:00
Areloch 8f60d03830 Adjusts Asset Importer logic when looking up and saving out a newly created ShapeConstructor so that it doesn't duplicate a definition it one already exists. 
Adds _ORM and -ORM suffixes for PBR-ORM map import rule
Tweaks naming convention for IgnoreNode/Meshes and ImportNode/Meshes to be clearer via the prefix 'Always'
Fixes a token typo in suffix parsing, and adds \t to token deliniation for all suffix parsing to asset importer
 2020-12-18 00:55:01 -06:00
AzaezelX 6408297eb9 add validation flagging for server objects 
sets up a generic `ServerAssetValidator` PersistenceManager onServerCreated and saves anything marked dirty after processing. demonstrates looking that up and setting something dirty via shapebase::preload asset tagging
 2020-12-16 21:31:54 -06:00