mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Interpolate tower scrolling

Browse source 
Now tower scrolling will look smooth ayy-eff.
This commit is contained in:
Misa 2020-04-30 11:52:21 -07:00 committed by Ethan Lee
parent 880465c2e5
commit fe1045b515
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
desktop_version/src/Graphics.cpp
View file

@ -1481,7 +1481,7 @@ void Graphics::drawentities()
int yoff; int yoff;
if (map.towermode) if (map.towermode)
{ {
yoff = map.ypos; yoff = lerp(map.oldypos, map.ypos);
} }
else else
{ {
@ -2320,12 +2320,13 @@ void Graphics::drawfinalmap()
void Graphics::drawtowermap() void Graphics::drawtowermap()
{ {
int temp; int temp;
int yoff = lerp(map.oldypos, map.ypos);
for (int j = 0; j < 31; j++) for (int j = 0; j < 31; j++)
{ {
for (int i = 0; i < 40; i++) for (int i = 0; i < 40; i++)
{ {
temp = map.tower.at(i, j, map.ypos); temp = map.tower.at(i, j, yoff);
if (temp > 0) drawtile3(i * 8, (j * 8) - ((int)map.ypos % 8), temp, map.colstate); if (temp > 0) drawtile3(i * 8, (j * 8) - (yoff % 8), temp, map.colstate);
} }
} }
} }
@ -2333,12 +2334,13 @@ void Graphics::drawtowermap()
void Graphics::drawtowermap_nobackground() void Graphics::drawtowermap_nobackground()
{ {
int temp; int temp;
int yoff = lerp(map.oldypos, map.ypos);
for (int j = 0; j < 31; j++) for (int j = 0; j < 31; j++)
{ {
for (int i = 0; i < 40; i++) for (int i = 0; i < 40; i++)
{ {
temp = map.tower.at(i, j, map.ypos); temp = map.tower.at(i, j, yoff);
if (temp > 0 && temp<28) drawtile3(i * 8, (j * 8) - ((int)map.ypos % 8), temp, map.colstate); if (temp > 0 && temp<28) drawtile3(i * 8, (j * 8) - (yoff % 8), temp, map.colstate);
} }
} }
} }

1
desktop_version/src/Logic.cpp
View file

@ -260,6 +260,7 @@ void gamelogic()
if (map.towermode) if (map.towermode)
{ {
map.oldypos = map.ypos;
if(!game.completestop) if(!game.completestop)
{ {
if (map.cameramode == 0) if (map.cameramode == 0)

4
desktop_version/src/Map.cpp
View file

@ -91,6 +91,10 @@ mapclass::mapclass()
2,2,2,2,2,0,0,2,0,3,0,0,0,0,0,0,0,0,0,0, 2,2,2,2,2,0,0,2,0,3,0,0,0,0,0,0,0,0,0,0,
}; };
areamap.insert(areamap.end(), tmap, tmap+400); areamap.insert(areamap.end(), tmap, tmap+400);
ypos = 0;
oldypos = 0;
bypos = 0;
} }
int mapclass::RGB(int red,int green,int blue) int mapclass::RGB(int red,int green,int blue)

1
desktop_version/src/Map.h
View file

@ -98,6 +98,7 @@ public:
//Special tower stuff //Special tower stuff
bool towermode; bool towermode;
float ypos; float ypos;
float oldypos;
int bypos; int bypos;
int cameramode; int cameramode;
int cameraseek, cameraseekframe; int cameraseek, cameraseekframe;