godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only set base in Sprite3D when needed 

(cherry picked from commit 3dd2e5d870)
This commit is contained in:
clayjohn 2021-05-05 22:35:21 -07:00 committed by Rémi Verschelde
parent e6186dad59
commit bb6b38680c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scene/3d/sprite_3d.cpp
View File

@ -437,6 +437,7 @@ SpriteBase3D::SpriteBase3D() {
mesh_surface_format = VS::get_singleton()->mesh_surface_get_format(mesh, 0); mesh_surface_format = VS::get_singleton()->mesh_surface_get_format(mesh, 0);
mesh_buffer = VS::get_singleton()->mesh_surface_get_array(mesh, 0); mesh_buffer = VS::get_singleton()->mesh_surface_get_array(mesh, 0);
mesh_stride = VS::get_singleton()->mesh_surface_make_offsets_from_format(mesh_surface_format, surface_vertex_len, surface_index_len, mesh_surface_offsets); mesh_stride = VS::get_singleton()->mesh_surface_make_offsets_from_format(mesh_surface_format, surface_vertex_len, surface_index_len, mesh_surface_offsets);
set_base(mesh);
} }
SpriteBase3D::~SpriteBase3D() { SpriteBase3D::~SpriteBase3D() {
@ -448,11 +449,13 @@ SpriteBase3D::~SpriteBase3D() {
/////////////////////////////////////////// ///////////////////////////////////////////
void Sprite3D::_draw() { void Sprite3D::_draw() {
if (get_base() != get_mesh()) {
set_base(RID()); set_base(get_mesh());
}
if (!texture.is_valid()) if (!texture.is_valid()) {
set_base(RID());
return; return;
}
Vector2 tsize = texture->get_size(); Vector2 tsize = texture->get_size();
if (tsize.x == 0 || tsize.y == 0) if (tsize.x == 0 || tsize.y == 0)
return; return;
@ -604,8 +607,6 @@ void Sprite3D::_draw() {
VS::get_singleton()->mesh_set_custom_aabb(mesh, aabb); VS::get_singleton()->mesh_set_custom_aabb(mesh, aabb);
set_aabb(aabb); set_aabb(aabb);
set_base(mesh);
RID mat = SpatialMaterial::get_material_rid_for_2d(get_draw_flag(FLAG_SHADED), get_draw_flag(FLAG_TRANSPARENT), get_draw_flag(FLAG_DOUBLE_SIDED), get_alpha_cut_mode() == ALPHA_CUT_DISCARD, get_alpha_cut_mode() == ALPHA_CUT_OPAQUE_PREPASS, get_billboard_mode() == SpatialMaterial::BILLBOARD_ENABLED, get_billboard_mode() == SpatialMaterial::BILLBOARD_FIXED_Y); RID mat = SpatialMaterial::get_material_rid_for_2d(get_draw_flag(FLAG_SHADED), get_draw_flag(FLAG_TRANSPARENT), get_draw_flag(FLAG_DOUBLE_SIDED), get_alpha_cut_mode() == ALPHA_CUT_DISCARD, get_alpha_cut_mode() == ALPHA_CUT_OPAQUE_PREPASS, get_billboard_mode() == SpatialMaterial::BILLBOARD_ENABLED, get_billboard_mode() == SpatialMaterial::BILLBOARD_FIXED_Y);
VS::get_singleton()->material_set_shader(get_material(), VS::get_singleton()->material_get_shader(mat)); VS::get_singleton()->material_set_shader(get_material(), VS::get_singleton()->material_get_shader(mat));
VS::get_singleton()->material_set_param(get_material(), "texture_albedo", texture->get_rid()); VS::get_singleton()->material_set_param(get_material(), "texture_albedo", texture->get_rid());
@ -802,8 +803,9 @@ Sprite3D::Sprite3D() {
//////////////////////////////////////// ////////////////////////////////////////
void AnimatedSprite3D::_draw() { void AnimatedSprite3D::_draw() {
if (get_base() != get_mesh()) {
set_base(RID()); set_base(get_mesh());
}
if (frames.is_null()) { if (frames.is_null()) {
return; return;
@ -818,8 +820,10 @@ void AnimatedSprite3D::_draw() {
} }
Ref<Texture> texture = frames->get_frame(animation, frame); Ref<Texture> texture = frames->get_frame(animation, frame);
if (!texture.is_valid()) if (!texture.is_valid()) {
set_base(RID());
return; //no texuture no life return; //no texuture no life
}
Vector2 tsize = texture->get_size(); Vector2 tsize = texture->get_size();
if (tsize.x == 0 || tsize.y == 0) if (tsize.x == 0 || tsize.y == 0)
return; return;
@ -966,8 +970,6 @@ void AnimatedSprite3D::_draw() {
VS::get_singleton()->mesh_set_custom_aabb(mesh, aabb); VS::get_singleton()->mesh_set_custom_aabb(mesh, aabb);
set_aabb(aabb); set_aabb(aabb);
set_base(mesh);
RID mat = SpatialMaterial::get_material_rid_for_2d(get_draw_flag(FLAG_SHADED), get_draw_flag(FLAG_TRANSPARENT), get_draw_flag(FLAG_DOUBLE_SIDED), get_alpha_cut_mode() == ALPHA_CUT_DISCARD, get_alpha_cut_mode() == ALPHA_CUT_OPAQUE_PREPASS, get_billboard_mode() == SpatialMaterial::BILLBOARD_ENABLED, get_billboard_mode() == SpatialMaterial::BILLBOARD_FIXED_Y); RID mat = SpatialMaterial::get_material_rid_for_2d(get_draw_flag(FLAG_SHADED), get_draw_flag(FLAG_TRANSPARENT), get_draw_flag(FLAG_DOUBLE_SIDED), get_alpha_cut_mode() == ALPHA_CUT_DISCARD, get_alpha_cut_mode() == ALPHA_CUT_OPAQUE_PREPASS, get_billboard_mode() == SpatialMaterial::BILLBOARD_ENABLED, get_billboard_mode() == SpatialMaterial::BILLBOARD_FIXED_Y);
VS::get_singleton()->material_set_shader(get_material(), VS::get_singleton()->material_get_shader(mat)); VS::get_singleton()->material_set_shader(get_material(), VS::get_singleton()->material_get_shader(mat));
VS::get_singleton()->material_set_param(get_material(), "texture_albedo", texture->get_rid()); VS::get_singleton()->material_set_param(get_material(), "texture_albedo", texture->get_rid());