Commit graph

4109 commits

Author SHA1 Message Date
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 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
James Urquhart 97d7d2e992 Alternate fix for castRay issue 2023-11-04 22:06:13 +00: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
James Urquhart e8271413e1 Set ri.object for castRay so convex shape editing works 2023-10-28 19:39:21 +01: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
Brian Roberts 083e367be1
Merge pull request #1117 from marauder2k9-torque/AppleToolchainTest
Apple toolchain fixes
2023-10-22 09:35:14 -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
marauder2k7 852ed8f225
Sfx playlist asset working (#1109)
* GroundWork

-Reverted SFXPlaylist since it is going to be made from an asset now instead.
-Added extra options to soundAssets description.
-SFXPlaylist may need an onAdd function

* Update sfxController.cpp

* SFXPlaylist data

-Added sfxPlaylist init persist fields for the slots to sound asset
-Added logic to fil sfxPlaylist if more than 1 slot is filled

* Update SoundAsset.cpp

to stop git ci complaining, assetImporter........

* Update SoundAsset.h

* sfxPlaylist

-Fix: incomplete type error
-Added onAdd and onRemove to playlist
-SoundAsset getProfile define now returns playlist if the asset is a playlist.

* Update SoundAsset.h

-updated asset array to return playlist or profile depending on what the asset is

* SFXPlaylist working

-SFXPlaylist works
AudioChannelDefault gets its volume set to 0 for some reason and was throwing off making sfxPlaylist inaudible.

Still an exception when closing if using a playlist trips on line 355 of sfxSound

* Update sfxSound.h

* setSoundFile index null fix

* Update SoundAsset.h

* Update SoundAsset.h

* netstream safety in case of a null asset assignment

* Update sfxController.cpp

added safeties around a null playlist trying to play.

* Update with Az's asset err code changes

---------

Co-authored-by: AzaezelX <quillus@hotmail.com>
2023-10-21 17:19:02 -05:00
marauder2k7 aebcf3fc87 Merge remote-tracking branch 'upstream/development' into AppleToolchainTest 2023-10-21 21:24:27 +01:00
AzaezelX e6c2fe78fb generateCachedPreviewImage needs loadShape() 2023-10-21 15:15:27 -05:00
Brian Roberts a8194fdf3a
Merge pull request #1114 from Azaezel/alpha41/assetAnalysisAugs
asset load flow work
2023-10-21 01:37:38 -05:00
marauder2k7 acf3177021 Revert "example cmake workflow"
This reverts commit 233c6a8045.
2023-10-21 07:08:12 +01:00
marauder2k7 233c6a8045 example cmake workflow 2023-10-21 01:50:31 +01:00
JeffR 92743f6fd8 Adjusts the logic for when creating a simObject from a taml so that array elements(like material slots or sound asset slots) properly can handle prefixed field values, such as referencing loose asset files. 2023-10-20 17:51:49 -05:00
marauder2k7 8b7e318fd5 multiplatform fixes
-Wrap macosconfig in if(apple)
2023-10-20 22:33:20 +01:00
marauder2k7 9bc06f0887 main dir
SDL_BaseDir was returning the directory that contains the app, now it returns the resources directory
2023-10-20 22:23:38 +01:00
marauder2k7 f10520e751 Macosx build with rpath
Archiving builds no longer have linking errors when run
2023-10-20 21:06:53 +01:00
marauder2k7 b6617b1b0f Working multi-arch archiving
-Working multi arch compile
-Required assets now copy to the app bundle
TODO: Make the logic to wrap around whether its multi arch
-The changes in torqumacosconfigs.cmake are not required if we are only building one architecture, also if it is x86_64 we can drop min deployment target to 10.13
2023-10-20 12:04:56 +01:00
marauder2k7 e381bf4838 Working archive
-Archive now working if we override the shared libs rpath with the correct installation path
2023-10-20 00:19:40 +01:00
marauder2k7 0af0b5a24a MACOS working
Mac working in this stage
2023-10-19 14:39:22 +01:00
marauder2k7 c11587cad3 Attempt 2
-Missing includes may be due to no parent_scope
2023-10-19 11:04:16 +01:00
AzaezelX 4fb67ed618 refactor by request 2023-10-15 16:09:49 -05:00
AzaezelX 3bdce1f33e lower engine requirements back to c++17 standards, not c++20. 2023-10-15 16:09:49 -05:00
marauder2k7 e6ead9f268 Update console.cpp 2023-10-15 15:14:58 -05:00
marauder2k7 09b1e9783a Mem fix
-Data chunker was leaking, (my bad) fixed

-Added != operator to scene container for std:c++17 conformance.
2023-10-15 15:14:58 -05:00
AzaezelX b278802645 cmake cleanups
new global defines: TORQUE_LIB_ROOT_DIRECTORY and TORQUE_LIB_TARG_DIRECTORY for source location and target to build static libs, respectively
reassign location back to torqueConfig.h, torque.rc, and Info.plist to  "${TORQUE_APP_ROOT_DIRECTORY}/source/ aka \My Projects\<apname>\source by request
2023-10-14 23:02:55 -05:00
AzaezelX a8d640e311 clean up redundant loads, shift first load to getResource methods for sound and shape.
still need to properly sort image
2023-10-09 14:41:14 -05:00
Lukas Aldershaab a5e75dfd61 Make sure TORQUE_TARGET_PROPERTIES is populated before using it 2023-10-08 17:36:51 -05:00
Lukas Aldershaab df8041e689 Add support for replacing the main.tscript file with a specified Console Function 2023-10-08 17:36:51 -05:00
Lukas Aldershaab bcea9bfc3a Support setting target properties and link options from modules 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 87c6884433 Expose SimObjectPtr C-API functions using EngineAPI 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 8748a2cac8 Expose some information in EngineFunction exports for better interop capabilities 2023-10-08 17:36:51 -05:00
Lukas Aldershaab ee93dc3b57 Ensure that getGlobalScope always returns the same object 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 2c9f6a5350 Remove EngineXMLExport filtering 2023-10-08 17:36:51 -05:00
Lukas Aldershaab 25c1ebcf13 Properly call endGroup instead of addGroup 2023-10-08 17:36:51 -05:00
AzaezelX b710a309bd asset load flow work
add reloading state to asset tracking,
convert most asset.isnull() checks on over to skipping out unless the errcode is ::Ok, or ::UsingFallback
add more errstriongcodes to hook up
skip load<type> execution if the asset loaded state is ::Ok
2023-10-08 13:19:43 -05:00
Lukas Aldershaab 753cbe32d9 Fix SkipMainCs flag, it was inverted 2023-09-28 08:31:39 -05:00
Lukas Aldershaab 27b6973da0 Reintroduce getFileLine for Console Modules 2023-09-27 14:58:44 -05:00
Lukas Aldershaab 01cfa4a604 Add sensible defaults for Console Module interface 2023-09-27 14:58:44 -05:00
Lukas Aldershaab 569f3a1e41 Allow skipping main.tscript execution 2023-09-27 14:58:44 -05:00