nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-05-12 22:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unqualified-id "near" and "far" in Node3DEditor/Viewport

Browse Source
This commit is contained in:
Silc Lizard (Tokage) Renew
2024-02-13 14:19:23 +09:00
parent 9050ee1542
commit 67e38709fd
8 changed files with 55 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/debugger/scene_debugger.cpp
+4 -9
View File
@@ -72,11 +72,6 @@ void SceneDebugger::deinitialize() {
}
}
#ifdef MINGW_ENABLED
#undef near
#undef far
#endif
#ifdef DEBUG_ENABLED
Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Array &p_args, bool &r_captured) {
SceneTree *scene_tree = SceneTree::get_singleton();
@@ -124,12 +119,12 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
Transform3D transform = p_args[0];
bool is_perspective = p_args[1];
float size_or_fov = p_args[2];
float near = p_args[3];
float far = p_args[4];
float depth_near = p_args[3];
float depth_far = p_args[4];
if (is_perspective) {
scene_tree->get_root()->set_camera_3d_override_perspective(size_or_fov, near, far);
scene_tree->get_root()->set_camera_3d_override_perspective(size_or_fov, depth_near, depth_far);
} else {
scene_tree->get_root()->set_camera_3d_override_orthogonal(size_or_fov, near, far);
scene_tree->get_root()->set_camera_3d_override_orthogonal(size_or_fov, depth_near, depth_far);
}
scene_tree->get_root()->set_camera_3d_override_transform(transform);
#endif // _3D_DISABLED