Browse Source

Merge pull request #61441 from clayjohn/rd-dependency

Remove mesh and particles RD dependencies from canvas rendering server
Rémi Verschelde 3 years ago
parent
commit
8a21f7231f

+ 1 - 1
servers/rendering/renderer_canvas_render.cpp

@@ -95,7 +95,7 @@ const Rect2 &RendererCanvasRender::Item::get_rect() const {
 			case Item::Command::TYPE_PARTICLES: {
 			case Item::Command::TYPE_PARTICLES: {
 				const Item::CommandParticles *particles_cmd = static_cast<const Item::CommandParticles *>(c);
 				const Item::CommandParticles *particles_cmd = static_cast<const Item::CommandParticles *>(c);
 				if (particles_cmd->particles.is_valid()) {
 				if (particles_cmd->particles.is_valid()) {
-					AABB aabb = RendererRD::ParticlesStorage::get_singleton()->particles_get_aabb(particles_cmd->particles);
+					AABB aabb = RSG::particles_storage->particles_get_aabb(particles_cmd->particles);
 					r = Rect2(aabb.position.x, aabb.position.y, aabb.size.x, aabb.size.y);
 					r = Rect2(aabb.position.x, aabb.position.y, aabb.size.x, aabb.size.y);
 				}
 				}
 
 

+ 0 - 2
servers/rendering/renderer_canvas_render.h

@@ -31,8 +31,6 @@
 #ifndef RENDERINGSERVERCANVASRENDER_H
 #ifndef RENDERINGSERVERCANVASRENDER_H
 #define RENDERINGSERVERCANVASRENDER_H
 #define RENDERINGSERVERCANVASRENDER_H
 
 
-#include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h"
-#include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"
 #include "servers/rendering/renderer_storage.h"
 #include "servers/rendering/renderer_storage.h"
 
 
 class RendererCanvasRender {
 class RendererCanvasRender {