TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons

Browse source 
Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
This commit is contained in:
Areloch 2022-12-08 20:00:55 -06:00
parent fc1bbabe46
commit 6162c5da05
11 changed files with 422 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Engine/source/T3D/tsStatic.cpp
View file

@ -411,8 +411,8 @@ bool TSStatic::_createShape()
resetWorldBox();
mShapeInstance = new TSShapeInstance(mShape, isClientObject());
if (isClientObject())
mShapeInstance->cloneMaterialList();
mShapeInstance->resetMaterialList();
mShapeInstance->cloneMaterialList();
if (isGhost())
{
@ -1649,28 +1649,18 @@ void TSStatic::onInspect(GuiInspector* inspector)
GuiControl* stack = dynamic_cast<GuiControl*>(materialGroup->findObjectByInternalName(StringTable->insert("Stack")));
//Do this on both the server and client
S32 materialCount = mShapeAsset->getShape()->materialList->getMaterialNameList().size(); //mMeshAsset->getMaterialCount();
TSMaterialList* matList = mShapeInstance->getMaterialList();
Vector<String> matListNames = matList->getMaterialNameList();
S32 materialCount = matListNames.size();
if (isServerObject())
{
//we need to update the editor
/*for (U32 i = 0; i < mFields.size(); i++)
{
//find any with the materialslot title and clear them out
if (FindMatch::isMatch("MaterialSlot*", mFields[i].mFieldName, false))
{
setDataField(mFields[i].mFieldName, NULL, "");
mFields.erase(i);
continue;
}
}*/
//next, get a listing of our materials in the shape, and build our field list for them
char matFieldName[128];
for (U32 i = 0; i < materialCount; i++)
{
StringTableEntry materialname = StringTable->insert(mShapeAsset->getShape()->materialList->getMaterialName(i).c_str());
StringTableEntry materialname = StringTable->insert(mShapeInstance->getMaterialList()->getMaterialName(i).c_str());
AssetPtr<MaterialAsset> matAsset;
if(MaterialAsset::getAssetByMaterialName(materialname, &matAsset) == MaterialAsset::Ok)
@ -1694,6 +1684,9 @@ void TSStatic::onInspect(GuiInspector* inspector)
{
StringTableEntry fieldValue = matAsset->getAssetId();
GuiInspectorTypeMaterialAssetPtr* matFieldPtr = dynamic_cast<GuiInspectorTypeMaterialAssetPtr*>(fieldGui);
matFieldPtr->setPreviewImage(fieldValue);
//Check if we'd already actually changed it, and display the modified value
for (U32 c = 0; c < mChangingMaterials.size(); c++)
{