v3f p_acceleration = m_acceleration;
moveresult = collisionMoveSimple(m_env,m_env->getGameDef(),
pos_max_d, box, m_prop.stepheight, dtime,
- p_pos, p_velocity, p_acceleration,
+ &p_pos, &p_velocity, p_acceleration,
this, m_prop.collideWithObjects);
// Apply results
}
if((m_prop.automatic_face_movement_dir) &&
- (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)){
- m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset;
+ (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001))
+ {
+ float optimal_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI
+ + m_prop.automatic_face_movement_dir_offset;
+ float max_rotation_delta =
+ dtime * m_prop.automatic_face_movement_max_rotation_per_sec;
+
+ if ((m_prop.automatic_face_movement_max_rotation_per_sec > 0) &&
+ (fabs(m_yaw - optimal_yaw) > max_rotation_delta)) {
+
+ m_yaw = optimal_yaw < m_yaw ? m_yaw - max_rotation_delta : m_yaw + max_rotation_delta;
+ } else {
+ m_yaw = optimal_yaw;
+ }
}
}
m_bone_position_sent(false),
m_attachment_parent_id(0),
m_attachment_sent(false),
- m_nametag_color(video::SColor(255, 255, 255, 255)),
- m_nametag_sent(false),
// public
m_physics_override_speed(1),
m_physics_override_jump(1),
os<<serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
m_physics_override_sneak_glitch)); // 5
- os << serializeLongString(gob_cmd_update_nametag_attributes(m_nametag_color)); // 6
+ os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6 (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
}
else
{
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push(aom);
}
-
- if (m_nametag_sent == false) {
- m_nametag_sent = true;
- std::string str = gob_cmd_update_nametag_attributes(m_nametag_color);
- // create message and add to list
- ActiveObjectMessage aom(getId(), true, str);
- m_messages_out.push(aom);
- }
}
void PlayerSAO::setBasePosition(const v3f &position)
m_properties_sent = false;
}
-void PlayerSAO::setNametagColor(video::SColor color)
-{
- m_nametag_color = color;
- m_nametag_sent = false;
-}
-
-video::SColor PlayerSAO::getNametagColor()
-{
- return m_nametag_color;
-}
-
Inventory* PlayerSAO::getInventory()
{
return m_inventory;
bool PlayerSAO::collideWithObjects(){
return true;
}
-