Skip to content

Commit

Permalink
Moved particles into ParticlesStorage
Browse files Browse the repository at this point in the history
  • Loading branch information
@BastiaanOlij
BastiaanOlij committed Apr 17, 2022
1 parent b6faf6c commit 0b4fd92
Show file tree
Hide file tree
Showing 33 changed files with 3,540 additions and 3,119 deletions.
3 changes: 3 additions & 0 deletions drivers/gles3/rasterizer_gles3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "storage/light_storage.h"
#include "storage/material_storage.h"
#include "storage/mesh_storage.h"
#include "storage/particles_storage.h"
#include "storage/texture_storage.h"

class RasterizerGLES3 : public RendererCompositor {
Expand All @@ -55,6 +56,7 @@ class RasterizerGLES3 : public RendererCompositor {
GLES3::TextureStorage texture_storage;
GLES3::MaterialStorage material_storage;
GLES3::MeshStorage mesh_storage;
GLES3::ParticlesStorage particles_storage;
GLES3::LightStorage light_storage;
RasterizerStorageGLES3 storage;
RasterizerCanvasGLES3 canvas;
Expand All @@ -66,6 +68,7 @@ class RasterizerGLES3 : public RendererCompositor {
RendererLightStorage *get_light_storage() { return &light_storage; }
RendererMaterialStorage *get_material_storage() { return &material_storage; }
RendererMeshStorage *get_mesh_storage() { return &mesh_storage; }
RendererParticlesStorage *get_particles_storage() { return &particles_storage; }
RendererTextureStorage *get_texture_storage() { return &texture_storage; }
RendererStorage *get_storage() { return &storage; }
RendererCanvasRender *get_canvas() { return &canvas; }
Expand Down
193 changes: 1 addition & 192 deletions drivers/gles3/rasterizer_storage_gles3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,198 +164,7 @@ uint32_t RasterizerStorageGLES3::voxel_gi_get_version(RID p_voxel_gi) {
void RasterizerStorageGLES3::occluder_set_mesh(RID p_occluder, const PackedVector3Array &p_vertices, const PackedInt32Array &p_indices) {
}

/* PARTICLES */

RID RasterizerStorageGLES3::particles_allocate() {
return RID();
}

void RasterizerStorageGLES3::particles_initialize(RID p_rid) {
}

void RasterizerStorageGLES3::particles_set_mode(RID p_particles, RS::ParticlesMode p_mode) {
}

void RasterizerStorageGLES3::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) {
}

void RasterizerStorageGLES3::particles_set_emitting(RID p_particles, bool p_emitting) {
}

void RasterizerStorageGLES3::particles_set_amount(RID p_particles, int p_amount) {
}

void RasterizerStorageGLES3::particles_set_lifetime(RID p_particles, double p_lifetime) {
}

void RasterizerStorageGLES3::particles_set_one_shot(RID p_particles, bool p_one_shot) {
}

void RasterizerStorageGLES3::particles_set_pre_process_time(RID p_particles, double p_time) {
}

void RasterizerStorageGLES3::particles_set_explosiveness_ratio(RID p_particles, real_t p_ratio) {
}

void RasterizerStorageGLES3::particles_set_randomness_ratio(RID p_particles, real_t p_ratio) {
}

void RasterizerStorageGLES3::particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) {
}

void RasterizerStorageGLES3::particles_set_speed_scale(RID p_particles, double p_scale) {
}

void RasterizerStorageGLES3::particles_set_use_local_coordinates(RID p_particles, bool p_enable) {
}

void RasterizerStorageGLES3::particles_set_process_material(RID p_particles, RID p_material) {
}
RID RasterizerStorageGLES3::particles_get_process_material(RID p_particles) const {
return RID();
}

void RasterizerStorageGLES3::particles_set_fixed_fps(RID p_particles, int p_fps) {
}

void RasterizerStorageGLES3::particles_set_interpolate(RID p_particles, bool p_enable) {
}

void RasterizerStorageGLES3::particles_set_fractional_delta(RID p_particles, bool p_enable) {
}

void RasterizerStorageGLES3::particles_set_subemitter(RID p_particles, RID p_subemitter_particles) {
}

void RasterizerStorageGLES3::particles_set_view_axis(RID p_particles, const Vector3 &p_axis, const Vector3 &p_up_axis) {
}

void RasterizerStorageGLES3::particles_set_collision_base_size(RID p_particles, real_t p_size) {
}

void RasterizerStorageGLES3::particles_set_transform_align(RID p_particles, RS::ParticlesTransformAlign p_transform_align) {
}

void RasterizerStorageGLES3::particles_set_trails(RID p_particles, bool p_enable, double p_length) {
}

void RasterizerStorageGLES3::particles_set_trail_bind_poses(RID p_particles, const Vector<Transform3D> &p_bind_poses) {
}

void RasterizerStorageGLES3::particles_restart(RID p_particles) {
}

void RasterizerStorageGLES3::particles_set_draw_order(RID p_particles, RS::ParticlesDrawOrder p_order) {
}

void RasterizerStorageGLES3::particles_set_draw_passes(RID p_particles, int p_count) {
}

void RasterizerStorageGLES3::particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) {
}

void RasterizerStorageGLES3::particles_request_process(RID p_particles) {
}

AABB RasterizerStorageGLES3::particles_get_current_aabb(RID p_particles) {
return AABB();
}

AABB RasterizerStorageGLES3::particles_get_aabb(RID p_particles) const {
return AABB();
}

void RasterizerStorageGLES3::particles_set_emission_transform(RID p_particles, const Transform3D &p_transform) {
}

bool RasterizerStorageGLES3::particles_get_emitting(RID p_particles) {
return false;
}

int RasterizerStorageGLES3::particles_get_draw_passes(RID p_particles) const {
return 0;
}

RID RasterizerStorageGLES3::particles_get_draw_pass_mesh(RID p_particles, int p_pass) const {
return RID();
}

void RasterizerStorageGLES3::particles_add_collision(RID p_particles, RID p_instance) {
}

void RasterizerStorageGLES3::particles_remove_collision(RID p_particles, RID p_instance) {
}

void RasterizerStorageGLES3::particles_set_canvas_sdf_collision(RID p_particles, bool p_enable, const Transform2D &p_xform, const Rect2 &p_to_screen, RID p_texture) {
}

void RasterizerStorageGLES3::update_particles() {
}

bool RasterizerStorageGLES3::particles_is_inactive(RID p_particles) const {
return false;
}

/* PARTICLES COLLISION */

RID RasterizerStorageGLES3::particles_collision_allocate() {
return RID();
}

void RasterizerStorageGLES3::particles_collision_initialize(RID p_rid) {
}

void RasterizerStorageGLES3::particles_collision_set_collision_type(RID p_particles_collision, RS::ParticlesCollisionType p_type) {
}

void RasterizerStorageGLES3::particles_collision_set_cull_mask(RID p_particles_collision, uint32_t p_cull_mask) {
}

void RasterizerStorageGLES3::particles_collision_set_sphere_radius(RID p_particles_collision, real_t p_radius) {
}

void RasterizerStorageGLES3::particles_collision_set_box_extents(RID p_particles_collision, const Vector3 &p_extents) {
}

void RasterizerStorageGLES3::particles_collision_set_attractor_strength(RID p_particles_collision, real_t p_strength) {
}

void RasterizerStorageGLES3::particles_collision_set_attractor_directionality(RID p_particles_collision, real_t p_directionality) {
}

void RasterizerStorageGLES3::particles_collision_set_attractor_attenuation(RID p_particles_collision, real_t p_curve) {
}

void RasterizerStorageGLES3::particles_collision_set_field_texture(RID p_particles_collision, RID p_texture) {
}

void RasterizerStorageGLES3::particles_collision_height_field_update(RID p_particles_collision) {
}

void RasterizerStorageGLES3::particles_collision_set_height_field_resolution(RID p_particles_collision, RS::ParticlesCollisionHeightfieldResolution p_resolution) {
}

AABB RasterizerStorageGLES3::particles_collision_get_aabb(RID p_particles_collision) const {
return AABB();
}

bool RasterizerStorageGLES3::particles_collision_is_heightfield(RID p_particles_collision) const {
return false;
}

RID RasterizerStorageGLES3::particles_collision_get_heightfield_framebuffer(RID p_particles_collision) const {
return RID();
}

RID RasterizerStorageGLES3::particles_collision_instance_create(RID p_collision) {
return RID();
}

void RasterizerStorageGLES3::particles_collision_instance_set_transform(RID p_collision_instance, const Transform3D &p_transform) {
}

void RasterizerStorageGLES3::particles_collision_instance_set_active(RID p_collision_instance, bool p_active) {
}
/* FOG */

RID RasterizerStorageGLES3::fog_volume_allocate() {
return RID();
Expand Down
77 changes: 0 additions & 77 deletions drivers/gles3/rasterizer_storage_gles3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,83 +175,6 @@ class RasterizerStorageGLES3 : public RendererStorage {

void occluder_set_mesh(RID p_occluder, const PackedVector3Array &p_vertices, const PackedInt32Array &p_indices);

/* PARTICLES */

RID particles_allocate() override;
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;
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;
AABB particles_get_aabb(RID p_particles) const override;

void particles_set_emission_transform(RID p_particles, const Transform3D &p_transform) override;

bool particles_get_emitting(RID p_particles) override;
int particles_get_draw_passes(RID p_particles) const override;
RID particles_get_draw_pass_mesh(RID p_particles, int p_pass) const override;

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;
bool particles_is_inactive(RID p_particles) const override;

/* PARTICLES COLLISION */

RID particles_collision_allocate() override;
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;
bool particles_collision_is_heightfield(RID p_particles_collision) const override;
RID particles_collision_get_heightfield_framebuffer(RID p_particles_collision) const override;

RID particles_collision_instance_create(RID p_collision) override;
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;

/* FOG VOLUMES */

RID fog_volume_allocate() override;
Expand Down
Loading

0 comments on commit 0b4fd92

Please sign in to comment.