AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2016-09-03 16:28:12 -10:00
parent a349076740 5880137b3a
commit c82703aee2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNAMP1/CMDLMaterials.cpp
View File

@ -183,7 +183,7 @@ void Material::AddTextureAnim(Stream& out,
" new_nodetree.links.new(node.outputs[0], soc_to)\n\n",
idx);
break;
case UVAnimation::Mode::WhoMustNotBeNamed:
case UVAnimation::Mode::CylinderEnvironment:
out.format("for link in list(tex_links):\n"
" if link.from_node.label == 'MTX_%u':\n"
" tex_links.remove(link)\n"
@ -1275,7 +1275,7 @@ MaterialSet::Material::UVAnimation::UVAnimation(const std::string& gameFunction,
mode = Mode::Model;
else if (!gameFunction.compare("RetroUVMode7NodeN"))
{
mode = Mode::WhoMustNotBeNamed;
mode = Mode::CylinderEnvironment;
if (gameArgs.size() < 2)
Log.report(logvisor::Fatal, "Mode7 UV anim requires 2 arguments");
vals[0] = gameArgs[0].vec[0];

8
DataSpec/DNAMP1/CMDLMaterials.hpp
View File

@ -264,7 +264,7 @@ struct MaterialSet : BigDNA
HStrip,
VStrip,
Model,
WhoMustNotBeNamed,
CylinderEnvironment,
Eight
} mode;
float vals[9];
@ -286,7 +286,7 @@ struct MaterialSet : BigDNA
vals[3] = reader.readFloatBig();
break;
case Mode::Rotation:
case Mode::WhoMustNotBeNamed:
case Mode::CylinderEnvironment:
vals[0] = reader.readFloatBig();
vals[1] = reader.readFloatBig();
break;
@ -321,7 +321,7 @@ struct MaterialSet : BigDNA
writer.writeFloatBig(vals[3]);
break;
case Mode::Rotation:
case Mode::WhoMustNotBeNamed:
case Mode::CylinderEnvironment:
writer.writeFloatBig(vals[0]);
writer.writeFloatBig(vals[1]);
break;
@ -351,7 +351,7 @@ struct MaterialSet : BigDNA
case Mode::VStrip:
return __isz + 20;
case Mode::Rotation:
case Mode::WhoMustNotBeNamed:
case Mode::CylinderEnvironment:
return __isz + 12;
case Mode::Eight:
return __isz + 40;