Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lighting improvements, fixed NaN issue for agents

Browse Source
This commit is contained in:
Joshua Barretto 2020-04-07 21:23:04 +01:00
parent 8c73ec982c
commit dde0319293
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/include/light.glsl
View File

@ -25,7 +25,7 @@ vec3 illuminate(vec3 color, vec3 light, vec3 diffuse, vec3 ambience) {
}
float attenuation_strength(vec3 rpos) {
return 1.0 / pow(rpos.x * rpos.x + rpos.y * rpos.y + rpos.z * rpos.z, 0.6);
return 1.0 / pow(rpos.x * rpos.x + rpos.y * rpos.y + rpos.z * rpos.z, 0.8);
}
vec3 light_at(vec3 wpos, vec3 wnorm) {

9
common/src/sys/agent.rs
View File

@ -99,10 +99,10 @@ impl<'a> System<'a> for Sys {
- *bearing * 0.01
- if let Some(patrol_origin) = agent.patrol_origin {
Vec2::<f32>::from(pos.0 - patrol_origin) * 0.0002
+ Vec3::one() / Vec2::<f32>::from(pos.0 - patrol_origin)
} else {
Vec2::zero()
};
// Stop if we're too close to a wall
*bearing *= 0.1
+ if terrain
@ -111,7 +111,7 @@ impl<'a> System<'a> for Sys {
pos.0
+ Vec3::from(*bearing)
.try_normalized()
.unwrap_or(Vec3::zero())
.unwrap_or(Vec3::unit_y())
* 1.5
+ Vec3::unit_z(),
)
@ -126,9 +126,8 @@ impl<'a> System<'a> for Sys {
0.0
};
if bearing.magnitude_squared() > 0.25f32.powf(2.0) {
inputs.move_dir =
bearing.try_normalized().unwrap_or(Vec2::zero()) * 0.65;
if bearing.magnitude_squared() > 0.5f32.powf(2.0) {
inputs.move_dir = *bearing * 0.65;
}
// Sometimes try searching for new targets