Commit: 358 - OpenXOPS (svn)

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

Commit MetaInfo

• Revision: 358 (tree)
• Zeit: 2023-07-01 22:53:49
• Autor: xops-mikan

Log Message

DirectXのシェーダーにおける2D描画処理を変更

Ändern Zusammenfassung

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

Diff

--- trunk/d3dgraphics-directx.cpp	(revision 357)
+++ trunk/d3dgraphics-directx.cpp	(revision 358)
@@ -59,12 +59,12 @@
 	pPixelShader = NULL;
 	pPSConstantTable = NULL;
 	hPSViewPos = NULL;
+	hPSEnable2DRendering = NULL;
 	hPSEnableTexture = NULL;
 	hPSEnableFog = NULL;
 	hPSFogColor = NULL;
 	hPSFogStart = NULL;
 	hPSFogEnd = NULL;
-	hPSEnable2DRender = NULL;
 #endif
 
 	BlockDataIF = NULL;
@@ -245,6 +245,8 @@
 	//ピクセルシェーダーの関連変数
 	hPSViewPos = pPSConstantTable->GetConstantByName(NULL, "ViewPos");
 	//if( hPSViewPos == NULL ){ return 1; }
+	hPSEnable2DRendering = pPSConstantTable->GetConstantByName(NULL, "Enable2DRendering");
+	//if( hPSEnable2DRendering == NULL ){ return 1; }
 	hPSEnableTexture = pPSConstantTable->GetConstantByName(NULL, "EnableTexture");
 	if( hPSEnableTexture == NULL ){ return 1; }
 	hPSEnableFog = pPSConstantTable->GetConstantByName(NULL, "EnableFog");
@@ -255,8 +257,6 @@
 	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);
@@ -1542,6 +1542,7 @@
 			pd3dDevice->SetTexture(0, ptextures[mapTextureID[textureID]] );
 		}
 #else
+		if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, false); }
 		if( mapTextureID[textureID] == -1 ){
 			pd3dDevice->SetFVF(D3DFVF_XYZ|D3DFVF_DIFFUSE);
 			pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, false);
@@ -1594,6 +1595,7 @@
 			pd3dDevice->SetTexture(0, ptextures[mapTextureID[textureID]] );
 		}
 #else
+		if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, false); }
 		if( mapTextureID[textureID] == -1 ){
 			pd3dDevice->SetFVF(D3DFVF_XYZ|D3DFVF_DIFFUSE);
 			pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, false);
@@ -1727,6 +1729,7 @@
 		pd3dDevice->SetTexture( 0, ptextures[id_texture] );
 	}
 #else
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, false); }
 	if( id_texture == -1 ){
 		pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, false);
 		pd3dDevice->SetTexture(0, NULL);
@@ -1799,6 +1802,7 @@
 
 	//テクスチャとデータ形式を設定し描画
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, false); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, true);
 #endif
 	pd3dDevice->SetTexture(0, ptextures[id_texture]);
@@ -1861,6 +1865,7 @@
 	}
 
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, false); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, false);
 #endif
 	pd3dDevice->SetTexture(0, NULL);
@@ -2021,12 +2026,6 @@
 #else
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableFog, false);
 #endif
-
-#if GRAPHIC_ENGINE == 1
-	if( hPSEnable2DRender != NULL ){
-		pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRender, true);
-	}
-#endif
 }
 
 //! @brief テクスチャフォントサイズ計算
@@ -2083,6 +2082,7 @@
 
 	//テクスチャをフォントテクスチャに設定
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, true); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, true);
 #endif
 	pd3dDevice->SetTexture( 0, ptextures[TextureFont] );
@@ -2220,6 +2220,7 @@
 
 	//テクスチャをフォントテクスチャに設定
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, true); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, true);
 #endif
 	pd3dDevice->SetTexture( 0, ptextures[TextureDebugFont] );
@@ -2302,6 +2303,7 @@
 	}
 
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, true); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, false);
 #endif
 	pd3dDevice->SetTexture(0, NULL);
@@ -2342,6 +2344,7 @@
 	}
 
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, true); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, false);
 #endif
 	pd3dDevice->SetTexture(0, NULL);
@@ -2388,6 +2391,7 @@
 	}
 
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, true); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, false);
 #endif
 	pd3dDevice->SetTexture(0, NULL);
@@ -2460,6 +2464,7 @@
 
 	//テクスチャとデータ形式を設定し、描画
 #if GRAPHIC_ENGINE == 1
+	if( hPSEnable2DRendering != NULL ){ pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRendering, true); }
 	pPSConstantTable->SetBool(pd3dDevice, hPSEnableTexture, true);
 #endif
 	pd3dDevice->SetTexture( 0, ptextures[id] );
@@ -2503,12 +2508,6 @@
 		pPSConstantTable->SetBool(pd3dDevice, hPSEnableFog, true);
 #endif
 	}
-
-#if GRAPHIC_ENGINE == 1
-	if( hPSEnable2DRender != NULL ){
-		pPSConstantTable->SetBool(pd3dDevice, hPSEnable2DRender, false);
-	}
-#endif
 }
 
 //! @brief 画面のスクリーンショットを保存

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