Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Use doubles for time in many other places

Browse source
This commit is contained in:
Aaron Franke 2021-02-01 21:16:37 -05:00
parent 78d33a6e24
commit 84f720966c
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
47 changed files with 291 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scene/2d/animated_sprite_2d.cpp
View file

@ -159,12 +159,12 @@ void AnimatedSprite2D::_notification(int p_what) {
return;
}
float speed = frames->get_animation_speed(animation) * speed_scale;
double speed = frames->get_animation_speed(animation) * speed_scale;
if (speed == 0) {
return; //do nothing
}
float remaining = get_process_delta_time();
double remaining = get_process_delta_time();
while (remaining) {
if (timeout <= 0) {
@ -205,7 +205,7 @@ void AnimatedSprite2D::_notification(int p_what) {
emit_signal(SceneStringNames::get_singleton()->frame_changed);
}
float to_process = MIN(timeout, remaining);
double to_process = MIN(timeout, remaining);
remaining -= to_process;
timeout -= to_process;
}
@ -310,8 +310,8 @@ int AnimatedSprite2D::get_frame() const {
return frame;
}
void AnimatedSprite2D::set_speed_scale(float p_speed_scale) {
float elapsed = _get_frame_duration() - timeout;
void AnimatedSprite2D::set_speed_scale(double p_speed_scale) {
double elapsed = _get_frame_duration() - timeout;
speed_scale = MAX(p_speed_scale, 0.0f);
@ -320,7 +320,7 @@ void AnimatedSprite2D::set_speed_scale(float p_speed_scale) {
timeout -= elapsed;
}
float AnimatedSprite2D::get_speed_scale() const {
double AnimatedSprite2D::get_speed_scale() const {
return speed_scale;
}
@ -402,9 +402,9 @@ bool AnimatedSprite2D::is_playing() const {
return playing;
}
float AnimatedSprite2D::_get_frame_duration() {
double AnimatedSprite2D::_get_frame_duration() {
if (frames.is_valid() && frames->has_animation(animation)) {
float speed = frames->get_animation_speed(animation) * speed_scale;
double speed = frames->get_animation_speed(animation) * speed_scale;
if (speed > 0) {
return 1.0 / speed;
}

6
scene/2d/animated_sprite_2d.h
View file

@ -56,7 +56,7 @@ class AnimatedSprite2D : public Node2D {
void _res_changed();
float _get_frame_duration();
double _get_frame_duration();
void _reset_timeout();
void _set_playing(bool p_playing);
bool _is_playing() const;
@ -94,8 +94,8 @@ public:
void set_frame(int p_frame);
int get_frame() const;
void set_speed_scale(float p_speed_scale);
float get_speed_scale() const;
void set_speed_scale(double p_speed_scale);
double get_speed_scale() const;
void set_centered(bool p_center);
bool is_centered() const;

46
scene/2d/cpu_particles_2d.cpp
View file

@ -65,7 +65,7 @@ void CPUParticles2D::set_amount(int p_amount) {
particle_order.resize(p_amount);
}
void CPUParticles2D::set_lifetime(float p_lifetime) {
void CPUParticles2D::set_lifetime(double p_lifetime) {
ERR_FAIL_COND_MSG(p_lifetime <= 0, "Particles lifetime must be greater than 0.");
lifetime = p_lifetime;
}
@ -74,7 +74,7 @@ void CPUParticles2D::set_one_shot(bool p_one_shot) {
one_shot = p_one_shot;
}
void CPUParticles2D::set_pre_process_time(float p_time) {
void CPUParticles2D::set_pre_process_time(double p_time) {
pre_process_time = p_time;
}
@ -86,7 +86,7 @@ void CPUParticles2D::set_randomness_ratio(real_t p_ratio) {
randomness_ratio = p_ratio;
}
void CPUParticles2D::set_lifetime_randomness(float p_random) {
void CPUParticles2D::set_lifetime_randomness(double p_random) {
lifetime_randomness = p_random;
}
@ -95,7 +95,7 @@ void CPUParticles2D::set_use_local_coordinates(bool p_enable) {
set_notify_transform(!p_enable);
}
void CPUParticles2D::set_speed_scale(real_t p_scale) {
void CPUParticles2D::set_speed_scale(double p_scale) {
speed_scale = p_scale;
}
@ -107,7 +107,7 @@ int CPUParticles2D::get_amount() const {
return particles.size();
}
float CPUParticles2D::get_lifetime() const {
double CPUParticles2D::get_lifetime() const {
return lifetime;
}
@ -115,7 +115,7 @@ bool CPUParticles2D::get_one_shot() const {
return one_shot;
}
float CPUParticles2D::get_pre_process_time() const {
double CPUParticles2D::get_pre_process_time() const {
return pre_process_time;
}
@ -127,7 +127,7 @@ real_t CPUParticles2D::get_randomness_ratio() const {
return randomness_ratio;
}
float CPUParticles2D::get_lifetime_randomness() const {
double CPUParticles2D::get_lifetime_randomness() const {
return lifetime_randomness;
}
@ -135,7 +135,7 @@ bool CPUParticles2D::get_use_local_coordinates() const {
return local_coords;
}
real_t CPUParticles2D::get_speed_scale() const {
double CPUParticles2D::get_speed_scale() const {
return speed_scale;
}
@ -516,7 +516,7 @@ void CPUParticles2D::_update_internal() {
return;
}
float delta = get_process_delta_time();
double delta = get_process_delta_time();
if (emitting) {
inactive_time = 0;
} else {
@ -536,14 +536,14 @@ void CPUParticles2D::_update_internal() {
_set_redraw(true);
if (time == 0 && pre_process_time > 0.0) {
float frame_time;
double frame_time;
if (fixed_fps > 0) {
frame_time = 1.0 / fixed_fps;
} else {
frame_time = 1.0 / 30.0;
}
float todo = pre_process_time;
double todo = pre_process_time;
while (todo >= 0) {
_particles_process(frame_time);
@ -552,16 +552,16 @@ void CPUParticles2D::_update_internal() {
}
if (fixed_fps > 0) {
float frame_time = 1.0 / fixed_fps;
float decr = frame_time;
double frame_time = 1.0 / fixed_fps;
double decr = frame_time;
float ldelta = delta;
double ldelta = delta;
if (ldelta > 0.1) { //avoid recursive stalls if fps goes below 10
ldelta = 0.1;
} else if (ldelta <= 0.0) { //unlikely but..
ldelta = 0.001;
}
float todo = frame_remainder + ldelta;
double todo = frame_remainder + ldelta;
while (todo >= frame_time) {
_particles_process(frame_time);
@ -577,7 +577,7 @@ void CPUParticles2D::_update_internal() {
_update_particle_data_buffer();
}
void CPUParticles2D::_particles_process(float p_delta) {
void CPUParticles2D::_particles_process(double p_delta) {
p_delta *= speed_scale;
int pcount = particles.size();
@ -585,7 +585,7 @@ void CPUParticles2D::_particles_process(float p_delta) {
Particle *parray = w;
float prev_time = time;
double prev_time = time;
time += p_delta;
if (time > lifetime) {
time = Math::fmod(time, lifetime);
@ -604,7 +604,7 @@ void CPUParticles2D::_particles_process(float p_delta) {
velocity_xform[2] = Vector2();
}
float system_phase = time / lifetime;
double system_phase = time / lifetime;
for (int i = 0; i < pcount; i++) {
Particle &p = parray[i];
@ -613,12 +613,12 @@ void CPUParticles2D::_particles_process(float p_delta) {
continue;
}
float local_delta = p_delta;
double local_delta = p_delta;
// The phase is a ratio between 0 (birth) and 1 (end of life) for each particle.
// While we use time in tests later on, for randomness we use the phase as done in the
// original shader code, and we later multiply by lifetime to get the time.
real_t restart_phase = real_t(i) / real_t(pcount);
double restart_phase = double(i) / double(pcount);
if (randomness_ratio > 0.0) {
uint32_t seed = cycle;
@ -627,12 +627,12 @@ void CPUParticles2D::_particles_process(float p_delta) {
}
seed *= uint32_t(pcount);
seed += uint32_t(i);
real_t random = (idhash(seed) % uint32_t(65536)) / 65536.0;
restart_phase += randomness_ratio * random * 1.0 / pcount;
double random = double(idhash(seed) % uint32_t(65536)) / 65536.0;
restart_phase += randomness_ratio * random * 1.0 / double(pcount);
}
restart_phase *= (1.0 - explosiveness_ratio);
float restart_time = restart_phase * lifetime;
double restart_time = restart_phase * lifetime;
bool restart = false;
if (time > prev_time) {

36
scene/2d/cpu_particles_2d.h
View file

@ -91,16 +91,16 @@ private:
real_t scale_rand = 0.0;
real_t hue_rot_rand = 0.0;
real_t anim_offset_rand = 0.0;
float time = 0.0;
float lifetime = 0.0;
double time = 0.0;
double lifetime = 0.0;
Color base_color;
uint32_t seed = 0;
};
float time = 0.0;
float inactive_time = 0.0;
float frame_remainder = 0.0;
double time = 0.0;
double inactive_time = 0.0;
double frame_remainder = 0.0;
int cycle = 0;
bool redraw = false;
@ -131,12 +131,12 @@ private:
bool one_shot = false;
float lifetime = 1.0;
float pre_process_time = 0.0;
double lifetime = 1.0;
double pre_process_time = 0.0;
real_t explosiveness_ratio = 0.0;
real_t randomness_ratio = 0.0;
real_t lifetime_randomness = 0.0;
real_t speed_scale = 1.0;
double lifetime_randomness = 0.0;
double speed_scale = 1.0;
bool local_coords;
int fixed_fps = 0;
bool fractional_delta = true;
@ -172,7 +172,7 @@ private:
Vector2 gravity = Vector2(0, 980);
void _update_internal();
void _particles_process(float p_delta);
void _particles_process(double p_delta);
void _update_particle_data_buffer();
Mutex update_mutex;
@ -193,27 +193,27 @@ protected:
public:
void set_emitting(bool p_emitting);
void set_amount(int p_amount);
void set_lifetime(float p_lifetime);
void set_lifetime(double p_lifetime);
void set_one_shot(bool p_one_shot);
void set_pre_process_time(float p_time);
void set_pre_process_time(double p_time);
void set_explosiveness_ratio(real_t p_ratio);
void set_randomness_ratio(real_t p_ratio);
void set_lifetime_randomness(float p_random);
void set_lifetime_randomness(double p_random);
void set_visibility_aabb(const Rect2 &p_aabb);
void set_use_local_coordinates(bool p_enable);
void set_speed_scale(real_t p_scale);
void set_speed_scale(double p_scale);
bool is_emitting() const;
int get_amount() const;
float get_lifetime() const;
double get_lifetime() const;
bool get_one_shot() const;
float get_pre_process_time() const;
double get_pre_process_time() const;
real_t get_explosiveness_ratio() const;
real_t get_randomness_ratio() const;
float get_lifetime_randomness() const;
double get_lifetime_randomness() const;
Rect2 get_visibility_aabb() const;
bool get_use_local_coordinates() const;
real_t get_speed_scale() const;
double get_speed_scale() const;
void set_fixed_fps(int p_count);
int get_fixed_fps() const;

25
scene/2d/gpu_particles_2d.cpp
View file

@ -54,7 +54,7 @@ void GPUParticles2D::set_amount(int p_amount) {
RS::get_singleton()->particles_set_amount(particles, amount);
}
void GPUParticles2D::set_lifetime(float p_lifetime) {
void GPUParticles2D::set_lifetime(double p_lifetime) {
ERR_FAIL_COND_MSG(p_lifetime <= 0, "Particles lifetime must be greater than 0.");
lifetime = p_lifetime;
RS::get_singleton()->particles_set_lifetime(particles, lifetime);
@ -76,7 +76,7 @@ void GPUParticles2D::set_one_shot(bool p_enable) {
}
}
void GPUParticles2D::set_pre_process_time(float p_time) {
void GPUParticles2D::set_pre_process_time(double p_time) {
pre_process_time = p_time;
RS::get_singleton()->particles_set_pre_process_time(particles, pre_process_time);
}
@ -148,7 +148,8 @@ void GPUParticles2D::set_trail_enabled(bool p_enabled) {
RS::get_singleton()->particles_set_transform_align(particles, p_enabled ? RS::PARTICLES_TRANSFORM_ALIGN_Y_TO_VELOCITY : RS::PARTICLES_TRANSFORM_ALIGN_DISABLED);
}
void GPUParticles2D::set_trail_length(float p_seconds) {
void GPUParticles2D::set_trail_length(double p_seconds) {
ERR_FAIL_COND(p_seconds < 0.001);
trail_length = p_seconds;
RS::get_singleton()->particles_set_trails(particles, trail_enabled, trail_length);
@ -162,6 +163,7 @@ void GPUParticles2D::set_trail_sections(int p_sections) {
trail_sections = p_sections;
update();
}
void GPUParticles2D::set_trail_section_subdivisions(int p_subdivisions) {
ERR_FAIL_COND(trail_section_subdivisions < 1);
ERR_FAIL_COND(trail_section_subdivisions > 1024);
@ -173,12 +175,13 @@ void GPUParticles2D::set_trail_section_subdivisions(int p_subdivisions) {
bool GPUParticles2D::is_trail_enabled() const {
return trail_enabled;
}
float GPUParticles2D::get_trail_length() const {
real_t GPUParticles2D::get_trail_length() const {
return trail_length;
}
void GPUParticles2D::_update_collision_size() {
float csize = collision_base_size;
real_t csize = collision_base_size;
if (texture.is_valid()) {
csize *= (texture->get_width() + texture->get_height()) / 4.0; //half size since its a radius
@ -187,16 +190,16 @@ void GPUParticles2D::_update_collision_size() {
RS::get_singleton()->particles_set_collision_base_size(particles, csize);
}
void GPUParticles2D::set_collision_base_size(float p_size) {
void GPUParticles2D::set_collision_base_size(real_t p_size) {
collision_base_size = p_size;
_update_collision_size();
}
float GPUParticles2D::get_collision_base_size() const {
real_t GPUParticles2D::get_collision_base_size() const {
return collision_base_size;
}
void GPUParticles2D::set_speed_scale(float p_scale) {
void GPUParticles2D::set_speed_scale(double p_scale) {
speed_scale = p_scale;
RS::get_singleton()->particles_set_speed_scale(particles, p_scale);
}
@ -209,7 +212,7 @@ int GPUParticles2D::get_amount() const {
return amount;
}
float GPUParticles2D::get_lifetime() const {
double GPUParticles2D::get_lifetime() const {
return lifetime;
}
@ -224,7 +227,7 @@ bool GPUParticles2D::get_one_shot() const {
return one_shot;
}
float GPUParticles2D::get_pre_process_time() const {
double GPUParticles2D::get_pre_process_time() const {
return pre_process_time;
}
@ -248,7 +251,7 @@ Ref<Material> GPUParticles2D::get_process_material() const {
return process_material;
}
float GPUParticles2D::get_speed_scale() const {
double GPUParticles2D::get_speed_scale() const {
return speed_scale;
}

22
scene/2d/gpu_particles_2d.h
View file

@ -51,11 +51,11 @@ private:
bool one_shot;
int amount;
float lifetime;
float pre_process_time;
double lifetime;
double pre_process_time;
float explosiveness_ratio;
float randomness_ratio;
float speed_scale;
double speed_scale;
Rect2 visibility_rect;
bool local_coords;
int fixed_fps;
@ -89,32 +89,32 @@ protected:
public:
void set_emitting(bool p_emitting);
void set_amount(int p_amount);
void set_lifetime(float p_lifetime);
void set_lifetime(double p_lifetime);
void set_one_shot(bool p_enable);
void set_pre_process_time(float p_time);
void set_pre_process_time(double p_time);
void set_explosiveness_ratio(float p_ratio);
void set_randomness_ratio(float p_ratio);
void set_visibility_rect(const Rect2 &p_visibility_rect);
void set_use_local_coordinates(bool p_enable);
void set_process_material(const Ref<Material> &p_material);
void set_speed_scale(float p_scale);
void set_collision_base_size(float p_ratio);
void set_speed_scale(double p_scale);
void set_collision_base_size(real_t p_ratio);
void set_trail_enabled(bool p_enabled);
void set_trail_length(float p_seconds);
void set_trail_length(double p_seconds);
void set_trail_sections(int p_sections);
void set_trail_section_subdivisions(int p_subdivisions);
bool is_emitting() const;
int get_amount() const;
float get_lifetime() const;
double get_lifetime() const;
bool get_one_shot() const;
float get_pre_process_time() const;
double get_pre_process_time() const;
float get_explosiveness_ratio() const;
float get_randomness_ratio() const;
Rect2 get_visibility_rect() const;
bool get_use_local_coordinates() const;
Ref<Material> get_process_material() const;
float get_speed_scale() const;
double get_speed_scale() const;
float get_collision_base_size() const;
bool is_trail_enabled() const;

46
scene/3d/cpu_particles_3d.cpp
View file

@ -78,7 +78,7 @@ void CPUParticles3D::set_amount(int p_amount) {
particle_order.resize(p_amount);
}
void CPUParticles3D::set_lifetime(float p_lifetime) {
void CPUParticles3D::set_lifetime(double p_lifetime) {
ERR_FAIL_COND_MSG(p_lifetime <= 0, "Particles lifetime must be greater than 0.");
lifetime = p_lifetime;
}
@ -87,7 +87,7 @@ void CPUParticles3D::set_one_shot(bool p_one_shot) {
one_shot = p_one_shot;
}
void CPUParticles3D::set_pre_process_time(float p_time) {
void CPUParticles3D::set_pre_process_time(double p_time) {
pre_process_time = p_time;
}
@ -99,7 +99,7 @@ void CPUParticles3D::set_randomness_ratio(real_t p_ratio) {
randomness_ratio = p_ratio;
}
void CPUParticles3D::set_lifetime_randomness(float p_random) {
void CPUParticles3D::set_lifetime_randomness(double p_random) {
lifetime_randomness = p_random;
}
@ -107,7 +107,7 @@ void CPUParticles3D::set_use_local_coordinates(bool p_enable) {
local_coords = p_enable;
}
void CPUParticles3D::set_speed_scale(real_t p_scale) {
void CPUParticles3D::set_speed_scale(double p_scale) {
speed_scale = p_scale;
}
@ -119,7 +119,7 @@ int CPUParticles3D::get_amount() const {
return particles.size();
}
float CPUParticles3D::get_lifetime() const {
double CPUParticles3D::get_lifetime() const {
return lifetime;
}
@ -127,7 +127,7 @@ bool CPUParticles3D::get_one_shot() const {
return one_shot;
}
float CPUParticles3D::get_pre_process_time() const {
double CPUParticles3D::get_pre_process_time() const {
return pre_process_time;
}
@ -139,7 +139,7 @@ real_t CPUParticles3D::get_randomness_ratio() const {
return randomness_ratio;
}
float CPUParticles3D::get_lifetime_randomness() const {
double CPUParticles3D::get_lifetime_randomness() const {
return lifetime_randomness;
}
@ -147,7 +147,7 @@ bool CPUParticles3D::get_use_local_coordinates() const {
return local_coords;
}
real_t CPUParticles3D::get_speed_scale() const {
double CPUParticles3D::get_speed_scale() const {
return speed_scale;
}
@ -519,7 +519,7 @@ void CPUParticles3D::_update_internal() {
return;
}
float delta = get_process_delta_time();
double delta = get_process_delta_time();
if (emitting) {
inactive_time = 0;
} else {
@ -541,14 +541,14 @@ void CPUParticles3D::_update_internal() {
bool processed = false;
if (time == 0 && pre_process_time > 0.0) {
float frame_time;
double frame_time;
if (fixed_fps > 0) {
frame_time = 1.0 / fixed_fps;
} else {
frame_time = 1.0 / 30.0;
}
float todo = pre_process_time;
double todo = pre_process_time;
while (todo >= 0) {
_particles_process(frame_time);
@ -558,16 +558,16 @@ void CPUParticles3D::_update_internal() {
}
if (fixed_fps > 0) {
float frame_time = 1.0 / fixed_fps;
float decr = frame_time;
double frame_time = 1.0 / fixed_fps;
double decr = frame_time;
float ldelta = delta;
double ldelta = delta;
if (ldelta > 0.1) { //avoid recursive stalls if fps goes below 10
ldelta = 0.1;
} else if (ldelta <= 0.0) { //unlikely but..
ldelta = 0.001;
}
float todo = frame_remainder + ldelta;
double todo = frame_remainder + ldelta;
while (todo >= frame_time) {
_particles_process(frame_time);
@ -587,7 +587,7 @@ void CPUParticles3D::_update_internal() {
}
}
void CPUParticles3D::_particles_process(float p_delta) {
void CPUParticles3D::_particles_process(double p_delta) {
p_delta *= speed_scale;
int pcount = particles.size();
@ -595,7 +595,7 @@ void CPUParticles3D::_particles_process(float p_delta) {
Particle *parray = w;
float prev_time = time;
double prev_time = time;
time += p_delta;
if (time > lifetime) {
time = Math::fmod(time, lifetime);
@ -613,7 +613,7 @@ void CPUParticles3D::_particles_process(float p_delta) {
velocity_xform = emission_xform.basis;
}
float system_phase = time / lifetime;
double system_phase = time / lifetime;
for (int i = 0; i < pcount; i++) {
Particle &p = parray[i];
@ -622,12 +622,12 @@ void CPUParticles3D::_particles_process(float p_delta) {
continue;
}
float local_delta = p_delta;
double local_delta = p_delta;
// The phase is a ratio between 0 (birth) and 1 (end of life) for each particle.
// While we use time in tests later on, for randomness we use the phase as done in the
// original shader code, and we later multiply by lifetime to get the time.
real_t restart_phase = real_t(i) / real_t(pcount);
double restart_phase = double(i) / double(pcount);
if (randomness_ratio > 0.0) {
uint32_t seed = cycle;
@ -636,12 +636,12 @@ void CPUParticles3D::_particles_process(float p_delta) {
}
seed *= uint32_t(pcount);
seed += uint32_t(i);
real_t random = (idhash(seed) % uint32_t(65536)) / real_t(65536.0);
restart_phase += randomness_ratio * random * 1.0 / pcount;
double random = double(idhash(seed) % uint32_t(65536)) / 65536.0;
restart_phase += randomness_ratio * random * 1.0 / double(pcount);
}
restart_phase *= (1.0 - explosiveness_ratio);
float restart_time = restart_phase * lifetime;
double restart_time = restart_phase * lifetime;
bool restart = false;
if (time > prev_time) {

36
scene/3d/cpu_particles_3d.h
View file

@ -93,16 +93,16 @@ private:
real_t scale_rand = 0.0;
real_t hue_rot_rand = 0.0;
real_t anim_offset_rand = 0.0;
float time = 0.0;
float lifetime = 0.0;
double time = 0.0;
double lifetime = 0.0;
Color base_color;
uint32_t seed = 0;
};
float time = 0.0;
float inactive_time = 0.0;
float frame_remainder = 0.0;
double time = 0.0;
double inactive_time = 0.0;
double frame_remainder = 0.0;
int cycle = 0;
bool redraw = false;
@ -132,12 +132,12 @@ private:
bool one_shot = false;
float lifetime = 1.0;
float pre_process_time = 0.0;
double lifetime = 1.0;
double pre_process_time = 0.0;
real_t explosiveness_ratio = 0.0;
real_t randomness_ratio = 0.0;
float lifetime_randomness = 0.0;
float speed_scale = 1.0;
double lifetime_randomness = 0.0;
double speed_scale = 1.0;
bool local_coords = true;
int fixed_fps = 0;
bool fractional_delta = true;
@ -180,7 +180,7 @@ private:
Vector3 gravity = Vector3(0, -9.8, 0);
void _update_internal();
void _particles_process(float p_delta);
void _particles_process(double p_delta);
void _update_particle_data_buffer();
Mutex update_mutex;
@ -200,27 +200,27 @@ public:
void set_emitting(bool p_emitting);
void set_amount(int p_amount);
void set_lifetime(float p_lifetime);
void set_lifetime(double p_lifetime);
void set_one_shot(bool p_one_shot);
void set_pre_process_time(float p_time);
void set_pre_process_time(double p_time);
void set_explosiveness_ratio(real_t p_ratio);
void set_randomness_ratio(real_t p_ratio);
void set_lifetime_randomness(float p_random);
void set_lifetime_randomness(double p_random);
void set_visibility_aabb(const AABB &p_aabb);
void set_use_local_coordinates(bool p_enable);
void set_speed_scale(real_t p_scale);
void set_speed_scale(double p_scale);
bool is_emitting() const;
int get_amount() const;
float get_lifetime() const;
double get_lifetime() const;
bool get_one_shot() const;
float get_pre_process_time() const;
double get_pre_process_time() const;
real_t get_explosiveness_ratio() const;
real_t get_randomness_ratio() const;
float get_lifetime_randomness() const;
double get_lifetime_randomness() const;
AABB get_visibility_aabb() const;
bool get_use_local_coordinates() const;
real_t get_speed_scale() const;
double get_speed_scale() const;
void set_fixed_fps(int p_count);
int get_fixed_fps() const;

12
scene/3d/gpu_particles_3d.cpp
View file

@ -59,7 +59,7 @@ void GPUParticles3D::set_amount(int p_amount) {
RS::get_singleton()->particles_set_amount(particles, amount);
}
void GPUParticles3D::set_lifetime(float p_lifetime) {
void GPUParticles3D::set_lifetime(double p_lifetime) {
ERR_FAIL_COND_MSG(p_lifetime <= 0, "Particles lifetime must be greater than 0.");
lifetime = p_lifetime;
RS::get_singleton()->particles_set_lifetime(particles, lifetime);
@ -81,7 +81,7 @@ void GPUParticles3D::set_one_shot(bool p_one_shot) {
}
}
void GPUParticles3D::set_pre_process_time(float p_time) {
void GPUParticles3D::set_pre_process_time(double p_time) {
pre_process_time = p_time;
RS::get_singleton()->particles_set_pre_process_time(particles, pre_process_time);
}
@ -118,7 +118,7 @@ void GPUParticles3D::set_process_material(const Ref<Material> &p_material) {
update_configuration_warnings();
}
void GPUParticles3D::set_speed_scale(float p_scale) {
void GPUParticles3D::set_speed_scale(double p_scale) {
speed_scale = p_scale;
RS::get_singleton()->particles_set_speed_scale(particles, p_scale);
}
@ -136,7 +136,7 @@ int GPUParticles3D::get_amount() const {
return amount;
}
float GPUParticles3D::get_lifetime() const {
double GPUParticles3D::get_lifetime() const {
return lifetime;
}
@ -144,7 +144,7 @@ bool GPUParticles3D::get_one_shot() const {
return one_shot;
}
float GPUParticles3D::get_pre_process_time() const {
double GPUParticles3D::get_pre_process_time() const {
return pre_process_time;
}
@ -168,7 +168,7 @@ Ref<Material> GPUParticles3D::get_process_material() const {
return process_material;
}
float GPUParticles3D::get_speed_scale() const {
double GPUParticles3D::get_speed_scale() const {
return speed_scale;
}

18
scene/3d/gpu_particles_3d.h
View file

@ -64,11 +64,11 @@ private:
bool one_shot;
int amount;
float lifetime;
float pre_process_time;
double lifetime;
double pre_process_time;
float explosiveness_ratio;
float randomness_ratio;
float speed_scale;
double speed_scale;
AABB visibility_aabb;
bool local_coords;
int fixed_fps;
@ -104,30 +104,30 @@ public:
void set_emitting(bool p_emitting);
void set_amount(int p_amount);
void set_lifetime(float p_lifetime);
void set_lifetime(double p_lifetime);
void set_one_shot(bool p_one_shot);
void set_pre_process_time(float p_time);
void set_pre_process_time(double p_time);
void set_explosiveness_ratio(float p_ratio);
void set_randomness_ratio(float p_ratio);
void set_visibility_aabb(const AABB &p_aabb);
void set_use_local_coordinates(bool p_enable);
void set_process_material(const Ref<Material> &p_material);
void set_speed_scale(float p_scale);
void set_speed_scale(double p_scale);
void set_collision_base_size(float p_ratio);
void set_trail_enabled(bool p_enabled);
void set_trail_length(float p_seconds);
bool is_emitting() const;
int get_amount() const;
float get_lifetime() const;
double get_lifetime() const;
bool get_one_shot() const;
float get_pre_process_time() const;
double get_pre_process_time() const;
float get_explosiveness_ratio() const;
float get_randomness_ratio() const;
AABB get_visibility_aabb() const;
bool get_use_local_coordinates() const;
Ref<Material> get_process_material() const;
float get_speed_scale() const;
double get_speed_scale() const;
float get_collision_base_size() const;
bool is_trail_enabled() const;
float get_trail_length() const;

4
scene/3d/sprite_3d.cpp
View file

@ -1037,7 +1037,7 @@ void AnimatedSprite3D::_notification(int p_what) {
return; //do nothing
}
float remaining = get_process_delta_time();
double remaining = get_process_delta_time();
while (remaining) {
if (timeout <= 0) {
@ -1059,7 +1059,7 @@ void AnimatedSprite3D::_notification(int p_what) {
emit_signal(SceneStringNames::get_singleton()->frame_changed);
}
float to_process = MIN(timeout, remaining);
double to_process = MIN(timeout, remaining);
remaining -= to_process;
timeout -= to_process;
}

2
scene/3d/sprite_3d.h
View file

@ -213,7 +213,7 @@ class AnimatedSprite3D : public SpriteBase3D {
bool centered = false;
float timeout = 0;
double timeout = 0.0;
void _res_changed();

12
scene/3d/velocity_tracker_3d.cpp
View file

@ -61,16 +61,16 @@ void VelocityTracker3D::update_position(const Vector3 &p_position) {
Vector3 VelocityTracker3D::get_tracked_linear_velocity() const {
Vector3 linear_velocity;
float max_time = 1 / 5.0; //maximum time to interpolate a velocity
double max_time = 1 / 5.0; //maximum time to interpolate a velocity
Vector3 distance_accum;
float time_accum = 0.0;
float base_time = 0.0;
double time_accum = 0.0;
double base_time = 0.0;
if (position_history_len) {
if (physics_step) {
uint64_t base = Engine::get_singleton()->get_physics_frames();
base_time = float(base - position_history[0].frame) / Engine::get_singleton()->get_iterations_per_second();
base_time = double(base - position_history[0].frame) / Engine::get_singleton()->get_iterations_per_second();
} else {
uint64_t base = Engine::get_singleton()->get_frame_ticks();
base_time = double(base - position_history[0].frame) / 1000000.0;
@ -78,12 +78,12 @@ Vector3 VelocityTracker3D::get_tracked_linear_velocity() const {
}
for (int i = 0; i < position_history_len - 1; i++) {
float delta = 0.0;
double delta = 0.0;
uint64_t diff = position_history[i].frame - position_history[i + 1].frame;
Vector3 distance = position_history[i].position - position_history[i + 1].position;
if (physics_step) {
delta = float(diff) / Engine::get_singleton()->get_iterations_per_second();
delta = double(diff) / Engine::get_singleton()->get_iterations_per_second();
} else {
delta = double(diff) / 1000000.0;
}

6
scene/gui/rich_text_effect.h
View file

@ -59,7 +59,7 @@ public:
bool outline = false;
Point2 offset;
Color color;
float elapsed_time = 0.0f;
double elapsed_time = 0.0f;
Dictionary environment;
uint32_t glpyh_index = 0;
RID font;
@ -69,8 +69,8 @@ public:
Vector2i get_range() { return range; }
void set_range(const Vector2i &p_range) { range = p_range; }
float get_elapsed_time() { return elapsed_time; }
void set_elapsed_time(float p_elapsed_time) { elapsed_time = p_elapsed_time; }
double get_elapsed_time() { return elapsed_time; }
void set_elapsed_time(double p_elapsed_time) { elapsed_time = p_elapsed_time; }
bool is_visible() { return visibility; }
void set_visibility(bool p_visibility) { visibility = p_visibility; }
bool is_outline() { return outline; }

4
scene/gui/rich_text_label.cpp
View file

@ -1323,7 +1323,7 @@ void RichTextLabel::_update_scroll() {
}
}
void RichTextLabel::_update_fx(RichTextLabel::ItemFrame *p_frame, float p_delta_time) {
void RichTextLabel::_update_fx(RichTextLabel::ItemFrame *p_frame, double p_delta_time) {
Item *it = p_frame;
while (it) {
ItemFX *ifx = nullptr;
@ -1441,7 +1441,7 @@ void RichTextLabel::_notification(int p_what) {
} break;
case NOTIFICATION_INTERNAL_PROCESS: {
if (is_visible_in_tree()) {
float dt = get_process_delta_time();
double dt = get_process_delta_time();
_update_fx(main, dt);
update();
}

4
scene/gui/rich_text_label.h
View file

@ -260,7 +260,7 @@ private:
};
struct ItemFX : public Item {
float elapsed_time = 0.f;
double elapsed_time = 0.f;
};
struct ItemShake : public ItemFX {
@ -440,7 +440,7 @@ private:
void _fetch_item_fx_stack(Item *p_item, Vector<ItemFX *> &r_stack);
void _update_scroll();
void _update_fx(ItemFrame *p_frame, float p_delta_time);
void _update_fx(ItemFrame *p_frame, double p_delta_time);
void _scroll_changed(double);
void _gui_input(Ref<InputEvent> p_event);

4
scene/main/node.cpp
View file

@ -712,7 +712,7 @@ bool Node::is_enabled() const {
return _is_enabled();
}
float Node::get_physics_process_delta_time() const {
double Node::get_physics_process_delta_time() const {
if (data.tree) {
return data.tree->get_physics_process_time();
} else {
@ -720,7 +720,7 @@ float Node::get_physics_process_delta_time() const {
}
}
float Node::get_process_delta_time() const {
double Node::get_process_delta_time() const {
if (data.tree) {
return data.tree->get_process_time();
} else {

4
scene/main/node.h
View file

@ -340,11 +340,11 @@ public:
/* PROCESSING */
void set_physics_process(bool p_process);
float get_physics_process_delta_time() const;
double get_physics_process_delta_time() const;
bool is_physics_processing() const;
void set_process(bool p_process);
float get_process_delta_time() const;
double get_process_delta_time() const;
bool is_processing() const;
void set_physics_process_internal(bool p_process_internal);

2
scene/main/viewport.h
View file

@ -375,7 +375,7 @@ private:
Variant drag_data;
ObjectID drag_preview_id;
Ref<SceneTreeTimer> tooltip_timer;
float tooltip_delay = 0.0;
double tooltip_delay = 0.0;
Transform2D focus_inv_xform;
bool roots_order_dirty = false;
List<Control *> roots;

4
scene/resources/sprite_frames.cpp
View file

@ -122,14 +122,14 @@ Vector<String> SpriteFrames::get_animation_names() const {
return names;
}
void SpriteFrames::set_animation_speed(const StringName &p_anim, float p_fps) {
void SpriteFrames::set_animation_speed(const StringName &p_anim, double p_fps) {
ERR_FAIL_COND_MSG(p_fps < 0, "Animation speed cannot be negative (" + itos(p_fps) + ").");
Map<StringName, Anim>::Element *E = animations.find(p_anim);
ERR_FAIL_COND_MSG(!E, "Animation '" + String(p_anim) + "' doesn't exist.");
E->get().speed = p_fps;
}
float SpriteFrames::get_animation_speed(const StringName &p_anim) const {
double SpriteFrames::get_animation_speed(const StringName &p_anim) const {
const Map<StringName, Anim>::Element *E = animations.find(p_anim);
ERR_FAIL_COND_V_MSG(!E, 0, "Animation '" + String(p_anim) + "' doesn't exist.");
return E->get().speed;

6
scene/resources/sprite_frames.h
View file

@ -37,7 +37,7 @@ class SpriteFrames : public Resource {
GDCLASS(SpriteFrames, Resource);
struct Anim {
float speed = 5.0;
double speed = 5.0;
bool loop = true;
Vector<Ref<Texture2D>> frames;
};
@ -64,8 +64,8 @@ public:
void get_animation_list(List<StringName> *r_animations) const;
Vector<String> get_animation_names() const;
void set_animation_speed(const StringName &p_anim, float p_fps);
float get_animation_speed(const StringName &p_anim) const;
void set_animation_speed(const StringName &p_anim, double p_fps);
double get_animation_speed(const StringName &p_anim) const;
void set_animation_loop(const StringName &p_anim, bool p_loop);
bool get_animation_loop(const StringName &p_anim) const;