diff options
| author | reduz <reduzio@gmail.com> | 2021-06-30 17:03:33 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2021-06-30 23:33:25 -0300 |
| commit | 9ad0c6cde708ad4fb31da78fb1a450a219a610d6 (patch) | |
| tree | 79fc5238de3eeaeee01cc7d17bf6f740b9ba3f82 /scene/3d | |
| parent | 3530cb639aa6927b46babe031b5e25792d9076ab (diff) | |
Import mesh colors in 8BPP.
* Colors were imported as 16BPP (half float)
* Far most common use cases only require 8BPP
* If you need higher data precision, use a custom array, which are supported now.
**WARNING**: 3D Scenes imported in 4.0 no longer compatible with this new format. You need to re-import them (erase them from .godot/import)
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/sprite_3d.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 8a79b03ad4..13f8002721 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -565,11 +565,11 @@ void Sprite3D::_draw() { v_tangent = value; } - uint16_t v_color[4] = { - Math::make_half_float(color.r), - Math::make_half_float(color.g), - Math::make_half_float(color.b), - Math::make_half_float(color.a), + uint8_t v_color[4] = { + uint8_t(CLAMP(color.r * 255.0, 0.0, 255.0)), + uint8_t(CLAMP(color.g * 255.0, 0.0, 255.0)), + uint8_t(CLAMP(color.b * 255.0, 0.0, 255.0)), + uint8_t(CLAMP(color.a * 255.0, 0.0, 255.0)) }; for (int i = 0; i < 4; i++) { @@ -591,7 +591,7 @@ void Sprite3D::_draw() { memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RS::ARRAY_VERTEX]], &v_vertex, sizeof(float) * 3); memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RS::ARRAY_NORMAL]], &v_normal, 4); memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RS::ARRAY_TANGENT]], &v_tangent, 4); - memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RS::ARRAY_COLOR]], v_color, 8); + memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RS::ARRAY_COLOR]], v_color, 4); } RID mesh = get_mesh(); @@ -931,11 +931,11 @@ void AnimatedSprite3D::_draw() { v_tangent = value; } - uint16_t v_color[4] = { - Math::make_half_float(color.r), - Math::make_half_float(color.g), - Math::make_half_float(color.b), - Math::make_half_float(color.a), + uint8_t v_color[4] = { + uint8_t(CLAMP(color.r * 255.0, 0.0, 255.0)), + uint8_t(CLAMP(color.g * 255.0, 0.0, 255.0)), + uint8_t(CLAMP(color.b * 255.0, 0.0, 255.0)), + uint8_t(CLAMP(color.a * 255.0, 0.0, 255.0)) }; for (int i = 0; i < 4; i++) { @@ -956,7 +956,7 @@ void AnimatedSprite3D::_draw() { memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RS::ARRAY_VERTEX]], &v_vertex, sizeof(float) * 3); memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RS::ARRAY_NORMAL]], &v_normal, 4); memcpy(&vertex_write_buffer[i * vertex_stride + mesh_surface_offsets[RS::ARRAY_TANGENT]], &v_tangent, 4); - memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RS::ARRAY_COLOR]], v_color, 8); + memcpy(&attribute_write_buffer[i * attrib_stride + mesh_surface_offsets[RS::ARRAY_COLOR]], v_color, 4); } RID mesh = get_mesh(); |