diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-14 07:35:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 07:35:02 +0100 |
| commit | fe49eaa54479ac1e568bd204cabc854930936a07 (patch) | |
| tree | 576d8a3a04b752f74f205dbfbf44cb3a8fead55c /scene/resources/mesh.h | |
| parent | b006fafad9d5439b7597d4794a00b38386a5f2f5 (diff) | |
| parent | 77a045e902db9f5f0ea7961e827c337541a6436c (diff) | |
Merge pull request #44319 from reduz/integrate-meshoptimizer
Rework Mesh handling on scene importing.
Diffstat (limited to 'scene/resources/mesh.h')
| -rw-r--r-- | scene/resources/mesh.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index ae2139a0cf..586bb2f802 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -53,7 +53,10 @@ public: NO_INDEX_ARRAY = RenderingServer::NO_INDEX_ARRAY, ARRAY_WEIGHTS_SIZE = RenderingServer::ARRAY_WEIGHTS_SIZE }; - + enum BlendShapeMode { + BLEND_SHAPE_MODE_NORMALIZED = RS::BLEND_SHAPE_MODE_NORMALIZED, + BLEND_SHAPE_MODE_RELATIVE = RS::BLEND_SHAPE_MODE_RELATIVE, + }; enum ArrayType { ARRAY_VERTEX = RenderingServer::ARRAY_VERTEX, ARRAY_NORMAL = RenderingServer::ARRAY_NORMAL, @@ -171,12 +174,6 @@ class ArrayMesh : public Mesh { Array _get_surfaces() const; void _set_surfaces(const Array &p_data); -public: - enum BlendShapeMode { - BLEND_SHAPE_MODE_NORMALIZED = RS::BLEND_SHAPE_MODE_NORMALIZED, - BLEND_SHAPE_MODE_RELATIVE = RS::BLEND_SHAPE_MODE_RELATIVE, - }; - private: struct Surface { uint32_t format; @@ -268,6 +265,6 @@ VARIANT_ENUM_CAST(Mesh::ArrayType); VARIANT_ENUM_CAST(Mesh::ArrayFormat); VARIANT_ENUM_CAST(Mesh::ArrayCustomFormat); VARIANT_ENUM_CAST(Mesh::PrimitiveType); -VARIANT_ENUM_CAST(ArrayMesh::BlendShapeMode); +VARIANT_ENUM_CAST(Mesh::BlendShapeMode); #endif |