Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 09:54:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove vmult lookup tables

Browse Source 
There's really no need to put the y-multiplication in a lookup table.
The compiler will optimize the multiplication better than putting it in
a lookup table will.

To improve readability and to hardcode things less, the new
SCREEN_WIDTH_TILES and SCREEN_HEIGHT_TILES constant names are used, as
well as adding a new TILE_IDX macro to calculate the index of a tile in
a concatenated-rows (row-major in formal parlance) array. Also, tile
numbers are stored in a temporary variable to improve readability as
well (no more copy-pasting `contents[i + vmult[j]]` over and over
again).
This commit is contained in:
Misa
2021-09-24 16:37:27 -07:00
parent 491f3732aa
commit 6192269128
8 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
desktop_version/src/CustomLevels.cpp
View File

@@ -9,6 +9,7 @@
#include <tinyxml2.h>
#include <utf8/unchecked.h>
#include "Constants.h"
#include "Editor.h"
#include "Enums.h"
#include "FileSystemUtils.h"
@@ -35,6 +36,9 @@
#include <inttypes.h>
#endif
#define VMULT(y) (y * SCREEN_WIDTH_TILES * maxwidth)
#define Y_INBOUNDS(y) (y >= 0 && y < SCREEN_HEIGHT_TILES * maxheight)
RoomProperty::RoomProperty(void)
{
tileset=0;
@@ -55,11 +59,6 @@ RoomProperty::RoomProperty(void)
customlevelclass::customlevelclass(void)
{
for (size_t i = 0; i < SDL_arraysize(vmult); i++)
{
vmult[i] = i * 40 * maxwidth;
}
reset();
}
@@ -709,9 +708,9 @@ int customlevelclass::gettileidx(
int mult;
int idx;
if (INBOUNDS_ARR(yoff, vmult))
if (Y_INBOUNDS(yoff))
{
mult = vmult[yoff];
mult = VMULT(yoff);
}
else
{
@@ -761,9 +760,9 @@ int customlevelclass::getabstile(const int x, const int y)
int idx;
int yoff;
if (INBOUNDS_ARR(y, vmult))
if (Y_INBOUNDS(y))
{
yoff = vmult[y];
yoff = VMULT(y);
}
else
{