From c87b5e57f0e76b2e79bf08a1297d3bf424d90933 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 11 Jul 2023 11:11:33 +0200 Subject: [PATCH] Ported the navigation geometry parsers for the csg module. --- modules/csg/SCsub | 2 + ...gshape3d_navigation_geometry_parser_3d.cpp | 56 +++++++++++++++++++ ...csgshape3d_navigation_geometry_parser_3d.h | 44 +++++++++++++++ modules/csg/register_types.cpp | 5 ++ 4 files changed, 107 insertions(+) create mode 100644 modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp create mode 100644 modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.h diff --git a/modules/csg/SCsub b/modules/csg/SCsub index 9af582929..857bc10b2 100644 --- a/modules/csg/SCsub +++ b/modules/csg/SCsub @@ -6,4 +6,6 @@ Import("env_modules") env_csg = env_modules.Clone() # Godot source files + env_csg.add_source_files(env.modules_sources, "*.cpp") +env_csg.add_source_files(env.modules_sources, "geometry_parser/*.cpp") diff --git a/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp b/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp new file mode 100644 index 000000000..1a953e73d --- /dev/null +++ b/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.cpp @@ -0,0 +1,56 @@ +/**************************************************************************/ +/* csgshape3d_navigation_geometry_parser_3d.cpp */ +/**************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/**************************************************************************/ +/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* 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. */ +/**************************************************************************/ + +#include "csgshape3d_navigation_geometry_parser_3d.h" + +#include "scene/resources/navigation_mesh.h" +#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" +#include "scene/resources/mesh.h" + +#include "modules/csg/csg_shape.h" + +bool CSGShape3DNavigationGeometryParser3D::parses_node(Node *p_node) { + return (Object::cast_to(p_node) != nullptr); +} + +void CSGShape3DNavigationGeometryParser3D::parse_geometry(Node *p_node, Ref p_navigationmesh, Ref p_source_geometry) { + NavigationMesh::ParsedGeometryType parsed_geometry_type = p_navigationmesh->get_parsed_geometry_type(); + + if (Object::cast_to(p_node) && parsed_geometry_type != NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS) { + CSGShape *csg_shape = Object::cast_to(p_node); + Array meshes = csg_shape->get_meshes(); + if (!meshes.empty()) { + Ref mesh = meshes[1]; + if (mesh.is_valid()) { + p_source_geometry->add_mesh(mesh, csg_shape->get_global_transform()); + } + } + } +} \ No newline at end of file diff --git a/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.h b/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.h new file mode 100644 index 000000000..e9d45d623 --- /dev/null +++ b/modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.h @@ -0,0 +1,44 @@ + +#ifndef CSGSHAPE3D_NAVIGATION_GEOMETRY_PARSER_3D_H +#define CSGSHAPE3D_NAVIGATION_GEOMETRY_PARSER_3D_H + +/**************************************************************************/ +/* csgshape3d_navigation_geometry_parser_3d.h */ +/**************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/**************************************************************************/ +/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* 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. */ +/**************************************************************************/ + +#include "scene/3d/navigation_geometry_parser_3d.h" + +class CSGShape3DNavigationGeometryParser3D : public NavigationGeometryParser3D { +public: + virtual bool parses_node(Node *p_node) override; + + virtual void parse_geometry(Node *p_node, Ref p_navigationmesh, Ref p_source_geometry) override; +}; + +#endif // CSGSHAPE3D_NAVIGATION_GEOMETRY_PARSER_3D_H \ No newline at end of file diff --git a/modules/csg/register_types.cpp b/modules/csg/register_types.cpp index 30a1bd352..28f8746d8 100644 --- a/modules/csg/register_types.cpp +++ b/modules/csg/register_types.cpp @@ -33,6 +33,9 @@ #include "csg_gizmos.h" #include "csg_shape.h" +#include "modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.h" +#include "servers/navigation/navigation_mesh_generator.h" + void register_csg_types(ModuleRegistrationLevel p_level) { #ifndef _3D_DISABLED if (p_level == MODULE_REGISTRATION_LEVEL_SCENE) { @@ -45,6 +48,8 @@ void register_csg_types(ModuleRegistrationLevel p_level) { ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); + + NavigationMeshGenerator::get_singleton()->register_geometry_parser_3d(memnew(CSGShape3DNavigationGeometryParser3D)); } #ifdef TOOLS_ENABLED