From 12e6702389645d17e30754ebe8440b4b56b947d5 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 3 Sep 2016 00:23:39 -0700 Subject: [PATCH] Rename Mode7 to more appropriate name --- DataSpec/DNAMP1/CMDLMaterials.cpp | 4 ++-- DataSpec/DNAMP1/CMDLMaterials.hpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DataSpec/DNAMP1/CMDLMaterials.cpp b/DataSpec/DNAMP1/CMDLMaterials.cpp index 71d412759..15a96ad92 100644 --- a/DataSpec/DNAMP1/CMDLMaterials.cpp +++ b/DataSpec/DNAMP1/CMDLMaterials.cpp @@ -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]; diff --git a/DataSpec/DNAMP1/CMDLMaterials.hpp b/DataSpec/DNAMP1/CMDLMaterials.hpp index 4fc32841a..e070bf532 100644 --- a/DataSpec/DNAMP1/CMDLMaterials.hpp +++ b/DataSpec/DNAMP1/CMDLMaterials.hpp @@ -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;