Skip to content
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

[4.4] Fix Physics Interpolation #611

Merged
merged 2 commits into from
Feb 2, 2025
Merged

[4.4] Fix Physics Interpolation #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4da6a
Move all snapping to the physics frame
TokisanGames Feb 1, 2025
389c48c
Reset mesh physics interpolation
TokisanGames Feb 1, 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
32 changes: 24 additions & 8 deletions src/terrain_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <godot_cpp/classes/viewport.hpp>
#include <godot_cpp/classes/viewport_texture.hpp>
#include <godot_cpp/classes/world3d.hpp>
#include <godot_cpp/core/version.hpp>

#include "geoclipmap.h"
#include "logger.h"
Expand Down Expand Up @@ -103,7 +104,7 @@ void Terrain3D::_initialize() {
* This is a proxy for _process(delta) called by _notification() due to
* https://github.com/godotengine/godot-cpp/issues/1022
*/
void Terrain3D::__process(const double p_delta) {
void Terrain3D::__physics_process(const double p_delta) {
if (!_initialized)
return;

Expand Down Expand Up @@ -140,7 +141,7 @@ void Terrain3D::_grab_camera() {
_camera_instance_id = _camera->get_instance_id();
} else {
_camera_instance_id = 0;
set_process(false); // disable snapping
set_physics_process(false); // disable snapping
LOG(ERROR, "Cannot find the active camera. Set it manually with Terrain3D.set_camera(). Stopping _process()");
}
}
Expand Down Expand Up @@ -634,7 +635,7 @@ void Terrain3D::set_camera(Camera3D *p_camera) {
_camera_instance_id = _camera->get_instance_id();
LOG(DEBUG, "Setting camera: ", _camera);
_initialize();
set_process(true); // enable __process snapping
set_physics_process(true); // enable snapping
}
}
}
Expand Down Expand Up @@ -803,6 +804,9 @@ void Terrain3D::snap(const Vector3 &p_cam_pos) {
Transform3D scaled_t = Transform3D().scaled(Vector3(_vertex_spacing, 1.f, _vertex_spacing));
scaled_t.origin = _snapped_position;
RS->instance_set_transform(_mesh_data.cross, scaled_t);
#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR == 4
RS->instance_reset_physics_interpolation(_mesh_data.cross);
#endif

int edge = 0;
int tile = 0;
Expand All @@ -828,6 +832,9 @@ void Terrain3D::snap(const Vector3 &p_cam_pos) {
t.origin = tile_tl;

RS->instance_set_transform(_mesh_data.tiles[tile], t);
#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR == 4
RS->instance_reset_physics_interpolation(_mesh_data.tiles[tile]);
#endif

tile++;
}
Expand All @@ -836,6 +843,9 @@ void Terrain3D::snap(const Vector3 &p_cam_pos) {
Transform3D t = Transform3D().scaled(Vector3(scale, 1.f, scale));
t.origin = snapped_pos;
RS->instance_set_transform(_mesh_data.fillers[l], t);
#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR == 4
RS->instance_reset_physics_interpolation(_mesh_data.fillers[l]);
#endif
}

if (l != _mesh_lods - 1) {
Expand All @@ -858,6 +868,9 @@ void Terrain3D::snap(const Vector3 &p_cam_pos) {
t = t.scaled(Vector3(scale, 1.f, scale));
t.origin = tile_center;
RS->instance_set_transform(_mesh_data.trims[edge], t);
#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR == 4
RS->instance_reset_physics_interpolation(_mesh_data.trims[edge]);
#endif
}

// Position seams
Expand All @@ -866,6 +879,9 @@ void Terrain3D::snap(const Vector3 &p_cam_pos) {
Transform3D t = Transform3D().scaled(Vector3(scale, 1.f, scale));
t.origin = next_base;
RS->instance_set_transform(_mesh_data.seams[edge], t);
#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR == 4
RS->instance_reset_physics_interpolation(_mesh_data.seams[edge]);
#endif
}
edge++;
}
Expand Down Expand Up @@ -1115,7 +1131,7 @@ void Terrain3D::_notification(const int p_what) {
set_meta("_edit_lock_", true);
_setup_mouse_picking();
_initialize(); // Rebuild anything freed: meshes, collision, instancer
set_process(true);
set_physics_process(true);
break;
}

Expand All @@ -1127,9 +1143,9 @@ void Terrain3D::_notification(const int p_what) {

/// Game Loop notifications

case NOTIFICATION_PROCESS: {
// Node is processing one frame
__process(get_process_delta_time());
case NOTIFICATION_PHYSICS_PROCESS: {
// Node is processing one physics frame
__physics_process(get_process_delta_time());
break;
}

Expand Down Expand Up @@ -1195,7 +1211,7 @@ void Terrain3D::_notification(const int p_what) {
// Node is about to exit a SceneTree
// Sent on scene changes
LOG(INFO, "NOTIFICATION_EXIT_TREE");
set_process(false);
set_physics_process(false);
_clear_meshes();
_destroy_mouse_picking();
break;
Expand Down
2 changes: 1 addition & 1 deletion src/terrain_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class Terrain3D : public Node3D {
Node3D *_mmi_parent;

void _initialize();
void __process(const double p_delta);
void __physics_process(const double p_delta);
void _grab_camera();

void _build_containers();
Expand Down