diff options
Diffstat (limited to 'servers/visual_server.h')
| -rw-r--r-- | servers/visual_server.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/servers/visual_server.h b/servers/visual_server.h index 2ab521c7c0..06dba99860 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -319,21 +319,7 @@ public: MULTIMESH_TRANSFORM_3D, }; - enum MultimeshColorFormat { - MULTIMESH_COLOR_NONE, - MULTIMESH_COLOR_8BIT, - MULTIMESH_COLOR_FLOAT, - MULTIMESH_COLOR_MAX, - }; - - enum MultimeshCustomDataFormat { - MULTIMESH_CUSTOM_DATA_NONE, - MULTIMESH_CUSTOM_DATA_8BIT, - MULTIMESH_CUSTOM_DATA_FLOAT, - MULTIMESH_CUSTOM_DATA_MAX, - }; - - virtual void multimesh_allocate(RID p_multimesh, int p_instances, MultimeshTransformFormat p_transform_format, MultimeshColorFormat p_color_format, MultimeshCustomDataFormat p_data_format = MULTIMESH_CUSTOM_DATA_NONE) = 0; + virtual void multimesh_allocate(RID p_multimesh, int p_instances, MultimeshTransformFormat p_transform_format, bool p_use_colors = false, bool p_use_custom_data = false) = 0; virtual int multimesh_get_instance_count(RID p_multimesh) const = 0; virtual void multimesh_set_mesh(RID p_multimesh, RID p_mesh) = 0; @@ -350,7 +336,8 @@ public: virtual Color multimesh_instance_get_color(RID p_multimesh, int p_index) const = 0; virtual Color multimesh_instance_get_custom_data(RID p_multimesh, int p_index) const = 0; - virtual void multimesh_set_as_bulk_array(RID p_multimesh, const PoolVector<float> &p_array) = 0; + virtual void multimesh_set_buffer(RID p_multimesh, const PoolVector<float> &p_buffer) = 0; + virtual PoolVector<float> multimesh_get_buffer(RID p_multimesh) const = 0; virtual void multimesh_set_visible_instances(RID p_multimesh, int p_visible) = 0; virtual int multimesh_get_visible_instances(RID p_multimesh) const = 0; @@ -1100,8 +1087,6 @@ VARIANT_ENUM_CAST(VisualServer::CanvasOccluderPolygonCullMode); VARIANT_ENUM_CAST(VisualServer::RenderInfo); VARIANT_ENUM_CAST(VisualServer::Features); VARIANT_ENUM_CAST(VisualServer::MultimeshTransformFormat); -VARIANT_ENUM_CAST(VisualServer::MultimeshColorFormat); -VARIANT_ENUM_CAST(VisualServer::MultimeshCustomDataFormat); VARIANT_ENUM_CAST(VisualServer::LightOmniShadowMode); VARIANT_ENUM_CAST(VisualServer::LightDirectionalShadowMode); VARIANT_ENUM_CAST(VisualServer::LightDirectionalShadowDepthRangeMode); |