ソースを参照

Removed Texture::Type::TEXTURE_UNKNOWN

Rcmaniac25 11 年 前
コミット
b3ae094256

+ 1 - 1
gameplay/src/Texture.cpp

@@ -51,7 +51,7 @@ static std::vector<Texture*> __textureCache;
 static TextureHandle __currentTextureId = 0;
 static Texture::Type __currentTextureType = Texture::TEXTURE_2D;
 
-Texture::Texture() : _handle(0), _format(UNKNOWN), _type(TEXTURE_UNKNOWN), _width(0), _height(0), _mipmapped(false), _cached(false), _compressed(false),
+Texture::Texture() : _handle(0), _format(UNKNOWN), _type((Texture::Type)0), _width(0), _height(0), _mipmapped(false), _cached(false), _compressed(false),
     _wrapS(Texture::REPEAT), _wrapT(Texture::REPEAT), _wrapR(Texture::REPEAT), _minFilter(Texture::NEAREST_MIPMAP_LINEAR), _magFilter(Texture::LINEAR)
 {
 }

+ 0 - 1
gameplay/src/Texture.h

@@ -56,7 +56,6 @@ public:
      */
     enum Type
     {
-        TEXTURE_UNKNOWN = 0,
         TEXTURE_2D = GL_TEXTURE_2D,
         TEXTURE_CUBE = GL_TEXTURE_CUBE_MAP
     };

+ 0 - 1
gameplay/src/lua/lua_Global.cpp

@@ -899,7 +899,6 @@ void luaRegister_lua_Global()
     {
         std::vector<std::string> scopePath;
         scopePath.push_back("Texture");
-        gameplay::ScriptUtil::registerConstantString("TEXTURE_UNKNOWN", "TEXTURE_UNKNOWN", scopePath);
         gameplay::ScriptUtil::registerConstantString("TEXTURE_2D", "TEXTURE_2D", scopePath);
         gameplay::ScriptUtil::registerConstantString("TEXTURE_CUBE", "TEXTURE_CUBE", scopePath);
     }

+ 1 - 6
gameplay/src/lua/lua_TextureType.cpp

@@ -6,25 +6,20 @@ namespace gameplay
 
 static const char* enumStringEmpty = "";
 
-static const char* luaEnumString_TextureType_TEXTURE_UNKNOWN = "TEXTURE_UNKNOWN";
 static const char* luaEnumString_TextureType_TEXTURE_2D = "TEXTURE_2D";
 static const char* luaEnumString_TextureType_TEXTURE_CUBE = "TEXTURE_CUBE";
 
 Texture::Type lua_enumFromString_TextureType(const char* s)
 {
-    if (strcmp(s, luaEnumString_TextureType_TEXTURE_UNKNOWN) == 0)
-        return Texture::TEXTURE_UNKNOWN;
     if (strcmp(s, luaEnumString_TextureType_TEXTURE_2D) == 0)
         return Texture::TEXTURE_2D;
     if (strcmp(s, luaEnumString_TextureType_TEXTURE_CUBE) == 0)
         return Texture::TEXTURE_CUBE;
-    return Texture::TEXTURE_UNKNOWN;
+    return Texture::TEXTURE_2D;
 }
 
 const char* lua_stringFromEnum_TextureType(Texture::Type e)
 {
-    if (e == Texture::TEXTURE_UNKNOWN)
-        return luaEnumString_TextureType_TEXTURE_UNKNOWN;
     if (e == Texture::TEXTURE_2D)
         return luaEnumString_TextureType_TEXTURE_2D;
     if (e == Texture::TEXTURE_CUBE)