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

Fixed gui editor drag and drop behavior for image, shape, and sound

Browse source 
Ensure BitmapFile is given a proper default
This commit is contained in:
JeffR 2025-05-30 20:21:13 -05:00
parent 5397c168bc
commit 0e6c33f78a
7 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/ImageAsset.h
View file

@ -264,7 +264,7 @@ public:
{ \
imageAssetId = query.mAssetList[0]; \
} \
else if(Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
else if(Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \
imageAssetId = ImageAsset::getAssetIdByFilename(_in); \
if (imageAssetId == ImageAsset::smNoImageAssetFallback) \

1
Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp
View file

@ -132,6 +132,7 @@ GuiBitmapButtonCtrl::GuiBitmapButtonCtrl()
mBitmapName = StringTable->EmptyString();
mBitmap = NULL;
mBitmapAsset.registerRefreshNotify(this);
mBitmapFile = String::EmptyString;
}
//-----------------------------------------------------------------------------

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

@ -2515,7 +2515,7 @@ function GuiEditor::onControlDropped(%this, %payload, %position)
%assetId = %payload.moduleName @ ":" @ %payload.assetName;
%assetType = AssetDatabase.getAssetType(%assetId);
AssetBrowser.callAssetTypeFunc(%assetType, "GUIEditorDropped", %payload.moduleName, %payload.assetName, %pos);
%ctrl = AssetBrowser.callAssetTypeFunc(%assetType, "onGUIEditorDropped", %payload.moduleName, %payload.assetName, %pos);
}
else
{

8
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/genericAsset.tscript
View file

@ -319,18 +319,18 @@ function GenericAsset::onSaveProperties(%this)
//Called when the asset's Preview has been dragged and dropped into the world editor
//This would usually spawn an associated instance, or a scene object that can utilize the
//asset in question(ie, Dropping a SoundAsset spawns a SoundEmitter)
function GenericAsset::onWorldEditorDropped(%this, %position)
/*function GenericAsset::onWorldEditorDropped(%this, %position)
{
echo("GenericAsset::onWorldEditorDropped() - " @ %this @ ", " @ %position);
}
}*/
//Called when the asset's Preview has been dragged and dropped into the GUI editor
//This would usually spawn an associated instance, or a gui object that can utilize the
//asset in question(ie, Dropping a SoundAsset spawns a guiAudioCtrl)
function GenericAsset::onGuiEditorDropped(%this, %position)
/*function GenericAsset::onGuiEditorDropped(%this, %position)
{
echo("GenericAsset::onGuiEditorDropped() - " @ %this @ ", " @ %position);
}
}*/
//An example case of handling other specialized editors, such as dropping a Datablock
//Preview into the DatablockEditor. This would be very case-by-case

12
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.tscript
View file

@ -84,6 +84,18 @@ function ImageAsset::onSaveProperties(%this)
{
GenericAsset::onSaveProperties(%this);
}
function ImageAsset::onGuiEditorDropped(%this, %position)
{
%assetId = %this.getAssetId();
%cmd = "new GuiBitmapCtrl(){";
%cmd = %cmd @ "BitmapAsset =\""@ %assetId @"\";";
%cmd = %cmd @ "position =\""@ %position @"\";";
%cmd = %cmd @ "};";
%ctrl = GuiEditCanvas.createObject(%cmd);
return %ctrl;
}
function GuiInspectorTypeImageAssetPtr::onControlDropped( %this, %payload, %position )
{

9
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript
View file

@ -148,9 +148,16 @@ function ShapeAsset::onWorldEditorDropped(%assetDef, %position)
MECreateUndoAction::submit(%newStatic );
}
function ShapeAsset::onGUIEditorDropped(%assetDef, %position)
function ShapeAsset::onGUIEditorDropped(%this, %position)
{
%assetId = %this.getAssetId();
%cmd = "new GuiObjectView(){";
%cmd = %cmd @ "ModelAsset =\""@ %assetId @"\";";
%cmd = %cmd @ "position =\""@ %position @"\";";
%cmd = %cmd @ "};";
%ctrl = GuiEditCanvas.createObject(%cmd);
return %ctrl;
}
function GuiInspectorTypeShapeAssetPtr::onControlDropped( %this, %payload, %position )

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/sound.tscript
View file

@ -87,6 +87,8 @@ function SoundAsset::onGUIEditorDropped(%this, %position)
%cmd = %cmd @ "};";
%ctrl = GuiEditCanvas.createObject(%cmd);
//echo(%ctrl SPC "created");
return %ctrl;
}
function GuiInspectorTypeSoundAssetPtr::onControlDropped( %this, %payload, %position )