Commit: 334 - OpenXOPS (svn)

X operations（XOPS）に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。

Commit MetaInfo

• Revision: 334 (tree)
• Time: 2022-10-17 01:14:13
• Author: xops-mikan

Log Message

バイトオーダーが絡む数値変換を関数化

Change Summary

• modified: trunk/d3dgraphics-directx.cpp
• modified: trunk/d3dgraphics-opengl.cpp
• modified: trunk/datafile.cpp
• modified: trunk/main.cpp
• modified: trunk/main.h
• modified: trunk/sound-directsound.cpp

Incremental Difference

--- trunk/d3dgraphics-directx.cpp	(revision 333)
+++ trunk/d3dgraphics-directx.cpp	(revision 334)
@@ -788,10 +788,7 @@
 	for(int i=0; i<headersize; i++){ bmpdata[i] = 0x00; }
 	bmpdata[0x00] = 'B';
 	bmpdata[0x01] = 'M';
-	bmpdata[0x02] = (unsigned char)((bufsize >> 0) & 0x000000FF);
-	bmpdata[0x03] = (unsigned char)((bufsize >> 8) & 0x000000FF);
-	bmpdata[0x04] = (unsigned char)((bufsize >> 16) & 0x000000FF);
-	bmpdata[0x05] = (unsigned char)((bufsize >> 24) & 0x000000FF);
+	Set4ByteLittleEndian(&(bmpdata[0x02]), bufsize);
 	bmpdata[0x0A] = (unsigned char)headersize;
 	bmpdata[0x0E] = (unsigned char)(headersize - 14);
 	bmpdata[0x12] = (unsigned char)width;
@@ -799,10 +796,7 @@
 	bmpdata[0x1A] = 1;
 	bmpdata[0x1C] = 24;
 	bmpdata[0x1E] = 0;
-	bmpdata[0x22] = (unsigned char)(( (bufsize - headersize) >> 0 ) & 0x000000FF);
-	bmpdata[0x23] = (unsigned char)(( (bufsize - headersize) >> 8 ) & 0x000000FF);
-	bmpdata[0x24] = (unsigned char)(( (bufsize - headersize) >> 16 ) & 0x000000FF);
-	bmpdata[0x25] = (unsigned char)(( (bufsize - headersize) >> 24 ) & 0x000000FF);
+	Set4ByteLittleEndian(&(bmpdata[0x22]), bufsize - headersize);
 
 	datacnt = headersize;
 

--- trunk/d3dgraphics-opengl.cpp	(revision 333)
+++ trunk/d3dgraphics-opengl.cpp	(revision 334)
@@ -2394,10 +2394,7 @@
 	VertexAry[3] = (float)x2*-1;	VertexAry[4] = (float)y2;	VertexAry[5] = (float)z2;
 
 	//色情報配列を用意
-	ColorAry[0] = (color>>24)&0xFF;
-	ColorAry[1] = (color>>16)&0xFF;
-	ColorAry[2] = (color>>8)&0xFF;
-	ColorAry[3] = color&0xFF;
+	Set4ByteBigEndian(&(ColorAry[0]), color);
 	memcpy(&(ColorAry[4]), ColorAry, sizeof(unsigned char)*4);
 
 	//配列有効化
@@ -2747,10 +2744,7 @@
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	//色情報配列を用意
-	ColorAry[0] = (color>>24)&0xFF;
-	ColorAry[1] = (color>>16)&0xFF;
-	ColorAry[2] = (color>>8)&0xFF;
-	ColorAry[3] = color&0xFF;
+	Set4ByteBigEndian(&(ColorAry[0]), color);
 	for(int i=1; i<strlens*6; i++){
 		memcpy(&(ColorAry[i*4]), ColorAry, sizeof(unsigned char)*4);
 	}
@@ -2894,10 +2888,7 @@
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	//色情報配列を用意
-	ColorAry[0] = (color>>24)&0xFF;
-	ColorAry[1] = (color>>16)&0xFF;
-	ColorAry[2] = (color>>8)&0xFF;
-	ColorAry[3] = color&0xFF;
+	Set4ByteBigEndian(&(ColorAry[0]), color);
 	for(int i=1; i<strlens*6; i++){
 		memcpy(&(ColorAry[i*4]), ColorAry, sizeof(unsigned char)*4);
 	}
@@ -2966,10 +2957,7 @@
 	VertexAry[2] = (float)x2;	VertexAry[3] = (float)y2;
 
 	//色情報配列を用意
-	ColorAry[0] = (color>>24)&0xFF;
-	ColorAry[1] = (color>>16)&0xFF;
-	ColorAry[2] = (color>>8)&0xFF;
-	ColorAry[3] = color&0xFF;
+	Set4ByteBigEndian(&(ColorAry[0]), color);
 	memcpy(&(ColorAry[4]), ColorAry, sizeof(unsigned char)*4);
 
 	//配列有効化
@@ -3014,10 +3002,7 @@
 	}
 
 	//色情報配列を用意
-	ColorAry[0] = (color>>24)&0xFF;
-	ColorAry[1] = (color>>16)&0xFF;
-	ColorAry[2] = (color>>8)&0xFF;
-	ColorAry[3] = color&0xFF;
+	Set4ByteBigEndian(&(ColorAry[0]), color);
 	for(int i=1; i<16+1; i++){
 		memcpy(&(ColorAry[i*4]), ColorAry, sizeof(unsigned char)*4);
 	}
@@ -3063,10 +3048,7 @@
 	VertexAry[6] = (float)x2;	VertexAry[7] = (float)y2;
 
 	//色情報配列を用意
-	ColorAry[0] = (color>>24)&0xFF;
-	ColorAry[1] = (color>>16)&0xFF;
-	ColorAry[2] = (color>>8)&0xFF;
-	ColorAry[3] = color&0xFF;
+	Set4ByteBigEndian(&(ColorAry[0]), color);
 	for(int i=1; i<4; i++){
 		memcpy(&(ColorAry[i*4]), ColorAry, sizeof(unsigned char)*4);
 	}
@@ -3234,14 +3216,8 @@
 	header[0x00] = 'B';
 	header[0x01] = 'M';
 	header[0x0E] = 40;
-	header[0x12] = (unsigned char)(GameConfig.GetScreenWidth()&0x000000FF);
-	header[0x13] = (unsigned char)((GameConfig.GetScreenWidth()&0x0000FF00) >> 8);
-	header[0x14] = (unsigned char)((GameConfig.GetScreenWidth()&0x00FF0000) >> 16);
-	header[0x15] = (unsigned char)((GameConfig.GetScreenWidth()&0xFF000000) >> 24);
-	header[0x16] = (unsigned char)(GameConfig.GetScreenHeight()&0x000000FF);
-	header[0x17] = (unsigned char)((GameConfig.GetScreenHeight()&0x0000FF00) >> 8);
-	header[0x18] = (unsigned char)((GameConfig.GetScreenHeight()&0x00FF0000) >> 16);
-	header[0x19] = (unsigned char)((GameConfig.GetScreenHeight()&0xFF000000) >> 24);
+	Set4ByteLittleEndian(&(header[0x12]), GameConfig.GetScreenWidth());
+	Set4ByteLittleEndian(&(header[0x16]), GameConfig.GetScreenHeight());
 	header[0x1C] = 24;
 
 	//ヘッダーを書き込む

--- trunk/datafile.cpp	(revision 333)
+++ trunk/datafile.cpp	(revision 334)
@@ -131,10 +131,8 @@
 
 	//データ数を取得
 	fread( bdata_header, 1, 2, fp );
-	datas = (int)bdata_header[1]*256 + bdata_header[0];
-	if( datas > MAX_BLOCKS ){
-		datas = MAX_BLOCKS;
-	}
+	datas = (int)Get2ByteLittleEndian(&(bdata_header[0]));
+	if( datas > MAX_BLOCKS ){ datas = MAX_BLOCKS; }
 
 	//ブロックデータ数分取得
 	for(int i=0; i<datas; i++){
@@ -441,10 +439,8 @@
 
 	//データ数を取得
 	fread( pdata_header, 1, 2, fp );
-	datas = (int)pdata_header[1]*256 + pdata_header[0];
-	if( datas > MAX_POINTS ){
-		datas = MAX_POINTS;
-	}
+	datas = (int)Get2ByteLittleEndian(&(pdata_header[0]));
+	if( datas > MAX_POINTS ){ datas = MAX_POINTS; }
 
 	//ポイントデータ数分処理する
 	for(int i=0; i<datas; i++){

--- trunk/main.cpp	(revision 333)
+++ trunk/main.cpp	(revision 334)
@@ -331,4 +331,92 @@
 	for(; r > (float)M_PI;    r -= (float)M_PI*2){}
 	for(; r < (float)M_PI*-1; r += (float)M_PI*2){}
 	return r;
-}
\ No newline at end of file
+}
+
+//! @brief 2バイトに数値設定（リトルエンディアン）
+//! @param outdata 2バイトのポインタ
+//! @param value 数値
+void Set2ByteLittleEndian(unsigned char *outdata, unsigned int value)
+{
+	if( outdata == NULL ){ return; }
+
+	outdata[0] = (unsigned char)(( value >> 0 ) & 0x00FF);
+	outdata[1] = (unsigned char)(( value >> 8 ) & 0x00FF);
+}
+
+//! @brief 4バイトに数値設定（リトルエンディアン）
+//! @param outdata 4バイトのポインタ
+//! @param value 数値
+void Set4ByteLittleEndian(unsigned char *outdata, unsigned int value)
+{
+	if( outdata == NULL ){ return; }
+
+	outdata[0] = (unsigned char)(( value >> 0 ) & 0x000000FF);
+	outdata[1] = (unsigned char)(( value >> 8 ) & 0x000000FF);
+	outdata[2] = (unsigned char)(( value >> 16 ) & 0x000000FF);
+	outdata[3] = (unsigned char)(( value >> 24 ) & 0x000000FF);
+}
+
+//! @brief 2バイトに数値設定（ビッグエンディアン）
+//! @param outdata 2バイトのポインタ
+//! @param value 数値
+void Set2ByteBigEndian(unsigned char *outdata, unsigned int value)
+{
+	if( outdata == NULL ){ return; }
+
+	outdata[0] = (unsigned char)(( value >> 8 ) & 0x00FF);
+	outdata[1] = (unsigned char)(( value >> 0 ) & 0x00FF);
+}
+
+//! @brief 4バイトに数値設定（ビッグエンディアン）
+//! @param outdata 4バイトのポインタ
+//! @param value 数値
+void Set4ByteBigEndian(unsigned char *outdata, unsigned int value)
+{
+	if( outdata == NULL ){ return; }
+
+	outdata[0] = (unsigned char)(( value >> 24 ) & 0x000000FF);
+	outdata[1] = (unsigned char)(( value >> 16 ) & 0x000000FF);
+	outdata[2] = (unsigned char)(( value >> 8 ) & 0x000000FF);
+	outdata[3] = (unsigned char)(( value >> 0 ) & 0x000000FF);
+}
+
+//! @brief 2バイトの数値取得（リトルエンディアン）
+//! @param indata 2バイトのポインタ
+//! @return 数値
+unsigned int Get2ByteLittleEndian(unsigned char *indata)
+{
+	if( indata == NULL ){ return 0; }
+
+	return (unsigned int)( ((indata[1]<<8)&0xFF00) + ((indata[0]<<0)&0x00FF) );
+}
+
+//! @brief 4バイトの数値取得（リトルエンディアン）
+//! @param indata 4バイトのポインタ
+//! @return 数値
+unsigned int Get4ByteLittleEndian(unsigned char *indata)
+{
+	if( indata == NULL ){ return 0; }
+
+	return (unsigned int)( ((indata[3]<<24)&0xFF000000) + ((indata[2]<<16)&0x00FF0000) + ((indata[1]<<8)&0x0000FF00) + ((indata[0]<<0)&0x000000FF) );
+}
+
+//! @brief 2バイトの数値取得（ビッグエンディアン）
+//! @param indata 2バイトのポインタ
+//! @return 数値
+unsigned int Get2ByteBigEndian(unsigned char *indata)
+{
+	if( indata == NULL ){ return 0; }
+
+	return (unsigned int)( ((indata[0]<<8)&0xFF00) + ((indata[1]<<0)&0x00FF) );
+}
+
+//! @brief 4バイトの数値取得（ビッグエンディアン）
+//! @param indata 4バイトのポインタ
+//! @return 数値
+unsigned int Get4ByteBigEndian(unsigned char *indata)
+{
+	if( indata == NULL ){ return 0; }
+
+	return (unsigned int)( ((indata[0]<<24)&0xFF000000) + ((indata[1]<<16)&0x00FF0000) + ((indata[2]<<8)&0x0000FF00) + ((indata[3]<<0)&0x000000FF) );
+}

--- trunk/main.h	(revision 333)
+++ trunk/main.h	(revision 334)
@@ -161,5 +161,13 @@
 
 bool CheckCommandParameter(const char *param, const char *cmd);
 float AngleNormalization(float r);
+void Set2ByteLittleEndian(unsigned char *outdata, unsigned int value);
+void Set4ByteLittleEndian(unsigned char *outdata, unsigned int value);
+void Set2ByteBigEndian(unsigned char *outdata, unsigned int value);
+void Set4ByteBigEndian(unsigned char *outdata, unsigned int value);
+unsigned int Get2ByteLittleEndian(unsigned char *indata);
+unsigned int Get4ByteLittleEndian(unsigned char *indata);
+unsigned int Get2ByteBigEndian(unsigned char *indata);
+unsigned int Get4ByteBigEndian(unsigned char *indata);
 
 #endif
\ No newline at end of file

--- trunk/sound-directsound.cpp	(revision 333)
+++ trunk/sound-directsound.cpp	(revision 334)
@@ -273,8 +273,8 @@
 			int byte = 0;
 			for(int i=0; i<dwSize; i+=4){
 				/*
-				//int mix = (((pWavData[i + 0]<<8)&0xFF00) + ((pWavData[i + 1])&0x00FF) + ((pWavData[i + 2]<<8)&0xFF00) + ((pWavData[i + 3])&0x00FF))/2;
-				int mix = ((pWavData[i + 0]<<8)&0xFF00) + ((pWavData[i + 1])&0x00FF);
+				//int mix = (int)(Get2ByteBigEndian(&(pWavData[i + 0])) + Get2ByteBigEndian(&(pWavData[i + 2])))/2;
+				int mix = (int)Get2ByteBigEndian(&(pWavData[i + 0]));
 				((BYTE*)pBuffer)[byte+0] = (BYTE)((mix>>8)&0x00FF);
 				((BYTE*)pBuffer)[byte+1] = (BYTE)(mix)&0x00FF;
 				byte += 2;