Browse Source

Exposed texture unit names in header.

Matt Benic 10 years ago
parent
commit
cdd90af5ca
2 changed files with 5 additions and 4 deletions
  1. 4 4
      Source/Atomic/Graphics/Material.cpp
  2. 1 0
      Source/Atomic/Graphics/Material.h

+ 4 - 4
Source/Atomic/Graphics/Material.cpp

@@ -47,7 +47,7 @@ namespace Atomic
 
 
 extern const char* wrapModeNames[];
 extern const char* wrapModeNames[];
 
 
-static const char* textureUnitNames[] =
+const char* TEXTURE_UNIT_NAMES[] =
 {
 {
     "diffuse",
     "diffuse",
     "normal",
     "normal",
@@ -95,7 +95,7 @@ TextureUnit ParseTextureUnitName(String name)
 {
 {
     name = name.ToLower().Trimmed();
     name = name.ToLower().Trimmed();
 
 
-    TextureUnit unit = (TextureUnit)GetStringListIndex(name.CString(), textureUnitNames, MAX_TEXTURE_UNITS);
+    TextureUnit unit = (TextureUnit)GetStringListIndex(name.CString(), TEXTURE_UNIT_NAMES, MAX_TEXTURE_UNITS);
     if (unit == MAX_TEXTURE_UNITS)
     if (unit == MAX_TEXTURE_UNITS)
     {
     {
         // Check also for shorthand names
         // Check also for shorthand names
@@ -428,7 +428,7 @@ bool Material::Save(XMLElement& dest) const
         if (texture)
         if (texture)
         {
         {
             XMLElement textureElem = dest.CreateChild("texture");
             XMLElement textureElem = dest.CreateChild("texture");
-            textureElem.SetString("unit", textureUnitNames[j]);
+            textureElem.SetString("unit", TEXTURE_UNIT_NAMES[j]);
             textureElem.SetString("name", texture->GetName());
             textureElem.SetString("name", texture->GetName());
         }
         }
     }
     }
@@ -758,7 +758,7 @@ Scene* Material::GetScene() const
 
 
 String Material::GetTextureUnitName(TextureUnit unit)
 String Material::GetTextureUnitName(TextureUnit unit)
 {
 {
-    return textureUnitNames[unit];
+    return TEXTURE_UNIT_NAMES[unit];
 }
 }
 
 
 Variant Material::ParseShaderParameterValue(const String& value)
 Variant Material::ParseShaderParameterValue(const String& value)

+ 1 - 0
Source/Atomic/Graphics/Material.h

@@ -41,6 +41,7 @@ class TextureCube;
 class ValueAnimationInfo;
 class ValueAnimationInfo;
 
 
 static const unsigned char DEFAULT_RENDER_ORDER = 128;
 static const unsigned char DEFAULT_RENDER_ORDER = 128;
+extern const char* TEXTURE_UNIT_NAMES[];
 
 
 /// %Material's shader parameter definition.
 /// %Material's shader parameter definition.
 struct MaterialShaderParameter
 struct MaterialShaderParameter