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

Merge pull request #827 from Areloch/MiscFIxes20220702

Browse source 
Misc Fixes 2022/07/02
This commit is contained in:
Brian Roberts 2022-07-03 02:25:49 -05:00 committed by GitHub
parent fbc304badb 305e4851e0
commit 32ddf5f791
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/sfx/sfxEmitter.cpp
View file

@ -690,7 +690,7 @@ void SFXEmitter::_update()
if (mSoundAsset.notNull() )
{
mLocalProfile = *mSoundAsset->getSfxProfile();
//mLocalProfile = *mSoundAsset->getSfxProfile();
mDescription = *mSoundAsset->getSfxDescription();
}

2
Engine/source/Verve/VPath/VPathEditor.cpp
View file

@ -20,6 +20,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "torqueConfig.h"
#ifdef TORQUE_TOOLS
#include "VPathEditor.h"

2
Engine/source/Verve/VPath/VPathEditor.h
View file

@ -22,6 +22,8 @@
//-----------------------------------------------------------------------------
#ifndef _VT_VPATHEDITOR_H_
#define _VT_VPATHEDITOR_H_
#include "torqueConfig.h"
#ifdef TORQUE_TOOLS
#ifndef _EDITTSCTRL_H_
#include "gui/worldEditor/editTSCtrl.h"

1
Engine/source/afx/ui/afxGuiSubstitutionField.cpp
View file

@ -22,6 +22,7 @@
// IN THE SOFTWARE.
//
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
#include "torqueConfig.h"
#ifdef TORQUE_TOOLS
#include "afx/arcaneFX.h"

1
Engine/source/afx/ui/afxGuiSubstitutionField.h
View file

@ -25,6 +25,7 @@
#ifndef _AFX_GUI_SUBSTITUTION_FIELD_H_
#define _AFX_GUI_SUBSTITUTION_FIELD_H_
#include "torqueConfig.h"
#ifdef TORQUE_TOOLS
#include "console/simFieldDictionary.h"
#include "gui/editor/inspector/field.h"

3
Engine/source/assets/assetManager.cpp
View file

@ -2988,7 +2988,8 @@ void AssetManager::unloadAsset( AssetDefinition* pAssetDefinition )
PROFILE_SCOPE(AssetManager_UnloadAsset);
// Destroy the asset.
pAssetDefinition->mpAssetBase->deleteObject();
if(pAssetDefinition->mpAssetBase->isProperlyAdded())
pAssetDefinition->mpAssetBase->deleteObject();
// Increase unloaded count.
pAssetDefinition->mAssetUnloadedCount++;

1
Engine/source/navigation/guiNavEditorCtrl.cpp
View file

@ -19,6 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "torqueConfig.h"
#ifdef TORQUE_TOOLS
#include "platform/platform.h"
#include "guiNavEditorCtrl.h"

1
Engine/source/navigation/guiNavEditorCtrl.h
View file

@ -22,6 +22,7 @@
#ifndef _GUINAVEDITORCTRL_H_
#define _GUINAVEDITORCTRL_H_
#include "torqueConfig.h"
#ifdef TORQUE_TOOLS
#ifndef _EDITTSCTRL_H_
#include "gui/worldEditor/editTSCtrl.h"

15
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -1090,14 +1090,17 @@ function AssetBrowserPreviewButton::onRightClick(%this)
EditAssetPopup.enableItem(9, false);
}
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
if(%assetDef.originalFilePath $= "" || !isFile(%assetDef.originalFilePath))
if(AssetDatabase.acquireAsset(EditAssetPopup.assetId))
{
//if we have no noted original import file path or it's invalid
//we can't reimport either
EditAssetPopup.enableItem(9, false);
%assetDef = AssetDatabase.acquireAsset(EditAssetPopup.assetId);
if(%assetDef.originalFilePath $= "" || !isFile(%assetDef.originalFilePath))
{
//if we have no noted original import file path or it's invalid
//we can't reimport either
EditAssetPopup.enableItem(9, false);
}
AssetDatabase.releaseAsset(EditAssetPopup.assetId);
}
AssetDatabase.releaseAsset(EditAssetPopup.assetId);
if(%assetType $= "LevelAsset")
{

23
Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript
View file

@ -33,6 +33,17 @@ function AssetBrowser::editAsset(%this, %assetDef)
{
AssetBrowser.navigateTo(%folder);
}
else
{
%object = getToken(EditAssetPopup.assetId, ":", 1);
if(isObject(%object))
{
if(%object.isMemberOfClass("SimDatablock"))
{
DatablockEditorPlugin.openDatablock( %object );
}
}
}
}
}
else if(AssetDatabase.isDeclaredAsset(%assetDef))
@ -42,12 +53,14 @@ function AssetBrowser::editAsset(%this, %assetDef)
%assetDef = AssetDatabase.acquireAsset(%assetDef);
}
if(%assetDef !$= "")
{
%assetType = %assetDef.getClassName();
%assetType = %assetDef.getClassName();
//Build out the edit command
%buildCommand = %this @ ".edit" @ %assetType @ "(" @ %assetDef @ ");";
eval(%buildCommand);
//Build out the edit command
%buildCommand = %this @ ".edit" @ %assetType @ "(" @ %assetDef @ ");";
eval(%buildCommand);
}
}
function AssetBrowser::appendSubLevel(%this)