Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix pan speed and larger than 320x240 panoramas #457

Merged
merged 2 commits into from Apr 28, 2015
Merged

Fix pan speed and larger than 320x240 panoramas #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336473c
Pan correctly panoramas that are larger than 320x240 without the
Zegeri Apr 26, 2015
02b270a
Slow down the pan speed
Zegeri Apr 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 46 additions & 11 deletions src/game_map.cpp
View file
Open in desktop
Expand Up @@ -48,6 +48,8 @@ namespace {

int parallax_x;
int parallax_y;
int parallax_width;
int parallax_height;
int animation_type;
bool animation_fast;

Expand Down Expand Up @@ -315,9 +317,13 @@ void Game_Map::ScrollDown(int distance) {
map_info.position_y = (map_info.position_y + distance + height) % height;
parallax_y -= map_info.parallax_vert ? distance / 2 : 0;
} else {
if (map_info.position_x + distance <= (GetHeight() - 15) * SCREEN_TILE_WIDTH) {
if (map_info.position_y + distance <= (GetHeight() - 15) * SCREEN_TILE_WIDTH) {
map_info.position_y += distance;
parallax_y -= map_info.parallax_vert ? distance / 2 : 0;
if (map_info.parallax_vert)
parallax_y -= distance / 2;
else if (!LoopVertical() && GetHeight() > 15 && parallax_height > SCREEN_TARGET_HEIGHT)
parallax_y -=
std::min(distance, (distance / (SCREEN_TILE_WIDTH / TILE_SIZE)) * (parallax_height - SCREEN_TARGET_HEIGHT) / (GetHeight() - 15));
}
}
}
Expand All @@ -330,7 +336,11 @@ void Game_Map::ScrollLeft(int distance) {
} else {
if (map_info.position_x - distance >= 0) {
map_info.position_x -= distance;
parallax_x += map_info.parallax_horz ? distance / 2 : 0;
if (map_info.parallax_horz)
parallax_x += distance / 2;
else if (!LoopHorizontal() && GetWidth() > 20 && parallax_width > SCREEN_TARGET_WIDTH)
parallax_x +=
std::min(distance, (distance / (SCREEN_TILE_WIDTH / TILE_SIZE)) * (parallax_width - SCREEN_TARGET_WIDTH) / (GetWidth() - 20));
}
}
}
Expand All @@ -343,7 +353,11 @@ void Game_Map::ScrollRight(int distance) {
} else {
if (map_info.position_x + distance <= (GetWidth() - 20) * SCREEN_TILE_WIDTH) {
map_info.position_x += distance;
parallax_x -= map_info.parallax_horz ? distance / 2 : 0;
if (map_info.parallax_horz)
parallax_x -= distance / 2;
else if (!LoopHorizontal() && GetWidth() > 20 && parallax_width > SCREEN_TARGET_WIDTH)
parallax_x -=
std::min(distance, (distance / (SCREEN_TILE_WIDTH / TILE_SIZE)) * (parallax_width - SCREEN_TARGET_WIDTH) / (GetWidth() - 20));
}
}
}
Expand All @@ -356,7 +370,11 @@ void Game_Map::ScrollUp(int distance) {
} else {
if (map_info.position_y - distance >= 0) {
map_info.position_y -= distance;
parallax_y += map_info.parallax_vert ? distance / 2 : 0;
if (map_info.parallax_vert)
parallax_y += distance / 2;
else if (!LoopVertical() && GetHeight() > 15 && parallax_height > SCREEN_TARGET_HEIGHT)
parallax_y +=
std::min(distance, (distance / (SCREEN_TILE_WIDTH / TILE_SIZE)) * (parallax_height - SCREEN_TARGET_HEIGHT) / (GetHeight() - 15));
}
}
}
Expand Down Expand Up @@ -895,12 +913,29 @@ void Game_Map::SetParallaxScroll(bool horz, bool vert,
map_info.parallax_vert_auto = vert_auto;
map_info.parallax_horz_speed = horz_speed;
map_info.parallax_vert_speed = vert_speed;
InitializeParallax();
}

void Game_Map::SetParallaxSize(int width, int height) {
parallax_width = width;
parallax_height = height;
}

void Game_Map::InitializeParallax() {
parallax_x = map_info.parallax_horz ? -map_info.position_x / 2 : 0;
parallax_y = map_info.parallax_vert ? map_info.position_y : 0;
if (map_info.parallax_horz)
parallax_x = -map_info.position_x / 2;
else if (GetWidth() > 20 && parallax_width > SCREEN_TARGET_WIDTH)
parallax_x = -std::min(map_info.position_x,
(map_info.position_x / (SCREEN_TILE_WIDTH / TILE_SIZE)) * (parallax_width - SCREEN_TARGET_WIDTH) / (GetWidth() - 20));
else
parallax_x = 0;

if (map_info.parallax_vert)
parallax_y = -map_info.position_y / 2;
else if (GetHeight() > 15 && parallax_height > SCREEN_TARGET_HEIGHT)
parallax_y = -std::min(map_info.position_y,
(map_info.position_y / (SCREEN_TILE_WIDTH / TILE_SIZE)) * (parallax_height - SCREEN_TARGET_HEIGHT) / (GetHeight() - 15));
else
parallax_y = 0;
}

int Game_Map::GetMapIndex(int id) {
Expand Down Expand Up @@ -982,7 +1017,7 @@ void Game_Map::UpdatePan() {
if (!IsPanActive())
return;

int step = (SCREEN_TILE_WIDTH/128) << (pan_speed + 1);
int step = (SCREEN_TILE_WIDTH/128) << pan_speed;
int dx = location.pan_finish_x - location.pan_current_x;
int dy = location.pan_finish_y - location.pan_current_y;

Expand Down Expand Up @@ -1037,11 +1072,11 @@ void Game_Map::UpdateParallax() {
}

int Game_Map::GetParallaxX() {
return parallax_x / 16;
return parallax_x / TILE_SIZE;
}

int Game_Map::GetParallaxY() {
return parallax_y / 16;
return parallax_y / TILE_SIZE;
}

const std::string& Game_Map::GetParallaxName() {
Expand Down
1 change: 1 addition & 0 deletions src/game_map.h
View file
Open in desktop
Expand Up @@ -480,6 +480,7 @@ namespace Game_Map {
void SetParallaxScroll(bool horz, bool vert,
bool horz_auto, bool vert_auto,
int horz_speed, int vert_speed);
void SetParallaxSize(int width, int height);
void InitializeParallax();

/**
Expand Down
1 change: 0 additions & 1 deletion src/game_player.cpp
View file
Open in desktop
Expand Up @@ -259,7 +259,6 @@ void Game_Player::Center(int x, int y) {
int max_y = (Game_Map::GetHeight() - DisplayUi->GetHeight() / TILE_SIZE) * SCREEN_TILE_WIDTH;
Game_Map::SetDisplayY(max(0, min((y * SCREEN_TILE_WIDTH - center_y), max_y)));
}
Game_Map::InitializeParallax();
}

void Game_Player::MoveTo(int x, int y) {
Expand Down
5 changes: 4 additions & 1 deletion src/spriteset_map.cpp
View file
Open in desktop
Expand Up @@ -69,7 +69,10 @@ void Spriteset_Map::Update() {
const std::string& name = Game_Map::GetParallaxName();
if (name != panorama_name) {
panorama_name = name;
panorama.SetBitmap(Cache::Panorama(panorama_name));
BitmapRef panorama_bmp = Cache::Panorama(panorama_name);
Game_Map::SetParallaxSize(panorama_bmp->GetWidth(), panorama_bmp->GetHeight());
panorama.SetBitmap(panorama_bmp);
Game_Map::InitializeParallax();
}
panorama.SetOx(Game_Map::GetParallaxX());
panorama.SetOy(Game_Map::GetParallaxY());
Expand Down