asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix glTF scene export crash on null normal texture

Browse source 
Also removes a redundant get_texture call directly below
the modified code block.

Fixes #56379

(cherry picked from commit 0e36d5e782)
This commit is contained in:
RedMser 2021-12-31 17:43:15 +01:00 committed by Rémi Verschelde
parent 098a8dab0d
commit f76430670c
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
modules/gltf/gltf_document.cpp
View file

@ -3382,30 +3382,33 @@ Error GLTFDocument::_serialize_materials(Ref<GLTFState> state) {
tex.instance(); tex.instance();
{ {
Ref<Texture> normal_texture = material->get_texture(SpatialMaterial::TEXTURE_NORMAL); Ref<Texture> normal_texture = material->get_texture(SpatialMaterial::TEXTURE_NORMAL);
// Code for uncompressing RG normal maps if (normal_texture.is_valid()) {
Ref<Image> img = normal_texture->get_data(); // Code for uncompressing RG normal maps
Ref<ImageTexture> img_tex = img; Ref<Image> img = normal_texture->get_data();
if (img_tex.is_valid()) { if (img.is_valid()) {
img = img_tex->get_data(); Ref<ImageTexture> img_tex = img;
} if (img_tex.is_valid()) {
img->decompress(); img = img_tex->get_data();
img->convert(Image::FORMAT_RGBA8); }
img->lock(); img->decompress();
for (int32_t y = 0; y < img->get_height(); y++) { img->convert(Image::FORMAT_RGBA8);
for (int32_t x = 0; x < img->get_width(); x++) { img->lock();
Color c = img->get_pixel(x, y); for (int32_t y = 0; y < img->get_height(); y++) {
Vector2 red_green = Vector2(c.r, c.g); for (int32_t x = 0; x < img->get_width(); x++) {
red_green = red_green * Vector2(2.0f, 2.0f) - Vector2(1.0f, 1.0f); Color c = img->get_pixel(x, y);
float blue = 1.0f - red_green.dot(red_green); Vector2 red_green = Vector2(c.r, c.g);
blue = MAX(0.0f, blue); red_green = red_green * Vector2(2.0f, 2.0f) - Vector2(1.0f, 1.0f);
c.b = Math::sqrt(blue); float blue = 1.0f - red_green.dot(red_green);
img->set_pixel(x, y, c); blue = MAX(0.0f, blue);
c.b = Math::sqrt(blue);
img->set_pixel(x, y, c);
}
}
img->unlock();
tex->create_from_image(img);
} }
} }
img->unlock();
tex->create_from_image(img);
} }
Ref<Texture> normal_texture = material->get_texture(SpatialMaterial::TEXTURE_NORMAL);
GLTFTextureIndex gltf_texture_index = -1; GLTFTextureIndex gltf_texture_index = -1;
if (tex.is_valid() && tex->get_data().is_valid()) { if (tex.is_valid() && tex->get_data().is_valid()) {
tex->set_name(material->get_name() + "_normal"); tex->set_name(material->get_name() + "_normal");