From 92af14b0b0b210d05e2fc968570bec7f3edf651b Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 8 Oct 2022 16:08:49 +0200 Subject: [PATCH] Ported: Move duplicated drawing code from Sprite3D/AnimatedSprite3D to `SpriteBase3D` - kleonc https://github.com/godotengine/godot/commit/0bf2b8e8133a85f45393f04e249209873392ed06 --- scene/3d/sprite_3d.cpp | 400 ++++++++++++++--------------------------- scene/3d/sprite_3d.h | 1 + 2 files changed, 139 insertions(+), 262 deletions(-) diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 77dd8bbe6..5048aa5e6 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -91,6 +91,139 @@ void SpriteBase3D::_notification(int p_what) { } } +void SpriteBase3D::draw_texture_rect(Ref p_texture, Rect2 p_dst_rect, Rect2 p_src_rect) { + ERR_FAIL_COND(p_texture.is_null()); + + Rect2 final_rect; + Rect2 final_src_rect; + if (!p_texture->get_rect_region(p_dst_rect, p_src_rect, final_rect, final_src_rect)) { + return; + } + + if (final_rect.size.x == 0 || final_rect.size.y == 0) { + return; + } + + Color color = _get_color_accum(); + color.a *= get_opacity(); + + float pixel_size = get_pixel_size(); + + Vector2 vertices[4] = { + (final_rect.position + Vector2(0, final_rect.size.y)) * pixel_size, + (final_rect.position + final_rect.size) * pixel_size, + (final_rect.position + Vector2(final_rect.size.x, 0)) * pixel_size, + final_rect.position * pixel_size, + }; + + Vector2 src_tsize = p_texture->get_size(); + + // Properly setup UVs for impostor textures (AtlasTexture). + Ref atlas_tex = p_texture; + if (atlas_tex != nullptr) { + src_tsize[0] = atlas_tex->get_atlas()->get_width(); + src_tsize[1] = atlas_tex->get_atlas()->get_height(); + } + + Vector2 uvs[4] = { + final_src_rect.position / src_tsize, + (final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / src_tsize, + (final_src_rect.position + final_src_rect.size) / src_tsize, + (final_src_rect.position + Vector2(0, final_src_rect.size.y)) / src_tsize, + }; + + if (is_flipped_h()) { + SWAP(uvs[0], uvs[1]); + SWAP(uvs[2], uvs[3]); + } + if (is_flipped_v()) { + SWAP(uvs[0], uvs[3]); + SWAP(uvs[1], uvs[2]); + } + + Vector3 normal; + int axis = get_axis(); + normal[axis] = 1.0; + + Plane tangent; + if (axis == Vector3::AXIS_X) { + tangent = Plane(0, 0, -1, -1); + } else { + tangent = Plane(1, 0, 0, -1); + } + + int x_axis = ((axis + 1) % 3); + int y_axis = ((axis + 2) % 3); + + if (axis != Vector3::AXIS_Z) { + SWAP(x_axis, y_axis); + + for (int i = 0; i < 4; i++) { + //uvs[i] = Vector2(1.0,1.0)-uvs[i]; + //SWAP(vertices[i].x,vertices[i].y); + if (axis == Vector3::AXIS_Y) { + vertices[i].y = -vertices[i].y; + } else if (axis == Vector3::AXIS_X) { + vertices[i].x = -vertices[i].x; + } + } + } + + AABB aabb; + + // Everything except position, color, and UV is compressed + PoolVector::Write write_buffer = mesh_buffer.write(); + + Vector2 normal_oct = RenderingServer::get_singleton()->norm_to_oct(normal); + int8_t v_normal[2] = { + (int8_t)CLAMP(normal_oct.x * 127, -128, 127), + (int8_t)CLAMP(normal_oct.y * 127, -128, 127), + }; + + Vector2 tangent_oct = RenderingServer::get_singleton()->tangent_to_oct(tangent.normal, tangent.d, false); + int8_t v_tangent[2] = { + (int8_t)CLAMP(tangent_oct.x * 127, -128, 127), + (int8_t)CLAMP(tangent_oct.y * 127, -128, 127), + }; + + for (int i = 0; i < 4; i++) { + Vector3 vtx; + vtx[x_axis] = vertices[i][0]; + vtx[y_axis] = vertices[i][1]; + if (i == 0) { + aabb.position = vtx; + aabb.size = Vector3(); + } else { + aabb.expand_to(vtx); + } + + float v_uv[2] = { uvs[i].x, uvs[i].y }; + memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_TEX_UV] + mesh_surface_offsets[RS::ARRAY_TEX_UV]], v_uv, 8); + + float v_vertex[3] = { vtx.x, vtx.y, vtx.z }; + memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_VERTEX] + mesh_surface_offsets[RS::ARRAY_VERTEX]], &v_vertex, sizeof(float) * 3); + memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_NORMAL] + mesh_surface_offsets[RS::ARRAY_NORMAL]], v_normal, 2); + memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_TANGENT] + mesh_surface_offsets[RS::ARRAY_TANGENT]], v_tangent, 2); + memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_COLOR] + mesh_surface_offsets[RS::ARRAY_COLOR]], color.components, 4 * 4); + } + + write_buffer.release(); + + RID mesh = get_mesh(); + RS::get_singleton()->mesh_surface_update_region(mesh, 0, 0, mesh_buffer); + + RS::get_singleton()->mesh_set_custom_aabb(mesh, aabb); + set_aabb(aabb); + + 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, get_draw_flag(FLAG_DISABLE_DEPTH_TEST), get_draw_flag(FLAG_FIXED_SIZE)); + RS::get_singleton()->material_set_shader(get_material(), RS::get_singleton()->material_get_shader(mat)); + RS::get_singleton()->material_set_param(get_material(), "texture_albedo", p_texture->get_rid()); + if (get_alpha_cut_mode() == ALPHA_CUT_DISABLED) { + RS::get_singleton()->material_set_render_priority(get_material(), get_render_priority()); + } + RS::get_singleton()->instance_set_surface_material(get_instance(), 0, get_material()); +} + void SpriteBase3D::set_centered(bool p_center) { centered = p_center; _queue_update(); @@ -488,143 +621,15 @@ void Sprite3D::_draw() { Point2 frame_offset = Point2(frame % hframes, frame / hframes); frame_offset *= frame_size; - Point2 dest_offset = get_offset(); + Point2 dst_offset = get_offset(); if (is_centered()) { - dest_offset -= frame_size / 2; + dst_offset -= frame_size / 2; } Rect2 src_rect(base_rect.position + frame_offset, frame_size); - Rect2 final_dst_rect(dest_offset, frame_size); - Rect2 final_rect; - Rect2 final_src_rect; - if (!texture->get_rect_region(final_dst_rect, src_rect, final_rect, final_src_rect)) { - return; - } + Rect2 dst_rect(dst_offset, frame_size); - if (final_rect.size.x == 0 || final_rect.size.y == 0) { - return; - } - - Color color = _get_color_accum(); - color.a *= get_opacity(); - - float pixel_size = get_pixel_size(); - - Vector2 vertices[4] = { - - (final_rect.position + Vector2(0, final_rect.size.y)) * pixel_size, - (final_rect.position + final_rect.size) * pixel_size, - (final_rect.position + Vector2(final_rect.size.x, 0)) * pixel_size, - final_rect.position * pixel_size, - - }; - - Vector2 src_tsize = tsize; - - // Properly setup UVs for impostor textures (AtlasTexture). - Ref atlas_tex = texture; - if (atlas_tex != nullptr) { - src_tsize[0] = atlas_tex->get_atlas()->get_width(); - src_tsize[1] = atlas_tex->get_atlas()->get_height(); - } - - Vector2 uvs[4] = { - final_src_rect.position / src_tsize, - (final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / src_tsize, - (final_src_rect.position + final_src_rect.size) / src_tsize, - (final_src_rect.position + Vector2(0, final_src_rect.size.y)) / src_tsize, - }; - - if (is_flipped_h()) { - SWAP(uvs[0], uvs[1]); - SWAP(uvs[2], uvs[3]); - } - if (is_flipped_v()) { - SWAP(uvs[0], uvs[3]); - SWAP(uvs[1], uvs[2]); - } - - Vector3 normal; - int axis = get_axis(); - normal[axis] = 1.0; - - Plane tangent; - if (axis == Vector3::AXIS_X) { - tangent = Plane(0, 0, -1, 1); - } else { - tangent = Plane(1, 0, 0, 1); - } - - int x_axis = ((axis + 1) % 3); - int y_axis = ((axis + 2) % 3); - - if (axis != Vector3::AXIS_Z) { - SWAP(x_axis, y_axis); - - for (int i = 0; i < 4; i++) { - //uvs[i] = Vector2(1.0,1.0)-uvs[i]; - //SWAP(vertices[i].x,vertices[i].y); - if (axis == Vector3::AXIS_Y) { - vertices[i].y = -vertices[i].y; - } else if (axis == Vector3::AXIS_X) { - vertices[i].x = -vertices[i].x; - } - } - } - - AABB aabb; - - // Everything except position, color, and UV is compressed - PoolVector::Write write_buffer = mesh_buffer.write(); - - Vector2 normal_oct = RenderingServer::get_singleton()->norm_to_oct(normal); - int8_t v_normal[2] = { - (int8_t)CLAMP(normal_oct.x * 127, -128, 127), - (int8_t)CLAMP(normal_oct.y * 127, -128, 127), - }; - - Vector2 tangent_oct = RenderingServer::get_singleton()->tangent_to_oct(tangent.normal, tangent.d, false); - int8_t v_tangent[2] = { - (int8_t)CLAMP(tangent_oct.x * 127, -128, 127), - (int8_t)CLAMP(tangent_oct.y * 127, -128, 127), - }; - - for (int i = 0; i < 4; i++) { - Vector3 vtx; - vtx[x_axis] = vertices[i][0]; - vtx[y_axis] = vertices[i][1]; - if (i == 0) { - aabb.position = vtx; - aabb.size = Vector3(); - } else { - aabb.expand_to(vtx); - } - - float v_uv[2] = { uvs[i].x, uvs[i].y }; - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_TEX_UV] + mesh_surface_offsets[RS::ARRAY_TEX_UV]], v_uv, 8); - - float v_vertex[3] = { vtx.x, vtx.y, vtx.z }; - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_VERTEX] + mesh_surface_offsets[RS::ARRAY_VERTEX]], &v_vertex, sizeof(float) * 3); - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_NORMAL] + mesh_surface_offsets[RS::ARRAY_NORMAL]], v_normal, 2); - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_TANGENT] + mesh_surface_offsets[RS::ARRAY_TANGENT]], v_tangent, 2); - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_COLOR] + mesh_surface_offsets[RS::ARRAY_COLOR]], color.components, 4 * 4); - } - - write_buffer.release(); - - RID mesh = get_mesh(); - RS::get_singleton()->mesh_surface_update_region(mesh, 0, 0, mesh_buffer); - - RS::get_singleton()->mesh_set_custom_aabb(mesh, aabb); - set_aabb(aabb); - - 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, get_draw_flag(FLAG_DISABLE_DEPTH_TEST), get_draw_flag(FLAG_FIXED_SIZE)); - RS::get_singleton()->material_set_shader(get_material(), RS::get_singleton()->material_get_shader(mat)); - RS::get_singleton()->material_set_param(get_material(), "texture_albedo", texture->get_rid()); - if (get_alpha_cut_mode() == ALPHA_CUT_DISABLED) { - RS::get_singleton()->material_set_render_priority(get_material(), get_render_priority()); - } - RS::get_singleton()->instance_set_surface_material(get_instance(), 0, get_material()); + draw_texture_rect(texture, dst_rect, src_rect); } void Sprite3D::set_texture(const Ref &p_texture) { @@ -841,136 +846,7 @@ void AnimatedSprite3D::_draw() { Rect2 dst_rect(ofs, tsize); - Rect2 final_rect; - Rect2 final_src_rect; - if (!texture->get_rect_region(dst_rect, src_rect, final_rect, final_src_rect)) { - return; - } - - if (final_rect.size.x == 0 || final_rect.size.y == 0) { - return; - } - - Color color = _get_color_accum(); - color.a *= get_opacity(); - - float pixel_size = get_pixel_size(); - - Vector2 vertices[4] = { - - (final_rect.position + Vector2(0, final_rect.size.y)) * pixel_size, - (final_rect.position + final_rect.size) * pixel_size, - (final_rect.position + Vector2(final_rect.size.x, 0)) * pixel_size, - final_rect.position * pixel_size, - - }; - - Vector2 src_tsize = tsize; - - // Properly setup UVs for impostor textures (AtlasTexture). - Ref atlas_tex = texture; - if (atlas_tex != nullptr) { - src_tsize[0] = atlas_tex->get_atlas()->get_width(); - src_tsize[1] = atlas_tex->get_atlas()->get_height(); - } - - Vector2 uvs[4] = { - final_src_rect.position / src_tsize, - (final_src_rect.position + Vector2(final_src_rect.size.x, 0)) / src_tsize, - (final_src_rect.position + final_src_rect.size) / src_tsize, - (final_src_rect.position + Vector2(0, final_src_rect.size.y)) / src_tsize, - }; - - if (is_flipped_h()) { - SWAP(uvs[0], uvs[1]); - SWAP(uvs[2], uvs[3]); - } - if (is_flipped_v()) { - SWAP(uvs[0], uvs[3]); - SWAP(uvs[1], uvs[2]); - } - - Vector3 normal; - int axis = get_axis(); - normal[axis] = 1.0; - - Plane tangent; - if (axis == Vector3::AXIS_X) { - tangent = Plane(0, 0, -1, -1); - } else { - tangent = Plane(1, 0, 0, -1); - } - - int x_axis = ((axis + 1) % 3); - int y_axis = ((axis + 2) % 3); - - if (axis != Vector3::AXIS_Z) { - SWAP(x_axis, y_axis); - - for (int i = 0; i < 4; i++) { - //uvs[i] = Vector2(1.0,1.0)-uvs[i]; - //SWAP(vertices[i].x,vertices[i].y); - if (axis == Vector3::AXIS_Y) { - vertices[i].y = -vertices[i].y; - } else if (axis == Vector3::AXIS_X) { - vertices[i].x = -vertices[i].x; - } - } - } - - AABB aabb; - - // Everything except position, color, and UV is compressed - PoolVector::Write write_buffer = mesh_buffer.write(); - - Vector2 normal_oct = RenderingServer::get_singleton()->norm_to_oct(normal); - int8_t v_normal[2] = { - (int8_t)CLAMP(normal_oct.x * 127, -128, 127), - (int8_t)CLAMP(normal_oct.y * 127, -128, 127), - }; - - Vector2 tangent_oct = RenderingServer::get_singleton()->tangent_to_oct(tangent.normal, tangent.d, false); - int8_t v_tangent[2] = { - (int8_t)CLAMP(tangent_oct.x * 127, -128, 127), - (int8_t)CLAMP(tangent_oct.y * 127, -128, 127), - }; - - for (int i = 0; i < 4; i++) { - Vector3 vtx; - vtx[x_axis] = vertices[i][0]; - vtx[y_axis] = vertices[i][1]; - if (i == 0) { - aabb.position = vtx; - aabb.size = Vector3(); - } else { - aabb.expand_to(vtx); - } - - float v_uv[2] = { uvs[i].x, uvs[i].y }; - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_TEX_UV] + mesh_surface_offsets[RS::ARRAY_TEX_UV]], v_uv, 8); - - float v_vertex[3] = { vtx.x, vtx.y, vtx.z }; - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_VERTEX] + mesh_surface_offsets[RS::ARRAY_VERTEX]], &v_vertex, sizeof(float) * 3); - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_NORMAL] + mesh_surface_offsets[RS::ARRAY_NORMAL]], v_normal, 2); - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_TANGENT] + mesh_surface_offsets[RS::ARRAY_TANGENT]], v_tangent, 2); - memcpy(&write_buffer[i * mesh_stride[RS::ARRAY_COLOR] + mesh_surface_offsets[RS::ARRAY_COLOR]], color.components, 4 * 4); - } - - write_buffer.release(); - - RID mesh = get_mesh(); - RS::get_singleton()->mesh_surface_update_region(mesh, 0, 0, mesh_buffer); - - RS::get_singleton()->mesh_set_custom_aabb(mesh, aabb); - set_aabb(aabb); - - 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, get_draw_flag(FLAG_DISABLE_DEPTH_TEST), get_draw_flag(FLAG_FIXED_SIZE)); - RS::get_singleton()->material_set_shader(get_material(), RS::get_singleton()->material_get_shader(mat)); - RS::get_singleton()->material_set_param(get_material(), "texture_albedo", texture->get_rid()); - if (get_alpha_cut_mode() == ALPHA_CUT_DISABLED) { - RS::get_singleton()->material_set_render_priority(get_material(), get_render_priority()); - } - RS::get_singleton()->instance_set_surface_material(get_instance(), 0, get_material()); + draw_texture_rect(texture, dst_rect, src_rect); } void AnimatedSprite3D::_validate_property(PropertyInfo &property) const { diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index b5d163fe0..6d6b628c2 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -97,6 +97,7 @@ protected: void _notification(int p_what); static void _bind_methods(); virtual void _draw() = 0; + void draw_texture_rect(Ref p_texture, Rect2 p_dst_rect, Rect2 p_src_rect); _FORCE_INLINE_ void set_aabb(const AABB &p_aabb) { aabb = p_aabb; } _FORCE_INLINE_ RID &get_mesh() { return mesh; } _FORCE_INLINE_ RID &get_material() { return material; }