float dynamic_speed_sm;
CameraConfig() {
- xmode = 1;
- ymode = 1;
+ xmode = 4;
+ ymode = 3;
target_x = .5f;
- target_y = 2.f/3.f;
- max_speed_y = 140;
- max_speed_x = 130;
- clamp_x = 1.f/6.f;
- clamp_y = 1.f/6.f;
+ target_y = .5f;
+ max_speed_y = 100;
+ max_speed_x = 100;
+ clamp_x = 0.1666f;
+ clamp_y = 0.3f;
kirby_rectsize_x = 0.2f;
kirby_rectsize_y = 0.34f;
- edge_x = 1.f/3.f;
- sensitive_x = 1.f/4.f;
+ edge_x = 0.4f;
+ sensitive_x = -1;
dynamic_max_speed_x = 1.0;
dirchange_time = 0.2f;
- dynamic_speed_sm = 1.0f;
+ dynamic_speed_sm = 0.8f;
}
void load(const std::string& filename)
void
Camera::reload_config()
{
- config->load("camera.cfg");
+ try {
+ config->load("camera.cfg");
+ } catch(std::exception &e) {
+ log_debug << "Couldn't load camera.cfg, using defaults ("
+ << e.what() << ")" << std::endl;
+ }
}
float clamp(float val, float min, float max)
{
const CameraConfig& config = *(this->config);
Player* player = sector->player;
- const Vector& player_pos = player->get_bbox().get_middle();
+ const Vector& player_pos = Vector(player->get_bbox().get_middle().x,
+ player->get_bbox().get_bottom());
static Vector last_player_pos = player_pos;
Vector player_delta = player_pos - last_player_pos;
last_player_pos = player_pos;
float peek_to = 0;
float translation_compensation = player_pos.y - translation.y;
- if(player->peeking_direction() == ::UP) {
+ if(player->peeking_direction_y() == ::UP) {
peek_to = bottom_edge - translation_compensation;
- } else if(player->peeking_direction() == ::DOWN) {
+ } else if(player->peeking_direction_y() == ::DOWN) {
peek_to = top_edge - translation_compensation;
}
float peek_to = 0;
float translation_compensation = player_pos.x - translation.x;
- if(player->peeking_direction() == ::LEFT) {
+ if(player->peeking_direction_x() == ::LEFT) {
peek_to = right_edge - translation_compensation;
- } else if(player->peeking_direction() == ::RIGHT) {
+ } else if(player->peeking_direction_x() == ::RIGHT) {
peek_to = left_edge - translation_compensation;
}