コミット: 357 - OpenXOPS (svn)

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

コミットメタ情報

• リビジョン: 357 (tree)
• 日時: 2023-07-01 12:17:23
• 作者: xops-mikan

ログメッセージ

DirectXのシェーダーでフォグが描画されない問題の改善、2D描画の処理を修正

変更サマリ

• modified: trunk/DirectX_Shader01.fx
• modified: trunk/d3dgraphics-directx.cpp
• modified: trunk/d3dgraphics.h

差分

--- trunk/d3dgraphics-directx.cpp	(revision 356)
+++ trunk/d3dgraphics-directx.cpp	(revision 357)
@@ -58,7 +58,13 @@
 	hVSDiffuse = NULL;
 	pPixelShader = NULL;
 	pPSConstantTable = NULL;
+	hPSViewPos = NULL;
 	hPSEnableTexture = NULL;
+	hPSEnableFog = NULL;
+	hPSFogColor = NULL;
+	hPSFogStart = NULL;
+	hPSFogEnd = NULL;
+	hPSEnable2DRender = NULL;
 #endif
 
 	BlockDataIF = NULL;
@@ -237,8 +243,20 @@
 	if( FAILED(hr) ){ return 1; }
 
 	//ピクセルシェーダーの関連変数
+	hPSViewPos = pPSConstantTable->GetConstantByName(NULL, "ViewPos");
+	//if( hPSViewPos == NULL ){ return 1; }
 	hPSEnableTexture = pPSConstantTable->GetConstantByName(NULL, "EnableTexture");
 	if( hPSEnableTexture == NULL ){ return 1; }
+	hPSEnableFog = pPSConstantTable->GetConstantByName(NULL, "EnableFog");
+	if( hPSEnableFog == NULL ){ return 1; }
+	hPSFogColor = pPSConstantTable->GetConstantByName(NULL, "FogColor");
+	if( hPSFogColor == NULL ){ return 1; }
+	hPSFogStart = pPSConstantTable->GetConstantByName(NULL, "FogStart");
+	if( hPSFogStart == NULL ){ return 1; }
+	hPSFogEnd = pPSConstantTable->GetConstantByName(NULL, "FogEnd");
+	if( hPSFogEnd == NULL ){ return 1; }
+	hPSEnable2DRender = pPSConstantTable->GetConstantByName(NULL, "Enable2DRender");
+	//if( hPSEnable2DRender == NULL ){ return 1; }
 
 	D3DXMatrixIdentity(&VSWorldPosMatrix);
 	D3DXMatrixIdentity(&VSViewPosMatrix);
@@ -1230,6 +1248,7 @@
 			//フォグ
 			float fog_st = 100;
 			float fog_end = 800;
+#if GRAPHIC_ENGINE == 0
 			pd3dDevice->SetRenderState(D3DRS_FOGENABLE, TRUE);
 			pd3dDevice->SetRenderState(D3DRS_FOGCOLOR, D3DCOLOR_RGBA(0, 0, 0, 0));
 			pd3dDevice->SetRenderState(D3DRS_FOGTABLEMODE, D3DFOG_LINEAR);
@@ -1236,6 +1255,13 @@
 			pd3dDevice->SetRenderState(D3DRS_FOGVERTEXMODE, D3DFOG_NONE);
 			pd3dDevice->SetRenderState(D3DRS_FOGSTART, *(DWORD*)(&fog_st));
 			pd3dDevice->SetRenderState(D3DRS_FOGEND,   *(DWORD*)(&fog_end));
+#else
+			float FogColor[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+			pPSConstantTable->SetBool(pd3dDevice, hPSEnableFog, true);
+			pPSConstantTable->SetFloatArray(pd3dDevice, hPSFogColor, FogColor, 4);
+			pPSConstantTable->SetFloat(pd3dDevice, hPSFogStart, fog_st);
+			pPSConstantTable->SetFloat(pd3dDevice, hPSFogEnd, fog_end);
+#endif
 		}
 
 		D3DCOLOR skycolor;
@@ -1251,12 +1277,21 @@
 		}
 
 		//フォグを設定
+#if GRAPHIC_ENGINE == 0
 		pd3dDevice->SetRenderState(D3DRS_FOGCOLOR, skycolor);
+#else
+		float FogColor[4] = {(float)((skycolor>>16)&0xFF)/255.0f, (float)((skycolor>>8)&0xFF)/255.0f, (float)(skycolor&0xFF)/255.0f, 1.0f};
+		pPSConstantTable->SetFloatArray(pd3dDevice, hPSFogColor, FogColor, 4);
+#endif
 
 		EnableFogFlag = true;
 	}
 	else{
+#if GRAPHIC_ENGINE == 0
 		pd3dDevice->SetRenderState(D3DRS_FOGENABLE, FALSE);
+#else
+		pPSConstantTable->SetBool(pd3dDevice, hPSEnableFog, false);
+#endif
 		EnableFogFlag = false;
 	}
 }
@@ -1310,6 +1345,11 @@
 #else
 	hVSConstantTable->SetMatrix(pd3dDevice, hVSWorldViewPos, &matView);
 	VSViewPosMatrix = matView;
+
+	if( hPSViewPos != NULL ){
+		float Camera[4] = {camera_x, camera_y, camera_z, 1.0f};
+		pPSConstantTable->SetFloatArray(pd3dDevice, hPSViewPos, Camera, 4);
+	}
 #endif
 
 	//カメラ設定（射影変換行列）viewangle
@@ -1974,6 +2014,19 @@
 
 	//深度バッファ比較関数を設定
 	pd3dDevice->SetRenderState(D3DRS_ZFUNC, D3DCMP_ALWAYS);
+
+	//フォグを一時的に無効にする
+#if GRAPHIC_ENGINE == 0
+	pd3dDevice->SetRenderState(D3DRS_FOGENABLE, FALSE);
+#else
+	pPSConstantTable->SetBool(pd3dDevice, hPSEnableFog, false);
+#endif
+
+#if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRender != NULL ){
+		pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRender, true);
+	}
+#endif
 }
 
 //! @brief テクスチャフォントサイズ計算
@@ -2441,6 +2494,21 @@
 
 	//深度バッファ比較関数を元に戻す
 	pd3dDevice->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
+
+	//フォグを元に戻す
+	if( EnableFogFlag == true ){
+#if GRAPHIC_ENGINE == 0
+		pd3dDevice->SetRenderState(D3DRS_FOGENABLE, TRUE);
+#else
+		pPSConstantTable->SetBool(pd3dDevice, hPSEnableFog, true);
+#endif
+	}
+
+#if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRender != NULL ){
+		pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRender, false);
+	}
+#endif
 }
 
 //! @brief 画面のスクリーンショットを保存

--- trunk/d3dgraphics.h	(revision 356)
+++ trunk/d3dgraphics.h	(revision 357)
@@ -196,7 +196,13 @@
 	D3DXHANDLE hVSDiffuse;							//!< 頂点シェーダーのディフューズ色
 	LPDIRECT3DPIXELSHADER9 pPixelShader;			//!< ピクセルシェーダー
 	LPD3DXCONSTANTTABLE pPSConstantTable;			//!< ピクセルシェーダーの定数テーブル
+	D3DXHANDLE hPSViewPos;							//!< ピクセルシェーダーのカメラ座標
 	D3DXHANDLE hPSEnableTexture;					//!< ピクセルシェーダーのテクスチャフラグ
+	D3DXHANDLE hPSEnableFog;						//!< ピクセルシェーダーのフォグ有効フラグ
+	D3DXHANDLE hPSFogColor;							//!< ピクセルシェーダーのフォグ色
+	D3DXHANDLE hPSFogStart;							//!< ピクセルシェーダーのフォグの開始深度
+	D3DXHANDLE hPSFogEnd;							//!< ピクセルシェーダーのフォグの終了深度
+	D3DXHANDLE hPSEnable2DRender;					//!< ピクセルシェーダーの2D描画フラグ
 	D3DXMATRIX VSWorldPosMatrix;					//!< 頂点シェーダーに与えた変換行列
 	D3DXMATRIX VSViewPosMatrix;						//!< 頂点シェーダーに与えた変換行列
 	D3DXMATRIX VSViewProjMatrix;					//!< 頂点シェーダーに与えた変換行列