godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61441 from clayjohn/rd-dependency 

Remove mesh and particles RD dependencies from canvas rendering server
This commit is contained in:
Rémi Verschelde 2022-05-27 10:22:09 +02:00 committed by GitHub
parent 92b337a215 7b71545652
commit 8a21f7231f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/rendering/renderer_canvas_render.cpp
View File

@ -95,7 +95,7 @@ const Rect2 &RendererCanvasRender::Item::get_rect() const {
case Item::Command::TYPE_PARTICLES: {
const Item::CommandParticles *particles_cmd = static_cast<const Item::CommandParticles *>(c);
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);
}

2
servers/rendering/renderer_canvas_render.h
View File

@ -31,8 +31,6 @@
#ifndef 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"
class RendererCanvasRender {