diff --git a/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp b/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp index d69aa26e2..f81f4f41e 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp @@ -368,8 +368,13 @@ bool Texture_matchInternalFormatModeStr(const char* str,Texture::InternalFormatM else if (strcmp(str,"USE_S3TC_DXT1_COMPRESSION")==0) mode = Texture::USE_S3TC_DXT1_COMPRESSION; else if (strcmp(str,"USE_S3TC_DXT3_COMPRESSION")==0) mode = Texture::USE_S3TC_DXT3_COMPRESSION; else if (strcmp(str,"USE_S3TC_DXT5_COMPRESSION")==0) mode = Texture::USE_S3TC_DXT5_COMPRESSION; - else if (strcmp(str,"USE_RGTC1_COMPRESSION")==0) mode = Texture::USE_RGTC1_COMPRESSION; - else if (strcmp(str,"USE_RGTC2_COMPRESSION")==0) mode = Texture::USE_RGTC2_COMPRESSION; + else if (strcmp(str,"USE_PVRTC_2BPP_COMPRESSION")==0) mode = Texture::USE_PVRTC_2BPP_COMPRESSION; + else if (strcmp(str,"USE_PVRTC_4BPP_COMPRESSION")==0) mode = Texture::USE_PVRTC_4BPP_COMPRESSION; + else if (strcmp(str,"USE_ETC_COMPRESSION")==0) mode = Texture::USE_ETC_COMPRESSION; + else if (strcmp(str,"USE_RGTC1_COMPRESSION")==0) mode = Texture::USE_RGTC1_COMPRESSION; + else if (strcmp(str,"USE_RGTC2_COMPRESSION")==0) mode = Texture::USE_RGTC2_COMPRESSION; + else if (strcmp(str,"USE_S3TC_DXT1c_COMPRESSION")==0) mode = Texture::USE_S3TC_DXT1c_COMPRESSION; + else if (strcmp(str,"USE_S3TC_DXT1a_COMPRESSION")==0) mode = Texture::USE_S3TC_DXT1a_COMPRESSION; else return false; return true; } @@ -385,8 +390,13 @@ const char* Texture_getInternalFormatModeStr(Texture::InternalFormatMode mode) case(Texture::USE_S3TC_DXT1_COMPRESSION): return "USE_S3TC_DXT1_COMPRESSION"; case(Texture::USE_S3TC_DXT3_COMPRESSION): return "USE_S3TC_DXT3_COMPRESSION"; case(Texture::USE_S3TC_DXT5_COMPRESSION): return "USE_S3TC_DXT5_COMPRESSION"; + case(Texture::USE_PVRTC_2BPP_COMPRESSION): return "USE_PVRTC_2BPP_COMPRESSION"; + case(Texture::USE_PVRTC_4BPP_COMPRESSION): return "USE_PVRTC_4BPP_COMPRESSION"; + case(Texture::USE_ETC_COMPRESSION): return "USE_ETC_COMPRESSION"; case(Texture::USE_RGTC1_COMPRESSION): return "USE_RGTC1_COMPRESSION"; case(Texture::USE_RGTC2_COMPRESSION): return "USE_RGTC2_COMPRESSION"; + case(Texture::USE_S3TC_DXT1c_COMPRESSION): return "USE_S3TC_DXT1c_COMPRESSION"; + case(Texture::USE_S3TC_DXT1a_COMPRESSION): return "USE_S3TC_DXT1a_COMPRESSION"; } return ""; } diff --git a/src/osgWrappers/serializers/osg/Texture.cpp b/src/osgWrappers/serializers/osg/Texture.cpp index c991deb89..34ba0ff15 100644 --- a/src/osgWrappers/serializers/osg/Texture.cpp +++ b/src/osgWrappers/serializers/osg/Texture.cpp @@ -95,8 +95,13 @@ REGISTER_OBJECT_WRAPPER( Texture, ADD_ENUM_VALUE( USE_S3TC_DXT1_COMPRESSION ); ADD_ENUM_VALUE( USE_S3TC_DXT3_COMPRESSION ); ADD_ENUM_VALUE( USE_S3TC_DXT5_COMPRESSION ); + ADD_ENUM_VALUE( USE_PVRTC_2BPP_COMPRESSION ); + ADD_ENUM_VALUE( USE_PVRTC_4BPP_COMPRESSION ); + ADD_ENUM_VALUE( USE_ETC_COMPRESSION ); ADD_ENUM_VALUE( USE_RGTC1_COMPRESSION ); ADD_ENUM_VALUE( USE_RGTC2_COMPRESSION ); + ADD_ENUM_VALUE( USE_S3TC_DXT1c_COMPRESSION ); + ADD_ENUM_VALUE( USE_S3TC_DXT1a_COMPRESSION ); END_ENUM_SERIALIZER(); // _internalFormatMode ADD_USER_SERIALIZER( InternalFormat ); // _internalFormat