提交: 99edffefaceb71e9bdd6c1b36e81cf31bea1992e - MG (git)

milligram

Commit MetaInfo

• 修訂: 99edffefaceb71e9bdd6c1b36e81cf31bea1992e (tree)
• 時間: 2011-03-18 10:12:48
• 作者: beru <berupon@gmai...>
• Commiter: beru

Log Message

Alpha Channelを含んだ32bit Bitmapの描画実装

Change Summary

• modified: main_plus.cpp
• modified: mg/bitmap.cpp

差異

--- a/main_plus.cpp
+++ b/main_plus.cpp
@@ -30,11 +30,38 @@ MG::Container mg(elements, 128);
 MG::Button button1;
 MG::Button button2;
 
-std::vector<uint8_t> imageBuffer;
-MG::Bitmap bmpContent;
+MG::Bitmap bmp24Content;
+std::vector<uint8_t> image24Buffer;
+
+MG::Bitmap bmp32Content;
+std::vector<uint8_t> image32Buffer;
+
 MG::Element pic1;
 MG::Element pic2;
 
+bool ReadImage(const char* filename, MG::Bitmap& bmp, std::vector<uint8_t>& buffer)
+{
+	FILE* file = fopen(filename, "r");
+	if (!file) {
+		return false;
+	}
+	File fileProxy(file);
+	ImageInfo imageInfo;
+	ReadImageInfo(fileProxy, imageInfo);
+	assert(imageInfo.bitsPerSample == 8);
+	assert(imageInfo.samplesPerPixel == 3 || imageInfo.samplesPerPixel == 4);
+	buffer.resize(imageInfo.width * imageInfo.height * imageInfo.samplesPerPixel);
+	int lineOffsetBytes = imageInfo.width * imageInfo.samplesPerPixel;
+	ReadImageData(fileProxy, &buffer[0], lineOffsetBytes, 0);
+	fclose(file);
+	bmp.bitsPerPixel = imageInfo.bitsPerSample * imageInfo.samplesPerPixel;
+	bmp.width = imageInfo.width;
+	bmp.height = imageInfo.height;
+	bmp.lineOffsetBytes = lineOffsetBytes;
+	bmp.pBits = &buffer[0];
+	return true;
+}
+
 } // anonymous namespace
 
 void OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
@@ -91,49 +118,38 @@ void OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 	rect.h = 50;
 	button2.rect = rect;
 	mg.Add(button2);
-
-	// read content
-	{
-		FILE* file = fopen("test.bmp", "r");
-		assert(file);
-		if (!file) {
-			return;
-		}
-		File fileProxy(file);
-		ImageInfo imageInfo;
-		ReadImageInfo(fileProxy, imageInfo);
-		assert(imageInfo.bitsPerSample == 8 && imageInfo.samplesPerPixel == 3);
-		imageBuffer.resize(imageInfo.width * imageInfo.height * imageInfo.samplesPerPixel);
-		int lineOffsetBytes = imageInfo.width * imageInfo.samplesPerPixel;
-		ReadImageData(fileProxy, &imageBuffer[0], lineOffsetBytes, 0);
-		fclose(file);
-		bmpContent.bitsPerPixel = imageInfo.bitsPerSample * imageInfo.samplesPerPixel;
-		bmpContent.width = imageInfo.width;
-		bmpContent.height = imageInfo.height;
-		bmpContent.lineOffsetBytes = lineOffsetBytes;
-		bmpContent.pBits = &imageBuffer[0];
+	
+	if (!ReadImage("test24.bmp", bmp24Content, image24Buffer)) {
+		return;
+	}
+	if (!ReadImage("test32.bmp", bmp32Content, image32Buffer)) {
+		return;
 	}
+	
 	rect.x = 100;
 	rect.y = 300;
 	pic1.rect = rect;
 	MG::Rectangle irec;
-	irec.x = irec.y = 0;
+	irec.x = 510;
+	irec.y = 340;
 	irec.w = 400;
 	irec.h = 400;
 	pic1.bg.image.rect = irec;
-	pic1.bg.image.pBitmap = &bmpContent;
+	pic1.bg.image.pBitmap = &bmp24Content;
 	pic1.needsToDraw = true;
 	mg.Add(pic1);
 	
 	rect.x = 300;
 	rect.y = 200;
-	rect.w = 300;
+	rect.w = 336;
 	rect.h = 300;
 	pic2.rect = rect;
-	pic2.bg = pic1.bg;
-	irec.x = 510;
-	irec.y = 340;
+	irec.x = 0;
+	irec.y = 0;
+	irec.w = 336;
+	irec.h = 24;
 	pic2.bg.image.rect = irec;
+	pic2.bg.image.pBitmap = &bmp32Content;
 	pic2.needsToDraw = true;
 	mg.Add(pic2);
 	

--- a/mg/bitmap.cpp
+++ b/mg/bitmap.cpp
@@ -3,6 +3,27 @@
 #include "bitmap.h"
 #include "arrayutil.h"
 
+namespace {
+
+// http://www.virtualdub.org/blog/pivot/entry.php?id=117
+__forceinline
+void blendColor_Phaeron(uint32_t fc, uint8_t fca, uint32_t& bc)
+{
+	uint32_t bc2 = bc;
+	uint32_t srb = fc & 0xff00ff;
+	uint32_t sg = fc & 0x00ff00;
+	uint32_t drb = bc2 & 0xff00ff;
+	uint32_t dg = bc2 & 0x00ff00;
+	uint32_t alpha = fca;
+	alpha += (alpha > 0);
+	uint32_t orb = (drb + (((srb - drb) * alpha + 0x800080) >> 8)) & 0xff00ff;
+	uint32_t og = (dg + (((sg - dg ) * alpha + 0x008000) >> 8)) & 0x00ff00;
+	
+	bc = orb+og;
+}
+
+} // namespace anonymous
+
 namespace MG {
 
 Rectangle Bitmap::GetRect() const
@@ -63,6 +84,27 @@ void BitBlt_Src32_Dst24(
 	Bitmap& dst, const Rectangle& dstRect
 	)
 {
+	const uint32_t* pSrc = (const uint32_t*) src.pBits;
+	OffsetPtr(pSrc, src.lineOffsetBytes * srcRect.y);
+	pSrc += srcRect.x;
+	
+	uint8_t* pDst = (uint8_t*) dst.pBits;
+	OffsetPtr(pDst, dst.lineOffsetBytes * dstRect.y);
+	pDst += 3 * dstRect.x;
+	
+	for (size_t y=0; y<dstRect.h; ++y) {
+		for (size_t x=0; x<dstRect.w; ++x) {
+			uint32_t fc = pSrc[x];
+			uint8_t fca = fc >> 24;
+			uint32_t bc = (pDst[x*3+0] << 0) | (pDst[x*3+1] << 8) | (pDst[x*3+2] << 16);
+			blendColor_Phaeron(fc, fca, bc);
+			pDst[x*3+0] = (bc >> 0) & 0xff;
+			pDst[x*3+1] = (bc >> 8) & 0xff;
+			pDst[x*3+2] = (bc >> 16) & 0xff;
+		}
+		OffsetPtr(pSrc, src.lineOffsetBytes);
+		OffsetPtr(pDst, dst.lineOffsetBytes);
+	}
 }
 
 void BitBlt_Src32_Dst32(