diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-27 20:26:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 20:26:23 +0200 |
| commit | 30cf49e8d0325759b36af698f0c08d95629d1e09 (patch) | |
| tree | 979b436083a55934c9cf56d54d9b6a213914b085 /scene/resources | |
| parent | 321419df99f211e8e317d9d24b6aa147bea5c21e (diff) | |
| parent | 62f8b0eb91a8afa372d60ec22bb0ce3e2399e546 (diff) | |
Merge pull request #53134 from briansemrau/quadmesh-has-no-indices
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/primitive_meshes.cpp | 6 | ||||
| -rw-r--r-- | scene/resources/primitive_meshes.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index e7da41db9d..25eb701596 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -1390,6 +1390,12 @@ void QuadMesh::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "center_offset"), "set_center_offset", "get_center_offset"); } +uint32_t QuadMesh::surface_get_format(int p_idx) const { + ERR_FAIL_INDEX_V(p_idx, 1, 0); + + return RS::ARRAY_FORMAT_VERTEX | RS::ARRAY_FORMAT_NORMAL | RS::ARRAY_FORMAT_TANGENT | RS::ARRAY_FORMAT_TEX_UV; +} + QuadMesh::QuadMesh() { primitive_type = PRIMITIVE_TRIANGLES; } diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h index 7915cb0028..d447dad97a 100644 --- a/scene/resources/primitive_meshes.h +++ b/scene/resources/primitive_meshes.h @@ -285,6 +285,8 @@ protected: virtual void _create_mesh_array(Array &p_arr) const override; public: + virtual uint32_t surface_get_format(int p_idx) const override; + QuadMesh(); void set_size(const Size2 &p_size); |