maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix for compiling the new lightmapper

Browse source 
also changed two calls that were ambiguous
This commit is contained in:
Michele Valente 2017-12-14 15:32:53 +01:00
parent f3ad14224e
commit dea5ba3991
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/3d/baked_lightmap.cpp
View file

@ -254,7 +254,7 @@ bool BakedLightmap::_bake_time(void *ud, float p_secs, float p_progress) {
if (time - btd->last_step > 1000000) {
int mins_left = p_secs / 60;
int secs_left = Math::fmod(p_secs, 60.0);
int secs_left = Math::fmod(p_secs, 60.0f);
int percent = p_progress * 100;
bool abort = bake_step_function(btd->pass + percent, btd->text + " " + itos(percent) + "% (Time Left: " + itos(mins_left) + ":" + itos(secs_left) + "s)");
btd->last_step = time;

6
scene/3d/voxel_light_baker.cpp
View file

@ -1029,7 +1029,7 @@ void VoxelLightBaker::plot_light_spot(const Vector3 &p_pos, const Vector3 &p_axi
continue; // too far away
}
float att = Math::pow(1.0 - angle / p_spot_angle, p_spot_attenuation);
float att = Math::pow(1.0f - angle / p_spot_angle, p_spot_attenuation);
{
float d = light_pos.distance_to(to);
@ -1638,9 +1638,9 @@ Vector3 VoxelLightBaker::_compute_ray_trace_at_pos(const Vector3 &p_pos, const V
for (int i = 0; i < samples; i++) {
float random_angle1 = (((rand() % 65535) / 65535.0) * 2.0 - 1.0) * spread;
float random_angle1 = (((Math::rand() % 65535) / 65535.0) * 2.0 - 1.0) * spread;
Vector3 axis(0, sin(random_angle1), cos(random_angle1));
float random_angle2 = ((rand() % 65535) / 65535.0) * Math_PI * 2.0;
float random_angle2 = ((Math::rand() % 65535) / 65535.0) * Math_PI * 2.0;
Basis rot(Vector3(0, 0, 1), random_angle2);
axis = rot.xform(axis);