diff options
| author | Silc Lizard (Tokage) Renew <61938263+TokageItLab@users.noreply.github.com> | 2024-02-13 14:19:23 +0900 |
|---|---|---|
| committer | Silc Lizard (Tokage) Renew <61938263+TokageItLab@users.noreply.github.com> | 2024-02-13 18:53:21 +0900 |
| commit | 67e38709fd1147149c6fcb032c774c5642b172fc (patch) | |
| tree | 2f502bd0877b962db5df0c778cc9c494f40880c3 /scene/debugger/scene_debugger.cpp | |
| parent | 9050ee1542f4e071188e8e4f868f3507bb31b3dc (diff) | |
| download | redot-engine-67e38709fd1147149c6fcb032c774c5642b172fc.tar.gz | |
Avoid unqualified-id "near" and "far" in Node3DEditor/Viewport
Diffstat (limited to 'scene/debugger/scene_debugger.cpp')
| -rw-r--r-- | scene/debugger/scene_debugger.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp index d539f45d31..19e5693736 100644 --- a/scene/debugger/scene_debugger.cpp +++ b/scene/debugger/scene_debugger.cpp @@ -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 |