Rename StreamTexture* to CompressedTexture*
* Its not and will not be used for streaming. * Streaming will be implemented in 4.1 and it will work different. * It makes more sense to be called CompressedTexture since it imports and compresses texture files.
This commit is contained in:
reduz
parent
ff65d33e8c
commit
ccd4cdfd8b
24 changed files with 239 additions and 239 deletions
|
|
@ -293,7 +293,7 @@ ImageTexture::~ImageTexture() {
|
|||
|
||||
//////////////////////////////////////////
|
||||
|
||||
Ref<Image> StreamTexture2D::load_image_from_file(FileAccess *f, int p_size_limit) {
|
||||
Ref<Image> CompressedTexture2D::load_image_from_file(FileAccess *f, int p_size_limit) {
|
||||
uint32_t data_format = f->get_32();
|
||||
uint32_t w = f->get_16();
|
||||
uint32_t h = f->get_16();
|
||||
|
|
@ -426,7 +426,7 @@ Ref<Image> StreamTexture2D::load_image_from_file(FileAccess *f, int p_size_limit
|
|||
return Ref<Image>();
|
||||
}
|
||||
|
||||
void StreamTexture2D::set_path(const String &p_path, bool p_take_over) {
|
||||
void CompressedTexture2D::set_path(const String &p_path, bool p_take_over) {
|
||||
if (texture.is_valid()) {
|
||||
RenderingServer::get_singleton()->texture_set_path(texture, p_path);
|
||||
}
|
||||
|
|
@ -434,36 +434,36 @@ void StreamTexture2D::set_path(const String &p_path, bool p_take_over) {
|
|||
Resource::set_path(p_path, p_take_over);
|
||||
}
|
||||
|
||||
void StreamTexture2D::_requested_3d(void *p_ud) {
|
||||
StreamTexture2D *st = (StreamTexture2D *)p_ud;
|
||||
Ref<StreamTexture2D> stex(st);
|
||||
void CompressedTexture2D::_requested_3d(void *p_ud) {
|
||||
CompressedTexture2D *st = (CompressedTexture2D *)p_ud;
|
||||
Ref<CompressedTexture2D> stex(st);
|
||||
ERR_FAIL_COND(!request_3d_callback);
|
||||
request_3d_callback(stex);
|
||||
}
|
||||
|
||||
void StreamTexture2D::_requested_roughness(void *p_ud, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_roughness_channel) {
|
||||
StreamTexture2D *st = (StreamTexture2D *)p_ud;
|
||||
Ref<StreamTexture2D> stex(st);
|
||||
void CompressedTexture2D::_requested_roughness(void *p_ud, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_roughness_channel) {
|
||||
CompressedTexture2D *st = (CompressedTexture2D *)p_ud;
|
||||
Ref<CompressedTexture2D> stex(st);
|
||||
ERR_FAIL_COND(!request_roughness_callback);
|
||||
request_roughness_callback(stex, p_normal_path, p_roughness_channel);
|
||||
}
|
||||
|
||||
void StreamTexture2D::_requested_normal(void *p_ud) {
|
||||
StreamTexture2D *st = (StreamTexture2D *)p_ud;
|
||||
Ref<StreamTexture2D> stex(st);
|
||||
void CompressedTexture2D::_requested_normal(void *p_ud) {
|
||||
CompressedTexture2D *st = (CompressedTexture2D *)p_ud;
|
||||
Ref<CompressedTexture2D> stex(st);
|
||||
ERR_FAIL_COND(!request_normal_callback);
|
||||
request_normal_callback(stex);
|
||||
}
|
||||
|
||||
StreamTexture2D::TextureFormatRequestCallback StreamTexture2D::request_3d_callback = nullptr;
|
||||
StreamTexture2D::TextureFormatRoughnessRequestCallback StreamTexture2D::request_roughness_callback = nullptr;
|
||||
StreamTexture2D::TextureFormatRequestCallback StreamTexture2D::request_normal_callback = nullptr;
|
||||
CompressedTexture2D::TextureFormatRequestCallback CompressedTexture2D::request_3d_callback = nullptr;
|
||||
CompressedTexture2D::TextureFormatRoughnessRequestCallback CompressedTexture2D::request_roughness_callback = nullptr;
|
||||
CompressedTexture2D::TextureFormatRequestCallback CompressedTexture2D::request_normal_callback = nullptr;
|
||||
|
||||
Image::Format StreamTexture2D::get_format() const {
|
||||
Image::Format CompressedTexture2D::get_format() const {
|
||||
return format;
|
||||
}
|
||||
|
||||
Error StreamTexture2D::_load_data(const String &p_path, int &r_width, int &r_height, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit) {
|
||||
Error CompressedTexture2D::_load_data(const String &p_path, int &r_width, int &r_height, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit) {
|
||||
alpha_cache.unref();
|
||||
|
||||
ERR_FAIL_COND_V(image.is_null(), ERR_INVALID_PARAMETER);
|
||||
|
|
@ -523,7 +523,7 @@ Error StreamTexture2D::_load_data(const String &p_path, int &r_width, int &r_hei
|
|||
return OK;
|
||||
}
|
||||
|
||||
Error StreamTexture2D::load(const String &p_path) {
|
||||
Error CompressedTexture2D::load(const String &p_path) {
|
||||
int lw, lh;
|
||||
Ref<Image> image;
|
||||
image.instantiate();
|
||||
|
|
@ -590,51 +590,51 @@ Error StreamTexture2D::load(const String &p_path) {
|
|||
return OK;
|
||||
}
|
||||
|
||||
String StreamTexture2D::get_load_path() const {
|
||||
String CompressedTexture2D::get_load_path() const {
|
||||
return path_to_file;
|
||||
}
|
||||
|
||||
int StreamTexture2D::get_width() const {
|
||||
int CompressedTexture2D::get_width() const {
|
||||
return w;
|
||||
}
|
||||
|
||||
int StreamTexture2D::get_height() const {
|
||||
int CompressedTexture2D::get_height() const {
|
||||
return h;
|
||||
}
|
||||
|
||||
RID StreamTexture2D::get_rid() const {
|
||||
RID CompressedTexture2D::get_rid() const {
|
||||
if (!texture.is_valid()) {
|
||||
texture = RS::get_singleton()->texture_2d_placeholder_create();
|
||||
}
|
||||
return texture;
|
||||
}
|
||||
|
||||
void StreamTexture2D::draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate, bool p_transpose) const {
|
||||
void CompressedTexture2D::draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate, bool p_transpose) const {
|
||||
if ((w | h) == 0) {
|
||||
return;
|
||||
}
|
||||
RenderingServer::get_singleton()->canvas_item_add_texture_rect(p_canvas_item, Rect2(p_pos, Size2(w, h)), texture, false, p_modulate, p_transpose);
|
||||
}
|
||||
|
||||
void StreamTexture2D::draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile, const Color &p_modulate, bool p_transpose) const {
|
||||
void CompressedTexture2D::draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile, const Color &p_modulate, bool p_transpose) const {
|
||||
if ((w | h) == 0) {
|
||||
return;
|
||||
}
|
||||
RenderingServer::get_singleton()->canvas_item_add_texture_rect(p_canvas_item, p_rect, texture, p_tile, p_modulate, p_transpose);
|
||||
}
|
||||
|
||||
void StreamTexture2D::draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate, bool p_transpose, bool p_clip_uv) const {
|
||||
void CompressedTexture2D::draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate, bool p_transpose, bool p_clip_uv) const {
|
||||
if ((w | h) == 0) {
|
||||
return;
|
||||
}
|
||||
RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas_item, p_rect, texture, p_src_rect, p_modulate, p_transpose, p_clip_uv);
|
||||
}
|
||||
|
||||
bool StreamTexture2D::has_alpha() const {
|
||||
bool CompressedTexture2D::has_alpha() const {
|
||||
return false;
|
||||
}
|
||||
|
||||
Ref<Image> StreamTexture2D::get_image() const {
|
||||
Ref<Image> CompressedTexture2D::get_image() const {
|
||||
if (texture.is_valid()) {
|
||||
return RS::get_singleton()->texture_2d_get(texture);
|
||||
} else {
|
||||
|
|
@ -642,7 +642,7 @@ Ref<Image> StreamTexture2D::get_image() const {
|
|||
}
|
||||
}
|
||||
|
||||
bool StreamTexture2D::is_pixel_opaque(int p_x, int p_y) const {
|
||||
bool CompressedTexture2D::is_pixel_opaque(int p_x, int p_y) const {
|
||||
if (!alpha_cache.is_valid()) {
|
||||
Ref<Image> img = get_image();
|
||||
if (img.is_valid()) {
|
||||
|
|
@ -676,7 +676,7 @@ bool StreamTexture2D::is_pixel_opaque(int p_x, int p_y) const {
|
|||
return true;
|
||||
}
|
||||
|
||||
void StreamTexture2D::reload_from_file() {
|
||||
void CompressedTexture2D::reload_from_file() {
|
||||
String path = get_path();
|
||||
if (!path.is_resource_file()) {
|
||||
return;
|
||||
|
|
@ -691,26 +691,26 @@ void StreamTexture2D::reload_from_file() {
|
|||
load(path);
|
||||
}
|
||||
|
||||
void StreamTexture2D::_validate_property(PropertyInfo &property) const {
|
||||
void CompressedTexture2D::_validate_property(PropertyInfo &property) const {
|
||||
}
|
||||
|
||||
void StreamTexture2D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("load", "path"), &StreamTexture2D::load);
|
||||
ClassDB::bind_method(D_METHOD("get_load_path"), &StreamTexture2D::get_load_path);
|
||||
void CompressedTexture2D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("load", "path"), &CompressedTexture2D::load);
|
||||
ClassDB::bind_method(D_METHOD("get_load_path"), &CompressedTexture2D::get_load_path);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "load_path", PROPERTY_HINT_FILE, "*.stex"), "load", "get_load_path");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "load_path", PROPERTY_HINT_FILE, "*.ctex"), "load", "get_load_path");
|
||||
}
|
||||
|
||||
StreamTexture2D::StreamTexture2D() {}
|
||||
CompressedTexture2D::CompressedTexture2D() {}
|
||||
|
||||
StreamTexture2D::~StreamTexture2D() {
|
||||
CompressedTexture2D::~CompressedTexture2D() {
|
||||
if (texture.is_valid()) {
|
||||
RS::get_singleton()->free(texture);
|
||||
}
|
||||
}
|
||||
|
||||
RES ResourceFormatLoaderStreamTexture2D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
|
||||
Ref<StreamTexture2D> st;
|
||||
RES ResourceFormatLoaderCompressedTexture2D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
|
||||
Ref<CompressedTexture2D> st;
|
||||
st.instantiate();
|
||||
Error err = st->load(p_path);
|
||||
if (r_error) {
|
||||
|
|
@ -723,17 +723,17 @@ RES ResourceFormatLoaderStreamTexture2D::load(const String &p_path, const String
|
|||
return st;
|
||||
}
|
||||
|
||||
void ResourceFormatLoaderStreamTexture2D::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
p_extensions->push_back("stex");
|
||||
void ResourceFormatLoaderCompressedTexture2D::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
p_extensions->push_back("ctex");
|
||||
}
|
||||
|
||||
bool ResourceFormatLoaderStreamTexture2D::handles_type(const String &p_type) const {
|
||||
return p_type == "StreamTexture2D";
|
||||
bool ResourceFormatLoaderCompressedTexture2D::handles_type(const String &p_type) const {
|
||||
return p_type == "CompressedTexture2D";
|
||||
}
|
||||
|
||||
String ResourceFormatLoaderStreamTexture2D::get_resource_type(const String &p_path) const {
|
||||
if (p_path.get_extension().to_lower() == "stex") {
|
||||
return "StreamTexture2D";
|
||||
String ResourceFormatLoaderCompressedTexture2D::get_resource_type(const String &p_path) const {
|
||||
if (p_path.get_extension().to_lower() == "ctex") {
|
||||
return "CompressedTexture2D";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
@ -846,7 +846,7 @@ ImageTexture3D::~ImageTexture3D() {
|
|||
|
||||
////////////////////////////////////////////
|
||||
|
||||
void StreamTexture3D::set_path(const String &p_path, bool p_take_over) {
|
||||
void CompressedTexture3D::set_path(const String &p_path, bool p_take_over) {
|
||||
if (texture.is_valid()) {
|
||||
RenderingServer::get_singleton()->texture_set_path(texture, p_path);
|
||||
}
|
||||
|
|
@ -854,11 +854,11 @@ void StreamTexture3D::set_path(const String &p_path, bool p_take_over) {
|
|||
Resource::set_path(p_path, p_take_over);
|
||||
}
|
||||
|
||||
Image::Format StreamTexture3D::get_format() const {
|
||||
Image::Format CompressedTexture3D::get_format() const {
|
||||
return format;
|
||||
}
|
||||
|
||||
Error StreamTexture3D::_load_data(const String &p_path, Vector<Ref<Image>> &r_data, Image::Format &r_format, int &r_width, int &r_height, int &r_depth, bool &r_mipmaps) {
|
||||
Error CompressedTexture3D::_load_data(const String &p_path, Vector<Ref<Image>> &r_data, Image::Format &r_format, int &r_width, int &r_height, int &r_depth, bool &r_mipmaps) {
|
||||
FileAccessRef f = FileAccess::open(p_path, FileAccess::READ);
|
||||
ERR_FAIL_COND_V_MSG(!f, ERR_CANT_OPEN, vformat("Unable to open file: %s.", p_path));
|
||||
|
||||
|
|
@ -887,7 +887,7 @@ Error StreamTexture3D::_load_data(const String &p_path, Vector<Ref<Image>> &r_da
|
|||
r_data.clear();
|
||||
|
||||
for (int i = 0; i < (r_depth + mipmaps); i++) {
|
||||
Ref<Image> image = StreamTexture2D::load_image_from_file(f, 0);
|
||||
Ref<Image> image = CompressedTexture2D::load_image_from_file(f, 0);
|
||||
ERR_FAIL_COND_V(image.is_null() || image->is_empty(), ERR_CANT_OPEN);
|
||||
if (i == 0) {
|
||||
r_format = image->get_format();
|
||||
|
|
@ -900,7 +900,7 @@ Error StreamTexture3D::_load_data(const String &p_path, Vector<Ref<Image>> &r_da
|
|||
return OK;
|
||||
}
|
||||
|
||||
Error StreamTexture3D::load(const String &p_path) {
|
||||
Error CompressedTexture3D::load(const String &p_path) {
|
||||
Vector<Ref<Image>> data;
|
||||
|
||||
int tw, th, td;
|
||||
|
|
@ -937,34 +937,34 @@ Error StreamTexture3D::load(const String &p_path) {
|
|||
return OK;
|
||||
}
|
||||
|
||||
String StreamTexture3D::get_load_path() const {
|
||||
String CompressedTexture3D::get_load_path() const {
|
||||
return path_to_file;
|
||||
}
|
||||
|
||||
int StreamTexture3D::get_width() const {
|
||||
int CompressedTexture3D::get_width() const {
|
||||
return w;
|
||||
}
|
||||
|
||||
int StreamTexture3D::get_height() const {
|
||||
int CompressedTexture3D::get_height() const {
|
||||
return h;
|
||||
}
|
||||
|
||||
int StreamTexture3D::get_depth() const {
|
||||
int CompressedTexture3D::get_depth() const {
|
||||
return d;
|
||||
}
|
||||
|
||||
bool StreamTexture3D::has_mipmaps() const {
|
||||
bool CompressedTexture3D::has_mipmaps() const {
|
||||
return mipmaps;
|
||||
}
|
||||
|
||||
RID StreamTexture3D::get_rid() const {
|
||||
RID CompressedTexture3D::get_rid() const {
|
||||
if (!texture.is_valid()) {
|
||||
texture = RS::get_singleton()->texture_3d_placeholder_create();
|
||||
}
|
||||
return texture;
|
||||
}
|
||||
|
||||
Vector<Ref<Image>> StreamTexture3D::get_data() const {
|
||||
Vector<Ref<Image>> CompressedTexture3D::get_data() const {
|
||||
if (texture.is_valid()) {
|
||||
return RS::get_singleton()->texture_3d_get(texture);
|
||||
} else {
|
||||
|
|
@ -972,7 +972,7 @@ Vector<Ref<Image>> StreamTexture3D::get_data() const {
|
|||
}
|
||||
}
|
||||
|
||||
void StreamTexture3D::reload_from_file() {
|
||||
void CompressedTexture3D::reload_from_file() {
|
||||
String path = get_path();
|
||||
if (!path.is_resource_file()) {
|
||||
return;
|
||||
|
|
@ -987,19 +987,19 @@ void StreamTexture3D::reload_from_file() {
|
|||
load(path);
|
||||
}
|
||||
|
||||
void StreamTexture3D::_validate_property(PropertyInfo &property) const {
|
||||
void CompressedTexture3D::_validate_property(PropertyInfo &property) const {
|
||||
}
|
||||
|
||||
void StreamTexture3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("load", "path"), &StreamTexture3D::load);
|
||||
ClassDB::bind_method(D_METHOD("get_load_path"), &StreamTexture3D::get_load_path);
|
||||
void CompressedTexture3D::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("load", "path"), &CompressedTexture3D::load);
|
||||
ClassDB::bind_method(D_METHOD("get_load_path"), &CompressedTexture3D::get_load_path);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "load_path", PROPERTY_HINT_FILE, "*.stex"), "load", "get_load_path");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "load_path", PROPERTY_HINT_FILE, "*.ctex"), "load", "get_load_path");
|
||||
}
|
||||
|
||||
StreamTexture3D::StreamTexture3D() {}
|
||||
CompressedTexture3D::CompressedTexture3D() {}
|
||||
|
||||
StreamTexture3D::~StreamTexture3D() {
|
||||
CompressedTexture3D::~CompressedTexture3D() {
|
||||
if (texture.is_valid()) {
|
||||
RS::get_singleton()->free(texture);
|
||||
}
|
||||
|
|
@ -1007,8 +1007,8 @@ StreamTexture3D::~StreamTexture3D() {
|
|||
|
||||
/////////////////////////////
|
||||
|
||||
RES ResourceFormatLoaderStreamTexture3D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
|
||||
Ref<StreamTexture3D> st;
|
||||
RES ResourceFormatLoaderCompressedTexture3D::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
|
||||
Ref<CompressedTexture3D> st;
|
||||
st.instantiate();
|
||||
Error err = st->load(p_path);
|
||||
if (r_error) {
|
||||
|
|
@ -1021,17 +1021,17 @@ RES ResourceFormatLoaderStreamTexture3D::load(const String &p_path, const String
|
|||
return st;
|
||||
}
|
||||
|
||||
void ResourceFormatLoaderStreamTexture3D::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
void ResourceFormatLoaderCompressedTexture3D::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
p_extensions->push_back("stex3d");
|
||||
}
|
||||
|
||||
bool ResourceFormatLoaderStreamTexture3D::handles_type(const String &p_type) const {
|
||||
return p_type == "StreamTexture3D";
|
||||
bool ResourceFormatLoaderCompressedTexture3D::handles_type(const String &p_type) const {
|
||||
return p_type == "CompressedTexture3D";
|
||||
}
|
||||
|
||||
String ResourceFormatLoaderStreamTexture3D::get_resource_type(const String &p_path) const {
|
||||
String ResourceFormatLoaderCompressedTexture3D::get_resource_type(const String &p_path) const {
|
||||
if (p_path.get_extension().to_lower() == "stex3d") {
|
||||
return "StreamTexture3D";
|
||||
return "CompressedTexture3D";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
@ -2599,7 +2599,7 @@ ImageTextureLayered::~ImageTextureLayered() {
|
|||
|
||||
///////////////////////////////////////////
|
||||
|
||||
void StreamTextureLayered::set_path(const String &p_path, bool p_take_over) {
|
||||
void CompressedTextureLayered::set_path(const String &p_path, bool p_take_over) {
|
||||
if (texture.is_valid()) {
|
||||
RenderingServer::get_singleton()->texture_set_path(texture, p_path);
|
||||
}
|
||||
|
|
@ -2607,11 +2607,11 @@ void StreamTextureLayered::set_path(const String &p_path, bool p_take_over) {
|
|||
Resource::set_path(p_path, p_take_over);
|
||||
}
|
||||
|
||||
Image::Format StreamTextureLayered::get_format() const {
|
||||
Image::Format CompressedTextureLayered::get_format() const {
|
||||
return format;
|
||||
}
|
||||
|
||||
Error StreamTextureLayered::_load_data(const String &p_path, Vector<Ref<Image>> &images, int &mipmap_limit, int p_size_limit) {
|
||||
Error CompressedTextureLayered::_load_data(const String &p_path, Vector<Ref<Image>> &images, int &mipmap_limit, int p_size_limit) {
|
||||
ERR_FAIL_COND_V(images.size() != 0, ERR_INVALID_PARAMETER);
|
||||
|
||||
FileAccessRef f = FileAccess::open(p_path, FileAccess::READ);
|
||||
|
|
@ -2647,7 +2647,7 @@ Error StreamTextureLayered::_load_data(const String &p_path, Vector<Ref<Image>>
|
|||
images.resize(layer_count);
|
||||
|
||||
for (uint32_t i = 0; i < layer_count; i++) {
|
||||
Ref<Image> image = StreamTexture2D::load_image_from_file(f, p_size_limit);
|
||||
Ref<Image> image = CompressedTexture2D::load_image_from_file(f, p_size_limit);
|
||||
ERR_FAIL_COND_V(image.is_null() || image->is_empty(), ERR_CANT_OPEN);
|
||||
images.write[i] = image;
|
||||
}
|
||||
|
|
@ -2655,7 +2655,7 @@ Error StreamTextureLayered::_load_data(const String &p_path, Vector<Ref<Image>>
|
|||
return OK;
|
||||
}
|
||||
|
||||
Error StreamTextureLayered::load(const String &p_path) {
|
||||
Error CompressedTextureLayered::load(const String &p_path) {
|
||||
Vector<Ref<Image>> images;
|
||||
|
||||
int mipmap_limit;
|
||||
|
|
@ -2690,38 +2690,38 @@ Error StreamTextureLayered::load(const String &p_path) {
|
|||
return OK;
|
||||
}
|
||||
|
||||
String StreamTextureLayered::get_load_path() const {
|
||||
String CompressedTextureLayered::get_load_path() const {
|
||||
return path_to_file;
|
||||
}
|
||||
|
||||
int StreamTextureLayered::get_width() const {
|
||||
int CompressedTextureLayered::get_width() const {
|
||||
return w;
|
||||
}
|
||||
|
||||
int StreamTextureLayered::get_height() const {
|
||||
int CompressedTextureLayered::get_height() const {
|
||||
return h;
|
||||
}
|
||||
|
||||
int StreamTextureLayered::get_layers() const {
|
||||
int CompressedTextureLayered::get_layers() const {
|
||||
return layers;
|
||||
}
|
||||
|
||||
bool StreamTextureLayered::has_mipmaps() const {
|
||||
bool CompressedTextureLayered::has_mipmaps() const {
|
||||
return mipmaps;
|
||||
}
|
||||
|
||||
TextureLayered::LayeredType StreamTextureLayered::get_layered_type() const {
|
||||
TextureLayered::LayeredType CompressedTextureLayered::get_layered_type() const {
|
||||
return layered_type;
|
||||
}
|
||||
|
||||
RID StreamTextureLayered::get_rid() const {
|
||||
RID CompressedTextureLayered::get_rid() const {
|
||||
if (!texture.is_valid()) {
|
||||
texture = RS::get_singleton()->texture_2d_layered_placeholder_create(RS::TextureLayeredType(layered_type));
|
||||
}
|
||||
return texture;
|
||||
}
|
||||
|
||||
Ref<Image> StreamTextureLayered::get_layer_data(int p_layer) const {
|
||||
Ref<Image> CompressedTextureLayered::get_layer_data(int p_layer) const {
|
||||
if (texture.is_valid()) {
|
||||
return RS::get_singleton()->texture_2d_layer_get(texture, p_layer);
|
||||
} else {
|
||||
|
|
@ -2729,7 +2729,7 @@ Ref<Image> StreamTextureLayered::get_layer_data(int p_layer) const {
|
|||
}
|
||||
}
|
||||
|
||||
void StreamTextureLayered::reload_from_file() {
|
||||
void CompressedTextureLayered::reload_from_file() {
|
||||
String path = get_path();
|
||||
if (!path.is_resource_file()) {
|
||||
return;
|
||||
|
|
@ -2744,21 +2744,21 @@ void StreamTextureLayered::reload_from_file() {
|
|||
load(path);
|
||||
}
|
||||
|
||||
void StreamTextureLayered::_validate_property(PropertyInfo &property) const {
|
||||
void CompressedTextureLayered::_validate_property(PropertyInfo &property) const {
|
||||
}
|
||||
|
||||
void StreamTextureLayered::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("load", "path"), &StreamTextureLayered::load);
|
||||
ClassDB::bind_method(D_METHOD("get_load_path"), &StreamTextureLayered::get_load_path);
|
||||
void CompressedTextureLayered::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("load", "path"), &CompressedTextureLayered::load);
|
||||
ClassDB::bind_method(D_METHOD("get_load_path"), &CompressedTextureLayered::get_load_path);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "load_path", PROPERTY_HINT_FILE, "*.stex"), "load", "get_load_path");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::STRING, "load_path", PROPERTY_HINT_FILE, "*.ctex"), "load", "get_load_path");
|
||||
}
|
||||
|
||||
StreamTextureLayered::StreamTextureLayered(LayeredType p_type) {
|
||||
CompressedTextureLayered::CompressedTextureLayered(LayeredType p_type) {
|
||||
layered_type = p_type;
|
||||
}
|
||||
|
||||
StreamTextureLayered::~StreamTextureLayered() {
|
||||
CompressedTextureLayered::~CompressedTextureLayered() {
|
||||
if (texture.is_valid()) {
|
||||
RS::get_singleton()->free(texture);
|
||||
}
|
||||
|
|
@ -2766,18 +2766,18 @@ StreamTextureLayered::~StreamTextureLayered() {
|
|||
|
||||
/////////////////////////////////////////////////
|
||||
|
||||
RES ResourceFormatLoaderStreamTextureLayered::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
|
||||
Ref<StreamTextureLayered> st;
|
||||
RES ResourceFormatLoaderCompressedTextureLayered::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
|
||||
Ref<CompressedTextureLayered> st;
|
||||
if (p_path.get_extension().to_lower() == "stexarray") {
|
||||
Ref<StreamTexture2DArray> s;
|
||||
Ref<CompressedTexture2DArray> s;
|
||||
s.instantiate();
|
||||
st = s;
|
||||
} else if (p_path.get_extension().to_lower() == "scube") {
|
||||
Ref<StreamCubemap> s;
|
||||
Ref<CompressedCubemap> s;
|
||||
s.instantiate();
|
||||
st = s;
|
||||
} else if (p_path.get_extension().to_lower() == "scubearray") {
|
||||
Ref<StreamCubemapArray> s;
|
||||
Ref<CompressedCubemapArray> s;
|
||||
s.instantiate();
|
||||
st = s;
|
||||
} else {
|
||||
|
|
@ -2797,25 +2797,25 @@ RES ResourceFormatLoaderStreamTextureLayered::load(const String &p_path, const S
|
|||
return st;
|
||||
}
|
||||
|
||||
void ResourceFormatLoaderStreamTextureLayered::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
void ResourceFormatLoaderCompressedTextureLayered::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
p_extensions->push_back("stexarray");
|
||||
p_extensions->push_back("scube");
|
||||
p_extensions->push_back("scubearray");
|
||||
}
|
||||
|
||||
bool ResourceFormatLoaderStreamTextureLayered::handles_type(const String &p_type) const {
|
||||
return p_type == "StreamTexture2DArray" || p_type == "StreamCubemap" || p_type == "StreamCubemapArray";
|
||||
bool ResourceFormatLoaderCompressedTextureLayered::handles_type(const String &p_type) const {
|
||||
return p_type == "CompressedTexture2DArray" || p_type == "CompressedCubemap" || p_type == "CompressedCubemapArray";
|
||||
}
|
||||
|
||||
String ResourceFormatLoaderStreamTextureLayered::get_resource_type(const String &p_path) const {
|
||||
String ResourceFormatLoaderCompressedTextureLayered::get_resource_type(const String &p_path) const {
|
||||
if (p_path.get_extension().to_lower() == "stexarray") {
|
||||
return "StreamTexture2DArray";
|
||||
return "CompressedTexture2DArray";
|
||||
}
|
||||
if (p_path.get_extension().to_lower() == "scube") {
|
||||
return "StreamCubemap";
|
||||
return "CompressedCubemap";
|
||||
}
|
||||
if (p_path.get_extension().to_lower() == "scubearray") {
|
||||
return "StreamCubemapArray";
|
||||
return "CompressedCubemapArray";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue