cpp/openttd-patchpack/source Changeset - r8095:11d624251249

Changeset - r8095:11d624251249

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

smatz - 16 years ago 2007-12-17 22:04:07
smatz@openttd.org

(svn r11656) -Codechange: add ZOOM_LVL_BEGIN and postfix operators so ZoomLevel can be used in some iterations

5 files changed with 23 insertions and 18 deletions:

src/blitter/8bpp_optimized.cpp

src/main_gui.cpp

src/openttd.cpp

src/sound.cpp

src/zoom.hpp

0 comments (0 inline, 0 general)

src/blitter/8bpp_optimized.cpp

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ void Blitter_8bppOptimized::Draw(Blitter @@
+{
 	const uint8 *src, *src_next;
 	uint8 *dst, *dst_line;
 	uint offset = 0;
 	/* Find the offset of this zoom-level */
 	offset = ((const uint8 *)bp->sprite)[(int)zoom * 2] | ((const byte *)bp->sprite)[(int)zoom * 2 + 1] << 8;
+	offset = ((const uint8 *)bp->sprite)[(int)(zoom - ZOOM_LVL_BEGIN) * 2] | ((const byte *)bp->sprite)[(int)(zoom - ZOOM_LVL_BEGIN) * 2 + 1] << 8;
 	/* Find where to start reading in the source sprite */
 	src = (const uint8 *)bp->sprite + offset;
 	dst_line = (uint8 *)bp->dst + bp->top * bp->pitch + bp->left;
 	/* Skip over the top lines in the source image */
@@ @@ -107,46 +107,46 @@ Sprite *Blitter_8bppOptimized::Encode(Sp @@
 	Sprite *dest_sprite;
 	byte *temp_dst;
 	uint memory = 0;
 	uint index = 0;
 	/* Make memory for all zoom-levels */
 	memory += (int)ZOOM_LVL_END * sizeof(uint16);
 	for (int i = 0; i < (int)ZOOM_LVL_END; i++) {
 		memory += UnScaleByZoom(sprite->height, (ZoomLevel)i) * UnScaleByZoom(sprite->width, (ZoomLevel)i);
 	memory += (int)(ZOOM_LVL_END - ZOOM_LVL_BEGIN) * sizeof(uint16);
 	for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) {
 		memory += UnScaleByZoom(sprite->height, i) * UnScaleByZoom(sprite->width, i);
 		index += 2;
+	}
 	/* We have no idea how much memory we really need, so just guess something */
 	memory *= 5;
 	temp_dst = MallocT<byte>(memory);
 	/* Make the sprites per zoom-level */
-	for (int i = 0; i < (int)ZOOM_LVL_END; i++) {
+	for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) {
 		/* Store the scaled image */
 		const SpriteLoader::CommonPixel *src;
 		/* Store the index table */
 		temp_dst[i * 2] = index & 0xFF;
 		temp_dst[i * 2 + 1] = (index >> 8) & 0xFF;
 		byte *dst = &temp_dst[index];
-		for (int y = 0; y < UnScaleByZoom(sprite->height, (ZoomLevel)i); y++) {
 		for (int y = 0; y < UnScaleByZoom(sprite->height, i); y++) {
 			uint trans = 0;
 			uint pixels = 0;
 			uint last_color = 0;
 			uint count_index = 0;
 			uint rx = 0;
-			src = &sprite->data[ScaleByZoom(y, (ZoomLevel)i) * sprite->width];
 			src = &sprite->data[ScaleByZoom(y, i) * sprite->width];
-			for (int x = 0; x < UnScaleByZoom(sprite->width, (ZoomLevel)i); x++) {
 			for (int x = 0; x < UnScaleByZoom(sprite->width, i); x++) {
 				uint color = 0;
 				/* Get the color keeping in mind the zoom-level */
-				for (int j = 0; j < ScaleByZoom(1, (ZoomLevel)i); j++) {
 				for (int j = 0; j < ScaleByZoom(1, i); j++) {
 					if (src->m != 0) color = src->m;
 					src++;
 					rx++;
 					/* Because of the scaling it might happen we read outside the buffer. Avoid that. */
 					if (rx == sprite->width) break;
+				}

src/main_gui.cpp

➞

Show inline comments

@@ @@ -869,24 +869,24 @@ bool DoZoomInOutWindow(int how, Window * @@
 	assert(w != NULL);
 	vp = w->viewport;
 	switch (how) {
 		case ZOOM_IN:
 			if (vp->zoom == ZOOM_LVL_MIN) return false;
-			vp->zoom = (ZoomLevel)((byte)vp->zoom - 1);
+			vp->zoom = (ZoomLevel)((int)vp->zoom - 1);
 			vp->virtual_width >>= 1;
 			vp->virtual_height >>= 1;
 			WP(w, vp_d).scrollpos_x += vp->virtual_width >> 1;
 			WP(w, vp_d).scrollpos_y += vp->virtual_height >> 1;
 			WP(w, vp_d).dest_scrollpos_x = WP(w,vp_d).scrollpos_x;
 			WP(w, vp_d).dest_scrollpos_y = WP(w,vp_d).scrollpos_y;
 			break;
 		case ZOOM_OUT:
 			if (vp->zoom == ZOOM_LVL_MAX) return false;
-			vp->zoom = (ZoomLevel)((byte)vp->zoom + 1);
+			vp->zoom = (ZoomLevel)((int)vp->zoom + 1);
 			WP(w, vp_d).scrollpos_x -= vp->virtual_width >> 1;
 			WP(w, vp_d).scrollpos_y -= vp->virtual_height >> 1;
 			WP(w, vp_d).dest_scrollpos_x = WP(w,vp_d).scrollpos_x;
 			WP(w, vp_d).dest_scrollpos_y = WP(w,vp_d).scrollpos_y;

src/openttd.cpp

➞

Show inline comments

@@ @@ -1288,13 +1288,13 @@ static bool InitializeWindowsAndCaches() @@
 	WP(w, vp_d).scrollpos_x = _saved_scrollpos_x;
 	WP(w, vp_d).scrollpos_y = _saved_scrollpos_y;
 	WP(w, vp_d).dest_scrollpos_x = _saved_scrollpos_x;
 	WP(w, vp_d).dest_scrollpos_y = _saved_scrollpos_y;
 	ViewPort *vp = w->viewport;
-	vp->zoom = (ZoomLevel)min(_saved_scrollpos_zoom, ZOOM_LVL_MAX);
 	vp->zoom = min(_saved_scrollpos_zoom, ZOOM_LVL_MAX);
 	vp->virtual_width = ScaleByZoom(vp->width, vp->zoom);
 	vp->virtual_height = ScaleByZoom(vp->height, vp->zoom);
 	DoZoomInOutWindow(ZOOM_NONE, w); // update button status
 	MarkWholeScreenDirty();

src/sound.cpp

➞

Show inline comments

@@ @@ -154,13 +154,13 @@ static void StartSound(uint sound, int p @@
 	MxSetChannelVolume(mc, left_vol * 128 / PANNING_LEVELS, right_vol * 128 / PANNING_LEVELS);
 	MxActivateChannel(mc);
+}
 static const byte _vol_factor_by_zoom[] = {255, 190, 134, 87};
 assert_compile(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_END);
+assert_compile(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_END - ZOOM_LVL_BEGIN);
 static const byte _sound_base_vol[] = {
 ,  90, 128, 128, 128, 128, 128, 128,
 ,  90,  90, 128, 128, 128, 128, 128,
 , 128, 128,  80, 128, 128, 128, 128,
 , 128, 128, 128, 128, 128, 128, 128,
@@ @@ -213,13 +213,13 @@ static void SndPlayScreenCoordFx(SoundFx @@
 				IsInsideBS(y, vp->virtual_top, vp->virtual_height)) {
 			int left = (x - vp->virtual_left);
 			StartSound(
 				sound,
 				left / max(1, vp->virtual_width / ((PANNING_LEVELS << 1) + 1)) - PANNING_LEVELS,
 				(GetSound(sound)->volume * msf.effect_vol * _vol_factor_by_zoom[vp->zoom]) >> 15
+				(GetSound(sound)->volume * msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) >> 15
 			);
 			return;
+		}
+	}
+}

src/zoom.hpp

➞

Show inline comments

@@ @@ -2,14 +2,17 @@ @@
 /** @file zoom.hpp */
 #ifndef ZOOM_HPP
 #define ZOOM_HPP
 #include "helpers.hpp"
 enum ZoomLevel {
 	/* Our possible zoom-levels */
 	ZOOM_LVL_BEGIN  = 0,
 	ZOOM_LVL_NORMAL = 0,
 	ZOOM_LVL_OUT_2X,
 	ZOOM_LVL_OUT_4X,
 	ZOOM_LVL_OUT_8X,
 	ZOOM_LVL_END,
@@ @@ -29,23 +32,25 @@ enum ZoomLevel { @@
 	ZOOM_LVL_MIN      = ZOOM_LVL_NORMAL,
 	ZOOM_LVL_MAX      = ZOOM_LVL_OUT_8X,
 };
 extern ZoomLevel _saved_scrollpos_zoom;
 DECLARE_POSTFIX_INCREMENT(ZoomLevel)
 /**
  * Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_NORMAL)
  * When shifting right, value is rounded up
  * @param value value to shift
  * @param zoom  zoom level to shift to
  * @return shifted value
  */
 static inline int ScaleByZoom(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
-	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : (value + (1 << -izoom) - 1) >> -izoom;
+}
 /**
  * Scale by zoom level, usually shift right (when zoom > ZOOM_LVL_NORMAL)
  * When shifting right, value is rounded up
@@ @@ -53,37 +58,37 @@ static inline int ScaleByZoom(int value, @@
  * @param zoom  zoom level to shift to
  * @return shifted value
  */
 static inline int UnScaleByZoom(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
-	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? (value + (1 << izoom) - 1) >> izoom : value << -izoom;
+}
 /**
  * Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_NORMAL)
  * @param value value to shift
  * @param zoom  zoom level to shift to
  * @return shifted value
  */
 static inline int ScaleByZoomLower(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
-	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : value >> -izoom;
+}
 /**
  * Scale by zoom level, usually shift right (when zoom > ZOOM_LVL_NORMAL)
  * @param value value to shift
  * @param zoom  zoom level to shift to
  * @return shifted value
  */
 static inline int UnScaleByZoomLower(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
-	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? value >> izoom : value << -izoom;
+}
 #endif /* ZOOM_HPP */

0 comments (0 inline, 0 general)