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

Merge pull request #51396 from lawnjelly/portals_sprite3d 

Portals - add support for Sprite3D
This commit is contained in:
Rémi Verschelde 2021-08-08 17:47:32 +02:00 committed by GitHub
parent 6149304c3a fc3c01db0f
commit be22d7b013
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scene/3d/room_manager.cpp
View File

@ -41,6 +41,7 @@
#include "room_group.h" #include "room_group.h"
#include "scene/3d/camera.h" #include "scene/3d/camera.h"
#include "scene/3d/light.h" #include "scene/3d/light.h"
#include "scene/3d/sprite_3d.h"
#include "visibility_notifier.h" #include "visibility_notifier.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
@ -1738,11 +1739,11 @@ bool RoomManager::_bound_findpoints_geom_instance(GeometryInstance *p_gi, Vector
// convert to world space // convert to world space
for (int n = 0; n < vertices.size(); n++) { for (int n = 0; n < vertices.size(); n++) {
Vector3 ptWorld = trans.xform(vertices[n]); Vector3 pt_world = trans.xform(vertices[n]);
r_room_pts.push_back(ptWorld); r_room_pts.push_back(pt_world);
// keep the bound up to date // keep the bound up to date
r_aabb.expand_to(ptWorld); r_aabb.expand_to(pt_world);
} }
} // for through the surfaces } // for through the surfaces
@ -1798,16 +1799,37 @@ bool RoomManager::_bound_findpoints_geom_instance(GeometryInstance *p_gi, Vector
trans = mmi->get_global_transform() * trans; trans = mmi->get_global_transform() * trans;
for (int n = 0; n < local_verts.size(); n++) { for (int n = 0; n < local_verts.size(); n++) {
Vector3 ptWorld = trans.xform(local_verts[n]); Vector3 pt_world = trans.xform(local_verts[n]);
r_room_pts.push_back(ptWorld); r_room_pts.push_back(pt_world);
// keep the bound up to date // keep the bound up to date
r_aabb.expand_to(ptWorld); r_aabb.expand_to(pt_world);
} }
} }
return true; return true;
} }
// Sprite3D
SpriteBase3D *sprite = Object::cast_to<SpriteBase3D>(p_gi);
if (sprite) {
Ref<TriangleMesh> tmesh = sprite->generate_triangle_mesh();
PoolVector<Vector3> vertices = tmesh->get_vertices();
// for converting meshes to world space
Transform trans = p_gi->get_global_transform();
// convert to world space
for (int n = 0; n < vertices.size(); n++) {
Vector3 pt_world = trans.xform(vertices[n]);
r_room_pts.push_back(pt_world);
// keep the bound up to date
r_aabb.expand_to(pt_world);
}
return true;
}
return false; return false;
} }