Commit graph

6544 commits

Author SHA1 Message Date
Areloch 7e5ccc65bd Removed extra PATTERNs from cmakelists 2023-11-23 13:09:54 -06:00
Areloch 431cffac11 Adds the D3DCompiler_47.dll to ensure it's packed and ready for projects when publishing 2023-11-23 12:46:55 -06:00
Brian Roberts 0738562296
Merge pull request #1139 from Azaezel/alpah41/ambientfix
ambient scales ibl
2023-11-20 15:26:56 -06:00
AzaezelX 456334fc55 ambient scales ibl
so default to 1,1,1, not 1/3rds
2023-11-20 15:26:30 -06:00
Brian Roberts 52e7156436
Merge pull request #1138 from Azaezel/alha41/luxTargTricks
lighting corrections:
2023-11-20 12:03:23 -06:00
AzaezelX 593d0ef9f0 lighting corrections:
1) fix spotlight shadow casting. we weren't properly accounting for reversedepthbuffer there
2) fix mismatched variables in forward lit spotlight param array
3) use disney diffuse in the generalized brdf, and apply it for spotlights after angular attenuation, not before
4) .provide a generailze luxTargMultiplier approach for spot and point lights (as well as future growth areas) so that range, angle ect can impact the brightness variable sent to a given light source shader without perpixel overhead
5) for spotlightParams in particular, use sizeof(point4f) for the alignedarray untill that's properly reviewed/revised
6) narrow attenuation slightly based on a given lights dot product to prevent tool vs outcome leakage, plus provide safeties for when a given spotslight's inner and outter angles match identially
2023-11-18 19:05:12 -06:00
Brian Roberts 1ee64b0a82
Merge pull request #1137 from Areloch/MiscUIFixes_20231116
Misc Tools UI fixes
2023-11-16 19:01:40 -06:00
Areloch 20e0fa8ec9 Misc Tools UI fixes
- Fixes the AB's select button not being properly offset to the right side
- Fixes incorrect height offset for the main editor tabbook because of a no-longer-used variable
- Fixes the bottom of the scene tree scroll being cut off
2023-11-16 18:55:18 -06:00
Brian Roberts 917cb882e9
Merge pull request #1136 from Areloch/TabbedEditorFormBaseline
Moves the world Editor guis to be based through a tabbed structure
2023-11-14 19:31:42 -06:00
Brian Roberts 762a0cbb9c
Merge pull request #1135 from Azaezel/alpha41/particlePunt
hide particleemitter dupes
2023-11-14 19:31:12 -06:00
Areloch 59247bd9ca Moves the world Editor guis to be based through a tabbed structure to make it easier to begin separating out editor/tool guis into their own tabs or elements for better separation.
Currently establishes the MainScene tab and otherwise retains existing behavior directly
2023-11-14 18:58:58 -06:00
AzaezelX 61b7813f11 hide particleemitter dupes
if you have a selected particleemitternode when opening the particle editor, don't show the edit-copy one
2023-11-14 13:11:01 -06:00
Brian Roberts 52b5ab197c
Merge pull request #1134 from Azaezel/alpha41/spotlightFix
revert b5d1d1a02c
2023-11-14 12:10:00 -06:00
AzaezelX 182fec8b1a revert b5d1d1a02c
turns out that caused lighting 'occlusion' artifacting
2023-11-14 12:09:32 -06:00
Brian Roberts fcd611353d
Merge pull request #1133 from Azaezel/alpha41/updateAudioStateCrashFix
fix updateAudioState null crash
2023-11-12 21:32:56 -06:00
AzaezelX 155477492d fix updateAudioState null crash 2023-11-12 21:32:24 -06:00
Brian Roberts efd81758a8
Merge pull request #1132 from Azaezel/alpha41/fixbitmapButtons
fix bitmap button state display
2023-11-12 19:50:00 -06:00
AzaezelX 7a9715654d fix bitmap button state display 2023-11-12 19:49:45 -06:00
Brian Roberts 4f0f97c5e7
Merge pull request #1131 from Azaezel/alpah41/assetLoadRefactor
asset load refactor
2023-11-12 18:43:57 -06:00
AzaezelX 1cf754dbca asset load refactor
genral load method, now returns loadedstate across the board
2023-11-12 16:33:17 -06:00
Brian Roberts 11ad16583e
Merge pull request #1130 from Azaezel/alpha41/doDropdownDisplay
kill duplicate ToolsGuiPopupMenuProfile define
2023-11-11 21:31:35 -06:00
AzaezelX 99b024d0c6 kill duplicate ToolsGuiPopupMenuProfile define 2023-11-11 13:34:59 -06:00
Brian Roberts aeee1d8e98
Merge pull request #1128 from Azaezel/alpha41/clusterCluck
clean up "Add" menubar categoes on the 3d object side via the following:
2023-11-10 02:51:05 -06:00
AzaezelX eeb42632f5 Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/clusterCluck
# Conflicts:
#	Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
#	Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
#	Engine/source/scene/sceneContainer.h
2023-11-10 02:50:13 -06:00
Brian Roberts e20e31072b
Merge pull request #1129 from Azaezel/alpha41/sigSour
fix getPrototypeSig
2023-11-10 02:46:10 -06:00
AzaezelX b0aadfb6e6 fix getPrototypeSig for cases of no input values whatsoever for a given method 2023-11-10 02:31:58 -06:00
AzaezelX 4e93c0543e hide scopealwaysshape from the "add" list, by consensus shive portals et al back to being tagged as volumes 2023-11-09 16:09:27 -06:00
AzaezelX 373508f622 add a generic fallback for gamebaseObject spawning via the "add" menu that fills in a generalized datablkock dropdown popup based on class name if a specified one does not exist 2023-11-09 11:51:58 -06:00
AzaezelX fbcfe02098 clean up "Add" menubar categoes on the 3d object side via the following:
SceneObject now defaults to a category of "misc"
getCategoryOfClass now checks parent classes for what categories they hold so that variants can inherit
categories are in one of a few rough groups and subgroups depending on actual mapper needs/usages
2023-11-08 20:42:47 -06:00
Brian Roberts a44c57aee4
Merge pull request #1127 from Azaezel/alpha41/playAudioCrashfix
fix playAudio crash
2023-11-05 15:31:09 -06:00
AzaezelX 12d0688abd fix playAudio crash 2023-11-05 15:30:19 -06:00
Brian Roberts 78aee62f71
Merge pull request #1126 from jamesu/fix_cast_ray
Alternate fix for castRay issue
2023-11-04 17:37:10 -05:00
James Urquhart 97d7d2e992 Alternate fix for castRay issue 2023-11-04 22:06:13 +00:00
Brian Roberts edbb76155b
Merge pull request #1123 from Azaezel/development
imageasset entries can be blank
2023-10-31 16:24:03 -05:00
AzaezelX 0303cadcc0 imageasset entries can be blank
don't spam the console. and definitely don't try and load it
2023-10-31 12:00:35 -05:00
Brian Roberts 8d643a35b6
Merge pull request #1122 from jamesu/fixconvex
Fix castray for cases where callback is used
2023-10-28 14:17:06 -05:00
James Urquhart e8271413e1 Set ri.object for castRay so convex shape editing works 2023-10-28 19:39:21 +01:00
Brian Roberts 105e45c56b
Merge pull request #1119 from Areloch/AssetPropEditRefreshFix
Ensures that when the asset is edited via the asset properties window the asset is refreshed in the backend systems as well
2023-10-24 18:42:53 -05:00
Brian Roberts 9ac8bfed8b
Merge pull request #1120 from Areloch/WorldEditorAddMenuAdded
Adds an Add menubar item to the World Editor menubar
2023-10-24 18:42:41 -05:00
Brian Roberts 0d179ae77f
Merge pull request #1121 from Areloch/MiscFixes_20231024
Misc Fixes for 2023/10/24
2023-10-24 18:10:11 -05:00
Areloch 473e566b70 Adds a separate gui profile for the popupmenus themselves that has a lighter border color, making it easier to keep track of the layout
Fixes the C++ asset creation and management function names so the AB can create C++ assets now
removes duplicate menuBuilder script file
2023-10-24 17:53:37 -05:00
Areloch 4bf7b0d5c0 Adds an Add menubar item to the World Editor menubar that populates SceneObject classes for spawnablility based on the categories assigned to the class itself 2023-10-24 17:36:58 -05:00
Areloch c3ea12f9df Ensures that when the asset is edited via the asset properties window, the asset is refreshed in the backend systems as well 2023-10-22 11:32:54 -05:00
Brian Roberts 083e367be1
Merge pull request #1117 from marauder2k9-torque/AppleToolchainTest
Apple toolchain fixes
2023-10-22 09:35:14 -05:00
Brian Roberts 0a9ba692ed
Merge pull request #1118 from Areloch/MenuBuilderUpdates
Expands functionality of MenuBuilder to act as primary API for building out menus
2023-10-22 09:34:58 -05:00
Areloch c2d1e9d654 Expands functionality of MenuBuilder to act as primary API for building out menus
Shifts "Help" menubar entry in world editor to use new API structure as example/test
Removes extraneous 'MainEditor'
Adds EditorCore module
Moved Menubuilder to EditorCore module
Fixes Help Menu editor settings so they properly point at modern documentation and forum URLs
Fixes handling of MenuBar so when inserting new items, ensures the menubar refreshes as would be expected
Adds remove function to menubar to remove a menu
Removes old commented console methods from menubar file
Adds checks for onMouseDown and onMouseUp for PopupMenu so items that are submenus aren't clickable like normal items
2023-10-22 00:47:29 -05:00
marauder2k7 dbb6359d80 Update CMakeLists.txt
add remaining torque requirements
2023-10-22 00:56:57 +01:00
marauder2k7 be3d26d9e6 SDL_FILESYSTEM
-Set the base dir based on build type
-enable only building active arch on debug
2023-10-22 00:47:14 +01:00
marauder2k7 2b2ce0229c Merge remote-tracking branch 'upstream/development' into AppleToolchainTest 2023-10-22 00:19:52 +01:00
marauder2k7 54959f0d19
SFXEmitter play pause and stop buttons (#1115)
-Add buttons to the inspector for SFXEmitter that will play pause and stop the sfxEmitter.
NOTE: Purely effects the state of the emitter when in the editor this will not effect sfxEmitter functionality in a level.
2023-10-21 18:09:19 -05:00