diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-13 11:25:24 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-13 11:25:24 +0100 |
| commit | dfe226b93346c208787728eceecc2c64d81a9553 (patch) | |
| tree | 30dbcfc95889efab0642405491c3d2213dfde37f /scene/debugger/scene_debugger.cpp | |
| parent | fbe8a1dfa27c8aadba7c5beae0255c1aa75ed992 (diff) | |
| parent | 67e38709fd1147149c6fcb032c774c5642b172fc (diff) | |
| download | redot-engine-dfe226b93346c208787728eceecc2c64d81a9553.tar.gz | |
Merge pull request #88270 from TokageItLab/avoid-near-far
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 |