Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use real_t in 2D nodes #45571

Merged
merged 1 commit into from
Mar 22, 2021
Merged

Use real_t in 2D nodes #45571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions scene/2d/camera_2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Transform2D Camera2D::get_camera_transform() {
}

if (smoothing_enabled && !Engine::get_singleton()->is_editor_hint()) {
float c = smoothing * (process_callback == CAMERA2D_PROCESS_PHYSICS ? get_physics_process_delta_time() : get_process_delta_time());
real_t c = smoothing * (process_callback == CAMERA2D_PROCESS_PHYSICS ? get_physics_process_delta_time() : get_process_delta_time());
smoothed_camera_pos = ((camera_pos - smoothed_camera_pos) * c) + smoothed_camera_pos;
ret_camera_pos = smoothed_camera_pos;
//camera_pos=camera_pos*(1.0-smoothing)+new_camera_pos*smoothing;
Expand All @@ -172,7 +172,7 @@ Transform2D Camera2D::get_camera_transform() {

Point2 screen_offset = (anchor_mode == ANCHOR_MODE_DRAG_CENTER ? (screen_size * 0.5 * zoom) : Point2());

float angle = get_global_transform().get_rotation();
real_t angle = get_global_transform().get_rotation();
if (rotating) {
screen_offset = screen_offset.rotated(angle);
}
Expand Down Expand Up @@ -271,7 +271,7 @@ void Camera2D::_notification(int p_what) {

if (screen_drawing_enabled) {
Color area_axis_color(0.5, 0.42, 0.87, 0.63);
float area_axis_width = 1;
real_t area_axis_width = 1;
if (is_current()) {
area_axis_width = 3;
area_axis_color.a = 0.83;
Expand All @@ -296,7 +296,7 @@ void Camera2D::_notification(int p_what) {

if (limit_drawing_enabled) {
Color limit_drawing_color(1, 1, 0, 0.63);
float limit_drawing_width = 1;
real_t limit_drawing_width = 1;
if (is_current()) {
limit_drawing_color.a = 0.83;
limit_drawing_width = 3;
Expand All @@ -318,7 +318,7 @@ void Camera2D::_notification(int p_what) {

if (margin_drawing_enabled) {
Color margin_drawing_color(0, 1, 1, 0.63);
float margin_drawing_width = 1;
real_t margin_drawing_width = 1;
if (is_current()) {
margin_drawing_width = 3;
margin_drawing_color.a = 0.83;
Expand Down Expand Up @@ -446,13 +446,13 @@ bool Camera2D::is_limit_smoothing_enabled() const {
return limit_smoothing_enabled;
}

void Camera2D::set_drag_margin(Side p_side, float p_drag_margin) {
void Camera2D::set_drag_margin(Side p_side, real_t p_drag_margin) {
ERR_FAIL_INDEX((int)p_side, 4);
drag_margin[p_side] = p_drag_margin;
update();
}

float Camera2D::get_drag_margin(Side p_side) const {
real_t Camera2D::get_drag_margin(Side p_side) const {
ERR_FAIL_INDEX_V((int)p_side, 4, 0);
return drag_margin[p_side];
}
Expand Down Expand Up @@ -494,7 +494,7 @@ void Camera2D::align() {
_update_scroll();
}

void Camera2D::set_follow_smoothing(float p_speed) {
void Camera2D::set_follow_smoothing(real_t p_speed) {
smoothing = p_speed;
if (smoothing > 0 && !(is_inside_tree() && Engine::get_singleton()->is_editor_hint())) {
set_process_internal(true);
Expand All @@ -503,7 +503,7 @@ void Camera2D::set_follow_smoothing(float p_speed) {
}
}

float Camera2D::get_follow_smoothing() const {
real_t Camera2D::get_follow_smoothing() const {
return smoothing;
}

Expand Down Expand Up @@ -535,31 +535,31 @@ bool Camera2D::is_drag_vertical_enabled() const {
return drag_vertical_enabled;
}

void Camera2D::set_drag_vertical_offset(float p_offset) {
void Camera2D::set_drag_vertical_offset(real_t p_offset) {
drag_vertical_offset = p_offset;
drag_vertical_offset_changed = true;
Point2 old_smoothed_camera_pos = smoothed_camera_pos;
_update_scroll();
smoothed_camera_pos = old_smoothed_camera_pos;
}

float Camera2D::get_drag_vertical_offset() const {
real_t Camera2D::get_drag_vertical_offset() const {
return drag_vertical_offset;
}

void Camera2D::set_drag_horizontal_offset(float p_offset) {
void Camera2D::set_drag_horizontal_offset(real_t p_offset) {
drag_horizontal_offset = p_offset;
drag_horizontal_offset_changed = true;
Point2 old_smoothed_camera_pos = smoothed_camera_pos;
_update_scroll();
smoothed_camera_pos = old_smoothed_camera_pos;
}

float Camera2D::get_drag_horizontal_offset() const {
real_t Camera2D::get_drag_horizontal_offset() const {
return drag_horizontal_offset;
}

void Camera2D::_set_old_smoothing(float p_enable) {
void Camera2D::_set_old_smoothing(real_t p_enable) {
//compatibility
if (p_enable > 0) {
smoothing_enabled = true;
Expand Down
26 changes: 13 additions & 13 deletions scene/2d/camera_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ class Camera2D : public Node2D {
AnchorMode anchor_mode = ANCHOR_MODE_DRAG_CENTER;
bool rotating = false;
bool current = false;
float smoothing = 5.0;
real_t smoothing = 5.0;
bool smoothing_enabled = false;
int limit[4];
bool limit_smoothing_enabled = false;

float drag_margin[4];
real_t drag_margin[4];
bool drag_horizontal_enabled = false;
bool drag_vertical_enabled = false;
float drag_horizontal_offset = 0.0;
float drag_vertical_offset = 0.0;
real_t drag_horizontal_offset = 0.0;
real_t drag_vertical_offset = 0.0;
bool drag_horizontal_offset_changed = false;
bool drag_vertical_offset_changed = false;

Expand All @@ -85,7 +85,7 @@ class Camera2D : public Node2D {
void _make_current(Object *p_which);
void _set_current(bool p_current);

void _set_old_smoothing(float p_enable);
void _set_old_smoothing(real_t p_enable);

bool screen_drawing_enabled = true;
bool limit_drawing_enabled = false;
Expand Down Expand Up @@ -124,20 +124,20 @@ class Camera2D : public Node2D {
void set_drag_vertical_enabled(bool p_enabled);
bool is_drag_vertical_enabled() const;

void set_drag_margin(Side p_side, float p_drag_margin);
float get_drag_margin(Side p_side) const;
void set_drag_margin(Side p_side, real_t p_drag_margin);
real_t get_drag_margin(Side p_side) const;

void set_drag_horizontal_offset(float p_offset);
float get_drag_horizontal_offset() const;
void set_drag_horizontal_offset(real_t p_offset);
real_t get_drag_horizontal_offset() const;

void set_drag_vertical_offset(float p_offset);
float get_drag_vertical_offset() const;
void set_drag_vertical_offset(real_t p_offset);
real_t get_drag_vertical_offset() const;

void set_enable_follow_smoothing(bool p_enabled);
bool is_follow_smoothing_enabled() const;

void set_follow_smoothing(float p_speed);
float get_follow_smoothing() const;
void set_follow_smoothing(real_t p_speed);
real_t get_follow_smoothing() const;

void set_process_callback(Camera2DProcessCallback p_mode);
Camera2DProcessCallback get_process_callback() const;
Expand Down
8 changes: 4 additions & 4 deletions scene/2d/canvas_group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "canvas_group.h"

void CanvasGroup::set_fit_margin(float p_fit_margin) {
void CanvasGroup::set_fit_margin(real_t p_fit_margin) {
ERR_FAIL_COND(p_fit_margin < 0.0);

fit_margin = p_fit_margin;
Expand All @@ -39,11 +39,11 @@ void CanvasGroup::set_fit_margin(float p_fit_margin) {
update();
}

float CanvasGroup::get_fit_margin() const {
real_t CanvasGroup::get_fit_margin() const {
return fit_margin;
}

void CanvasGroup::set_clear_margin(float p_clear_margin) {
void CanvasGroup::set_clear_margin(real_t p_clear_margin) {
ERR_FAIL_COND(p_clear_margin < 0.0);

clear_margin = p_clear_margin;
Expand All @@ -52,7 +52,7 @@ void CanvasGroup::set_clear_margin(float p_clear_margin) {
update();
}

float CanvasGroup::get_clear_margin() const {
real_t CanvasGroup::get_clear_margin() const {
return clear_margin;
}

Expand Down
12 changes: 6 additions & 6 deletions scene/2d/canvas_group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@

class CanvasGroup : public Node2D {
GDCLASS(CanvasGroup, Node2D)
float fit_margin = 10.0;
float clear_margin = 10.0;
real_t fit_margin = 10.0;
real_t clear_margin = 10.0;
bool use_mipmaps = false;

protected:
static void _bind_methods();

public:
void set_fit_margin(float p_fit_margin);
float get_fit_margin() const;
void set_fit_margin(real_t p_fit_margin);
real_t get_fit_margin() const;

void set_clear_margin(float p_clear_margin);
float get_clear_margin() const;
void set_clear_margin(real_t p_clear_margin);
real_t get_clear_margin() const;

void set_use_mipmaps(bool p_use_mipmaps);
bool is_using_mipmaps() const;
Expand Down
Loading