godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
godot/scene/3d/camera_3d.cpp

900 lines
29 KiB
C++
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
/* camera_3d.cpp */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Use HTTPS URL for Godot's website in the headers
2017-08-27 12:16:55 +00:00
/* https://godotengine.org */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
Update copyright statements to 2020 Happy new year to the wonderful Godot community! We're starting a new decade with a well-established, non-profit, free and open source game engine, and tons of further improvements in the pipeline from hundreds of contributors. Godot will keep getting better, and we're looking forward to all the games that the community will keep developing and releasing with it.
2020-01-01 10:16:22 +00:00
/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
Add missing copyright headers and fix formatting Using `misc/scripts/fix_headers.py` on all Godot files. Some missing header guards were added, and the header inclusion order was fixed in the Bullet module.
2018-01-04 23:50:27 +00:00
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
#include "camera_3d.h"
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
#include "collision_object_3d.h"
Reorganized core/ directory, it was too fatty already -Removed FuncRef, since Callable makes it obsolete -Removed int_types.h as its obsolete in c++11+ -Changed color names code
2020-11-07 22:33:38 +00:00
#include "core/config/engine.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 16:13:45 +00:00
#include "core/math/camera_matrix.h"
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
#include "scene/resources/material.h"
#include "scene/resources/surface_tool.h"
Environment: Refactor code for readability + more - Makes all boolean setters/getters consistent. - Fixes bug where `glow_hdr_bleed_scale` was not used. - Split CameraEffects to their own source file. - Reorder all Environment method and properties declarations, definitions and bindings to be consistent with each other and with the order of property bindings. - Bind missing enum values added with SDFGI. - Remove unused SDFGI enhance_ssr boolean. - Sync doc changes after SDFGI merge and other misc changes.
2020-07-01 12:18:13 +00:00
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::_update_audio_listener_state() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::_request_camera_update() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
_update_camera();
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::_update_camera_mode() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
force_change = true;
switch (mode) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case PROJECTION_PERSPECTIVE: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
set_perspective(fov, near, far);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case PROJECTION_ORTHOGONAL: {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
set_orthogonal(size, near, far);
remove trailing whitespace
2016-03-08 23:00:52 +00:00
} break;
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
case PROJECTION_FRUSTUM: {
set_frustum(size, frustum_offset, near, far);
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::_validate_property(PropertyInfo &p_property) const {
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
if (p_property.name == "fov") {
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
if (mode != PROJECTION_PERSPECTIVE) {
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
p_property.usage = PROPERTY_USAGE_NOEDITOR;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
} else if (p_property.name == "size") {
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
if (mode != PROJECTION_ORTHOGONAL && mode != PROJECTION_FRUSTUM) {
p_property.usage = PROPERTY_USAGE_NOEDITOR;
}
} else if (p_property.name == "frustum_offset") {
if (mode != PROJECTION_FRUSTUM) {
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
p_property.usage = PROPERTY_USAGE_NOEDITOR;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::_update_camera() {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!is_inside_tree()) {
Fix error if scene has Camera at saving scene
2017-12-24 16:31:28 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Fix error if scene has Camera at saving scene
2017-12-24 16:31:28 +00:00
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->camera_set_transform(camera, get_camera_transform());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
// here goes listener stuff
/*
if (viewport_ptr && is_inside_scene() && is_current())
get_viewport()->_camera_transform_changed_notify();
*/
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (get_tree()->is_node_being_edited(this) || !is_current()) {
Added some clean up in camera/viewport management. Fixes #12279, Fixes #12774
2017-12-07 15:13:20 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Added some clean up in camera/viewport management. Fixes #12279, Fixes #12774
2017-12-07 15:13:20 +00:00
get_viewport()->_camera_transform_changed_notify();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Change non-existent World to World3D
2020-04-18 09:00:51 +00:00
if (get_world_3d().is_valid()) {
get_world_3d()->_update_camera(this);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::_notification(int p_what) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
switch (p_what) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case NOTIFICATION_ENTER_WORLD: {
Fix Viewport and Camera issues 1. Consider 'own_world' as well as 'world' to stop propagating enter/exit world notifications. 2. Clean & fix handling of camera currency. This fixes some random crashes and error logs in the editor; namely - when enabling/disabling own world in a Viewport; - when switching back from a subscene displayed into a main scene's Viewport; - when exiting the editor after any of them; - memory corruption (can that explain certain other seemingly unrelated crash reports?). This also fixes situations where a Viewport and its main Camera get out of sync about which World is relevant to them.
2019-03-10 03:59:52 +00:00
// Needs to track the Viewport because it's needed on NOTIFICATION_EXIT_WORLD
// and Spatial will handle it first, including clearing its reference to the Viewport,
// therefore making it impossible to subclasses to access it
viewport = get_viewport();
ERR_FAIL_COND(!viewport);
bool first_camera = viewport->_camera_add(this);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (current || first_camera) {
Fix Viewport and Camera issues 1. Consider 'own_world' as well as 'world' to stop propagating enter/exit world notifications. 2. Clean & fix handling of camera currency. This fixes some random crashes and error logs in the editor; namely - when enabling/disabling own world in a Viewport; - when switching back from a subscene displayed into a main scene's Viewport; - when exiting the editor after any of them; - memory corruption (can that explain certain other seemingly unrelated crash reports?). This also fixes situations where a Viewport and its main Camera get out of sync about which World is relevant to them.
2019-03-10 03:59:52 +00:00
viewport->_camera_set(this);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
remove trailing whitespace
2016-03-08 23:00:52 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case NOTIFICATION_TRANSFORM_CHANGED: {
_request_camera_update();
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
if (doppler_tracking != DOPPLER_TRACKING_DISABLED) {
velocity_tracker->update_position(get_global_transform().origin);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case NOTIFICATION_EXIT_WORLD: {
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
if (!get_tree()->is_node_being_edited(this)) {
if (is_current()) {
clear_current();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
current = true; //keep it true
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
} else {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
current = false;
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
Fix Viewport and Camera issues 1. Consider 'own_world' as well as 'world' to stop propagating enter/exit world notifications. 2. Clean & fix handling of camera currency. This fixes some random crashes and error logs in the editor; namely - when enabling/disabling own world in a Viewport; - when switching back from a subscene displayed into a main scene's Viewport; - when exiting the editor after any of them; - memory corruption (can that explain certain other seemingly unrelated crash reports?). This also fixes situations where a Viewport and its main Camera get out of sync about which World is relevant to them.
2019-03-10 03:59:52 +00:00
if (viewport) {
viewport->_camera_remove(this);
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
viewport = nullptr;
Fix Viewport and Camera issues 1. Consider 'own_world' as well as 'world' to stop propagating enter/exit world notifications. 2. Clean & fix handling of camera currency. This fixes some random crashes and error logs in the editor; namely - when enabling/disabling own world in a Viewport; - when switching back from a subscene displayed into a main scene's Viewport; - when exiting the editor after any of them; - memory corruption (can that explain certain other seemingly unrelated crash reports?). This also fixes situations where a Viewport and its main Camera get out of sync about which World is relevant to them.
2019-03-10 03:59:52 +00:00
}
Little Bits -=-=-=-=-=- -fix duplicate function bug when creating script callback in editor -fix bug where hiding lights does not work -fix 2D audio listener bug (romulox_x reported) -fix exported properties with inheritance bug -fix timer autostart (make it not work on editor) -reactivate first camara found if viewport runs out of active camera -option to hide gizmos in viewport -changed skeleton gizmo because it sucks -Make convex shapes using CollisionShape visible (use quickhull class) -fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it. -make a menu option to show SRGB in 3D editor views by default -make option to edit default light direction in viewport settings -make option to edit default ambient light in viewport settings -make software conversion of linear->RGB if hardware support not found
2014-10-12 05:13:22 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case NOTIFICATION_BECAME_CURRENT: {
Fix Viewport and Camera issues 1. Consider 'own_world' as well as 'world' to stop propagating enter/exit world notifications. 2. Clean & fix handling of camera currency. This fixes some random crashes and error logs in the editor; namely - when enabling/disabling own world in a Viewport; - when switching back from a subscene displayed into a main scene's Viewport; - when exiting the editor after any of them; - memory corruption (can that explain certain other seemingly unrelated crash reports?). This also fixes situations where a Viewport and its main Camera get out of sync about which World is relevant to them.
2019-03-10 03:59:52 +00:00
if (viewport) {
Change non-existent World to World3D
2020-04-18 09:00:51 +00:00
viewport->find_world_3d()->_register_camera(this);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} break;
case NOTIFICATION_LOST_CURRENT: {
Fix Viewport and Camera issues 1. Consider 'own_world' as well as 'world' to stop propagating enter/exit world notifications. 2. Clean & fix handling of camera currency. This fixes some random crashes and error logs in the editor; namely - when enabling/disabling own world in a Viewport; - when switching back from a subscene displayed into a main scene's Viewport; - when exiting the editor after any of them; - memory corruption (can that explain certain other seemingly unrelated crash reports?). This also fixes situations where a Viewport and its main Camera get out of sync about which World is relevant to them.
2019-03-10 03:59:52 +00:00
if (viewport) {
Change non-existent World to World3D
2020-04-18 09:00:51 +00:00
viewport->find_world_3d()->_remove_camera(this);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} break;
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Transform Camera3D::get_camera_transform() const {
Fix camera offsets not applied always Specifically, project/unproject methods weren't taking them into account. Frustum computation may be affected as well. This commit considers them for the camera matrix at all times.
2018-07-09 19:07:15 +00:00
Transform tr = get_global_transform().orthonormalized();
tr.origin += tr.basis.get_axis(1) * v_offset;
tr.origin += tr.basis.get_axis(0) * h_offset;
return tr;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_perspective(float p_fovy_degrees, float p_z_near, float p_z_far) {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!force_change && fov == p_fovy_degrees && p_z_near == near && p_z_far == far && mode == PROJECTION_PERSPECTIVE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
fov = p_fovy_degrees;
near = p_z_near;
far = p_z_far;
mode = PROJECTION_PERSPECTIVE;
remove trailing whitespace
2016-03-08 23:00:52 +00:00
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->camera_set_perspective(camera, fov, near, far);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
update_gizmo();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
force_change = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_orthogonal(float p_size, float p_z_near, float p_z_far) {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!force_change && size == p_size && p_z_near == near && p_z_far == far && mode == PROJECTION_ORTHOGONAL) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
size = p_size;
remove trailing whitespace
2016-03-08 23:00:52 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
near = p_z_near;
far = p_z_far;
mode = PROJECTION_ORTHOGONAL;
force_change = false;
remove trailing whitespace
2016-03-08 23:00:52 +00:00
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->camera_set_orthogonal(camera, size, near, far);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
update_gizmo();
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_frustum(float p_size, Vector2 p_offset, float p_z_near, float p_z_far) {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!force_change && size == p_size && frustum_offset == p_offset && p_z_near == near && p_z_far == far && mode == PROJECTION_FRUSTUM) {
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
size = p_size;
frustum_offset = p_offset;
near = p_z_near;
far = p_z_far;
mode = PROJECTION_FRUSTUM;
force_change = false;
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->camera_set_frustum(camera, size, frustum_offset, near, far);
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
update_gizmo();
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_projection(Camera3D::Projection p_mode) {
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
if (p_mode == PROJECTION_PERSPECTIVE || p_mode == PROJECTION_ORTHOGONAL || p_mode == PROJECTION_FRUSTUM) {
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
mode = p_mode;
_update_camera_mode();
_change_notify();
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
RID Camera3D::get_camera() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return camera;
};
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::make_current() {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
current = true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!is_inside_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
-Fix crash opening and closing the scene, closes #3491
2016-01-31 18:09:52 +00:00
get_viewport()->_camera_set(this);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//get_scene()->call_group(SceneMainLoop::GROUP_CALL_REALTIME,camera_group,"_camera_make_current",this);
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::clear_current(bool p_enable_next) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
current = false;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!is_inside_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (get_viewport()->get_camera() == this) {
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
get_viewport()->_camera_set(nullptr);
a way to ensure that camera is disabled
2018-03-16 18:10:26 +00:00
if (p_enable_next) {
get_viewport()->_camera_make_next_current(this);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_current(bool p_current) {
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
if (p_current) {
make_current();
} else {
clear_current();
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
bool Camera3D::is_current() const {
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
if (is_inside_tree() && !get_tree()->is_node_being_edited(this)) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
return get_viewport()->get_camera() == this;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return current;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
bool Camera3D::_can_gizmo_scale() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector3 Camera3D::project_ray_normal(const Point2 &p_pos) const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 ray = project_local_ray_normal(p_pos);
return get_camera_transform().basis.xform(ray).normalized();
};
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector3 Camera3D::project_local_ray_normal(const Point2 &p_pos) const {
Remove ERR_EXPLAIN from scene/* code
2019-08-08 20:11:48 +00:00
ERR_FAIL_COND_V_MSG(!is_inside_tree(), Vector3(), "Camera is not inside scene.");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
Size2 viewport_size = get_viewport()->get_camera_rect_size();
Vector2 cpos = get_viewport()->get_camera_coords(p_pos);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 ray;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (mode == PROJECTION_ORTHOGONAL) {
ray = Vector3(0, 0, -1);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
CameraMatrix cm;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cm.set_perspective(fov, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH);
Change CameraMatrix::get_viewport_size to get_viewport_half_extents Fixes #26637. Fixes #19900. The viewport_size returned by get_viewport_size was previously incorrect, being half the correct value. The function is renamed to get_viewport_half_extents, and now returns a Vector2. Code which called this function has also been modified accordingly. This PR also fixes shadow culling when using ortho cameras, because the correct input for CameraMatrix::set_orthogonal should be the full HEIGHT from get_viewport_half_extents, and not half the width. It also fixes state.ubo_data.viewport_size in rasterizer_scene_gles3.cpp to be the width and the height of the viewport in pixels as stated in the documentation, rather than the current value which is half the viewport extents in worldspace, presumed to be a bug.
2020-01-21 18:39:16 +00:00
Vector2 screen_he = cm.get_viewport_half_extents();
ray = Vector3(((cpos.x / viewport_size.width) * 2.0 - 1.0) * screen_he.x, ((1.0 - (cpos.y / viewport_size.height)) * 2.0 - 1.0) * screen_he.y, -near).normalized();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
return ray;
};
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector3 Camera3D::project_ray_origin(const Point2 &p_pos) const {
Remove ERR_EXPLAIN from scene/* code
2019-08-08 20:11:48 +00:00
ERR_FAIL_COND_V_MSG(!is_inside_tree(), Vector3(), "Camera is not inside scene.");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
Size2 viewport_size = get_viewport()->get_camera_rect_size();
Vector2 cpos = get_viewport()->get_camera_coords(p_pos);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ERR_FAIL_COND_V(viewport_size.y == 0, Vector3());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (mode == PROJECTION_PERSPECTIVE) {
return get_camera_transform().origin;
} else {
-Much improvement to baked light baker -Fixed many bugs in stretch mode -Fixes to camera project and unproject as consequence of the above -added setget to script (documented in script doc) -more fixes to collada exporter for blender
2014-10-28 01:54:32 +00:00
Vector2 pos = cpos / viewport_size;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
float vsize, hsize;
if (keep_aspect == KEEP_WIDTH) {
vsize = size / viewport_size.aspect();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
hsize = size;
} else {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
hsize = size * viewport_size.aspect();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
vsize = size;
}
Vector3 ray;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ray.x = pos.x * (hsize)-hsize / 2;
ray.y = (1.0 - pos.y) * (vsize)-vsize / 2;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ray.z = -near;
ray = get_camera_transform().xform(ray);
return ray;
};
};
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
bool Camera3D::is_position_behind(const Vector3 &p_pos) const {
-fix forced texture repeat in Polygon2D, now depends on texture. -added a new function, Camera::is_position_behind to aid to unproject(), fixes #1725
2015-04-29 01:05:01 +00:00
Transform t = get_global_transform();
Call Node3D::get_global_transform and Vector3::dot only once within Camera3D::is_position_behind to avoid redundant work.
2020-06-26 14:52:02 +00:00
Vector3 eyedir = -t.basis.get_axis(2).normalized();
return eyedir.dot(p_pos - t.origin) < near;
-fix forced texture repeat in Polygon2D, now depends on texture. -added a new function, Camera::is_position_behind to aid to unproject(), fixes #1725
2015-04-29 01:05:01 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector<Vector3> Camera3D::get_near_plane_points() const {
Remove ERR_EXPLAIN from scene/* code
2019-08-08 20:11:48 +00:00
ERR_FAIL_COND_V_MSG(!is_inside_tree(), Vector<Vector3>(), "Camera is not inside scene.");
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Size2 viewport_size = get_viewport()->get_visible_rect().size;
CameraMatrix cm;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (mode == PROJECTION_ORTHOGONAL) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
cm.set_orthogonal(size, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
cm.set_perspective(fov, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Vector3 endpoints[8];
cm.get_endpoints(Transform(), endpoints);
Vector<Vector3> points;
points.push_back(Vector3());
for (int i = 0; i < 4; i++) {
points.push_back(endpoints[i + 4]);
}
return points;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Point2 Camera3D::unproject_position(const Vector3 &p_pos) const {
Remove ERR_EXPLAIN from scene/* code
2019-08-08 20:11:48 +00:00
ERR_FAIL_COND_V_MSG(!is_inside_tree(), Vector2(), "Camera is not inside scene.");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
Size2 viewport_size = get_viewport()->get_visible_rect().size;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
CameraMatrix cm;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (mode == PROJECTION_ORTHOGONAL) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cm.set_orthogonal(size, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cm.set_perspective(fov, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Plane p(get_camera_transform().xform_inv(p_pos), 1.0);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
p = cm.xform4(p);
Revert "Renamed plane's d to distance" This reverts commit ec7b481170dcd6a7b4cf0e6c1221e204ff7945f3. This was wrong, `d` is not a distance but the `d` constant in the parametric equation `ax + by + cz = d` describing the plane.
2020-05-10 14:47:11 +00:00
p.normal /= p.d;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Point2 res;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
res.x = (p.normal.x * 0.5 + 0.5) * viewport_size.x;
res.y = (-p.normal.y * 0.5 + 0.5) * viewport_size.y;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return res;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector3 Camera3D::project_position(const Point2 &p_point, float p_z_depth) const {
Remove ERR_EXPLAIN from scene/* code
2019-08-08 20:11:48 +00:00
ERR_FAIL_COND_V_MSG(!is_inside_tree(), Vector3(), "Camera is not inside scene.");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Update Camera.project_position to not return get_global_transform().origin if projection mode is orthogonal
2019-12-09 20:10:09 +00:00
if (p_z_depth == 0 && mode != PROJECTION_ORTHOGONAL) {
Add a depth parameter to Camera::project_position()
2019-05-28 13:14:13 +00:00
return get_global_transform().origin;
}
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
Size2 viewport_size = get_viewport()->get_visible_rect().size;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
CameraMatrix cm;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (mode == PROJECTION_ORTHOGONAL) {
fixed camera project_position function that was still using the near parameter in a few calculations
2020-01-09 14:34:31 +00:00
cm.set_orthogonal(size, viewport_size.aspect(), p_z_depth, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
fixed camera project_position function that was still using the near parameter in a few calculations
2020-01-09 14:34:31 +00:00
cm.set_perspective(fov, viewport_size.aspect(), p_z_depth, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Change CameraMatrix::get_viewport_size to get_viewport_half_extents Fixes #26637. Fixes #19900. The viewport_size returned by get_viewport_size was previously incorrect, being half the correct value. The function is renamed to get_viewport_half_extents, and now returns a Vector2. Code which called this function has also been modified accordingly. This PR also fixes shadow culling when using ortho cameras, because the correct input for CameraMatrix::set_orthogonal should be the full HEIGHT from get_viewport_half_extents, and not half the width. It also fixes state.ubo_data.viewport_size in rasterizer_scene_gles3.cpp to be the width and the height of the viewport in pixels as stated in the documentation, rather than the current value which is half the viewport extents in worldspace, presumed to be a bug.
2020-01-21 18:39:16 +00:00
Vector2 vp_he = cm.get_viewport_half_extents();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector2 point;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
point.x = (p_point.x / viewport_size.x) * 2.0 - 1.0;
point.y = (1.0 - (p_point.y / viewport_size.y)) * 2.0 - 1.0;
Change CameraMatrix::get_viewport_size to get_viewport_half_extents Fixes #26637. Fixes #19900. The viewport_size returned by get_viewport_size was previously incorrect, being half the correct value. The function is renamed to get_viewport_half_extents, and now returns a Vector2. Code which called this function has also been modified accordingly. This PR also fixes shadow culling when using ortho cameras, because the correct input for CameraMatrix::set_orthogonal should be the full HEIGHT from get_viewport_half_extents, and not half the width. It also fixes state.ubo_data.viewport_size in rasterizer_scene_gles3.cpp to be the width and the height of the viewport in pixels as stated in the documentation, rather than the current value which is half the viewport extents in worldspace, presumed to be a bug.
2020-01-21 18:39:16 +00:00
point *= vp_he;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add a depth parameter to Camera::project_position()
2019-05-28 13:14:13 +00:00
Vector3 p(point.x, point.y, -p_z_depth);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return get_camera_transform().xform(p);
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_environment(const Ref<Environment> &p_environment) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
environment = p_environment;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (environment.is_valid()) {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RS::get_singleton()->camera_set_environment(camera, environment->get_rid());
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RS::get_singleton()->camera_set_environment(camera, RID());
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
_update_camera_mode();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Ref<Environment> Camera3D::get_environment() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return environment;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_effects(const Ref<CameraEffects> &p_effects) {
WIP CameraEffects implementation (bokeh not working for now)
2020-01-13 18:37:24 +00:00
effects = p_effects;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (effects.is_valid()) {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RS::get_singleton()->camera_set_camera_effects(camera, effects->get_rid());
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RS::get_singleton()->camera_set_camera_effects(camera, RID());
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
WIP CameraEffects implementation (bokeh not working for now)
2020-01-13 18:37:24 +00:00
_update_camera_mode();
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Ref<CameraEffects> Camera3D::get_effects() const {
WIP CameraEffects implementation (bokeh not working for now)
2020-01-13 18:37:24 +00:00
return effects;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_keep_aspect_mode(KeepAspect p_aspect) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
keep_aspect = p_aspect;
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->camera_set_use_vertical_aspect(camera, p_aspect == KEEP_WIDTH);
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
_update_camera_mode();
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
_change_notify();
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Camera3D::KeepAspect Camera3D::get_keep_aspect_mode() const {
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
return keep_aspect;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_doppler_tracking(DopplerTracking p_tracking) {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (doppler_tracking == p_tracking) {
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
doppler_tracking = p_tracking;
if (p_tracking != DOPPLER_TRACKING_DISABLED) {
Renamed fixed_process to physics_process
2017-09-30 14:19:07 +00:00
velocity_tracker->set_track_physics_step(doppler_tracking == DOPPLER_TRACKING_PHYSICS_STEP);
Remove setting that caused is_inside_tree() errors on doppler tracking enabled.
2019-02-26 12:15:51 +00:00
if (is_inside_tree()) {
velocity_tracker->reset(get_global_transform().origin);
}
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
}
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
_update_camera_mode();
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Camera3D::DopplerTracking Camera3D::get_doppler_tracking() const {
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
return doppler_tracking;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("project_ray_normal", "screen_point"), &Camera3D::project_ray_normal);
ClassDB::bind_method(D_METHOD("project_local_ray_normal", "screen_point"), &Camera3D::project_local_ray_normal);
ClassDB::bind_method(D_METHOD("project_ray_origin", "screen_point"), &Camera3D::project_ray_origin);
ClassDB::bind_method(D_METHOD("unproject_position", "world_point"), &Camera3D::unproject_position);
ClassDB::bind_method(D_METHOD("is_position_behind", "world_point"), &Camera3D::is_position_behind);
ClassDB::bind_method(D_METHOD("project_position", "screen_point", "z_depth"), &Camera3D::project_position);
ClassDB::bind_method(D_METHOD("set_perspective", "fov", "z_near", "z_far"), &Camera3D::set_perspective);
ClassDB::bind_method(D_METHOD("set_orthogonal", "size", "z_near", "z_far"), &Camera3D::set_orthogonal);
ClassDB::bind_method(D_METHOD("set_frustum", "size", "offset", "z_near", "z_far"), &Camera3D::set_frustum);
ClassDB::bind_method(D_METHOD("make_current"), &Camera3D::make_current);
ClassDB::bind_method(D_METHOD("clear_current", "enable_next"), &Camera3D::clear_current, DEFVAL(true));
ClassDB::bind_method(D_METHOD("set_current"), &Camera3D::set_current);
ClassDB::bind_method(D_METHOD("is_current"), &Camera3D::is_current);
ClassDB::bind_method(D_METHOD("get_camera_transform"), &Camera3D::get_camera_transform);
ClassDB::bind_method(D_METHOD("get_fov"), &Camera3D::get_fov);
ClassDB::bind_method(D_METHOD("get_frustum_offset"), &Camera3D::get_frustum_offset);
ClassDB::bind_method(D_METHOD("get_size"), &Camera3D::get_size);
Rename Camera3D near and far getters and setters Renames: - get_znear() -> get_near() - set_znear() -> set_near() - get_zfar() -> get_far() - set_zfar() -> set_far()
2020-12-16 12:40:42 +00:00
ClassDB::bind_method(D_METHOD("get_far"), &Camera3D::get_far);
ClassDB::bind_method(D_METHOD("get_near"), &Camera3D::get_near);
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
ClassDB::bind_method(D_METHOD("set_fov"), &Camera3D::set_fov);
ClassDB::bind_method(D_METHOD("set_frustum_offset"), &Camera3D::set_frustum_offset);
ClassDB::bind_method(D_METHOD("set_size"), &Camera3D::set_size);
Rename Camera3D near and far getters and setters Renames: - get_znear() -> get_near() - set_znear() -> set_near() - get_zfar() -> get_far() - set_zfar() -> set_far()
2020-12-16 12:40:42 +00:00
ClassDB::bind_method(D_METHOD("set_far"), &Camera3D::set_far);
ClassDB::bind_method(D_METHOD("set_near"), &Camera3D::set_near);
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
ClassDB::bind_method(D_METHOD("get_projection"), &Camera3D::get_projection);
ClassDB::bind_method(D_METHOD("set_projection"), &Camera3D::set_projection);
ClassDB::bind_method(D_METHOD("set_h_offset", "ofs"), &Camera3D::set_h_offset);
ClassDB::bind_method(D_METHOD("get_h_offset"), &Camera3D::get_h_offset);
ClassDB::bind_method(D_METHOD("set_v_offset", "ofs"), &Camera3D::set_v_offset);
ClassDB::bind_method(D_METHOD("get_v_offset"), &Camera3D::get_v_offset);
ClassDB::bind_method(D_METHOD("set_cull_mask", "mask"), &Camera3D::set_cull_mask);
ClassDB::bind_method(D_METHOD("get_cull_mask"), &Camera3D::get_cull_mask);
ClassDB::bind_method(D_METHOD("set_environment", "env"), &Camera3D::set_environment);
ClassDB::bind_method(D_METHOD("get_environment"), &Camera3D::get_environment);
ClassDB::bind_method(D_METHOD("set_effects", "env"), &Camera3D::set_effects);
ClassDB::bind_method(D_METHOD("get_effects"), &Camera3D::get_effects);
ClassDB::bind_method(D_METHOD("set_keep_aspect_mode", "mode"), &Camera3D::set_keep_aspect_mode);
ClassDB::bind_method(D_METHOD("get_keep_aspect_mode"), &Camera3D::get_keep_aspect_mode);
ClassDB::bind_method(D_METHOD("set_doppler_tracking", "mode"), &Camera3D::set_doppler_tracking);
ClassDB::bind_method(D_METHOD("get_doppler_tracking"), &Camera3D::get_doppler_tracking);
ClassDB::bind_method(D_METHOD("get_frustum"), &Camera3D::get_frustum);
ClassDB::bind_method(D_METHOD("get_camera_rid"), &Camera3D::get_camera);
ClassDB::bind_method(D_METHOD("set_cull_mask_bit", "layer", "enable"), &Camera3D::set_cull_mask_bit);
ClassDB::bind_method(D_METHOD("get_cull_mask_bit", "layer"), &Camera3D::get_cull_mask_bit);
Add extra functions to toggle bits in visualinstance and camera, same as physics. Helps with #6685
2018-07-29 23:05:16 +00:00
Rename the _MD macro to D_METHOD This new name also makes its purpose a little clearer This is a step towards fixing #56
2017-02-13 11:47:24 +00:00
//ClassDB::bind_method(D_METHOD("_camera_make_current"),&Camera::_camera_make_current );
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
ADD_PROPERTY(PropertyInfo(Variant::INT, "keep_aspect", PROPERTY_HINT_ENUM, "Keep Width,Keep Height"), "set_keep_aspect_mode", "get_keep_aspect_mode");
ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_environment", "get_environment");
WIP CameraEffects implementation (bokeh not working for now)
2020-01-13 18:37:24 +00:00
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "effects", PROPERTY_HINT_RESOURCE_TYPE, "CameraEffects"), "set_effects", "get_effects");
Variant: Added 64-bit packed arrays, renamed Variant::REAL to FLOAT. - Renames PackedIntArray to PackedInt32Array. - Renames PackedFloatArray to PackedFloat32Array. - Adds PackedInt64Array and PackedFloat64Array. - Renames Variant::REAL to Variant::FLOAT for consistency. Packed arrays are for storing large amount of data and creating stuff like meshes, buffers. textures, etc. Forcing them to be 64 is a huge waste of memory. That said, many users requested the ability to have 64 bits packed arrays for their games, so this is just an optional added type. For Variant, the float datatype is always 64 bits, and exposed as `float`. We still have `real_t` which is the datatype that can change from 32 to 64 bits depending on a compile flag (not entirely working right now, but that's the idea). It affects math related datatypes and code only. Neither Variant nor PackedArray make use of real_t, which is only intended for math precision, so the term is removed from there to keep only float.
2020-02-24 18:20:53 +00:00
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "h_offset"), "set_h_offset", "get_h_offset");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "v_offset"), "set_v_offset", "get_v_offset");
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
ADD_PROPERTY(PropertyInfo(Variant::INT, "doppler_tracking", PROPERTY_HINT_ENUM, "Disabled,Idle,Physics"), "set_doppler_tracking", "get_doppler_tracking");
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
ADD_PROPERTY(PropertyInfo(Variant::INT, "projection", PROPERTY_HINT_ENUM, "Perspective,Orthogonal,Frustum"), "set_projection", "get_projection");
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "current"), "set_current", "is_current");
Variant: Added 64-bit packed arrays, renamed Variant::REAL to FLOAT. - Renames PackedIntArray to PackedInt32Array. - Renames PackedFloatArray to PackedFloat32Array. - Adds PackedInt64Array and PackedFloat64Array. - Renames Variant::REAL to Variant::FLOAT for consistency. Packed arrays are for storing large amount of data and creating stuff like meshes, buffers. textures, etc. Forcing them to be 64 is a huge waste of memory. That said, many users requested the ability to have 64 bits packed arrays for their games, so this is just an optional added type. For Variant, the float datatype is always 64 bits, and exposed as `float`. We still have `real_t` which is the datatype that can change from 32 to 64 bits depending on a compile flag (not entirely working right now, but that's the idea). It affects math related datatypes and code only. Neither Variant nor PackedArray make use of real_t, which is only intended for math precision, so the term is removed from there to keep only float.
2020-02-24 18:20:53 +00:00
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "fov", PROPERTY_HINT_RANGE, "1,179,0.1"), "set_fov", "get_fov");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "size", PROPERTY_HINT_RANGE, "0.1,16384,0.01"), "set_size", "get_size");
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "frustum_offset"), "set_frustum_offset", "get_frustum_offset");
Rename Camera3D near and far getters and setters Renames: - get_znear() -> get_near() - set_znear() -> set_near() - get_zfar() -> get_far() - set_zfar() -> set_far()
2020-12-16 12:40:42 +00:00
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "near", PROPERTY_HINT_EXP_RANGE, "0.001,10,0.001,or_greater"), "set_near", "get_near");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "far", PROPERTY_HINT_EXP_RANGE, "0.01,4000,0.01,or_greater"), "set_far", "get_far");
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
ClassDB: Provide the enum name of integer constants
2017-08-20 15:45:01 +00:00
BIND_ENUM_CONSTANT(PROJECTION_PERSPECTIVE);
BIND_ENUM_CONSTANT(PROJECTION_ORTHOGONAL);
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
BIND_ENUM_CONSTANT(PROJECTION_FRUSTUM);
Camera Fixes -=-=-=-=-=-= -Object Picking and orthogonal camera related functions fixed (i hope) -Going to preview mode in the camera shows a frame with the correct game aspect ratio -Changed Camera API and properties a little t make it more straightforward -Fixed bug in shader compiler. -Fixed bug in ShaderGL
2014-09-15 23:06:37 +00:00
ClassDB: Provide the enum name of integer constants
2017-08-20 15:45:01 +00:00
BIND_ENUM_CONSTANT(KEEP_WIDTH);
BIND_ENUM_CONSTANT(KEEP_HEIGHT);
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
Add missing semicolons to `BIND_ENUM_CONSTANT` macro uses
2019-10-02 07:57:12 +00:00
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_DISABLED);
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_IDLE_STEP);
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_PHYSICS_STEP);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
float Camera3D::get_fov() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return fov;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
float Camera3D::get_size() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return size;
}
Rename Camera3D near and far getters and setters Renames: - get_znear() -> get_near() - set_znear() -> set_near() - get_zfar() -> get_far() - set_zfar() -> set_far()
2020-12-16 12:40:42 +00:00
float Camera3D::get_near() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return near;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector2 Camera3D::get_frustum_offset() const {
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
return frustum_offset;
}
Rename Camera3D near and far getters and setters Renames: - get_znear() -> get_near() - set_znear() -> set_near() - get_zfar() -> get_far() - set_zfar() -> set_far()
2020-12-16 12:40:42 +00:00
float Camera3D::get_far() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return far;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Camera3D::Projection Camera3D::get_projection() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return mode;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_fov(float p_fov) {
Clamps fov/size for Camera gizmo
2019-12-29 03:36:57 +00:00
ERR_FAIL_COND(p_fov < 1 || p_fov > 179);
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
fov = p_fov;
_update_camera_mode();
Update FOV if edited in gizmo, fixes #16400
2018-09-06 19:22:34 +00:00
_change_notify("fov");
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_size(float p_size) {
Clamps fov/size for Camera gizmo
2019-12-29 03:36:57 +00:00
ERR_FAIL_COND(p_size < 0.1 || p_size > 16384);
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
size = p_size;
_update_camera_mode();
Update FOV if edited in gizmo, fixes #16400
2018-09-06 19:22:34 +00:00
_change_notify("size");
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
}
Rename Camera3D near and far getters and setters Renames: - get_znear() -> get_near() - set_znear() -> set_near() - get_zfar() -> get_far() - set_zfar() -> set_far()
2020-12-16 12:40:42 +00:00
void Camera3D::set_near(float p_near) {
near = p_near;
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
_update_camera_mode();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_frustum_offset(Vector2 p_offset) {
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
frustum_offset = p_offset;
_update_camera_mode();
}
Rename Camera3D near and far getters and setters Renames: - get_znear() -> get_near() - set_znear() -> set_near() - get_zfar() -> get_far() - set_zfar() -> set_far()
2020-12-16 12:40:42 +00:00
void Camera3D::set_far(float p_far) {
far = p_far;
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
_update_camera_mode();
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_cull_mask(uint32_t p_layers) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
layers = p_layers;
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->camera_set_cull_mask(camera, layers);
[DOCS] Camera property changes
2017-12-07 06:31:03 +00:00
_update_camera_mode();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
uint32_t Camera3D::get_cull_mask() const {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return layers;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_cull_mask_bit(int p_layer, bool p_enable) {
Add extra functions to toggle bits in visualinstance and camera, same as physics. Helps with #6685
2018-07-29 23:05:16 +00:00
ERR_FAIL_INDEX(p_layer, 32);
if (p_enable) {
set_cull_mask(layers | (1 << p_layer));
} else {
set_cull_mask(layers & (~(1 << p_layer)));
}
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
bool Camera3D::get_cull_mask_bit(int p_layer) const {
Add extra functions to toggle bits in visualinstance and camera, same as physics. Helps with #6685
2018-07-29 23:05:16 +00:00
ERR_FAIL_INDEX_V(p_layer, 32, false);
return (layers & (1 << p_layer));
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector<Plane> Camera3D::get_frustum() const {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
ERR_FAIL_COND_V(!is_inside_world(), Vector<Plane>());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Properly clear/restore current camera when switching scenes. Fixes #2137
2016-01-02 20:18:45 +00:00
Size2 viewport_size = get_viewport()->get_visible_rect().size;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
CameraMatrix cm;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (mode == PROJECTION_PERSPECTIVE) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cm.set_perspective(fov, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
cm.set_orthogonal(size, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Huge Amount of BugFix -=-=-=-=-=-=-=-=-=-=- -Fixes to Collada Exporter (avoid crash situtions) -Fixed to Collada Importer (Fixed Animation Optimizer Bugs) -Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy -Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode. -Added proper trigger support for 3D Physics shapes -Changed proper value for Z-Offset in OmniLight -Fixed spot attenuation bug in SpotLight -Fixed some 3D and 2D spatial soudn bugs related to distance attenuation. -Fixed bugs in EventPlayer (channels were muted by default) -Fix in ButtonGroup (get nodes in group are now returned in order) -Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK -Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot -Fixed options for Y-Fov and X-Fov in camera, should be more intuitive. -Fixed bugs related to viewports and transparency Huge Amount of New Stuff: -=-=-=-=-=-=-=-==-=-=-=- -Ability to manually advance an AnimationPlayer that is inactive (with advance() function) -More work in WinRT platform -Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC -Added Anisotropic filter support to textures, can be specified on import -Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap. -Added Isometric Dungeon demo. -Added simple hexagonal map demo. -Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore. -Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 03:10:51 +00:00
return cm.get_projection_planes(get_camera_transform());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_v_offset(float p_offset) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
v_offset = p_offset;
Style: Fix statements ending with ';;'
2017-01-14 17:03:38 +00:00
_update_camera();
-fixed issue with denormals in half precission, closes #1073 -added h_offset and v_offset to 3D Camera, should allow to do the same as in #1102
2015-01-03 14:06:53 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
float Camera3D::get_v_offset() const {
-fixed issue with denormals in half precission, closes #1073 -added h_offset and v_offset to 3D Camera, should allow to do the same as in #1102
2015-01-03 14:06:53 +00:00
return v_offset;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
void Camera3D::set_h_offset(float p_offset) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
h_offset = p_offset;
-fixed issue with denormals in half precission, closes #1073 -added h_offset and v_offset to 3D Camera, should allow to do the same as in #1102
2015-01-03 14:06:53 +00:00
_update_camera();
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
float Camera3D::get_h_offset() const {
-fixed issue with denormals in half precission, closes #1073 -added h_offset and v_offset to 3D Camera, should allow to do the same as in #1102
2015-01-03 14:06:53 +00:00
return h_offset;
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Vector3 Camera3D::get_doppler_tracked_velocity() const {
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
if (doppler_tracking != DOPPLER_TRACKING_DISABLED) {
return velocity_tracker->get_tracked_linear_velocity();
} else {
return Vector3();
}
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Camera3D::Camera3D() {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
camera = RenderingServer::get_singleton()->camera_create();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
size = 1;
fov = 0;
Add FRUSTUM camera mode, allowing tilted frustums This new camera mode makes it easy to create tilted frustums for mirror or portal effects. This work was kindly sponsored by IMVU.
2019-02-19 16:17:02 +00:00
frustum_offset = Vector2();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
near = 0;
far = 0;
current = false;
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
viewport = nullptr;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
force_change = false;
mode = PROJECTION_PERSPECTIVE;
Increase the default Camera Zfar to 4000 This makes it possible to view far away objects without having to tweak any settings. This results in a more usable editor when working on large-scale levels. This change should have no impact on performance, but note that Z-fighting will be visible at a distance. This can be made less visible by increasing the Znear value (however, doing so will cause nearby surfaces to disappear). This change was also applied to the editor, but it will only apply to newly created scenes. This also changes the default camera settings in the glTF importer to match the Camera node's defaults.
2019-10-31 13:32:46 +00:00
set_perspective(75.0, 0.05, 4000.0);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
keep_aspect = KEEP_HEIGHT;
layers = 0xfffff;
v_offset = 0;
h_offset = 0;
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->camera_set_cull_mask(camera, layers);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//active=false;
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 04:23:10 +00:00
velocity_tracker.instance();
doppler_tracking = DOPPLER_TRACKING_DISABLED;
Must now register with set_transform_notify() to get NOTIFICATION_TRANSFORM_CHANGED
2017-01-12 23:35:46 +00:00
set_notify_transform(true);
Ability to disable scale in nodes, closes #19927
2018-07-18 16:47:42 +00:00
set_disable_scale(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Camera3D::~Camera3D() {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->free(camera);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
////////////////////////////////////////
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::set_margin(float p_margin) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
margin = p_margin;
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
float ClippedCamera3D::get_margin() const {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
return margin;
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::set_process_mode(ProcessMode p_mode) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
if (process_mode == p_mode) {
return;
}
Fixes to ClippedCamera This work has been kindly sponsored by IMVU.
2019-05-10 08:35:15 +00:00
process_mode = p_mode;
set_process_internal(process_mode == CLIP_PROCESS_IDLE);
set_physics_process_internal(process_mode == CLIP_PROCESS_PHYSICS);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClippedCamera3D::ProcessMode ClippedCamera3D::get_process_mode() const {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
return process_mode;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
Transform ClippedCamera3D::get_camera_transform() const {
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Transform t = Camera3D::get_camera_transform();
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
t.origin += -t.basis.get_axis(Vector3::AXIS_Z).normalized() * clip_offset;
return t;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::_notification(int p_what) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
if (p_what == NOTIFICATION_INTERNAL_PROCESS || p_what == NOTIFICATION_INTERNAL_PHYSICS_PROCESS) {
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Node3D *parent = Object::cast_to<Node3D>(get_parent());
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
if (!parent) {
return;
}
Change non-existent World to World3D
2020-04-18 09:00:51 +00:00
PhysicsDirectSpaceState3D *dspace = get_world_3d()->get_direct_space_state();
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
ERR_FAIL_COND(!dspace); // most likely physics set to threads
Vector3 cam_fw = -get_global_transform().basis.get_axis(Vector3::AXIS_Z).normalized();
Vector3 cam_pos = get_global_transform().origin;
Vector3 parent_pos = parent->get_global_transform().origin;
Plane parent_plane(parent_pos, cam_fw);
if (parent_plane.is_point_over(cam_pos)) {
//cam is beyond parent plane
return;
}
Vector3 ray_from = parent_plane.project(cam_pos);
clip_offset = 0; //reset by defau;t
{ //check if points changed
Vector<Vector3> local_points = get_near_plane_points();
bool all_equal = true;
for (int i = 0; i < 5; i++) {
if (points[i] != local_points[i]) {
all_equal = false;
break;
}
}
if (!all_equal) {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
PhysicsServer3D::get_singleton()->shape_set_data(pyramid_shape, local_points);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
points = local_points;
}
}
Transform xf = get_global_transform();
xf.origin = ray_from;
xf.orthonormalize();
Check for motion in cast_motion() before doing Bullet convexSweepTest(). Also ensure that default closest_safe and closest_unsafe values are defined in cast_motion() and before cast_motion() is called.
2019-12-09 10:11:06 +00:00
float closest_safe = 1.0f, closest_unsafe = 1.0f;
if (dspace->cast_motion(pyramid_shape, xf, cam_pos - ray_from, margin, closest_safe, closest_unsafe, exclude, collision_mask, clip_to_bodies, clip_to_areas)) {
clip_offset = cam_pos.distance_to(ray_from + (cam_pos - ray_from) * closest_safe);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
}
_update_camera();
}
if (p_what == NOTIFICATION_LOCAL_TRANSFORM_CHANGED) {
update_gizmo();
}
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::set_collision_mask(uint32_t p_mask) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
collision_mask = p_mask;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
uint32_t ClippedCamera3D::get_collision_mask() const {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
return collision_mask;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::set_collision_mask_bit(int p_bit, bool p_value) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
uint32_t mask = get_collision_mask();
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (p_value) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
mask |= 1 << p_bit;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
} else {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
mask &= ~(1 << p_bit);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
set_collision_mask(mask);
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
bool ClippedCamera3D::get_collision_mask_bit(int p_bit) const {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
return get_collision_mask() & (1 << p_bit);
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::add_exception_rid(const RID &p_rid) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
exclude.insert(p_rid);
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::add_exception(const Object *p_object) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
ERR_FAIL_NULL(p_object);
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
const CollisionObject3D *co = Object::cast_to<CollisionObject3D>(p_object);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!co) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
add_exception_rid(co->get_rid());
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::remove_exception_rid(const RID &p_rid) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
exclude.erase(p_rid);
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::remove_exception(const Object *p_object) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
ERR_FAIL_NULL(p_object);
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
const CollisionObject3D *co = Object::cast_to<CollisionObject3D>(p_object);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!co) {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
remove_exception_rid(co->get_rid());
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::clear_exceptions() {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
exclude.clear();
}
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
float ClippedCamera3D::get_clip_offset() const {
Expose ClippedCamera clip_offset
2019-06-14 15:39:13 +00:00
return clip_offset;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::set_clip_to_areas(bool p_clip) {
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
clip_to_areas = p_clip;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
bool ClippedCamera3D::is_clip_to_areas_enabled() const {
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
return clip_to_areas;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::set_clip_to_bodies(bool p_clip) {
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
clip_to_bodies = p_clip;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
bool ClippedCamera3D::is_clip_to_bodies_enabled() const {
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
return clip_to_bodies;
}
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
void ClippedCamera3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_margin", "margin"), &ClippedCamera3D::set_margin);
ClassDB::bind_method(D_METHOD("get_margin"), &ClippedCamera3D::get_margin);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("set_process_mode", "process_mode"), &ClippedCamera3D::set_process_mode);
ClassDB::bind_method(D_METHOD("get_process_mode"), &ClippedCamera3D::get_process_mode);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("set_collision_mask", "mask"), &ClippedCamera3D::set_collision_mask);
ClassDB::bind_method(D_METHOD("get_collision_mask"), &ClippedCamera3D::get_collision_mask);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("set_collision_mask_bit", "bit", "value"), &ClippedCamera3D::set_collision_mask_bit);
ClassDB::bind_method(D_METHOD("get_collision_mask_bit", "bit"), &ClippedCamera3D::get_collision_mask_bit);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("add_exception_rid", "rid"), &ClippedCamera3D::add_exception_rid);
ClassDB::bind_method(D_METHOD("add_exception", "node"), &ClippedCamera3D::add_exception);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("remove_exception_rid", "rid"), &ClippedCamera3D::remove_exception_rid);
ClassDB::bind_method(D_METHOD("remove_exception", "node"), &ClippedCamera3D::remove_exception);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("set_clip_to_areas", "enable"), &ClippedCamera3D::set_clip_to_areas);
ClassDB::bind_method(D_METHOD("is_clip_to_areas_enabled"), &ClippedCamera3D::is_clip_to_areas_enabled);
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("get_clip_offset"), &ClippedCamera3D::get_clip_offset);
Expose ClippedCamera clip_offset
2019-06-14 15:39:13 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("set_clip_to_bodies", "enable"), &ClippedCamera3D::set_clip_to_bodies);
ClassDB::bind_method(D_METHOD("is_clip_to_bodies_enabled"), &ClippedCamera3D::is_clip_to_bodies_enabled);
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClassDB::bind_method(D_METHOD("clear_exceptions"), &ClippedCamera3D::clear_exceptions);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
Variant: Added 64-bit packed arrays, renamed Variant::REAL to FLOAT. - Renames PackedIntArray to PackedInt32Array. - Renames PackedFloatArray to PackedFloat32Array. - Adds PackedInt64Array and PackedFloat64Array. - Renames Variant::REAL to Variant::FLOAT for consistency. Packed arrays are for storing large amount of data and creating stuff like meshes, buffers. textures, etc. Forcing them to be 64 is a huge waste of memory. That said, many users requested the ability to have 64 bits packed arrays for their games, so this is just an optional added type. For Variant, the float datatype is always 64 bits, and exposed as `float`. We still have `real_t` which is the datatype that can change from 32 to 64 bits depending on a compile flag (not entirely working right now, but that's the idea). It affects math related datatypes and code only. Neither Variant nor PackedArray make use of real_t, which is only intended for math precision, so the term is removed from there to keep only float.
2020-02-24 18:20:53 +00:00
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "margin", PROPERTY_HINT_RANGE, "0,32,0.01"), "set_margin", "get_margin");
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Physics,Idle"), "set_process_mode", "get_process_mode");
ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
ADD_GROUP("Clip To", "clip_to");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "clip_to_areas", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_clip_to_areas", "is_clip_to_areas_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "clip_to_bodies", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_clip_to_bodies", "is_clip_to_bodies_enabled");
Add missing BIND_ENUM_CONSTANT to ClippedCamera
2018-08-23 16:53:05 +00:00
BIND_ENUM_CONSTANT(CLIP_PROCESS_PHYSICS);
BIND_ENUM_CONSTANT(CLIP_PROCESS_IDLE);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClippedCamera3D::ClippedCamera3D() {
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
margin = 0;
clip_offset = 0;
process_mode = CLIP_PROCESS_PHYSICS;
set_physics_process_internal(true);
collision_mask = 1;
set_notify_local_transform(Engine::get_singleton()->is_editor_hint());
points.resize(5);
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
pyramid_shape = PhysicsServer3D::get_singleton()->shape_create(PhysicsServer3D::SHAPE_CONVEX_POLYGON);
Changes to ClippedCamera, RayCast,Raycast2D and 2D physics API to add ability to choose between bodies and areas when colliding.
2018-08-21 18:30:41 +00:00
clip_to_areas = false;
clip_to_bodies = true;
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
ClippedCamera3D::~ClippedCamera3D() {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
PhysicsServer3D::get_singleton()->free(pyramid_shape);
Clipped camera implementation, a camera that avoids going into geometry.
2018-08-21 14:48:17 +00:00
}