JailDoctor/arounders
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

- Arreglats errors ambs el viewport

Browse Source 
- Els fades van mes lentos
This commit is contained in:
Raimon Zamora
2023-10-12 13:50:31 +02:00
parent 5cb0200b9f
commit 83e5234cb6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/jdraw.cpp
View File

@@ -52,6 +52,9 @@ namespace draw
// Creem la superficie "screen" i la establim com a superficie destinació // Creem la superficie "screen" i la establim com a superficie destinació
screen = createSurface(width, height); screen = createSurface(width, height);
destination = screen; destination = screen;
viewport.x = viewport.y = 0;
viewport.w = width;
viewport.h = height;
sel_color = transparent = 0; sel_color = transparent = 0;
for (int i=0;i<256;++i) color_indices[i] = i; for (int i=0;i<256;++i) color_indices[i] = i;
@@ -257,7 +260,7 @@ namespace draw
surface->pixels[(viewport.x+x) + (y+viewport.y) * surface->w] = color_indices[color]; surface->pixels[(viewport.x+x) + (y+viewport.y) * surface->w] = color_indices[color];
} else { } else {
// Si no es destinations, mirem que estiga dins de la surface, i sinó fora! // Si no es destinations, mirem que estiga dins de la surface, i sinó fora!
if (x >= 0 && y >= 0 && x < destination->w && y < destination->h) if (x >= 0 && y >= 0 && x < surface->w && y < surface->h)
surface->pixels[x + y * surface->w] = color_indices[color]; surface->pixels[x + y * surface->w] = color_indices[color];
} }
} }
@@ -271,7 +274,7 @@ namespace draw
return surface->pixels[(viewport.x + x) + (viewport.y + y) * surface->w]; return surface->pixels[(viewport.x + x) + (viewport.y + y) * surface->w];
} else { } else {
// Si no es "destination", si la coordenada està dins del rang que abarca la superficie, // Si no es "destination", si la coordenada està dins del rang que abarca la superficie,
if (x >= 0 && y >= 0 && x < destination->w && y < destination->h) if (x >= 0 && y >= 0 && x < surface->w && y < surface->h)
return surface->pixels[x + y * surface->w]; return surface->pixels[x + y * surface->w];
} }
@@ -404,13 +407,13 @@ namespace draw
} }
} }
fading_in = false; fading_in = false;
for (int i=0; i<256; ++i) if (incPalEntry(i, 16)) fading_in = true; for (int i=0; i<256; ++i) if (incPalEntry(i, 8)) fading_in = true;
} }
void fadeout() void fadeout()
{ {
fading_out = false; fading_out = false;
for (int i=0; i<256; ++i) if (decPalEntry(i, 16)) fading_out = true; for (int i=0; i<256; ++i) if (decPalEntry(i, 8)) fading_out = true;
} }
// Refresca la pantalla // Refresca la pantalla