Fix SubViewport bug when opening the scene FirstPersonPlayer / Zombie (bone collision shape) / Bullet in the editor

This commit is contained in:
Morph01
2024-08-30 15:49:22 +02:00
parent 68d3cec08a
commit 791cea356d
3 changed files with 48 additions and 22 deletions

View File

@@ -1,5 +1,7 @@
#include "BoneCollisionShape.h"
#include <godot_cpp/classes/engine.hpp>
using namespace godot;
namespace blitz {
@@ -25,7 +27,13 @@ BoneCollisionShape::BoneCollisionShape() {}
BoneCollisionShape::~BoneCollisionShape() {}
void BoneCollisionShape::_ready() {
m_Crosshair = Object::cast_to<Crosshair>(get_parent()->get_parent()->get_parent()->get_parent()->get_parent()->get_parent()->get_parent()->find_child("Crosshair"));
#if DEBUG_ENABLED
if (Engine::get_singleton()->is_editor_hint()) {
return;
}
#endif
m_Crosshair = Object::cast_to<Crosshair>(
get_parent()->get_parent()->get_parent()->get_parent()->get_parent()->get_parent()->get_parent()->find_child("Crosshair"));
DEV_ASSERT(m_Crosshair);
}

View File

@@ -1,6 +1,8 @@
#include "Bullet.h"
#include "BoneCollisionShape.h"
#include <godot_cpp/classes/engine.hpp>
using namespace godot;
namespace blitz {
@@ -25,6 +27,11 @@ void Bullet::_ready() {
m_Timer = memnew(Timer);
add_child(m_Timer);
m_Timer->connect("timeout", callable_mp(this, &Bullet::_on_timer_timeout));
#if DEBUG_ENABLED
if (Engine::get_singleton()->is_editor_hint()) {
return;
}
#endif
m_Crosshair = Object::cast_to<Crosshair>(get_parent()->find_child("Crosshair"));
DEV_ASSERT(m_Crosshair);
}

View File

@@ -15,8 +15,19 @@ Crosshair::Crosshair() :
Crosshair::~Crosshair() {}
void Crosshair::_ready() {
m_Player = Object::cast_to<FirstPersonPlayer>(get_parent()->get_parent()->get_parent()->find_child("FirstPersonPlayer"));
// Catch the parent node directly without SubViewport problem in the editor thx to "recursivity" (if we go up the tree one more
// notch its bugging)
Node* root_node = get_parent();
while (root_node != nullptr && !root_node->is_class("FirstPersonPlayer")) {
root_node = root_node->get_parent();
}
if (root_node != nullptr && root_node->is_class("FirstPersonPlayer")) {
m_Player = Object::cast_to<FirstPersonPlayer>(root_node);
DEV_ASSERT(m_Player);
} else {
ERR_PRINT("FirstPersonPlayer not found in parent hierarchy.");
}
m_CrosshairLines = {Object::cast_to<Line2D>(find_child("Top")), Object::cast_to<Line2D>(find_child("Right")),
Object::cast_to<Line2D>(find_child("Bottom")), Object::cast_to<Line2D>(find_child("Left"))};
for (size_t i = 0; i < m_CrosshairLines.size(); i++) {