Moved particles into ParticlesStorage

3 files changed, 129 insertions, 78 deletions

diff --git a/servers/rendering/dummy/rasterizer_dummy.h b/servers/rendering/dummy/rasterizer_dummy.h
index 17bf88bbd7..6cad45ea6d 100644
--- a/servers/rendering/dummy/rasterizer_dummy.h
+++ b/servers/rendering/dummy/rasterizer_dummy.h
@@ -40,6 +40,7 @@
 #include "servers/rendering/dummy/storage/light_storage.h"
 #include "servers/rendering/dummy/storage/material_storage.h"
 #include "servers/rendering/dummy/storage/mesh_storage.h"
+#include "servers/rendering/dummy/storage/particles_storage.h"
 #include "servers/rendering/dummy/storage/texture_storage.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering_server.h"
@@ -54,6 +55,7 @@ protected:
 	RendererDummy::LightStorage light_storage;
 	RendererDummy::MaterialStorage material_storage;
 	RendererDummy::MeshStorage mesh_storage;
+	RendererDummy::ParticlesStorage particles_storage;
 	RendererDummy::TextureStorage texture_storage;
 	RasterizerStorageDummy storage;
 	RasterizerSceneDummy scene;
@@ -62,6 +64,7 @@ public:
 	RendererLightStorage *get_light_storage() override { return &light_storage; };
 	RendererMaterialStorage *get_material_storage() override { return &material_storage; };
 	RendererMeshStorage *get_mesh_storage() override { return &mesh_storage; };
+	RendererParticlesStorage *get_particles_storage() override { return &particles_storage; };
 	RendererTextureStorage *get_texture_storage() override { return &texture_storage; };
 	RendererStorage *get_storage() override { return &storage; }
 	RendererCanvasRender *get_canvas() override { return &canvas; }
diff --git a/servers/rendering/dummy/rasterizer_storage_dummy.h b/servers/rendering/dummy/rasterizer_storage_dummy.h
index 9aaeead1c2..ac6085cdec 100644
--- a/servers/rendering/dummy/rasterizer_storage_dummy.h
+++ b/servers/rendering/dummy/rasterizer_storage_dummy.h
@@ -83,84 +83,6 @@ public:
 
 	void occluder_set_mesh(RID p_occluder, const PackedVector3Array &p_vertices, const PackedInt32Array &p_indices) {}
 
-	/* PARTICLES */
-
-	RID particles_allocate() override { return RID(); }
-	void particles_initialize(RID p_rid) override {}
-	void particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) override {}
-	void particles_emit(RID p_particles, const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags) override {}
-	void particles_set_emitting(RID p_particles, bool p_emitting) override {}
-	void particles_set_amount(RID p_particles, int p_amount) override {}
-	void particles_set_lifetime(RID p_particles, double p_lifetime) override {}
-	void particles_set_one_shot(RID p_particles, bool p_one_shot) override {}
-	void particles_set_pre_process_time(RID p_particles, double p_time) override {}
-	void particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) override {}
-	void particles_set_randomness_ratio(RID p_particles, real_t p_ratio) override {}
-	void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) override {}
-	void particles_set_speed_scale(RID p_particles, double p_scale) override {}
-	void particles_set_use_local_coordinates(RID p_particles, bool p_enable) override {}
-	void particles_set_process_material(RID p_particles, RID p_material) override {}
-	RID particles_get_process_material(RID p_particles) const override { return RID(); }
-	void particles_set_fixed_fps(RID p_particles, int p_fps) override {}
-	void particles_set_interpolate(RID p_particles, bool p_enable) override {}
-	void particles_set_fractional_delta(RID p_particles, bool p_enable) override {}
-	void particles_set_subemitter(RID p_particles, RID p_subemitter_particles) override {}
-	void particles_set_view_axis(RID p_particles, const Vector3 &p_axis, const Vector3 &p_up_axis) override {}
-	void particles_set_collision_base_size(RID p_particles, real_t p_size) override {}
-
-	void particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) override {}
-
-	void particles_set_trails(RID p_particles, bool p_enable, double p_length) override {}
-	void particles_set_trail_bind_poses(RID p_particles, const Vector<Transform3D> &p_bind_poses) override {}
-
-	void particles_restart(RID p_particles) override {}
-
-	void particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) override {}
-
-	void particles_set_draw_passes(RID p_particles, int p_count) override {}
-	void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) override {}
-
-	void particles_request_process(RID p_particles) override {}
-	AABB particles_get_current_aabb(RID p_particles) override { return AABB(); }
-	AABB particles_get_aabb(RID p_particles) const override { return AABB(); }
-
-	void particles_set_emission_transform(RID p_particles, const Transform3D &p_transform) override {}
-
-	bool particles_get_emitting(RID p_particles) override { return false; }
-	int particles_get_draw_passes(RID p_particles) const override { return 0; }
-	RID particles_get_draw_pass_mesh(RID p_particles, int p_pass) const override { return RID(); }
-
-	void particles_add_collision(RID p_particles, RID p_instance) override {}
-	void particles_remove_collision(RID p_particles, RID p_instance) override {}
-
-	void particles_set_canvas_sdf_collision(RID p_particles, bool p_enable, const Transform2D &p_xform, const Rect2 &p_to_screen, RID p_texture) override {}
-
-	void update_particles() override {}
-
-	/* PARTICLES COLLISION */
-
-	RID particles_collision_allocate() override { return RID(); }
-	void particles_collision_initialize(RID p_rid) override {}
-	void particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) override {}
-	void particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) override {}
-	void particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) override {}
-	void particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) override {}
-	void particles_collision_set_attractor_strength(RID p_particles_collision, real_t p_strength) override {}
-	void particles_collision_set_attractor_directionality(RID p_particles_collision, real_t p_directionality) override {}
-	void particles_collision_set_attractor_attenuation(RID p_particles_collision, real_t p_curve) override {}
-	void particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) override {}
-	void particles_collision_height_field_update(RID p_particles_collision) override {}
-	void particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) override {}
-	AABB particles_collision_get_aabb(RID p_particles_collision) const override { return AABB(); }
-	bool particles_collision_is_heightfield(RID p_particles_collision) const override { return false; }
-	RID particles_collision_get_heightfield_framebuffer(RID p_particles_collision) const override { return RID(); }
-
-	RID particles_collision_instance_create(RID p_collision) override { return RID(); }
-	void particles_collision_instance_set_transform(RID p_collision_instance, const Transform3D &p_transform) override {}
-	void particles_collision_instance_set_active(RID p_collision_instance, bool p_active) override {}
-
-	bool particles_is_inactive(RID p_particles) const override { return false; }
-
 	/* FOG VOLUMES */
 
 	RID fog_volume_allocate() override { return RID(); }
diff --git a/servers/rendering/dummy/storage/particles_storage.h b/servers/rendering/dummy/storage/particles_storage.h
new file mode 100644
index 0000000000..f614b41c4c
--- /dev/null
+++ b/servers/rendering/dummy/storage/particles_storage.h
@@ -0,0 +1,126 @@
+/*************************************************************************/
+/*  particles_storage.h                                                  */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef PARTICLES_STORAGE_DUMMY_H
+#define PARTICLES_STORAGE_DUMMY_H
+
+#include "servers/rendering/storage/particles_storage.h"
+
+namespace RendererDummy {
+
+class ParticlesStorage : public RendererParticlesStorage {
+public:
+	/* PARTICLES */
+
+	virtual RID particles_allocate() override { return RID(); }
+	virtual void particles_initialize(RID p_rid) override {}
+	virtual void particles_free(RID p_rid) override {}
+
+	virtual void particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) override {}
+	virtual void particles_emit(RID p_particles, const Transform3D &p_transform, const Vector3 &p_velocity, const Color &p_color, const Color &p_custom, uint32_t p_emit_flags) override {}
+	virtual void particles_set_emitting(RID p_particles, bool p_emitting) override {}
+	virtual void particles_set_amount(RID p_particles, int p_amount) override {}
+	virtual void particles_set_lifetime(RID p_particles, double p_lifetime) override {}
+	virtual void particles_set_one_shot(RID p_particles, bool p_one_shot) override {}
+	virtual void particles_set_pre_process_time(RID p_particles, double p_time) override {}
+	virtual void particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) override {}
+	virtual void particles_set_randomness_ratio(RID p_particles, real_t p_ratio) override {}
+	virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) override {}
+	virtual void particles_set_speed_scale(RID p_particles, double p_scale) override {}
+	virtual void particles_set_use_local_coordinates(RID p_particles, bool p_enable) override {}
+	virtual void particles_set_process_material(RID p_particles, RID p_material) override {}
+	virtual RID particles_get_process_material(RID p_particles) const override { return RID(); }
+	virtual void particles_set_fixed_fps(RID p_particles, int p_fps) override {}
+	virtual void particles_set_interpolate(RID p_particles, bool p_enable) override {}
+	virtual void particles_set_fractional_delta(RID p_particles, bool p_enable) override {}
+	virtual void particles_set_subemitter(RID p_particles, RID p_subemitter_particles) override {}
+	virtual void particles_set_view_axis(RID p_particles, const Vector3 &p_axis, const Vector3 &p_up_axis) override {}
+	virtual void particles_set_collision_base_size(RID p_particles, real_t p_size) override {}
+
+	virtual void particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) override {}
+
+	virtual void particles_set_trails(RID p_particles, bool p_enable, double p_length) override {}
+	virtual void particles_set_trail_bind_poses(RID p_particles, const Vector<Transform3D> &p_bind_poses) override {}
+
+	virtual void particles_restart(RID p_particles) override {}
+
+	virtual void particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) override {}
+
+	virtual void particles_set_draw_passes(RID p_particles, int p_count) override {}
+	virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) override {}
+
+	virtual void particles_request_process(RID p_particles) override {}
+	virtual AABB particles_get_current_aabb(RID p_particles) override { return AABB(); }
+	virtual AABB particles_get_aabb(RID p_particles) const override { return AABB(); }
+
+	virtual void particles_set_emission_transform(RID p_particles, const Transform3D &p_transform) override {}
+
+	virtual bool particles_get_emitting(RID p_particles) override { return false; }
+	virtual int particles_get_draw_passes(RID p_particles) const override { return 0; }
+	virtual RID particles_get_draw_pass_mesh(RID p_particles, int p_pass) const override { return RID(); }
+
+	virtual void particles_add_collision(RID p_particles, RID p_instance) override {}
+	virtual void particles_remove_collision(RID p_particles, RID p_instance) override {}
+
+	virtual void particles_set_canvas_sdf_collision(RID p_particles, bool p_enable, const Transform2D &p_xform, const Rect2 &p_to_screen, RID p_texture) override {}
+
+	virtual void update_particles() override {}
+
+	/* PARTICLES COLLISION */
+
+	virtual RID particles_collision_allocate() override { return RID(); }
+	virtual void particles_collision_initialize(RID p_rid) override {}
+	virtual void particles_collision_free(RID p_rid) override {}
+
+	virtual void particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) override {}
+	virtual void particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) override {}
+	virtual void particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) override {}
+	virtual void particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) override {}
+	virtual void particles_collision_set_attractor_strength(RID p_particles_collision, real_t p_strength) override {}
+	virtual void particles_collision_set_attractor_directionality(RID p_particles_collision, real_t p_directionality) override {}
+	virtual void particles_collision_set_attractor_attenuation(RID p_particles_collision, real_t p_curve) override {}
+	virtual void particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) override {}
+	virtual void particles_collision_height_field_update(RID p_particles_collision) override {}
+	virtual void particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) override {}
+	virtual AABB particles_collision_get_aabb(RID p_particles_collision) const override { return AABB(); }
+	virtual bool particles_collision_is_heightfield(RID p_particles_collision) const override { return false; }
+	virtual RID particles_collision_get_heightfield_framebuffer(RID p_particles_collision) const override { return RID(); }
+
+	virtual RID particles_collision_instance_create(RID p_collision) override { return RID(); }
+	virtual void particles_collision_instance_free(RID p_rid) override {}
+	virtual void particles_collision_instance_set_transform(RID p_collision_instance, const Transform3D &p_transform) override {}
+	virtual void particles_collision_instance_set_active(RID p_collision_instance, bool p_active) override {}
+
+	virtual bool particles_is_inactive(RID p_particles) const override { return false; }
+};
+
+} // namespace RendererDummy
+
+#endif // !PARTICLES_STORAGE_DUMMY_H