TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Material editor fixes from eval cleanup.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-09-24 19:09:43 -04:00
parent 2e153e43e0
commit f1ee4f781b
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -1097,9 +1097,6 @@ function MaterialEditorGui::updateActiveMaterial(%this, %propertyField, %value,
{ {
MaterialEditorGui.setMaterialDirty(); MaterialEditorGui.setMaterialDirty();
if(%value $= "")
%value = "\"\"";
// Here is where we handle undo actions with slider controls. We want to be able to // Here is where we handle undo actions with slider controls. We want to be able to
// undo every onMouseUp; so we overrite the same undo action when necessary in order // undo every onMouseUp; so we overrite the same undo action when necessary in order
// to achieve this desired effect. // to achieve this desired effect.
@ -1130,7 +1127,7 @@ function MaterialEditorGui::updateActiveMaterial(%this, %propertyField, %value,
if (MaterialEditorGui.livePreview == true) if (MaterialEditorGui.livePreview == true)
{ {
MaterialEditorGui.setFieldValue(%propertyField, %value); MaterialEditorGui.currentMaterial.setFieldValue(%propertyField, %value);
MaterialEditorGui.currentMaterial.flush(); MaterialEditorGui.currentMaterial.flush();
MaterialEditorGui.currentMaterial.reload(); MaterialEditorGui.currentMaterial.reload();
} }
@ -1263,8 +1260,8 @@ function MaterialEditorGui::doUpdateTextureMap( %this, %assetId )
%bitmap = strreplace(%bitmap,"tools/materialEditor/scripts/",""); %bitmap = strreplace(%bitmap,"tools/materialEditor/scripts/","");
%bitmapCtrl.setBitmap(%bitmap); %bitmapCtrl.setBitmap(%bitmap);
%textCtrl.setText(%assetId); %textCtrl.setText(%assetId);
MaterialEditorGui.updateActiveMaterial(%type @ "Map[" @ %layer @ "]","\"\""); MaterialEditorGui.updateActiveMaterial(%type @ "Map[" @ %layer @ "]","");
MaterialEditorGui.updateActiveMaterial(%type @ "MapAsset[" @ %layer @ "]","\"" @ %assetId @ "\""); MaterialEditorGui.updateActiveMaterial(%type @ "MapAsset[" @ %layer @ "]", %assetId);
} }
} }
@ -1276,7 +1273,7 @@ function MaterialEditorGui::updateDetailScale(%this,%newScale)
{ {
%layer = MaterialEditorGui.currentLayer; %layer = MaterialEditorGui.currentLayer;
%detailScale = "\"" @ %newScale SPC %newScale @ "\""; %detailScale = %newScale SPC %newScale;
MaterialEditorGui.updateActiveMaterial("detailScale[" @ %layer @ "]", %detailScale); MaterialEditorGui.updateActiveMaterial("detailScale[" @ %layer @ "]", %detailScale);
} }
@ -1284,7 +1281,7 @@ function MaterialEditorGui::updateDetailNormalStrength(%this,%newStrength)
{ {
%layer = MaterialEditorGui.currentLayer; %layer = MaterialEditorGui.currentLayer;
%detailStrength = "\"" @ %newStrength @ "\""; %detailStrength = %newStrength;
MaterialEditorGui.updateActiveMaterial("detailNormalMapStrength[" @ %layer @ "]", %detailStrength); MaterialEditorGui.updateActiveMaterial("detailNormalMapStrength[" @ %layer @ "]", %detailStrength);
} }
@ -1295,7 +1292,7 @@ function MaterialEditorGui::updateRotationOffset(%this, %isSlider, %onMouseUp)
%Y = MaterialEditorPropertiesWindow-->RotationTextEditV.getText(); %Y = MaterialEditorPropertiesWindow-->RotationTextEditV.getText();
MaterialEditorPropertiesWindow-->RotationCrosshair.setPosition(45*mAbs(%X)-2, 45*mAbs(%Y)-2); MaterialEditorPropertiesWindow-->RotationCrosshair.setPosition(45*mAbs(%X)-2, 45*mAbs(%Y)-2);
MaterialEditorGui.updateActiveMaterial("rotPivotOffset[" @ %layer @ "]","\"" @ %X SPC %Y @ "\"",%isSlider,%onMouseUp); MaterialEditorGui.updateActiveMaterial("rotPivotOffset[" @ %layer @ "]", %X SPC %Y,%isSlider,%onMouseUp);
} }
function MaterialEditorGui::updateRotationSpeed(%this, %isSlider, %onMouseUp) function MaterialEditorGui::updateRotationSpeed(%this, %isSlider, %onMouseUp)
@ -1457,7 +1454,7 @@ function MaterialEditorGui::syncGuiColor(%this, %guiCtrl, %propname, %color)
%a = getWord(%color,3); %a = getWord(%color,3);
%colorSwatch = (%r SPC %g SPC %b SPC %a); %colorSwatch = (%r SPC %g SPC %b SPC %a);
%color = "\"" @ %r SPC %g SPC %b SPC %a @ "\""; %color = %r SPC %g SPC %b SPC %a;
%guiCtrl.color = %colorSwatch; %guiCtrl.color = %colorSwatch;
MaterialEditorGui.updateActiveMaterial(%propName, %color); MaterialEditorGui.updateActiveMaterial(%propName, %color);