Skip to content

Instance collision #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aidandavey wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Instance collision #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5d3a1b2
Started instance collision
aidandavey Jun 4, 2025
9219ea4
Build from cell audit and shape recycling
aidandavey Jun 11, 2025
947da06
Fix ordering of shape data and body set shape
almic Dec 11, 2025
afeff08
Fix region selection for full collision mode
almic Dec 12, 2025
c48f395
Improve instance collision (+3 squashed commit)
aidandavey Dec 14, 2025
2f3ff28
Convert cell locations to Vector2i, restructure
almic Dec 17, 2025
f11435b
Fix debug meshes when saving/reloading, update on set vertex spacing …
aidandavey Dec 17, 2025
6d462b3
Check if circle overlaps cell in build/desompose logic
aidandavey Dec 19, 2025
ae75d15
Set up one body per MA with layers, masks and physics materials
aidandavey Dec 19, 2025
f3e9e19
Fix destroy instance collision
aidandavey Dec 20, 2025
b76dec2
Fix variant cast and rename some things
aidandavey Dec 20, 2025
467ffda
Fix improper casting
aidandavey Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/terrain_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ void Terrain3D::__physics_process(const double p_delta) {
if (_collision && _collision->is_dynamic_mode()) {
_collision->update();
}
if (_collision && _collision->is_instance_collision_enabled()) {
_collision->update_instance_collision();
}
}

/**
Expand Down Expand Up @@ -175,6 +178,7 @@ void Terrain3D::_destroy_collision(const bool p_final) {
LOG(INFO, "Destroying Collision");
if (_collision) {
_collision->destroy();
_collision->destroy_instance_collision();
}
if (p_final) {
memdelete_safely(_collision);
Expand Down Expand Up @@ -683,6 +687,7 @@ void Terrain3D::set_vertex_spacing(const real_t p_spacing) {
_material->update();
_collision->destroy();
_collision->build();
_collision->set_instance_collision_dirty(true);
_update_displacement_buffer();
}
if (IS_EDITOR && _editor_plugin) {
Expand Down Expand Up @@ -1099,6 +1104,7 @@ void Terrain3D::_notification(const int p_what) {
set_physics_process(false);
_destroy_mesher();
_destroy_instancer();
_destroy_collision();
_destroy_mouse_picking();
_destroy_displacement_buffer();
if (_assets.is_valid()) {
Expand Down Expand Up @@ -1219,6 +1225,12 @@ void Terrain3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_physics_material", "material"), &Terrain3D::set_physics_material);
ClassDB::bind_method(D_METHOD("get_physics_material"), &Terrain3D::get_physics_material);

// Instance Collision
ClassDB::bind_method(D_METHOD("set_instance_collision_mode", "mode"), &Terrain3D::set_instance_collision_mode);
ClassDB::bind_method(D_METHOD("get_instance_collision_mode"), &Terrain3D::get_instance_collision_mode);
ClassDB::bind_method(D_METHOD("set_instance_collision_radius", "radius"), &Terrain3D::set_instance_collision_radius);
ClassDB::bind_method(D_METHOD("get_instance_collision_radius"), &Terrain3D::get_instance_collision_radius);

// Terrain Mesh
ClassDB::bind_method(D_METHOD("set_mesh_lods", "count"), &Terrain3D::set_mesh_lods);
ClassDB::bind_method(D_METHOD("get_mesh_lods"), &Terrain3D::get_mesh_lods);
Expand Down Expand Up @@ -1337,6 +1349,9 @@ void Terrain3D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_priority", PROPERTY_HINT_RANGE, "0.1,256,.1"), "set_collision_priority", "get_collision_priority");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "physics_material", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), "set_physics_material", "get_physics_material");
ADD_SUBGROUP("Instance Collision", "");
ADD_PROPERTY(PropertyInfo(Variant::INT, "instance_collision_mode", PROPERTY_HINT_ENUM, "Disabled, Dynamic / Game, Dynamic / Editor"), "set_instance_collision_mode", "get_instance_collision_mode");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "instance_collision_radius", PROPERTY_HINT_RANGE, "1.,256.,1."), "set_instance_collision_radius", "get_instance_collision_radius");

ADD_GROUP("Terrain Mesh", "");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "clipmap_target", PROPERTY_HINT_NODE_TYPE, "Node3D", PROPERTY_USAGE_DEFAULT, "Node3D"), "set_clipmap_target", "get_clipmap_target");
Expand Down
6 changes: 6 additions & 0 deletions src/terrain_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,12 @@ class Terrain3D : public Node3D {
void set_physics_material(const Ref<PhysicsMaterial> &p_mat) { _collision ? _collision->set_physics_material(p_mat) : void(); }
Ref<PhysicsMaterial> get_physics_material() const { return _collision ? _collision->get_physics_material() : Ref<PhysicsMaterial>(); }

// Instance Collision Aliases
void set_instance_collision_mode(const InstanceCollisionMode p_mode) { _collision ? _collision->set_instance_collision_mode(p_mode) : void(); }
InstanceCollisionMode get_instance_collision_mode() const { return _collision ? _collision->get_instance_collision_mode() : InstanceCollisionMode::INSTANCE_COLLISION_DYNAMIC_GAME; }
void set_instance_collision_radius(const real_t p_radius) { _collision ? _collision->set_instance_collision_radius(p_radius) : void(); }
real_t get_instance_collision_radius() const { return _collision ? _collision->get_instance_collision_radius() : 64.f; }

// Instancer Aliases
void set_instancer_mode(const InstancerMode p_mode) { _instancer ? _instancer->set_mode(p_mode) : void(); }
InstancerMode get_instancer_mode() const { return _instancer ? _instancer->get_mode() : InstancerMode::NORMAL; }
Expand Down
Loading
Loading