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

addsa material.setAnimflags(LAYER,TAGS STRING); method

Browse source 
workaround for mat.animFlags[#]= foo; not taking
time of writing seems to not work for scroll for some reason. might be a different bug
This commit is contained in:
AzaezelX 2021-10-25 22:54:19 -05:00
parent 14ebeaf3eb
commit 3fdf49f829
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Engine/source/materials/materialDefinition.cpp
View file

@ -755,6 +755,30 @@ DefineEngineMethod(Material, getAnimFlags, const char*, (U32 id), , "")
return animFlags; return animFlags;
} }
DefineEngineMethod(Material, setAnimFlags, void, (S32 id, const char *flags), (0, ""), "setAnimFlags")
{
object->mAnimFlags[id] = 0;
if (String(flags).find("$Scroll") != String::NPos)
object->mAnimFlags[id] |= Material::Scroll;
if (String(flags).find("$Rotate") != String::NPos)
object->mAnimFlags[id] |= Material::Rotate;
if (String(flags).find("$Wave") != String::NPos)
object->mAnimFlags[id] |= Material::Wave;
if (String(flags).find("$Scale") != String::NPos)
object->mAnimFlags[id] |= Material::Scale;
if (String(flags).find("$Sequence") != String::NPos)
object->mAnimFlags[id] |= Material::Sequence;
//if we're still unset, see if they tried assigning a number
if (object->mAnimFlags[id] == 0)
object->mAnimFlags[id] = dAtoi(flags);
}
DefineEngineMethod(Material, getFilename, const char*, (), , "Get filename of material") DefineEngineMethod(Material, getFilename, const char*, (), , "Get filename of material")
{ {
SimObject* material = static_cast<SimObject*>(object); SimObject* material = static_cast<SimObject*>(object);

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

@ -1432,13 +1432,13 @@ function MaterialEditorGui::updateAnimationFlags(%this)
%action.oldValue = %oldFlags; %action.oldValue = %oldFlags;
MaterialEditorGui.submitUndo( %action ); MaterialEditorGui.submitUndo( %action );
materialEd_previewMaterial.animFlags[MaterialEditorGui.currentLayer] = %flags; materialEd_previewMaterial.setAnimFlags(MaterialEditorGui.currentLayer, %flags);
materialEd_previewMaterial.flush(); materialEd_previewMaterial.flush();
materialEd_previewMaterial.reload(); materialEd_previewMaterial.reload();
if (MaterialEditorGui.livePreview == true) if (MaterialEditorGui.livePreview == true)
{ {
MaterialEditorGui.currentMaterial.animFlags[MaterialEditorGui.currentLayer] = %flags; MaterialEditorGui.currentMaterial.setAnimFlags(MaterialEditorGui.currentLayer, %flags);
MaterialEditorGui.currentMaterial.flush(); MaterialEditorGui.currentMaterial.flush();
MaterialEditorGui.currentMaterial.reload(); MaterialEditorGui.currentMaterial.reload();
} }