X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FGauge.cpp;h=09405a2069ca15da6b560df6a9328d95e0ceec71;hb=c182086fbc039ec2b943b4d109597ccc481b7ba4;hp=65535f5d2436f4b0664c430370a2e4bb5f032093;hpb=cf20874f973521e84fc2aaa6cd47c56a278d9de7;p=l2e.git

diff --git a/src/graphics/Gauge.cpp b/src/graphics/Gauge.cpp
index 65535f5..09405a2 100644
--- a/src/graphics/Gauge.cpp
+++ b/src/graphics/Gauge.cpp
@@ -11,109 +11,56 @@ using geometry::Point;
 
 namespace graphics {
 
-// TODO: add start and end "ignore" offsets
-void Gauge::Draw(SDL_Surface *dest, Point<int> position, int width, int fullWidth) const {
+void Gauge::Draw(SDL_Surface *dest, Point<int> position, int width, Uint8 fill) const {
 	SDL_Rect srcRect, destRect;
 
+	int filledWidth = fill * (width - startWidth - endWidth) / 255;
+	int emptyWidth = (255 - fill) * (width - startWidth - endWidth) / 255;
+
 	// start
+	srcRect.w = startWidth;
 	srcRect.h = height;
 	destRect.x = position.X();
 	destRect.y = position.Y();
 	// full part
-	if (fullWidth >= startWidth) { // completely filled
-		srcRect.x = fullX;
-		srcRect.y = fullY;
-		srcRect.w = startWidth;
-		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-	} else if (fullWidth > 0) { // partially filled
-		srcRect.x = fullX;
-		srcRect.y = fullY;
-		srcRect.w = fullWidth;
-		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-	}
-	// empty part
-	if (fullWidth == 0) { // completely empty
+	if (fill == 0) {
 		srcRect.x = emptyX;
 		srcRect.y = emptyY;
-		srcRect.w = startWidth;
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-	} else if (fullWidth < startWidth) { // partially empty
-		srcRect.x = emptyX + fullWidth;
-		srcRect.y = emptyY;
-		srcRect.w = startWidth - fullWidth;
-		destRect.x = position.X() + fullWidth;
+	} else {
+		srcRect.x = fullX;
+		srcRect.y = fullY;
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 	}
 
 	destRect.x = position.X() + startWidth;
 
 	// fill
-	if (fullWidth >= width - endWidth) { // completely filled
-		srcRect.x = fullX + startWidth;
-		srcRect.y = fullY;
-		srcRect.w = repeatWidth;
-		int fillWidth(width - startWidth - endWidth);
-		int fillCursor(0);
-		while (fillCursor < fillWidth) {
-			SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-			destRect.x += repeatWidth;
-			fillCursor += repeatWidth;
-		}
-	} else if (fullWidth <= startWidth) { // completely empty
-		srcRect.x = emptyX + startWidth;
-		srcRect.y = emptyY;
-		srcRect.w = repeatWidth;
-		int fillWidth(width - startWidth - endWidth);
-		int fillCursor(0);
-		while (fillCursor < fillWidth) {
-			SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-			destRect.x += repeatWidth;
-			fillCursor += repeatWidth;
-		}
-	} else { // partially filled/empty
-		srcRect.x = fullX + startWidth;
-		srcRect.y = fullY;
-		srcRect.w = repeatWidth;
-		int fillCursor(0);
-		while (fillCursor < fullWidth) {
-			SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-			destRect.x += repeatWidth;
-			fillCursor += repeatWidth;
-		}
-		srcRect.x = emptyX + startWidth;
-		srcRect.y = emptyY;
-		int remaining(width - startWidth - endWidth);
-		while (fillCursor < remaining) {
-			SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-			destRect.x += repeatWidth;
-			fillCursor += repeatWidth;
-		}
+	srcRect.x = fullX + startWidth;
+	srcRect.y = fullY;
+	srcRect.w = repeatWidth;
+	while (filledWidth > repeatWidth) {
+		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
+		destRect.x += repeatWidth;
+		filledWidth -= repeatWidth;
+	}
+	srcRect.x = emptyX + startWidth;
+	srcRect.y = emptyY;
+	while (emptyWidth > repeatWidth) {
+		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
+		destRect.x += repeatWidth;
+		emptyWidth -= repeatWidth;
 	}
 
 	// end
-	// full part
-	if (fullWidth >= width) { // completely filled
+	srcRect.w = endWidth;
+	if (fill == 255) {
 		srcRect.x = fullX + startWidth + repeatWidth;
 		srcRect.y = fullY;
-		srcRect.w = endWidth;
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-	} else if (fullWidth > (width - endWidth)) { // partially filled
-		srcRect.x = fullX + startWidth + repeatWidth;
-		srcRect.y = fullY;
-		srcRect.w = endWidth - width + fullWidth;
-		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-	}
-	// empty part
-	if (fullWidth <= width - endWidth) { // completely empty
+	} else {
 		srcRect.x = emptyX + startWidth + repeatWidth;
 		srcRect.y = emptyY;
-		srcRect.w = startWidth;
-		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
-	} else if (fullWidth > (width - endWidth) && fullWidth < width) { // partially empty
-		srcRect.x = emptyX + startWidth + repeatWidth + fullWidth - width + endWidth;
-		srcRect.y = emptyY;
-		srcRect.w = width - fullWidth;
-		destRect.x = position.X() + fullWidth;
 		SDL_BlitSurface(surface, &srcRect, dest, &destRect);
 	}