diff --git a/Client/Client/CharacterActionControl/CCameraScript.h b/Client/Client/CharacterActionControl/CCameraScript.h index b66724e..3e653c2 100644 --- a/Client/Client/CharacterActionControl/CCameraScript.h +++ b/Client/Client/CharacterActionControl/CCameraScript.h @@ -1,8 +1,8 @@ #ifndef __CCAMERASCRIPT_H__ #define __CCAMERASCRIPT_H__ -#include -#include +#include +#include #include #include @@ -76,7 +76,7 @@ private: CCameraEvent m_CurrentEvent; // ӿ ´, Event Unit D3DXMATRIX m_matCurrentFrame; // Frame View Matrix - LPDIRECT3DDEVICE8 m_pDevice; // Direct3D Device + LPDIRECT3DDEVICE9 m_pDevice; // Direct3D Device DWORD m_dwBeforeTick; DWORD m_dwCurrentTick; diff --git a/Client/Client/CharacterActionControl/CameraControl.h b/Client/Client/CharacterActionControl/CameraControl.h index 795e044..c5b5b20 100644 --- a/Client/Client/CharacterActionControl/CameraControl.h +++ b/Client/Client/CharacterActionControl/CameraControl.h @@ -10,7 +10,7 @@ #endif // _MSC_VER > 1000 #include "3DMath.h" -#include +#include class CCameraControl { diff --git a/Client/Client/CharacterActionControl/RYLDamageEffect.cpp b/Client/Client/CharacterActionControl/RYLDamageEffect.cpp index f98018d..5652183 100644 --- a/Client/Client/CharacterActionControl/RYLDamageEffect.cpp +++ b/Client/Client/CharacterActionControl/RYLDamageEffect.cpp @@ -52,7 +52,7 @@ RYLDamageEffect::~RYLDamageEffect() //-------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------- // RYLDamageEffect::RenderDamage() -void RYLDamageEffect::RenderDamage( LPDIRECT3DDEVICE8 lpD3DDevice, bool bMovieVersion, vector3 vecPos, DAMAGE_TYPE type ) +void RYLDamageEffect::RenderDamage( LPDIRECT3DDEVICE9 lpD3DDevice, bool bMovieVersion, vector3 vecPos, DAMAGE_TYPE type ) { if( !m_lstDamageEffect.empty() ) { @@ -277,7 +277,7 @@ void RYLDamageEffect::RenderDamage( LPDIRECT3DDEVICE8 lpD3DDevice, bool bMovieVe //-------------------------------------------------------------------------------------------------------------------------- // RYLDamageEffect::RenderDamageNumber() -void RYLDamageEffect::RenderDamageNumber( LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate, unsigned long dwAlign ) +void RYLDamageEffect::RenderDamageNumber( LPDIRECT3DDEVICE9 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate, unsigned long dwAlign ) { if( !m_pNumberTexture ) { diff --git a/Client/Client/CharacterActionControl/RYLDamageEffect.h b/Client/Client/CharacterActionControl/RYLDamageEffect.h index 64537c9..5c789df 100644 --- a/Client/Client/CharacterActionControl/RYLDamageEffect.h +++ b/Client/Client/CharacterActionControl/RYLDamageEffect.h @@ -78,9 +78,9 @@ public: //-------------------------------------------------------------------------------------------------------------------------- // damage rendering enum DAMAGE_TYPE { FRIENDLY_DAMAGE = 0, ENEMY_DAMAGE = 1 }; - void RenderDamage( LPDIRECT3DDEVICE8 lpD3DDevice, bool bMovieVersion, vector3 vecPos, DAMAGE_TYPE type ); + void RenderDamage( LPDIRECT3DDEVICE9 lpD3DDevice, bool bMovieVersion, vector3 vecPos, DAMAGE_TYPE type ); private: - void RenderDamageNumber( LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate, unsigned long dwAlign ); + void RenderDamageNumber( LPDIRECT3DDEVICE9 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate, unsigned long dwAlign ); public: diff --git a/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.cpp b/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.cpp index c37b3c9..fa02cb8 100644 --- a/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.cpp +++ b/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.cpp @@ -1322,7 +1322,7 @@ VOID CRYLLongAttackWeaponControl::SetCamera( int dx, int dy, int dz ) } } -void CRYLLongAttackWeaponControl::Render( LPDIRECT3DDEVICE8 pd3dDevice ) +void CRYLLongAttackWeaponControl::Render( LPDIRECT3DDEVICE9 pd3dDevice ) { } diff --git a/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.h b/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.h index c720ad1..8904c51 100644 --- a/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.h +++ b/Client/Client/CharacterActionControl/RYLLongAttackWeaponControl.h @@ -144,7 +144,7 @@ public : HRESULT UpdateControl( BOOL bKeyAble = TRUE, BOOL bEdge = FALSE, int MouseX = 0,int MouseY = 0 ) ; VOID SetCamera( int dx = 0, int dy = 0, int dz = 0 ) ; - void Render( LPDIRECT3DDEVICE8 pd3dDevice ) ; + void Render( LPDIRECT3DDEVICE9 pd3dDevice ) ; VOID SetModifySkileton() ; VOID SetSiegeModel( unsigned long dwChrID, const char *strName, vector3 vecChrPos, float fDirection ) ; diff --git a/Client/Client/CharacterActionControl/RYLObjectControl.cpp b/Client/Client/CharacterActionControl/RYLObjectControl.cpp index 18dee82..2b978a1 100644 --- a/Client/Client/CharacterActionControl/RYLObjectControl.cpp +++ b/Client/Client/CharacterActionControl/RYLObjectControl.cpp @@ -666,7 +666,7 @@ void CCharacterControl::MouseMove( int MouseX, int MouseY ) { } -void CCharacterControl::Render( LPDIRECT3DDEVICE8 pd3dDevice ) +void CCharacterControl::Render( LPDIRECT3DDEVICE9 pd3dDevice ) { m_pRYLLongAttackWeaponControl->Render( pd3dDevice ) ; } diff --git a/Client/Client/CharacterActionControl/RYLObjectControl.h b/Client/Client/CharacterActionControl/RYLObjectControl.h index f8e3e86..f7bd535 100644 --- a/Client/Client/CharacterActionControl/RYLObjectControl.h +++ b/Client/Client/CharacterActionControl/RYLObjectControl.h @@ -281,7 +281,7 @@ public : VOID UpdateCreatureControl( BOOL bKeyAble = TRUE, BOOL bEdge = FALSE, int MouseX = 0,int MouseY = 0 ) ; void Update( float fUpdateTime ) ; - void Render( LPDIRECT3DDEVICE8 pd3dDevice ) ; + void Render( LPDIRECT3DDEVICE9 pd3dDevice ) ; void SwapElement( RYLCreature* pNode1, RYLCreature* pNode2 ) ; diff --git a/Client/Client/GlobalScript/HShield/HShield.h b/Client/Client/GlobalScript/HShield/HShield.h index 013af93..b4efc8e 100644 --- a/Client/Client/GlobalScript/HShield/HShield.h +++ b/Client/Client/GlobalScript/HShield/HShield.h @@ -588,9 +588,9 @@ _AhnHS_Direct3DCreate9 ( /*! * - * @remarks Direct3DCreate8 API Wrapper Function + * @remarks Direct3DCreate9 API Wrapper Function * - * @param SDKVersion : [IN] Direct3DCreate8 API ڷ  SDK Version + * @param SDKVersion : [IN] Direct3DCreate9 API ڷ  SDK Version * */ PVOID diff --git a/Client/Client/GlobalScript/Utility/SystemInfo.cpp b/Client/Client/GlobalScript/Utility/SystemInfo.cpp index 1facd55..91f77f3 100644 --- a/Client/Client/GlobalScript/Utility/SystemInfo.cpp +++ b/Client/Client/GlobalScript/Utility/SystemInfo.cpp @@ -374,7 +374,7 @@ BOOL CSystemInfo::GetSoundCardInfo(void) return FALSE; } -typedef IDirect3D8 * (WINAPI* Direct3DCreate8_PROC) (UINT SDKVersion); +typedef IDirect3D9 * (WINAPI* Direct3DCreate8_PROC) (UINT SDKVersion); HRESULT CSystemInfo::EnumulationD3D(void) { @@ -385,7 +385,7 @@ HRESULT CSystemInfo::EnumulationD3D(void) } Direct3DCreate8_PROC d3dCreate; - d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate8"); + d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate9"); if(!d3dCreate) { @@ -898,7 +898,7 @@ BOOL CSystemInfo::FindDepthStencilFormat(UINT iAdapter, D3DDEVTYPE DeviceType, D return FALSE; } -HRESULT CSystemInfo::ConfirmDevice(D3DCAPS8 *, DWORD, D3DFORMAT) +HRESULT CSystemInfo::ConfirmDevice(D3DCAPS9 *, DWORD, D3DFORMAT) { return S_OK; } @@ -1005,7 +1005,7 @@ BOOL CSystemInfo::GetAvailableCompressTexture(D3DFORMAT d3dFormat) } Direct3DCreate8_PROC d3dCreate; - d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate8"); + d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate9"); if(!d3dCreate) { diff --git a/Client/Client/GlobalScript/Utility/SystemInfo.h b/Client/Client/GlobalScript/Utility/SystemInfo.h index 4674b3b..3b8ec5f 100644 --- a/Client/Client/GlobalScript/Utility/SystemInfo.h +++ b/Client/Client/GlobalScript/Utility/SystemInfo.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include namespace SystemInfo @@ -31,7 +31,7 @@ namespace SystemInfo { // Device data D3DDEVTYPE DeviceType; // Reference, HAL, etc. - D3DCAPS8 d3dCaps; // Capabilities of this device + D3DCAPS9 d3dCaps; // Capabilities of this device const TCHAR* strDesc; // Name of this device BOOL bCanDoWindowed; // Whether this device can work in windowed mode @@ -60,7 +60,7 @@ namespace SystemInfo { // Device data D3DDEVTYPE DeviceType; // Reference, HAL, etc. - D3DCAPS8 d3dCaps; // Capabilities of this device + D3DCAPS9 d3dCaps; // Capabilities of this device const TCHAR* strDesc; // Name of this device BOOL bCanDoWindowed; // Whether this device can work in windowed mode @@ -85,7 +85,7 @@ namespace SystemInfo struct D3DAdapterInfo { // Adapter data - D3DADAPTER_IDENTIFIER8 d3dAdapterIdentifier; + D3DADAPTER_IDENTIFIER9 d3dAdapterIdentifier; D3DDISPLAYMODE d3ddmDesktop; // Desktop display mode for this adapter // Devices for this adapter @@ -119,7 +119,7 @@ namespace SystemInfo unsigned long m_dwMinDepthBits; // ּ Ʈ unsigned long m_dwMinStencilBits; // ּ ٽ Ʈ - HRESULT ConfirmDevice(D3DCAPS8*,DWORD,D3DFORMAT); + HRESULT ConfirmDevice(D3DCAPS9*,DWORD,D3DFORMAT); BOOL FindDepthStencilFormat(UINT iAdapter, D3DDEVTYPE DeviceType, D3DFORMAT TargetFormat, D3DFORMAT *pDepthStencilFormat); OSVERSIONINFOEX m_osvi; @@ -135,7 +135,7 @@ namespace SystemInfo char m_strSoundCard[MAX_PATH]; char m_strSoundCardVersion[MAX_PATH]; - LPDIRECT3D8 m_lpD3D; + LPDIRECT3D9 m_lpD3D; DDCAPS m_ddHALCaps, m_ddHELCaps; diff --git a/Client/Client/RYLClient/BaseGUI.cpp b/Client/Client/RYLClient/BaseGUI.cpp index 32835bc..2c11e30 100644 --- a/Client/Client/RYLClient/BaseGUI.cpp +++ b/Client/Client/RYLClient/BaseGUI.cpp @@ -278,7 +278,7 @@ void CBaseGUI::DestroyAllObject(void) } } -void CBaseGUI::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor) +void CBaseGUI::RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor) { RECT rcRect; @@ -322,7 +322,7 @@ void CBaseGUI::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwUI // g_TextEdit.DrawText(lpCreature->m_strName, &rcRect, DT_CENTER | DT_VCENTER, D3DCOLOR_RGBA(255, 202, 132, 255)); } -void CBaseGUI::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, char *strText, short wPosX, short wPosY) +void CBaseGUI::RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, char *strText, short wPosX, short wPosY) { RECT rcRect; @@ -364,7 +364,7 @@ void CBaseGUI::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, char *strText, sho g_TextEdit.DrawText(strText, &rcRect, DT_CENTER | DT_VCENTER, D3DCOLOR_RGBA(255, 255, 255, 255)); } -void CBaseGUI::RenderPopUp(LPDIRECT3DDEVICE8 lpD3DDevice) +void CBaseGUI::RenderPopUp(LPDIRECT3DDEVICE9 lpD3DDevice) { TLVertex Vertex[16]; unsigned short Index[54]; @@ -972,7 +972,7 @@ BOOL CBaseGUI::SelectNPC(unsigned long dwTargetID, BOOL bButton) return FALSE; } -void CBaseGUI::RenderSkillGauge(LPDIRECT3DDEVICE8 lpD3DDevice) +void CBaseGUI::RenderSkillGauge(LPDIRECT3DDEVICE9 lpD3DDevice) { if(g_CharacterData.m_lstCharData[g_CharacterData.m_nFocusCharacter]->m_bStillCasting) { @@ -1024,7 +1024,7 @@ void CBaseGUI::RenderSkillGauge(LPDIRECT3DDEVICE8 lpD3DDevice) } } -void CBaseGUI::RenderChrName(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY) +void CBaseGUI::RenderChrName(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY) { RECT rcRect; @@ -1102,7 +1102,7 @@ void CBaseGUI::PickItem(DWORD nSelectItem) } } -void CBaseGUI::RenderCrossHair(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwMode) +void CBaseGUI::RenderCrossHair(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwMode) { TLVertex pVertices[4]; pVertices[0].Diffuse.c = pVertices[1].Diffuse.c = pVertices[2].Diffuse.c = pVertices[3].Diffuse.c = 0xFFFFFFFF; @@ -1918,7 +1918,7 @@ BOOL CBaseGUI::InitZone(unsigned long dwZoneNumber) return TRUE; } -void CBaseGUI::RenderChant(LPDIRECT3DDEVICE8 lpD3DDevice) +void CBaseGUI::RenderChant(LPDIRECT3DDEVICE9 lpD3DDevice) { unsigned long dwFirst = 0, dwSecond = 0, dwThird = 0; @@ -1989,7 +1989,7 @@ void CBaseGUI::RenderChant(LPDIRECT3DDEVICE8 lpD3DDevice) } } -void CBaseGUI::RenderChrName(LPDIRECT3DDEVICE8 lpD3DDevice, CCreature *lpCreature, short wPosX, short wPosY) +void CBaseGUI::RenderChrName(LPDIRECT3DDEVICE9 lpD3DDevice, CCreature *lpCreature, short wPosX, short wPosY) { RECT rcRect; diff --git a/Client/Client/RYLClient/BaseGUI.h b/Client/Client/RYLClient/BaseGUI.h index 05e778c..68edae1 100644 --- a/Client/Client/RYLClient/BaseGUI.h +++ b/Client/Client/RYLClient/BaseGUI.h @@ -201,14 +201,14 @@ class CItemInstance ; class CBaseGUI { public: - void RenderChant(LPDIRECT3DDEVICE8 lpD3DDevice); + void RenderChant(LPDIRECT3DDEVICE9 lpD3DDevice); BOOL InitZone(unsigned long dwZoneNumber); void ProcessSkill(void); - void RenderCrossHair(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwMode); + void RenderCrossHair(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwMode); static void PickItem(DWORD nSelectItem); - void RenderChrName(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY); - void RenderSkillGauge(LPDIRECT3DDEVICE8 lpD3DDevice); + void RenderChrName(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY); + void RenderSkillGauge(LPDIRECT3DDEVICE9 lpD3DDevice); BOOL SelectNPC(unsigned long dwTargetID, BOOL bButton = FALSE); void NPCSpawn(void); BOOL UpdatePopup(void); @@ -276,10 +276,10 @@ class CBaseGUI BOOL m_bShowHelp; // ǥ BOOL m_bShowSkillError; // ų ǥ (콺 带 ) - void RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, char *strText, short wPosX, short wPosY); - void RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor = D3DCOLOR_RGBA(255, 202, 132, 255)); - void RenderPopUp(LPDIRECT3DDEVICE8 lpD3DDevice); - void RenderChrName(LPDIRECT3DDEVICE8 lpD3DDevice, CCreature *lpCreature, short wPosX, short wPosY); + void RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, char *strText, short wPosX, short wPosY); + void RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor = D3DCOLOR_RGBA(255, 202, 132, 255)); + void RenderPopUp(LPDIRECT3DDEVICE9 lpD3DDevice); + void RenderChrName(LPDIRECT3DDEVICE9 lpD3DDevice, CCreature *lpCreature, short wPosX, short wPosY); void DestroyAllObject(void); @@ -288,10 +288,10 @@ class CBaseGUI virtual BOOL InitChrSelect(void) = 0; virtual void UpdateChrSelect(void) = 0; - virtual void RenderChrSelect(LPDIRECT3DDEVICE8 lpD3DDevice) = 0; + virtual void RenderChrSelect(LPDIRECT3DDEVICE9 lpD3DDevice) = 0; virtual BOOL InitGame(void) = 0; virtual void UpdateGame(void) = 0; - virtual void RenderGame(LPDIRECT3DDEVICE8 lpD3DDevice) = 0; + virtual void RenderGame(LPDIRECT3DDEVICE9 lpD3DDevice) = 0; virtual void InitTrade(unsigned long dwKindMarket, unsigned long dwNPCID) = 0; virtual BOOL GetIsTrade(void) = 0; virtual void InitClassChange(unsigned long dwNPCID) = 0; diff --git a/Client/Client/RYLClient/CommonOption.cpp b/Client/Client/RYLClient/CommonOption.cpp index 530c6b8..aa36b4c 100644 --- a/Client/Client/RYLClient/CommonOption.cpp +++ b/Client/Client/RYLClient/CommonOption.cpp @@ -695,7 +695,7 @@ void CCommonOption::SelectOption(void) }*/ } -void CCommonOption::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +void CCommonOption::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { switch(m_dwShowOption) { diff --git a/Client/Client/RYLClient/CommonOption.h b/Client/Client/RYLClient/CommonOption.h index 1029860..3de5332 100644 --- a/Client/Client/RYLClient/CommonOption.h +++ b/Client/Client/RYLClient/CommonOption.h @@ -28,7 +28,7 @@ class CCommonOption : public CGUIWindow void InitValue(void); BOOL Update(BOOL &bClick, BOOL &bEdge); void ShowWindow(BOOL bShow); - void Render(LPDIRECT3DDEVICE8 lpD3DDevice); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice); }; #endif // !defined(AFX_COMMONOPTION_H__AE9ED6FC_651F_41A2_933A_AB88CF554CCE__INCLUDED_) diff --git a/Client/Client/RYLClient/GUIMessageBox.cpp b/Client/Client/RYLClient/GUIMessageBox.cpp index 1d3af1c..cdfd99f 100644 --- a/Client/Client/RYLClient/GUIMessageBox.cpp +++ b/Client/Client/RYLClient/GUIMessageBox.cpp @@ -724,12 +724,12 @@ BOOL CGUIMessageBox::UpdateEx(float fTick, BOOL &bClick, BOOL bAble) return TRUE; } -HRESULT CGUIMessageBox::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +HRESULT CGUIMessageBox::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK ; } -VOID CGUIMessageBox::GuildMsgBoxRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +VOID CGUIMessageBox::GuildMsgBoxRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { if ( m_dwFlag & MB_SUPPLEMENTDATA ) { diff --git a/Client/Client/RYLClient/GUIMessageBox.h b/Client/Client/RYLClient/GUIMessageBox.h index b291eb0..9dd7102 100644 --- a/Client/Client/RYLClient/GUIMessageBox.h +++ b/Client/Client/RYLClient/GUIMessageBox.h @@ -145,8 +145,8 @@ public : void AddWord(char *strWord); BOOL UpdateEx(float fTick, BOOL &bClick, BOOL bAble); - //void Render(LPDIRECT3DDEVICE8 lpD3DDevice); - VOID GuildMsgBoxRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + //void Render(LPDIRECT3DDEVICE9 lpD3DDevice); + VOID GuildMsgBoxRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; VOID InitCtrl() ; VOID FinalCtrl() ; @@ -156,8 +156,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) { return S_OK ; }; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/GUIMessageBoxManager.cpp b/Client/Client/RYLClient/GUIMessageBoxManager.cpp index 3c24fbb..965a967 100644 --- a/Client/Client/RYLClient/GUIMessageBoxManager.cpp +++ b/Client/Client/RYLClient/GUIMessageBoxManager.cpp @@ -83,7 +83,7 @@ BOOL CGUIMessageBoxManager::Update() return TRUE;*/ } -void CGUIMessageBoxManager::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUIMessageBoxManager::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { vector::iterator it; for(it = m_lstMessageBox.begin(); it != m_lstMessageBox.end(); it++) diff --git a/Client/Client/RYLClient/GUIMessageBoxManager.h b/Client/Client/RYLClient/GUIMessageBoxManager.h index b4007c7..422fbc7 100644 --- a/Client/Client/RYLClient/GUIMessageBoxManager.h +++ b/Client/Client/RYLClient/GUIMessageBoxManager.h @@ -19,7 +19,7 @@ class CGUIMessageBoxManager { public: void DestroyList(void); - void Render(LPDIRECT3DDEVICE8 lpD3DDevice); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice); BOOL Update(void); void DeleteMessageBox(CGUIMessageBox *lpMessageBox); void Create(void); diff --git a/Client/Client/RYLClient/GUITextEdit.cpp b/Client/Client/RYLClient/GUITextEdit.cpp index 667c9da..4a3e49e 100644 --- a/Client/Client/RYLClient/GUITextEdit.cpp +++ b/Client/Client/RYLClient/GUITextEdit.cpp @@ -148,7 +148,7 @@ LRESULT APIENTRY EditProc(HWND hWnd, unsigned int uMsg, WPARAM wParam, LPARAM lP return CallWindowProc(OldEditProc, hWnd, uMsg, wParam, lParam); } -void CGUITextEdit::Create(HWND hWnd, LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUITextEdit::Create(HWND hWnd, LPDIRECT3DDEVICE9 lpD3DDevice) { m_dwTextSize[0] = 0; m_dwTextSize[1] = 6; m_dwTextSize[2] = 6; m_dwTextSize[3] = 6; m_dwTextSize[4] = 0; m_dwTextSize[5] = 0; m_dwTextSize[6] = 0; m_dwTextSize[7] = 0; diff --git a/Client/Client/RYLClient/GUITextEdit.h b/Client/Client/RYLClient/GUITextEdit.h index d76910e..89e217d 100644 --- a/Client/Client/RYLClient/GUITextEdit.h +++ b/Client/Client/RYLClient/GUITextEdit.h @@ -9,8 +9,8 @@ #pragma once #endif // _MSC_VER > 1000 -#include -#include +#include +#include #include #define MAX_CHATMESSAGE 100 @@ -77,7 +77,7 @@ class CGUITextEdit ~CGUITextEdit(); void DeleteStallMessage(void); - void Create(HWND hWnd, LPDIRECT3DDEVICE8 lpD3DDevice); + void Create(HWND hWnd, LPDIRECT3DDEVICE9 lpD3DDevice); void AddNormalChatMessage(char *strMessage, unsigned long dwSender, unsigned long dwCommand); void AddPartyChatMessage(char *strMessage, unsigned long dwSender, unsigned long dwCommand); void AddGuildChatMessage(char *strMessage, unsigned long dwSender, unsigned long dwCommand); diff --git a/Client/Client/RYLClient/GUITooltip.h b/Client/Client/RYLClient/GUITooltip.h index bba46b9..fbd4d27 100644 --- a/Client/Client/RYLClient/GUITooltip.h +++ b/Client/Client/RYLClient/GUITooltip.h @@ -10,7 +10,7 @@ #endif // _MSC_VER > 1000 #include -#include +#include class CGUITooltip { @@ -36,7 +36,7 @@ class CGUITooltip virtual BOOL GetIsTooltip(void) = 0; virtual void DestroyTooltip(void) = 0; - virtual void Render(LPDIRECT3DDEVICE8 lpD3DDevice) = 0; + virtual void Render(LPDIRECT3DDEVICE9 lpD3DDevice) = 0; }; #endif // !defined(AFX_GUITOOLTIP_H__269F8F44_BF9E_401E_BFC8_8237A2BFE60B__INCLUDED_) diff --git a/Client/Client/RYLClient/GUITooltipButton.cpp b/Client/Client/RYLClient/GUITooltipButton.cpp index 93d24af..bdb4244 100644 --- a/Client/Client/RYLClient/GUITooltipButton.cpp +++ b/Client/Client/RYLClient/GUITooltipButton.cpp @@ -81,7 +81,7 @@ void CGUITooltipButton::DestroyTooltip(void) } -void CGUITooltipButton::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUITooltipButton::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { POINT *ptMousePos = g_DeviceInput.GetMouseLocal(); unsigned short SizeX = ptMousePos->x + 7; diff --git a/Client/Client/RYLClient/GUITooltipButton.h b/Client/Client/RYLClient/GUITooltipButton.h index 149ef65..32da642 100644 --- a/Client/Client/RYLClient/GUITooltipButton.h +++ b/Client/Client/RYLClient/GUITooltipButton.h @@ -26,7 +26,7 @@ class CGUITooltipButton : public CGUITooltip void InitTooltip(const char *strTooltip); BOOL GetIsTooltip(void); void DestroyTooltip(void); - void Render(LPDIRECT3DDEVICE8 lpD3DDevice); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice); }; #endif // !defined(AFX_GUITOOLTIPBUTTON_H__F5EDCEA4_DBCE_459E_BD5D_09BDF373993F__INCLUDED_) diff --git a/Client/Client/RYLClient/GUITooltipItem.cpp b/Client/Client/RYLClient/GUITooltipItem.cpp index 0aa0c84..d2c99d5 100644 --- a/Client/Client/RYLClient/GUITooltipItem.cpp +++ b/Client/Client/RYLClient/GUITooltipItem.cpp @@ -72,7 +72,7 @@ void CGUITooltipItem::DestroyTooltip(void) GM_DELETE( m_pTooltipList ) ; } -void CGUITooltipItem::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUITooltipItem::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { if (m_lpItem->m_bSkill) { @@ -123,7 +123,7 @@ void CGUITooltipItem::Render(LPDIRECT3DDEVICE8 lpD3DDevice) } } } -void CGUITooltipItem::RenderRune(LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUITooltipItem::RenderRune(LPDIRECT3DDEVICE9 lpD3DDevice) { POINT *ptMousePos = g_DeviceInput.GetMouseLocal(); short SizeX = ptMousePos->x + 7; @@ -319,7 +319,7 @@ void CGUITooltipItem::RenderRune(LPDIRECT3DDEVICE8 lpD3DDevice) } -void CGUITooltipItem::RenderBook( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CGUITooltipItem::RenderBook( LPDIRECT3DDEVICE9 lpD3DDevice ) { POINT *ptMousePos = g_DeviceInput.GetMouseLocal(); short SizeX = ptMousePos->x + 7; @@ -823,7 +823,7 @@ unsigned long CGUITooltipItem::GetGradeColor(const Item::EquipType::Grade eGrade return D3DCOLOR_RGBA(255, 255, 255, 255); } -void CGUITooltipItem::RenderEquip( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CGUITooltipItem::RenderEquip( LPDIRECT3DDEVICE9 lpD3DDevice ) { POINT *ptMousePos = g_DeviceInput.GetMouseLocal(); short SizeX = ptMousePos->x + 7; @@ -904,7 +904,7 @@ void CGUITooltipItem::RenderEquip( LPDIRECT3DDEVICE8 lpD3DDevice ) } } -void CGUITooltipItem::MakeEquipDesc( unsigned short wWidth, LPDIRECT3DDEVICE8 lpD3DDevice ) +void CGUITooltipItem::MakeEquipDesc( unsigned short wWidth, LPDIRECT3DDEVICE9 lpD3DDevice ) { POINT* ptMousePos = g_DeviceInput.GetMouseLocal(); short SizeX = ptMousePos->x + 7; @@ -1877,7 +1877,7 @@ void CGUITooltipItem::MakeEquipDesc( unsigned short wWidth, LPDIRECT3DDEVICE8 lp } } -void CGUITooltipItem::RenderSkill(LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUITooltipItem::RenderSkill(LPDIRECT3DDEVICE9 lpD3DDevice) { // edith 2009.10.26 Ƽ // Ƽ ȭ鿡 Ѵ. @@ -3413,7 +3413,7 @@ void CGUITooltipItem::GetEtcTooltipPos(short &sPosX, short &sPosY, short &sLengt } } -void CGUITooltipItem::RenderEtc(LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUITooltipItem::RenderEtc(LPDIRECT3DDEVICE9 lpD3DDevice) { POINT *ptMousePos = g_DeviceInput.GetMouseLocal(); short SizeX = ptMousePos->x + 7; diff --git a/Client/Client/RYLClient/GUITooltipItem.h b/Client/Client/RYLClient/GUITooltipItem.h index 46f2889..b972f51 100644 --- a/Client/Client/RYLClient/GUITooltipItem.h +++ b/Client/Client/RYLClient/GUITooltipItem.h @@ -31,7 +31,7 @@ public: CGUITooltipItem(); ~CGUITooltipItem(); - void Render(LPDIRECT3DDEVICE8 lpD3DDevice); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice); void SetItem(CItemInstance* lpItem) { m_lpItem = lpItem; } BOOL GetIsTooltip(void); @@ -46,15 +46,15 @@ protected: void GetEtcTooltipPos(short &sPosX, short &sPosY, short &sLength, short &sLine); void GetRuneTooltipPos(short &sPosX, short &sPosY, short &sLength, short &sLine); - void RenderEquip(LPDIRECT3DDEVICE8 lpD3DDevice); - void RenderSkill(LPDIRECT3DDEVICE8 lpD3DDevice); - void RenderBook(LPDIRECT3DDEVICE8 lpD3DDevice); - void RenderEtc(LPDIRECT3DDEVICE8 lpD3DDevice); - void RenderRune(LPDIRECT3DDEVICE8 lpD3DDevice); + void RenderEquip(LPDIRECT3DDEVICE9 lpD3DDevice); + void RenderSkill(LPDIRECT3DDEVICE9 lpD3DDevice); + void RenderBook(LPDIRECT3DDEVICE9 lpD3DDevice); + void RenderEtc(LPDIRECT3DDEVICE9 lpD3DDevice); + void RenderRune(LPDIRECT3DDEVICE9 lpD3DDevice); void MakeSkillBookDesc( unsigned short wWidth ) ; void MakeEtcDesc( unsigned short wWidth ) ; - void MakeEquipDesc( unsigned short wWidth, LPDIRECT3DDEVICE8 lpD3DDevice ) ; + void MakeEquipDesc( unsigned short wWidth, LPDIRECT3DDEVICE9 lpD3DDevice ) ; unsigned long GetGradeColor(const Item::Attribute::Type eType); unsigned long GetGradeColor(const Item::EquipType::Grade eGrade); diff --git a/Client/Client/RYLClient/GUITooltipManager.cpp b/Client/Client/RYLClient/GUITooltipManager.cpp index 6148ca1..d24ee1e 100644 --- a/Client/Client/RYLClient/GUITooltipManager.cpp +++ b/Client/Client/RYLClient/GUITooltipManager.cpp @@ -69,7 +69,7 @@ void CGUITooltipManager::Update(long lMoveX, long lMoveY) } } -void CGUITooltipManager::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +void CGUITooltipManager::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { if(m_ttRenderTarget && m_ttRenderTarget->m_bShow) { diff --git a/Client/Client/RYLClient/GUITooltipManager.h b/Client/Client/RYLClient/GUITooltipManager.h index c69a8be..5eee260 100644 --- a/Client/Client/RYLClient/GUITooltipManager.h +++ b/Client/Client/RYLClient/GUITooltipManager.h @@ -20,7 +20,7 @@ class CGUITooltipManager vector m_lstTooltip; static CGUITooltip *m_ttRenderTarget; - void Render(LPDIRECT3DDEVICE8 lpD3DDevice); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice); void Update(long lMoveX = 0, long lMoveY = 0); void DestroyAllTooltip(void); BOOL AddTooltip(CGUITooltip *pTooltip); diff --git a/Client/Client/RYLClient/GUIWindow.h b/Client/Client/RYLClient/GUIWindow.h index 83ec48c..174c549 100644 --- a/Client/Client/RYLClient/GUIWindow.h +++ b/Client/Client/RYLClient/GUIWindow.h @@ -64,7 +64,7 @@ class CGUIWindow virtual void InitValue(void) = 0; virtual BOOL Update(BOOL &bClick, BOOL &bEdge) = 0; virtual void ShowWindow(BOOL bShow) = 0; - virtual void Render(LPDIRECT3DDEVICE8 lpD3DDevice) = 0; + virtual void Render(LPDIRECT3DDEVICE9 lpD3DDevice) = 0; }; #endif // !defined(AFX_GUIWINDOW_H__FBEDCE5C_5D7D_438F_B55B_112096006F1A__INCLUDED_) diff --git a/Client/Client/RYLClient/HumanStoneStatueRespawn.cpp b/Client/Client/RYLClient/HumanStoneStatueRespawn.cpp index b3982fb..f942990 100644 --- a/Client/Client/RYLClient/HumanStoneStatueRespawn.cpp +++ b/Client/Client/RYLClient/HumanStoneStatueRespawn.cpp @@ -249,7 +249,7 @@ void CHumanStoneStatue::FadeOut( INT Index ) m_StonStatueInfo[ Index ].lScreenFade = FADE_END ; } -void CHumanStoneStatue::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +void CHumanStoneStatue::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { for ( int i = 0 ; i < 3 ; i ++ ) { diff --git a/Client/Client/RYLClient/HumanStoneStatueRespawn.h b/Client/Client/RYLClient/HumanStoneStatueRespawn.h index 716e28b..b70553f 100644 --- a/Client/Client/RYLClient/HumanStoneStatueRespawn.h +++ b/Client/Client/RYLClient/HumanStoneStatueRespawn.h @@ -74,7 +74,7 @@ public : void InitValue(void) {} ; BOOL Update(BOOL &bClick, BOOL &bEdge); void ShowWindow(BOOL bShow) ; - void Render(LPDIRECT3DDEVICE8 lpD3DDevice); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice); void FadeIn( INT Index ) ; void FadeOut( INT Index ) ; diff --git a/Client/Client/RYLClient/ItemInstance.cpp b/Client/Client/RYLClient/ItemInstance.cpp index 7d78038..42f6e9d 100644 --- a/Client/Client/RYLClient/ItemInstance.cpp +++ b/Client/Client/RYLClient/ItemInstance.cpp @@ -98,7 +98,7 @@ CItemInstance::~CItemInstance() } } -Skill::ProtoType* CItemInstance::Render(LPDIRECT3DDEVICE8 lpD3DDevice, bool bAlterSkill ) +Skill::ProtoType* CItemInstance::Render(LPDIRECT3DDEVICE9 lpD3DDevice, bool bAlterSkill ) { Skill::ProtoType* pAltSkill = NULL ; @@ -366,7 +366,7 @@ Skill::ProtoType* CItemInstance::Render(LPDIRECT3DDEVICE8 lpD3DDevice, bool bAlt return pAltSkill ; } -void CItemInstance::RenderEnableChant(LPDIRECT3DDEVICE8 lpD3DDevice) +void CItemInstance::RenderEnableChant(LPDIRECT3DDEVICE9 lpD3DDevice) { if(!m_lpSprite ) return; diff --git a/Client/Client/RYLClient/ItemInstance.h b/Client/Client/RYLClient/ItemInstance.h index 57a30cc..55a1b28 100644 --- a/Client/Client/RYLClient/ItemInstance.h +++ b/Client/Client/RYLClient/ItemInstance.h @@ -60,9 +60,9 @@ class CItemInstance int SetItemInfofromID(unsigned short wProtoTypeID, Item::ItemPos &pItemIndex); int SetItemInfofromItem( Item::CItem* pBaseItem, Item::ItemPos &pItemIndex); - Skill::ProtoType* Render(LPDIRECT3DDEVICE8 lpD3DDevice, bool bAlterSkill = false ); + Skill::ProtoType* Render(LPDIRECT3DDEVICE9 lpD3DDevice, bool bAlterSkill = false ); - void RenderEnableChant(LPDIRECT3DDEVICE8 lpD3DDevice); + void RenderEnableChant(LPDIRECT3DDEVICE9 lpD3DDevice); // Ÿ ID ȯ unsigned short GetProtoTypeID( bool bAlterSkill = false ); diff --git a/Client/Client/RYLClient/RYLClient.vcproj b/Client/Client/RYLClient/RYLClient.vcproj index 63911bd..be19399 100644 --- a/Client/Client/RYLClient/RYLClient.vcproj +++ b/Client/Client/RYLClient/RYLClient.vcproj @@ -33,7 +33,7 @@ Name="VCCustomBuildTool"/> true - Effect.lib;SoundLib.lib;Caldron.lib;Zalla3DBaseClass.lib;GlobalScript.lib;ScriptEngine.lib;CharacterActionControl.lib;ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static_d.lib;luad.lib;%(AdditionalDependencies) + Effect.lib;SoundLib.lib;Caldron.lib;Zalla3DBaseClass.lib;GlobalScript.lib;ScriptEngine.lib;CharacterActionControl.lib;ws2_32.lib;dsound.lib;eaxguid.lib;d3d9.lib;d3dx9.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static_d.lib;luad.lib;%(AdditionalDependencies) F:\YouxiLand\ROW\Client.exe ../../Engine/SoundLib/vorbis_sdk/lib;../../Library/$(Configuration) LIBC;LIBCD;MSVCRT;MSVCRTD;LIBCMT;%(IgnoreSpecificDefaultLibraries) @@ -163,7 +163,7 @@ true - ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;lua.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies) + ws2_32.lib;dsound.lib;eaxguid.lib;d3d9.lib;d3dx9.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;lua.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies) $(OutDir)Client.exe ../../Engine/SoundLib/vorbis_sdk/lib;../..\Library\$(Configuration) true @@ -197,7 +197,7 @@ true - ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;lua.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies) + ws2_32.lib;dsound.lib;eaxguid.lib;d3d9.lib;d3dx9.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;lua.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies) $(OutDir)Client.exe ../../Engine/SoundLib/vorbis_sdk/lib;../..\Library\$(Configuration) true @@ -228,7 +228,7 @@ true - ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxguid.lib;dxerr8.lib;dinput8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies) + ws2_32.lib;dsound.lib;eaxguid.lib;d3d9.lib;d3dx9.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxguid.lib;dxerr.lib;dinput8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static.lib;%(AdditionalDependencies) $(OutDir)Client.exe ../../Engine/SoundLib/vorbis_sdk/lib;../..\Library\$(Configuration) %(IgnoreSpecificDefaultLibraries) @@ -258,7 +258,7 @@ true - ws2_32.lib;dsound.lib;eaxguid.lib;d3d8.lib;d3dx8.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr8.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static_d.lib;%(AdditionalDependencies) + ws2_32.lib;dsound.lib;eaxguid.lib;d3d9.lib;d3dx9.lib;dxguid.lib;dinput8.lib;shlwapi.lib;ole32.lib;wbemuuid.lib;winmm.lib;dxerr.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;ijl15.lib;imm32.lib;../../Engine/SoundLib/vorbis_sdk/lib/ogg_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbis_static_d.lib;../../Engine/SoundLib/vorbis_sdk/lib/vorbisfile_static_d.lib;%(AdditionalDependencies) $(OutDir)Client.exe ../../Engine/SoundLib/vorbis_sdk/lib;../..\Library\$(Configuration) %(IgnoreSpecificDefaultLibraries) diff --git a/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.cpp index 01668ac..6401324 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.cpp @@ -156,12 +156,12 @@ VOID CRYLAbilityDescDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLAbilityDescDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLAbilityDescDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLAbilityDescDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLAbilityDescDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.h b/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.h index b05db8c..ee38862 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLAbilityDescDlg.h @@ -55,8 +55,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; void RestoreAbilityUI( unsigned short wSkillID, unsigned char cSkillStep, unsigned char cSkillLevel, unsigned char cWeaponType ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.cpp index 9b03680..a435d53 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.cpp @@ -695,13 +695,13 @@ HRESULT CRYLAbilityPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLAbilityPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLAbilityPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLAbilityPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLAbilityPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -719,7 +719,7 @@ HRESULT CRYLAbilityPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) return S_OK ; } -VOID CRYLAbilityPanel::RenderAbilitySlot( LPDIRECT3DDEVICE8 lpD3DDevice, +VOID CRYLAbilityPanel::RenderAbilitySlot( LPDIRECT3DDEVICE9 lpD3DDevice, VIRTUAL_ABILITY_SLOT* lpSlot, LONG lMoveX, LONG lMoveY, bool bAlterAbility ) { diff --git a/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.h b/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.h index 7fc5026..b6b7944 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLAbilityPanel.h @@ -10,7 +10,7 @@ #include "GMUICustomPanel.h" #include "RYLButton.h" -#include +#include #include #include @@ -130,8 +130,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; @@ -143,7 +143,7 @@ public : unsigned char cPos, unsigned char cIndex) ; - VOID RenderAbilitySlot( LPDIRECT3DDEVICE8 lpD3DDevice, + VOID RenderAbilitySlot( LPDIRECT3DDEVICE9 lpD3DDevice, VIRTUAL_ABILITY_SLOT* lpSlot, LONG lMoveX, LONG lMoveY, bool bAlterAbility = false ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLAgreeDlg.h b/Client/Client/RYLClient/RYLClient/RYLAgreeDlg.h index 4f30b08..41c4f56 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAgreeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLAgreeDlg.h @@ -41,8 +41,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLAkhanCharacterCreationDlg.h b/Client/Client/RYLClient/RYLClient/RYLAkhanCharacterCreationDlg.h index 5ccfe6f..cb815cb 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAkhanCharacterCreationDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLAkhanCharacterCreationDlg.h @@ -159,8 +159,8 @@ public : virtual VOID Hide( CGMUIObject* Sender ) ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.cpp index 47acc70..98c6d15 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.cpp @@ -677,7 +677,7 @@ HRESULT CRYLAkhanInventoryPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLAkhanInventoryPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLAkhanInventoryPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } @@ -878,7 +878,7 @@ BOOL CRYLAkhanInventoryPanel::SelectItem() } -HRESULT CRYLAkhanInventoryPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLAkhanInventoryPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData* pGame = CRYLGameData::Instance() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.h b/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.h index 9896c7b..a527c53 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLAkhanInventoryPanel.h @@ -9,7 +9,7 @@ #define __RYL_AKHANINVENTORYPANEL_H__ #include "RYLInventoryPanel.h" -#include +#include class CRYLLabel ; class CRYLButton ; @@ -52,8 +52,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.cpp index f970142..b7518d9 100644 --- a/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.cpp @@ -196,7 +196,7 @@ VOID CRYLArmsCreatMenuDlg::Hide( CGMUIObject* Sender ) VOID CRYLArmsCreatMenuDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -217,12 +217,12 @@ VOID CRYLArmsCreatMenuDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLArmsCreatMenuDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLArmsCreatMenuDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLArmsCreatMenuDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLArmsCreatMenuDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.h b/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.h index 65d1a70..a03acfb 100644 --- a/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLArmsCreatMenuDlg.h @@ -46,8 +46,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.cpp index e0982ae..02132f5 100644 --- a/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.cpp @@ -152,12 +152,12 @@ VOID CRYLArmsHPDlg::GMUIPaint( INT xx, INT yy ) } -HRESULT CRYLArmsHPDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLArmsHPDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLArmsHPDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLArmsHPDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.h b/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.h index 656c329..3fadb28 100644 --- a/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLArmsHPDlg.h @@ -39,8 +39,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLAuthoritySettingDlg.h b/Client/Client/RYLClient/RYLClient/RYLAuthoritySettingDlg.h index 43b7c46..94745e5 100644 --- a/Client/Client/RYLClient/RYLClient/RYLAuthoritySettingDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLAuthoritySettingDlg.h @@ -102,8 +102,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLBattleGroundDlg.h b/Client/Client/RYLClient/RYLClient/RYLBattleGroundDlg.h index 68cf95e..b6637c9 100644 --- a/Client/Client/RYLClient/RYLClient/RYLBattleGroundDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLBattleGroundDlg.h @@ -66,8 +66,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLBattleWaitDlg.h b/Client/Client/RYLClient/RYLClient/RYLBattleWaitDlg.h index 888cf85..b465a0a 100644 --- a/Client/Client/RYLClient/RYLClient/RYLBattleWaitDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLBattleWaitDlg.h @@ -58,8 +58,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.cpp index da2b6e4..4e2eafe 100644 --- a/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.cpp @@ -284,7 +284,7 @@ VOID CRYLBlacksmithDlg::Hide( CGMUIObject* Sender ) VOID CRYLBlacksmithDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -336,12 +336,12 @@ VOID CRYLBlacksmithDlg::GMUIPaint( INT xx, INT yy ) m_pGoldLabel->SetCaption( strGold ) ; } -HRESULT CRYLBlacksmithDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLBlacksmithDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLBlacksmithDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLBlacksmithDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { diff --git a/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.h b/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.h index 3e40101..39cd502 100644 --- a/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLBlacksmithDlg.h @@ -62,8 +62,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.cpp index 6a5b30b..53a37dc 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.cpp @@ -234,7 +234,7 @@ VOID CRYLCampChangeDlg::Hide( CGMUIObject* Sender ) VOID CRYLCampChangeDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -259,12 +259,12 @@ VOID CRYLCampChangeDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLCampChangeDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampChangeDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCampChangeDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampChangeDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.h b/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.h index dc03511..d8852cf 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCampChangeDlg.h @@ -52,8 +52,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.cpp index ce7f5fb..e84c101 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.cpp @@ -215,12 +215,12 @@ VOID CRYLCampCreatingDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLCampCreatingDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampCreatingDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCampCreatingDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampCreatingDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.h b/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.h index b181c77..efdc8b4 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCampCreatingDlg.h @@ -48,8 +48,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.cpp index 962efa3..e33acbd 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.cpp @@ -218,7 +218,7 @@ VOID CRYLCampRepairDlg::Hide( CGMUIObject* Sender ) VOID CRYLCampRepairDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -243,12 +243,12 @@ VOID CRYLCampRepairDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLCampRepairDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampRepairDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCampRepairDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampRepairDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.h b/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.h index 97692b4..0b8c167 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCampRepairDlg.h @@ -54,8 +54,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.cpp index 3a409f5..fc5cdea 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.cpp @@ -352,12 +352,12 @@ VOID CRYLCampRightDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLCampRightDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampRightDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCampRightDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampRightDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.h b/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.h index 5e2f681..fda0063 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCampRightDlg.h @@ -69,8 +69,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.cpp index 3bcd963..1670cce 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.cpp @@ -367,7 +367,7 @@ VOID CRYLCampShopDlg::GMUIPaint(INT xx, INT yy) // UI CRYLDialog::GMUIPaint(xx, yy); - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); // for (list::iterator it = m_lstItem.begin(); it != m_lstItem.end(); ++it) diff --git a/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.h b/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.h index e9d8f0d..cf9dbec 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCampShopDlg.h @@ -70,8 +70,8 @@ public: virtual VOID GMUIPaint(INT xx, INT yy); virtual HRESULT Update(BOOL &bClick, BOOL &bEdge); - virtual HRESULT Render(LPDIRECT3DDEVICE8 lpD3DDevice) { return S_OK; } - virtual HRESULT FinalRender(LPDIRECT3DDEVICE8 lpD3DDevice) { return S_OK; } + virtual HRESULT Render(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK; } + virtual HRESULT FinalRender(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK; } virtual bool SendChat(char* szChatMessage); virtual void AddItemList(CItemInstance* lpItem, bool bSound); diff --git a/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.cpp index 4337426..b8300da 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.cpp @@ -212,12 +212,12 @@ VOID CRYLCampShowTaxInfoDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLCampShowTaxInfoDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampShowTaxInfoDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCampShowTaxInfoDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampShowTaxInfoDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.h b/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.h index e2aa137..6ca1d35 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCampShowTaxInfoDlg.h @@ -55,8 +55,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; VOID SetCampShop( const vector3& vecPos ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.cpp index 33da62c..61f24f9 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.cpp @@ -212,7 +212,7 @@ VOID CRYLCampUpgradeDlg::Hide( CGMUIObject* Sender ) VOID CRYLCampUpgradeDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -244,12 +244,12 @@ VOID CRYLCampUpgradeDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLCampUpgradeDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampUpgradeDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCampUpgradeDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCampUpgradeDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.h b/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.h index 7777251..9d60c72 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCampUpgradeDlg.h @@ -53,8 +53,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.cpp index 693372c..c7a8cd0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.cpp @@ -173,12 +173,12 @@ VOID CRYLCastleDoorblockDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLCastleDoorblockDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCastleDoorblockDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCastleDoorblockDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCastleDoorblockDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.h b/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.h index e62d7be..83c8dcb 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCastleDoorblockDlg.h @@ -45,8 +45,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.cpp index 493851f..4f0452b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.cpp @@ -562,12 +562,12 @@ VOID CRYLCastleEmblemRightDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLCastleEmblemRightDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCastleEmblemRightDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCastleEmblemRightDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCastleEmblemRightDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.h b/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.h index d0df22e..6558e52 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCastleEmblemRightDlg.h @@ -90,8 +90,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.cpp index 3796d23..4131ee3 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.cpp @@ -257,7 +257,7 @@ VOID CRYLCastleMineralDlg::Hide( CGMUIObject* Sender ) VOID CRYLCastleMineralDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; std::vector< CItemInstance* >::iterator iter; diff --git a/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.h b/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.h index 97da7b9..65e9249 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCastleMineralDlg.h @@ -78,8 +78,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; } ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCastleStatusFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLCastleStatusFrameDlg.h index c75ac72..18ca732 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCastleStatusFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCastleStatusFrameDlg.h @@ -41,8 +41,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLChangeNameDlg.h b/Client/Client/RYLClient/RYLClient/RYLChangeNameDlg.h index d3b325b..35bce28 100644 --- a/Client/Client/RYLClient/RYLClient/RYLChangeNameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLChangeNameDlg.h @@ -71,8 +71,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLChannelDlg.h b/Client/Client/RYLClient/RYLClient/RYLChannelDlg.h index b0d7f8a..84c7086 100644 --- a/Client/Client/RYLClient/RYLClient/RYLChannelDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLChannelDlg.h @@ -48,8 +48,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCharacterCreationDlg.h b/Client/Client/RYLClient/RYLClient/RYLCharacterCreationDlg.h index d9e44cb..675c461 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCharacterCreationDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCharacterCreationDlg.h @@ -280,8 +280,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCharacterDeleteDlg.h b/Client/Client/RYLClient/RYLClient/RYLCharacterDeleteDlg.h index 33948c1..265ad8d 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCharacterDeleteDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCharacterDeleteDlg.h @@ -50,8 +50,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.cpp index 16f3b5f..624d2b0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.cpp @@ -667,7 +667,7 @@ VOID CRYLCharacterInfoDlg::CharacterDelete() } } -HRESULT CRYLCharacterInfoDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCharacterInfoDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.h b/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.h index 13494f5..f592a58 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLCharacterInfoDlg.h @@ -65,8 +65,8 @@ public : virtual VOID Hide( CGMUIObject* Sender ) ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCharacterInfoPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLCharacterInfoPanel.cpp index fdb0b64..ba1fc42 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCharacterInfoPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCharacterInfoPanel.cpp @@ -646,7 +646,7 @@ HRESULT CRYLCharacterInfoPanel::Update() } // ũ - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); CRYLSprite* pSprite = pPanel->GetGuildSprite( pSelfData->m_ulGuildID ); if ( pSprite ) diff --git a/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.cpp b/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.cpp index afc215e..e06c5aa 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.cpp @@ -78,12 +78,12 @@ void CRYLCharacterSelectScene::DeleteCharacterCreation() GM_DELETE( m_pCharacterCreation ) ; } -HRESULT CRYLCharacterSelectScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCharacterSelectScene::SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCharacterSelectScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCharacterSelectScene::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData::Instance()->m_lpInterface->RenderChrSelect( lpD3DDevice ) ; @@ -98,7 +98,7 @@ HRESULT CRYLCharacterSelectScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) return S_OK ; } -HRESULT CRYLCharacterSelectScene::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCharacterSelectScene::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLLoadingScene::Instance()->Render( lpD3DDevice ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.h b/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.h index 4f96f59..644608f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.h +++ b/Client/Client/RYLClient/RYLClient/RYLCharacterSelectScene.h @@ -34,9 +34,9 @@ public : CRYLCharacterSelectScene( INT iID ) ; virtual ~CRYLCharacterSelectScene() ; - virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update() ; virtual HRESULT InitResourceObject() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLChattingDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLChattingDlg.cpp index f2d05fc..ea35b98 100644 --- a/Client/Client/RYLClient/RYLClient/RYLChattingDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLChattingDlg.cpp @@ -723,7 +723,7 @@ VOID CRYLChattingDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; #ifdef _RYL_LANGUAGE - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; if(m_bShowTooltip && m_lpTooltip) { m_lpTooltip->Render(lpD3DDevice); @@ -731,12 +731,12 @@ VOID CRYLChattingDlg::GMUIPaint( INT xx, INT yy ) #endif } -HRESULT CRYLChattingDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLChattingDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLChattingDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLChattingDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; diff --git a/Client/Client/RYLClient/RYLClient/RYLChattingDlg.h b/Client/Client/RYLClient/RYLClient/RYLChattingDlg.h index 5643fe1..e46f7b1 100644 --- a/Client/Client/RYLClient/RYLClient/RYLChattingDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLChattingDlg.h @@ -161,8 +161,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLChinaUnifiedServerSelCharDlg.h b/Client/Client/RYLClient/RYLClient/RYLChinaUnifiedServerSelCharDlg.h index 3190d82..d8faf20 100644 --- a/Client/Client/RYLClient/RYLClient/RYLChinaUnifiedServerSelCharDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLChinaUnifiedServerSelCharDlg.h @@ -83,8 +83,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLClientMain.h b/Client/Client/RYLClient/RYLClient/RYLClientMain.h index 1b344f9..75f7522 100644 --- a/Client/Client/RYLClient/RYLClient/RYLClientMain.h +++ b/Client/Client/RYLClient/RYLClient/RYLClientMain.h @@ -116,7 +116,7 @@ public : CRYLSceneManager* m_pRYLSceneManager ; CRYLIMEView* m_pImeView ; - LPDIRECT3DDEVICE8 m_lpD3DDevice ; // D3D Device + LPDIRECT3DDEVICE9 m_lpD3DDevice ; // D3D Device CRYLLoadingScene* m_pLoadingScene ; // Loading Scene [ Instance ޾ƿ; ] diff --git a/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.cpp index 8037461..f121de5 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.cpp @@ -276,12 +276,12 @@ HRESULT CRYLCompleteQuestPanel::Update( BOOL &bClick, BOOL &bEdge ) } -HRESULT CRYLCompleteQuestPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCompleteQuestPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLCompleteQuestPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLCompleteQuestPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.h b/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.h index e1c3c48..fa1b7fa 100644 --- a/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLCompleteQuestPanel.h @@ -66,8 +66,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLDialogControlDlg.h b/Client/Client/RYLClient/RYLClient/RYLDialogControlDlg.h index f6bfa13..9ddf6ac 100644 --- a/Client/Client/RYLClient/RYLClient/RYLDialogControlDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLDialogControlDlg.h @@ -60,8 +60,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.cpp index 8741c26..8bcbb34 100644 --- a/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.cpp @@ -224,7 +224,7 @@ VOID CRYLEmblemUpgradeDlg::Hide( CGMUIObject* Sender ) VOID CRYLEmblemUpgradeDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -267,12 +267,12 @@ VOID CRYLEmblemUpgradeDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLEmblemUpgradeDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLEmblemUpgradeDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLEmblemUpgradeDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLEmblemUpgradeDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.h b/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.h index 4108872..e57a35b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLEmblemUpgradeDlg.h @@ -61,8 +61,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.cpp index 4c91ac9..05a2614 100644 --- a/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.cpp @@ -402,7 +402,7 @@ VOID CRYLEnchantDlg::Hide( CGMUIObject* Sender ) VOID CRYLEnchantDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; INT iLeft = GetLeft() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.h b/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.h index 7b73b82..94c12b0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLEnchantDlg.h @@ -44,8 +44,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.cpp index 0dde9b5..b1bd1dc 100644 --- a/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.cpp @@ -349,7 +349,7 @@ VOID CRYLExchangeDlg::GMUIPaint( INT xx, INT yy ) { CRYLDialog::GMUIPaint( xx, yy ) ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLGameData* pGame = CRYLGameData::Instance() ; if (!m_bSingleWindow) diff --git a/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.h b/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.h index 9d7ecad..6026847 100644 --- a/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLExchangeDlg.h @@ -75,8 +75,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.cpp index 4a13a7f..4be75cf 100644 --- a/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.cpp @@ -512,12 +512,12 @@ HRESULT CRYLExecutionQuestPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLExecutionQuestPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLExecutionQuestPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLExecutionQuestPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLExecutionQuestPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.h b/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.h index 14f188c..6d2491d 100644 --- a/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLExecutionQuestPanel.h @@ -11,7 +11,7 @@ #include "GMUICustomPanel.h" #include "RYLButton.h" #include "..\\CharStatus.h" -#include +#include #include class CRYLLabel ; @@ -116,8 +116,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.cpp index 2aa8adc..3936adf 100644 --- a/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.cpp @@ -121,7 +121,7 @@ HRESULT CRYLFirstCreateDlg::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLFirstCreateDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLFirstCreateDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.h b/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.h index 2d25a0c..36d669c 100644 --- a/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLFirstCreateDlg.h @@ -29,8 +29,8 @@ public: virtual VOID Hide( CGMUIObject* Sender ) ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLFriendPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLFriendPanel.cpp index 83281ee..9261199 100644 --- a/Client/Client/RYLClient/RYLClient/RYLFriendPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLFriendPanel.cpp @@ -619,7 +619,7 @@ VOID CRYLFriendPanel::UpdateWhisperCharacter(char* szName) CRYLGuildInfoPanel* pPanel = ( CRYLGuildInfoPanel* )pDlg->GetGuildInfoPanel(); // ũ - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); CRYLSprite* pSprite = NULL; @@ -687,7 +687,7 @@ VOID CRYLFriendPanel::SetWhisperCharacter() CRYLGuildInfoPanel* pPanel = ( CRYLGuildInfoPanel* )pDlg->GetGuildInfoPanel(); // ũ - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); CRYLSprite* pSprite = NULL; diff --git a/Client/Client/RYLClient/RYLClient/RYLGMReportDlg.h b/Client/Client/RYLClient/RYLClient/RYLGMReportDlg.h index ca3d1e3..d692fb7 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGMReportDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLGMReportDlg.h @@ -55,8 +55,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGameData.cpp b/Client/Client/RYLClient/RYLClient/RYLGameData.cpp index 05f20c7..05f93c9 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGameData.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLGameData.cpp @@ -3332,7 +3332,7 @@ void CRYLGameData::EnterClient() */ } -void CRYLGameData::RenderNumber(LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate) +void CRYLGameData::RenderNumber(LPDIRECT3DDEVICE9 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate) { if (!m_lpNumber) { @@ -3601,7 +3601,7 @@ void CRYLGameData::RenderNumber(LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, shor } } -void CRYLGameData::RenderRect(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned short x1, unsigned short y1, unsigned short x2, unsigned short y2, unsigned long dwColor, unsigned char cAlpha) +void CRYLGameData::RenderRect(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned short x1, unsigned short y1, unsigned short x2, unsigned short y2, unsigned long dwColor, unsigned char cAlpha) { TLVertex pVertices[4]; pVertices[0].Diffuse.c = pVertices[1].Diffuse.c = pVertices[2].Diffuse.c = pVertices[3].Diffuse.c = dwColor; @@ -3631,7 +3631,7 @@ char *CRYLGameData::GetClassName(unsigned short wClass) } -void CRYLGameData::RenderStackNumber(LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, short sPosY, long lValue) +void CRYLGameData::RenderStackNumber(LPDIRECT3DDEVICE9 lpD3DDevice, short sPosX, short sPosY, long lValue) { if (!m_lpStackNumber) { @@ -3685,7 +3685,7 @@ void CRYLGameData::RenderStackNumber(LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, } } -void CRYLGameData::RenderCursor(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned short wPosX, unsigned short wPosY, unsigned long dwKindCursor, unsigned char cAlpha) +void CRYLGameData::RenderCursor(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned short wPosX, unsigned short wPosY, unsigned long dwKindCursor, unsigned char cAlpha) { if (!m_lpCursor) { diff --git a/Client/Client/RYLClient/RYLClient/RYLGameData.h b/Client/Client/RYLClient/RYLClient/RYLGameData.h index 0aa7a8e..b34c572 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGameData.h +++ b/Client/Client/RYLClient/RYLClient/RYLGameData.h @@ -434,11 +434,11 @@ protected: public: // Old CommonInterface Mothod - void RenderNumber(LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate) ; - void RenderRect(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned short x1, unsigned short y1, unsigned short x2, unsigned short y2, unsigned long dwColor, unsigned char cAlpha) ; + void RenderNumber(LPDIRECT3DDEVICE9 lpD3DDevice, short sPosX, short sPosY, unsigned char cAlpha, unsigned short wMode, long lValue, float fRate) ; + void RenderRect(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned short x1, unsigned short y1, unsigned short x2, unsigned short y2, unsigned long dwColor, unsigned char cAlpha) ; char* GetClassName(unsigned short wClass) ; - void RenderStackNumber(LPDIRECT3DDEVICE8 lpD3DDevice, short sPosX, short sPosY, long lValue) ; - void RenderCursor(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned short wPosX, unsigned short wPosY, unsigned long dwKindCursor, unsigned char cAlpha = 0xFF) ; + void RenderStackNumber(LPDIRECT3DDEVICE9 lpD3DDevice, short sPosX, short sPosY, long lValue) ; + void RenderCursor(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned short wPosX, unsigned short wPosY, unsigned long dwKindCursor, unsigned char cAlpha = 0xFF) ; BOOL EncodeJPGFile(LPTSTR lpstrFilename, LPDIRECT3DSURFACE8 lpSurface) ; void FadeIn(void) diff --git a/Client/Client/RYLClient/RYLClient/RYLGameScene.cpp b/Client/Client/RYLClient/RYLClient/RYLGameScene.cpp index b369d90..4dea71a 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGameScene.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLGameScene.cpp @@ -185,19 +185,19 @@ CRYLGameScene::~CRYLGameScene() GM_RELEASE( m_pDownMovieBarImage ) ; } -HRESULT CRYLGameScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGameScene::SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLGameScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGameScene::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData::Instance()->m_lpInterface->RenderGame( lpD3DDevice ) ; return S_OK ; } -HRESULT CRYLGameScene::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGameScene::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { if ( m_RYLMiniMapDlg->GetVisible() ) m_RYLMiniMapDlg->FinalRender( lpD3DDevice ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGameScene.h b/Client/Client/RYLClient/RYLClient/RYLGameScene.h index af2db81..1290f21 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGameScene.h +++ b/Client/Client/RYLClient/RYLClient/RYLGameScene.h @@ -31,9 +31,9 @@ public : CRYLGameScene( INT iID ) ; virtual ~CRYLGameScene() ; - virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update() ; VOID InitResourceByRace() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.cpp index 8f2057e..f9bdb60 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.cpp @@ -228,12 +228,12 @@ HRESULT CRYLGuildFrameDlg::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLGuildFrameDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildFrameDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLGuildFrameDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildFrameDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } @@ -283,7 +283,7 @@ VOID CRYLGuildFrameDlg::Hide( CGMUIObject* Sender ) VOID CRYLGuildFrameDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.h index 99aa1b9..154ef64 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLGuildFrameDlg.h @@ -52,8 +52,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildInclinationDlg.h b/Client/Client/RYLClient/RYLClient/RYLGuildInclinationDlg.h index 184200a..cbfe7d6 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildInclinationDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLGuildInclinationDlg.h @@ -103,8 +103,8 @@ public : VOID InitCtrl() ; VOID FinalCtrl() ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.cpp index 1ea62dd..7035619 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.cpp @@ -634,12 +634,12 @@ HRESULT CRYLGuildInfoPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLGuildInfoPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildInfoPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLGuildInfoPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildInfoPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.h b/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.h index c8eb451..73b27c2 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLGuildInfoPanel.h @@ -187,8 +187,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; VOID GuildEntryButtonEvent() ; VOID GuildEntryCancelButtonEvent() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildMarkDlg.h b/Client/Client/RYLClient/RYLClient/RYLGuildMarkDlg.h index 767a962..68cc5b4 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildMarkDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLGuildMarkDlg.h @@ -68,8 +68,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.cpp index 10a0784..d488a9b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.cpp @@ -738,12 +738,12 @@ HRESULT CRYLGuildMemberPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLGuildMemberPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildMemberPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLGuildMemberPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildMemberPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.h b/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.h index 8c89739..c23d176 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLGuildMemberPanel.h @@ -9,7 +9,7 @@ #define __RYL_GUILDMEMBERPANEL_H__ #include "GMUICustomPanel.h" -#include +#include #include #include #include @@ -139,8 +139,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; static VOID DlgMouseUp( CGMUIObject* Sender, INT Button, INT Shift, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.cpp index 3948bea..d747a67 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.cpp @@ -431,12 +431,12 @@ HRESULT CRYLGuildPropertyPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLGuildPropertyPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildPropertyPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLGuildPropertyPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildPropertyPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.h b/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.h index a5813e7..f6110d1 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLGuildPropertyPanel.h @@ -10,7 +10,7 @@ #include "GMUICustomPanel.h" #include -#include +#include class CRYLLabel ; class CRYLButton ; @@ -122,8 +122,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.cpp index d2dd286..7189c26 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.cpp @@ -500,12 +500,12 @@ HRESULT CRYLGuildTacticsPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLGuildTacticsPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildTacticsPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLGuildTacticsPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildTacticsPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.h b/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.h index 8650a74..4dc86e7 100644 --- a/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLGuildTacticsPanel.h @@ -9,7 +9,7 @@ #define __RYL_GUILDTACTICSPANEL_H__ #include "GMUICustomPanel.h" -#include +#include #include #include #include @@ -112,8 +112,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; static VOID DlgMouseUp( CGMUIObject* Sender, INT Button, INT Shift, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLHelpControlDlg.h b/Client/Client/RYLClient/RYLClient/RYLHelpControlDlg.h index 9c5537d..6fd2691 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHelpControlDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLHelpControlDlg.h @@ -32,8 +32,8 @@ public : virtual VOID GMUIPaint(INT xx, INT yy); - virtual HRESULT Render(LPDIRECT3DDEVICE8 lpD3DDevice) { return S_OK; } - virtual HRESULT FinalRender(LPDIRECT3DDEVICE8 lpD3DDevice) { return S_OK; } + virtual HRESULT Render(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK; } + virtual HRESULT FinalRender(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK; } virtual HRESULT Update(BOOL &bClick, BOOL &bEdge) { return S_OK; } static VOID DlgClick(CGMUIObject* Sender, INT X, INT Y); diff --git a/Client/Client/RYLClient/RYLClient/RYLHelpFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLHelpFrameDlg.h index 5854337..4f97874 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHelpFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLHelpFrameDlg.h @@ -36,8 +36,8 @@ public : void FinalCtrl(void); virtual HRESULT Update(BOOL &bClick, BOOL &bEdge); - virtual HRESULT Render(LPDIRECT3DDEVICE8 lpD3DDevice) { return S_OK; } - virtual HRESULT FinalRender(LPDIRECT3DDEVICE8 lpD3DDevice) { return S_OK; } + virtual HRESULT Render(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK; } + virtual HRESULT FinalRender(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK; } virtual VOID Show(CGMUIObject* Sender); virtual VOID Hide(CGMUIObject* Sender); diff --git a/Client/Client/RYLClient/RYLClient/RYLHostilityDlg.h b/Client/Client/RYLClient/RYLClient/RYLHostilityDlg.h index b886674..9441cd0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHostilityDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLHostilityDlg.h @@ -64,8 +64,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLHumanCharacterCreationDlg.h b/Client/Client/RYLClient/RYLClient/RYLHumanCharacterCreationDlg.h index 8b906ac..2688fbc 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHumanCharacterCreationDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLHumanCharacterCreationDlg.h @@ -197,8 +197,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.cpp index 32b33e7..846c34b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.cpp @@ -249,13 +249,13 @@ HRESULT CRYLHumanInventoryFrameDlg::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLHumanInventoryFrameDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLHumanInventoryFrameDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLHumanInventoryFrameDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLHumanInventoryFrameDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } @@ -324,7 +324,7 @@ VOID CRYLHumanInventoryFrameDlg::GMUIPaint( INT xx, INT yy ) { CRYLDialog::GMUIPaint( xx, yy ) ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; if ( m_pHumanInvenPanel && m_pHumanInvenPanel->GetVisible() ) ( ( CRYLHumanInventoryPanel * )m_pHumanInvenPanel )->FinalRender( lpD3DDevice ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.h index eb5ebdf..603ac40 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryFrameDlg.h @@ -31,7 +31,7 @@ private : CGMUICustomPanel* m_pSkillPanel ; CGMUICustomPanel* m_pAbilityPanel ; CGMUICustomPanel* m_pSocialActionPanel ; - LPDIRECT3DDEVICE8 m_lpD3DDevice ; + LPDIRECT3DDEVICE9 m_lpD3DDevice ; public : CRYLHumanInventoryFrameDlg() ; @@ -45,8 +45,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.cpp index 3b9e311..9ff094f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.cpp @@ -814,7 +814,7 @@ HRESULT CRYLHumanInventoryPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLHumanInventoryPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLHumanInventoryPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } @@ -1065,7 +1065,7 @@ BOOL CRYLHumanInventoryPanel::SelectItem() } -HRESULT CRYLHumanInventoryPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLHumanInventoryPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData* pGame = CRYLGameData::Instance() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.h b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.h index 771d39c..e455bca 100644 --- a/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLHumanInventoryPanel.h @@ -9,7 +9,7 @@ #define __RYL_HUMANINVENTORYPANEL_H__ #include "RYLInventoryPanel.h" -#include +#include class CRYLLabel ; class CRYLCheckBox ; @@ -60,8 +60,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLIntegServerSelCharDlg.h b/Client/Client/RYLClient/RYLClient/RYLIntegServerSelCharDlg.h index 604c8dc..5fcbbb3 100644 --- a/Client/Client/RYLClient/RYLClient/RYLIntegServerSelCharDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLIntegServerSelCharDlg.h @@ -110,8 +110,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLIntegServerSelVaultDlg.h b/Client/Client/RYLClient/RYLClient/RYLIntegServerSelVaultDlg.h index 2640715..96db772 100644 --- a/Client/Client/RYLClient/RYLClient/RYLIntegServerSelVaultDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLIntegServerSelVaultDlg.h @@ -88,8 +88,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLIntroScene.cpp b/Client/Client/RYLClient/RYLClient/RYLIntroScene.cpp index 5e06219..b7f99a9 100644 --- a/Client/Client/RYLClient/RYLClient/RYLIntroScene.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLIntroScene.cpp @@ -80,7 +80,7 @@ HRESULT CRYLIntroScene::DeleteResourceObject() return S_OK ; } -HRESULT CRYLIntroScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLIntroScene::SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); @@ -99,7 +99,7 @@ HRESULT CRYLIntroScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) return S_OK ; } -HRESULT CRYLIntroScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLIntroScene::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { float fUpdate = CFrameTimer::GetUpdateTimer( GRYLTimer.GetShowInterfaceTimerID() ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLIntroScene.h b/Client/Client/RYLClient/RYLClient/RYLIntroScene.h index 6738ed4..6a29e0e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLIntroScene.h +++ b/Client/Client/RYLClient/RYLClient/RYLIntroScene.h @@ -24,9 +24,9 @@ public : CRYLIntroScene( INT iID ) ; virtual ~CRYLIntroScene() ; - virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update() ; virtual HRESULT InitResourceObject() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.cpp index 203df66..88aad72 100644 --- a/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.cpp @@ -36,7 +36,7 @@ CRYLInventoryPanel::~CRYLInventoryPanel(void) { } -void CRYLInventoryPanel::RenderRectBGColor(LPDIRECT3DDEVICE8 lpD3DDevice, Item::EquipmentPos::Type eIndex, +void CRYLInventoryPanel::RenderRectBGColor(LPDIRECT3DDEVICE9 lpD3DDevice, Item::EquipmentPos::Type eIndex, int nLeft, int nTop, int nRight, int nBottom) { CRYLGameData* pGame = CRYLGameData::Instance(); diff --git a/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.h b/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.h index e8335ff..d6a0923 100644 --- a/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLInventoryPanel.h @@ -22,7 +22,7 @@ public: protected: - void RenderRectBGColor(LPDIRECT3DDEVICE8 lpD3DDevice, Item::EquipmentPos::Type eIndex, + void RenderRectBGColor(LPDIRECT3DDEVICE9 lpD3DDevice, Item::EquipmentPos::Type eIndex, int nLeft, int nTop, int nRight, int nBottom); bool IsSelectableFifthItem(unsigned short wSkillID); diff --git a/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.cpp index 642001a..97ff61e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.cpp @@ -595,7 +595,7 @@ CRYLItemCompo1Panel::GMUIPaint( INT xx, INT yy ) { CGMUICustomPanel::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; unsigned int left = m_pGMUIParentDlg->GetLeft() + GetLeft(); unsigned int top = m_pGMUIParentDlg->GetTop() + GetTop(); @@ -1254,7 +1254,7 @@ CRYLItemCompo2Panel::GMUIPaint( INT xx, INT yy ) { CGMUICustomPanel::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; unsigned int left = m_pGMUIParentDlg->GetLeft() + GetLeft(); unsigned int top = m_pGMUIParentDlg->GetTop() + GetTop(); @@ -1600,7 +1600,7 @@ CRYLItemCompo3Panel::GMUIPaint( INT xx, INT yy ) { CGMUICustomPanel::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; } HRESULT @@ -2080,7 +2080,7 @@ CRYLItemCompo4Panel::GMUIPaint( INT xx, INT yy ) { CGMUICustomPanel::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; unsigned int left; unsigned int top; diff --git a/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.h b/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.h index c4ef911..473f17b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLItemCompositionDlg.h @@ -108,9 +108,9 @@ public : virtual VOID Hide( CGMUIObject* Sender ) ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update() ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; virtual VOID SetVisible( BOOL bVisible ) ; @@ -139,7 +139,7 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; CRYLItemCompo1Panel( CGMUICustomDlg *pParentDlg ) ; virtual ~CRYLItemCompo1Panel() ; @@ -181,7 +181,7 @@ public : int SelectStringGrid(); virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; CRYLItemCompo2Panel( CGMUICustomDlg *pParentDlg ) ; @@ -216,7 +216,7 @@ public : VOID FinalCtrl() ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; CRYLItemCompo3Panel( CGMUICustomDlg *pParentDlg ) ; @@ -253,7 +253,7 @@ public : VOID ResetText(); virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; CRYLItemCompo4Panel( CGMUICustomDlg *pParentDlg ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.cpp index 225ae53..ca29e5b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.cpp @@ -277,7 +277,7 @@ VOID CRYLItemReparationDlg::GMUIPaint( INT xx, INT yy ) { CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; // Ǹ if (NULL != pGame->m_csStatus.m_lpCompensation) @@ -324,7 +324,7 @@ VOID CRYLItemReparationDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLItemReparationDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLItemReparationDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.h b/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.h index ab18806..edda5f4 100644 --- a/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLItemReparationDlg.h @@ -58,9 +58,9 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; bool OK(void); diff --git a/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.cpp index cc56350..2592109 100644 --- a/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.cpp @@ -453,12 +453,12 @@ VOID CRYLJobChangeDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLJobChangeDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLJobChangeDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLJobChangeDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLJobChangeDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { diff --git a/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.h b/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.h index f97dc6f..9f9ae95 100644 --- a/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLJobChangeDlg.h @@ -79,8 +79,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLJobPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLJobPanel.cpp index 6c0372d..ec8fc11 100644 --- a/Client/Client/RYLClient/RYLClient/RYLJobPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLJobPanel.cpp @@ -169,12 +169,12 @@ HRESULT CRYLJobPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLJobPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLJobPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLJobPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLJobPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLJobPanel.h b/Client/Client/RYLClient/RYLClient/RYLJobPanel.h index 4f0fd80..e403db3 100644 --- a/Client/Client/RYLClient/RYLClient/RYLJobPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLJobPanel.h @@ -2,7 +2,7 @@ #define __RYL_JOBPANEL_H__ #include "GMUICustomPanel.h" -#include +#include #include class CRYLLabel ; @@ -41,8 +41,8 @@ public: VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.cpp index 87555e1..5682fae 100644 --- a/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.cpp @@ -191,12 +191,12 @@ VOID CRYLJoystickConfigureDlg::DlgClick( CGMUIObject* Sender, INT X, INT Y ) return ; } -HRESULT CRYLJoystickConfigureDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLJoystickConfigureDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } -HRESULT CRYLJoystickConfigureDlg::FinalRender(LPDIRECT3DDEVICE8 lpD3DDevice) +HRESULT CRYLJoystickConfigureDlg::FinalRender(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK ; } \ No newline at end of file diff --git a/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.h b/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.h index 8dfea7c..889a85e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLJoystickConfigureDlg.h @@ -41,8 +41,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ); - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ); + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ); + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ); virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.cpp index 3adcba1..8b3f637 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.cpp @@ -259,7 +259,7 @@ VOID CRYLCampDistributePanel::LoadCampEnableBuildMapTexture() VOID CRYLCampDistributePanel::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CGMUICustomPanel::GMUIPaint( xx, yy ) ; lpD3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE ) ; @@ -321,7 +321,7 @@ void CRYLCampDistributePanel::DrawCampArea( INT xx, INT yy ) std::map< unsigned long, CRYLCamp* >::iterator iter = Node.begin() ; long lX, lY ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLGameScene* pScene = ( CRYLGameScene * )CRYLSceneManager::Instance()->FindScene( GAME_SCENE ); CRYLGuildFrameDlg* pDlg = ( CRYLGuildFrameDlg* )pScene->GetGuildFrameDlg(); @@ -444,7 +444,7 @@ void CRYLCampDistributePanel::DrawGuildInfo( INT xx, INT yy ) unsigned long dwLength ; int iHalfSize ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLGameScene* pScene = ( CRYLGameScene * )CRYLSceneManager::Instance()->FindScene( GAME_SCENE ); CRYLGuildFrameDlg* pDlg = ( CRYLGuildFrameDlg* )pScene->GetGuildFrameDlg(); diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.h b/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.h index 122ee63..bdf84c4 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapCampDistributeDlg.h @@ -9,7 +9,7 @@ #define __RYL_LARGEMAPCAMPDISTRIBUTEDLG_H__ #include "GMUICustomPanel.h" -#include +#include class CRYLImage ; @@ -34,8 +34,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.cpp index 54f3208..17ba98e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.cpp @@ -412,7 +412,7 @@ VOID CRYLLargeMapDlg::Hide( CGMUIObject* Sender ) VOID CRYLLargeMapDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CGMUICustomPanel::GMUIPaint( xx, yy ) ; lpD3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE ) ; @@ -714,7 +714,7 @@ void CRYLLargeMapDlg::DrawCampArea( INT xx, INT yy ) std::map< unsigned long, CRYLCamp* >::iterator iter = Node.begin() ; long lX, lY ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLGameScene* pScene = ( CRYLGameScene * )CRYLSceneManager::Instance()->FindScene( GAME_SCENE ); CRYLGuildFrameDlg* pDlg = ( CRYLGuildFrameDlg* )pScene->GetGuildFrameDlg(); @@ -837,7 +837,7 @@ void CRYLLargeMapDlg::DrawGuildInfo( INT xx, INT yy ) unsigned long dwLength ; int iHalfSize ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLGameScene* pScene = ( CRYLGameScene * )CRYLSceneManager::Instance()->FindScene( GAME_SCENE ); CRYLGuildFrameDlg* pDlg = ( CRYLGuildFrameDlg* )pScene->GetGuildFrameDlg(); diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.h b/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.h index fa48425..fdf70c3 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapDlg.h @@ -8,7 +8,7 @@ #include "RYLDialog.h" #include "GMUICustomPanel.h" -#include +#include #include namespace RYLLARGEMAPDLG @@ -88,8 +88,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.cpp index 8bd5001..e53387e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.cpp @@ -238,12 +238,12 @@ HRESULT CRYLLargeMapFrameDlg::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLLargeMapFrameDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLLargeMapFrameDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLLargeMapFrameDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLLargeMapFrameDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } @@ -357,7 +357,7 @@ VOID CRYLLargeMapFrameDlg::SetTabButtonName(BOOL bStatue) VOID CRYLLargeMapFrameDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.h index 96bf358..f173cec 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapFrameDlg.h @@ -91,8 +91,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.cpp index b26d49f..a37dbf8 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.cpp @@ -196,7 +196,7 @@ CRYLMobDistributeDlg::FinalCtrl() VOID CRYLMobDistributeDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CGMUICustomPanel::GMUIPaint( xx, yy ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.h b/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.h index 12ade4d..f3449ae 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLLargeMapMobDistributeDlg.h @@ -9,7 +9,7 @@ #define __RYL_LARGEMAPMOBDISTRIBUTEDLG_H__ #include "GMUICustomPanel.h" -#include +#include typedef union { @@ -62,8 +62,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLoadingScene.cpp b/Client/Client/RYLClient/RYLClient/RYLLoadingScene.cpp index 4c607ea..9642aef 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLoadingScene.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLLoadingScene.cpp @@ -66,7 +66,7 @@ CRYLLoadingScene::~CRYLLoadingScene() DeleteResourceObject() ; } -HRESULT CRYLLoadingScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLLoadingScene::SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); @@ -85,7 +85,7 @@ HRESULT CRYLLoadingScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) return S_OK ; } -HRESULT CRYLLoadingScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLLoadingScene::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { if (m_lScreenFade < FADE_START) { diff --git a/Client/Client/RYLClient/RYLClient/RYLLoadingScene.h b/Client/Client/RYLClient/RYLClient/RYLLoadingScene.h index 845324a..9d4f7a8 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLoadingScene.h +++ b/Client/Client/RYLClient/RYLClient/RYLLoadingScene.h @@ -41,9 +41,9 @@ public : CRYLLoadingScene() ; virtual ~CRYLLoadingScene() ; - HRESULT SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + HRESULT SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } HRESULT Update() ; HRESULT InitResourceObject( INT iZone = -1 ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLoginDlg.h b/Client/Client/RYLClient/RYLClient/RYLLoginDlg.h index 9743939..ab56fe1 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLoginDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLLoginDlg.h @@ -54,8 +54,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLLoginScene.cpp b/Client/Client/RYLClient/RYLClient/RYLLoginScene.cpp index 9d76287..d808beb 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLoginScene.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLLoginScene.cpp @@ -83,7 +83,7 @@ CRYLLoginScene::~CRYLLoginScene() DeleteResourceObject() ; } -HRESULT CRYLLoginScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLLoginScene::SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); @@ -102,7 +102,7 @@ HRESULT CRYLLoginScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) return S_OK ; } -HRESULT CRYLLoginScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLLoginScene::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { float fUpdate = CFrameTimer::GetUpdateTimer( GRYLTimer.GetShowInterfaceTimerID() ) ; @@ -129,7 +129,7 @@ HRESULT CRYLLoginScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) return S_OK ; } -HRESULT CRYLLoginScene::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLLoginScene::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLLoginScene.h b/Client/Client/RYLClient/RYLClient/RYLLoginScene.h index e1da2d8..a39d09a 100644 --- a/Client/Client/RYLClient/RYLClient/RYLLoginScene.h +++ b/Client/Client/RYLClient/RYLClient/RYLLoginScene.h @@ -45,9 +45,9 @@ public : CRYLLoginScene( INT iID ) ; virtual ~CRYLLoginScene() ; - virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update() ; virtual HRESULT InitResourceObject() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.cpp index 38dc06b..ac06df0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.cpp @@ -352,7 +352,7 @@ VOID CRYLMIniMapDlg::MiniMapDelete(void) VOID CRYLMIniMapDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; lpD3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE ) ; lpD3DDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA ) ; @@ -1028,7 +1028,7 @@ VOID CRYLMIniMapDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLMIniMapDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLMIniMapDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } @@ -1277,7 +1277,7 @@ VOID CRYLMIniMapDlg::DlgMouseDown( CGMUIObject* Sender, INT Button, INT Shift, I } } -HRESULT CRYLMIniMapDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLMIniMapDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.h b/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.h index eecb38c..45036df 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLMiniMapDlg.h @@ -91,8 +91,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.cpp index 9802e52..9bd08df 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.cpp @@ -498,7 +498,7 @@ VOID CRYLMiniPartyDlg::GMUIPaint( INT xx, INT yy ) if(m_bShowEnchant) // æƮ ǥ { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLGameData* pGame = CRYLGameData::Instance() ; CRYLGameScene *pScene = (CRYLGameScene *)CRYLSceneManager::Instance()->FindScene( GAME_SCENE ) ; CRYLEnchantDlg *pDlg = (CRYLEnchantDlg *)pScene->GetEnchantDlg(); diff --git a/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.h b/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.h index 61a1cf0..c3aa176 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLMiniPartyDlg.h @@ -89,8 +89,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.cpp index b5ed77d..f389156 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.cpp @@ -298,7 +298,7 @@ VOID CRYLMiningAmountDlg::Hide( CGMUIObject* Sender ) VOID CRYLMiningAmountDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; std::vector< CItemInstance* >::iterator iter; diff --git a/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.h b/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.h index ae7b021..52f9189 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLMiningAmountDlg.h @@ -72,8 +72,8 @@ public : VOID UpdateMineral(); HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.cpp index 998cedd..5c7e10f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.cpp @@ -198,7 +198,7 @@ VOID CRYLMiningAmountProcessDlg::Hide( CGMUIObject* Sender ) VOID CRYLMiningAmountProcessDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; if( UpdateProcess() ) { diff --git a/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.h b/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.h index 80426bc..8e2523b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLMiningAmountProcessDlg.h @@ -58,8 +58,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.cpp index 56d1bcf..34053b3 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.cpp @@ -316,7 +316,7 @@ VOID CRYLMiningCampDlg::Hide( CGMUIObject* Sender ) VOID CRYLMiningCampDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; std::vector< CItemInstance* >::iterator iter; diff --git a/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.h b/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.h index 4a83b06..43aacec 100644 --- a/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLMiningCampDlg.h @@ -89,8 +89,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; }; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; }; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLNameDlg.h b/Client/Client/RYLClient/RYLClient/RYLNameDlg.h index 95f2537..55dd649 100644 --- a/Client/Client/RYLClient/RYLClient/RYLNameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLNameDlg.h @@ -34,8 +34,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLNationDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLNationDlg.cpp index 6abda56..ba197c0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLNationDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLNationDlg.cpp @@ -163,12 +163,12 @@ VOID CRYLNationDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLNationDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLNationDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLNationDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLNationDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLNationDlg.h b/Client/Client/RYLClient/RYLClient/RYLNationDlg.h index 1f1f327..63b46fb 100644 --- a/Client/Client/RYLClient/RYLClient/RYLNationDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLNationDlg.h @@ -50,8 +50,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.cpp index 22389f8..766f44c 100644 --- a/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.cpp @@ -338,12 +338,12 @@ VOID CRYLNationSelectDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLNationSelectDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLNationSelectDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLNationSelectDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLNationSelectDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.h b/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.h index 3e25842..21ad660 100644 --- a/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLNationSelectDlg.h @@ -68,8 +68,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.cpp index e2b5402..64a96a5 100644 --- a/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.cpp @@ -662,7 +662,7 @@ VOID CRYLNewTradeDlg::Hide( CGMUIObject* Sender ) VOID CRYLNewTradeDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); CRYLDialog::GMUIPaint( xx, yy ); vector::iterator it; @@ -679,12 +679,12 @@ VOID CRYLNewTradeDlg::GMUIPaint( INT xx, INT yy ) } -HRESULT CRYLNewTradeDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLNewTradeDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLNewTradeDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLNewTradeDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.h b/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.h index 2ceb09d..b5d9c89 100644 --- a/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLNewTradeDlg.h @@ -135,8 +135,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ); + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ); virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/RYLOptionDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLOptionDlg.cpp index d991d1a..687e08f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLOptionDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLOptionDlg.cpp @@ -217,12 +217,12 @@ VOID CRYLOptionDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLOptionDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLOptionDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLOptionDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLOptionDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLOptionDlg.h b/Client/Client/RYLClient/RYLClient/RYLOptionDlg.h index e2d7dd2..8cfd98b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLOptionDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLOptionDlg.h @@ -48,8 +48,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ); + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ); virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/RYLPCCheckAgreementDlg.h b/Client/Client/RYLClient/RYLClient/RYLPCCheckAgreementDlg.h index 00dc744..0a14bd2 100644 --- a/Client/Client/RYLClient/RYLClient/RYLPCCheckAgreementDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLPCCheckAgreementDlg.h @@ -43,8 +43,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLPartChoiceDlg.h b/Client/Client/RYLClient/RYLClient/RYLPartChoiceDlg.h index caace16..2b0b57c 100644 --- a/Client/Client/RYLClient/RYLClient/RYLPartChoiceDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLPartChoiceDlg.h @@ -43,8 +43,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLPartyPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLPartyPanel.cpp index a993918..ef75da8 100644 --- a/Client/Client/RYLClient/RYLClient/RYLPartyPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLPartyPanel.cpp @@ -622,7 +622,7 @@ VOID CRYLPartyPanel::UpdateSelectPartyMember() CRYLGuildInfoPanel* pPanel = ( CRYLGuildInfoPanel* )pDlg->GetGuildInfoPanel(); // ũ - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); CRYLSprite* pSprite = NULL; diff --git a/Client/Client/RYLClient/RYLClient/RYLPasswordReAuthDlg.h b/Client/Client/RYLClient/RYLClient/RYLPasswordReAuthDlg.h index 04360e8..fae258f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLPasswordReAuthDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLPasswordReAuthDlg.h @@ -41,8 +41,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLQuestDetailDataDlg.h b/Client/Client/RYLClient/RYLClient/RYLQuestDetailDataDlg.h index 1e78b13..36498d7 100644 --- a/Client/Client/RYLClient/RYLClient/RYLQuestDetailDataDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLQuestDetailDataDlg.h @@ -45,8 +45,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; VOID SetDetailDataDlg( QuestInstance* lpQuestInstance ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLQuestOpeningDlg.h b/Client/Client/RYLClient/RYLClient/RYLQuestOpeningDlg.h index e7fc989..099fa5d 100644 --- a/Client/Client/RYLClient/RYLClient/RYLQuestOpeningDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLQuestOpeningDlg.h @@ -63,8 +63,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.cpp index 966ca44..8c6bf60 100644 --- a/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.cpp @@ -265,7 +265,7 @@ VOID CRYLQuickSlotDlg::GMUIPaint( INT xx, INT yy ) { CRYLDialog::GMUIPaint( xx, yy ) ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; RYLCreature* pSelfCreature = RYLCreatureManager::Instance()->GetSelfCreature(); if ( !pSelfCreature ) @@ -990,7 +990,7 @@ VOID CRYLQuickSlotDlg::DlgClick( CGMUIObject* Sender, INT X, INT Y ) } } -HRESULT CRYLQuickSlotDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLQuickSlotDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.h b/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.h index ea692d5..66e6a62 100644 --- a/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLQuickSlotDlg.h @@ -57,8 +57,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLRaceBase.h b/Client/Client/RYLClient/RYLClient/RYLRaceBase.h index 43fa076..dbbff41 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRaceBase.h +++ b/Client/Client/RYLClient/RYLClient/RYLRaceBase.h @@ -207,46 +207,46 @@ public: public: - void RenderChrSelect(LPDIRECT3DDEVICE8 lpD3DDevice) ; - void RenderGame(LPDIRECT3DDEVICE8 lpD3DDevice); - void FinalRenderGame(LPDIRECT3DDEVICE8 lpD3DDevice); + void RenderChrSelect(LPDIRECT3DDEVICE9 lpD3DDevice) ; + void RenderGame(LPDIRECT3DDEVICE9 lpD3DDevice); + void FinalRenderGame(LPDIRECT3DDEVICE9 lpD3DDevice); protected: - void SetRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - void RenderScene( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + void SetRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + void RenderScene( LPDIRECT3DDEVICE9 lpD3DDevice ) ; // ------------------------------------------------------------------------------------------ // ޼ҵ - RYLRaceRenderFight.cpp - void RenderCrossHair(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwMode); - void RenderCrossHair(LPDIRECT3DDEVICE8 lpD3DDevice); + void RenderCrossHair(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwMode); + void RenderCrossHair(LPDIRECT3DDEVICE9 lpD3DDevice); void RenderNormalTarget( void ) ; void RenderSkillTarget( void ) ; - void RenderSkillGauge(LPDIRECT3DDEVICE8 lpD3DDevice); + void RenderSkillGauge(LPDIRECT3DDEVICE9 lpD3DDevice); // ------------------------------------------------------------------------------------------ // ũ ޼ҵ - RYLRaceRenderCreature.cpp - void RenderStreetStallButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY); - void RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY); - void RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor); - void RenderPopUp(LPDIRECT3DDEVICE8 lpD3DDevice ); - void RenderHPBar(LPDIRECT3DDEVICE8 lpD3DDevice, CharDataNode* pData, short wPosX, short wPosY, unsigned long ulBackColor, unsigned long ulHPColor ); - void RenderChrName(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, short wPosX, short wPosY); - void RenderHead( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - void RenderPC( LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; - void RenderNPC( LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; - void RenderMonster( LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; - void RenderSiege( LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; + void RenderStreetStallButton(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY); + void RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY); + void RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor); + void RenderPopUp(LPDIRECT3DDEVICE9 lpD3DDevice ); + void RenderHPBar(LPDIRECT3DDEVICE9 lpD3DDevice, CharDataNode* pData, short wPosX, short wPosY, unsigned long ulBackColor, unsigned long ulHPColor ); + void RenderChrName(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, short wPosX, short wPosY); + void RenderHead( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + void RenderPC( LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; + void RenderNPC( LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; + void RenderMonster( LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; + void RenderSiege( LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) ; // ------------------------------------------------------------------------------------------ // UI ޼ҵ - RYLRaceRenderUI.cpp - void RenderStoneRespawn( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - void RenderInterface( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - void RenderMsgBox( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - void RenderEtcInterface( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + void RenderStoneRespawn( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + void RenderInterface( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + void RenderMsgBox( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + void RenderEtcInterface( LPDIRECT3DDEVICE9 lpD3DDevice ) ; // ------------------------------------------------------------------------------------------ // NPC Ÿ ޼ҵ - RYLRaceNPC.cpp diff --git a/Client/Client/RYLClient/RYLClient/RYLRaceRender.cpp b/Client/Client/RYLClient/RYLClient/RYLRaceRender.cpp index 44d55d9..747b5d2 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRaceRender.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLRaceRender.cpp @@ -20,7 +20,7 @@ #include "RYLRaceBase.h" #include "GMMemory.h" -void CRYLRaceBase::RenderChrSelect(LPDIRECT3DDEVICE8 lpD3DDevice) +void CRYLRaceBase::RenderChrSelect(LPDIRECT3DDEVICE9 lpD3DDevice) { CRYLGameData* pGame = CRYLGameData::Instance(); @@ -169,7 +169,7 @@ void CRYLRaceBase::RenderChrSelect(LPDIRECT3DDEVICE8 lpD3DDevice) } } -void CRYLRaceBase::RenderGame(LPDIRECT3DDEVICE8 lpD3DDevice) +void CRYLRaceBase::RenderGame(LPDIRECT3DDEVICE9 lpD3DDevice) { CRYLGameData* pGame = CRYLGameData::Instance() ; SetRenderState( lpD3DDevice ) ; @@ -203,7 +203,7 @@ void CRYLRaceBase::RenderGame(LPDIRECT3DDEVICE8 lpD3DDevice) } } -void CRYLRaceBase::FinalRenderGame(LPDIRECT3DDEVICE8 lpD3DDevice) +void CRYLRaceBase::FinalRenderGame(LPDIRECT3DDEVICE9 lpD3DDevice) { CRYLGameData* pGame = CRYLGameData::Instance() ; if (pGame->m_dwClientState == GAME_PLAYING) @@ -224,7 +224,7 @@ void CRYLRaceBase::FinalRenderGame(LPDIRECT3DDEVICE8 lpD3DDevice) } } -void CRYLRaceBase::SetRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CRYLRaceBase::SetRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { lpD3DDevice->SetTextureStageState(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR); lpD3DDevice->SetTextureStageState(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR); @@ -240,7 +240,7 @@ void CRYLRaceBase::SetRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) lpD3DDevice->SetRenderState(D3DRS_LIGHTING, TRUE); } -void CRYLRaceBase::RenderScene( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CRYLRaceBase::RenderScene( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData* pGame = CRYLGameData::Instance(); diff --git a/Client/Client/RYLClient/RYLClient/RYLRaceRenderCreature.cpp b/Client/Client/RYLClient/RYLClient/RYLRaceRenderCreature.cpp index 27bd0cc..4bc387e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRaceRenderCreature.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLRaceRenderCreature.cpp @@ -38,7 +38,7 @@ #include "RYLGameTimeManager.h" #include "GMMemory.h" -void CRYLRaceBase::RenderStreetStallButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY) +void CRYLRaceBase::RenderStreetStallButton(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY) { RECT rcRect; @@ -62,7 +62,7 @@ void CRYLRaceBase::RenderStreetStallButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCre Label->DoDraw(NULL, rt, 0); } -void CRYLRaceBase::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY) +void CRYLRaceBase::RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, char *strText, short wPosX, short wPosY) { RECT rcRect; @@ -86,7 +86,7 @@ void CRYLRaceBase::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* p Label->DoDraw(NULL, rt, 0); } -void CRYLRaceBase::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor) +void CRYLRaceBase::RenderChrButton(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, unsigned long dwUID, short wPosX, short wPosY, unsigned long dwColor) { RYLCreature* pTempCreature = RYLCreatureManager::Instance()->GetCreature( dwUID ) ; if ( !pTempCreature ) @@ -213,7 +213,7 @@ void CRYLRaceBase::RenderChrButton(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* p } } -void CRYLRaceBase::RenderPopUp(LPDIRECT3DDEVICE8 lpD3DDevice) +void CRYLRaceBase::RenderPopUp(LPDIRECT3DDEVICE9 lpD3DDevice) { RYLCreature* pTempCreature = RYLCreatureManager::Instance()->GetCreature( m_dwPopupSelect ); @@ -332,7 +332,7 @@ void CRYLRaceBase::RenderPopUp(LPDIRECT3DDEVICE8 lpD3DDevice) popupMenuList.DrawItems(WindowX + 15, WindowY + 13); } -void CRYLRaceBase::RenderHPBar(LPDIRECT3DDEVICE8 lpD3DDevice, CharDataNode* pData, +void CRYLRaceBase::RenderHPBar(LPDIRECT3DDEVICE9 lpD3DDevice, CharDataNode* pData, short wPosX, short wPosY, unsigned long ulBackColor, unsigned long ulHPColor) { lpD3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE); @@ -414,7 +414,7 @@ void CRYLRaceBase::RenderHPBar(LPDIRECT3DDEVICE8 lpD3DDevice, CharDataNode* pDat } -void CRYLRaceBase::RenderChrName(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, short wPosX, short wPosY) +void CRYLRaceBase::RenderChrName(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, short wPosX, short wPosY) { CRYLGameData* pGame = CRYLGameData::Instance(); @@ -742,7 +742,7 @@ lb_Mark: } -void CRYLRaceBase::RenderHead(LPDIRECT3DDEVICE8 lpD3DDevice) +void CRYLRaceBase::RenderHead(LPDIRECT3DDEVICE9 lpD3DDevice) { RYLCreature* pSelfCreature = RYLCreatureManager::Instance()->GetSelfCreature(); if (!pSelfCreature) @@ -861,7 +861,7 @@ void CRYLRaceBase::RenderHead(LPDIRECT3DDEVICE8 lpD3DDevice) -void CRYLRaceBase::RenderPC(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult) +void CRYLRaceBase::RenderPC(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult) { CRYLGameData* pGame = CRYLGameData::Instance(); @@ -1057,7 +1057,7 @@ void CRYLRaceBase::RenderPC(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreatur } } -void CRYLRaceBase::RenderNPC(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) +void CRYLRaceBase::RenderNPC(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult ) { CRYLGameData* pGame = CRYLGameData::Instance(); @@ -1369,7 +1369,7 @@ void CRYLRaceBase::RenderNPC(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreatu } } -void CRYLRaceBase::RenderMonster(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult) +void CRYLRaceBase::RenderMonster(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult) { CRYLGameData* pGame = CRYLGameData::Instance(); @@ -1449,7 +1449,7 @@ void CRYLRaceBase::RenderMonster(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCr } } -void CRYLRaceBase::RenderSiege(LPDIRECT3DDEVICE8 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult) +void CRYLRaceBase::RenderSiege(LPDIRECT3DDEVICE9 lpD3DDevice, RYLCreature* pCreature, vector3 vecResult, vector3 vecDamageResult) { char strNameText[MAX_PATH]; CRYLGameData* pGame = CRYLGameData::Instance(); diff --git a/Client/Client/RYLClient/RYLClient/RYLRaceRenderFight.cpp b/Client/Client/RYLClient/RYLClient/RYLRaceRenderFight.cpp index d344c75..1521bfe 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRaceRenderFight.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLRaceRenderFight.cpp @@ -21,7 +21,7 @@ #include "RYLGameTimeManager.h" #include "GMMemory.h" -void CRYLRaceBase::RenderCrossHair(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long dwMode) +void CRYLRaceBase::RenderCrossHair(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned long dwMode) { TLVertex pVertices[4]; pVertices[0].Diffuse.c = pVertices[1].Diffuse.c = pVertices[2].Diffuse.c = pVertices[3].Diffuse.c = 0xFFFFFFFF; @@ -61,7 +61,7 @@ void CRYLRaceBase::RenderCrossHair(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned long lpD3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, pVertices, sizeof(TLVertex)); } -void CRYLRaceBase::RenderCrossHair( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CRYLRaceBase::RenderCrossHair( LPDIRECT3DDEVICE9 lpD3DDevice ) { PROFILE("Crosshair"); @@ -218,7 +218,7 @@ void CRYLRaceBase::RenderSkillTarget( void ) } } -void CRYLRaceBase::RenderSkillGauge(LPDIRECT3DDEVICE8 lpD3DDevice) +void CRYLRaceBase::RenderSkillGauge(LPDIRECT3DDEVICE9 lpD3DDevice) { RYLCreature* pSelfCreature = RYLCreatureManager::Instance()->GetSelfCreature(); if ( !pSelfCreature ) diff --git a/Client/Client/RYLClient/RYLClient/RYLRaceRenderUI.cpp b/Client/Client/RYLClient/RYLClient/RYLRaceRenderUI.cpp index 53f71cd..75a1450 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRaceRenderUI.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLRaceRenderUI.cpp @@ -24,7 +24,7 @@ #include "RYLGameTimeManager.h" #include "GMMemory.h" -void CRYLRaceBase::RenderStoneRespawn( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CRYLRaceBase::RenderStoneRespawn( LPDIRECT3DDEVICE9 lpD3DDevice ) { if (CRYLNetworkData::Instance()->m_dwPresentZone == SERVER_ID::ZONE3 || CRYLNetworkData::Instance()->m_dwPresentZone == SERVER_ID::BATTLE_ZONE) @@ -37,7 +37,7 @@ void CRYLRaceBase::RenderStoneRespawn( LPDIRECT3DDEVICE8 lpD3DDevice ) } } -void CRYLRaceBase::RenderInterface( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CRYLRaceBase::RenderInterface( LPDIRECT3DDEVICE9 lpD3DDevice ) { lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); lpD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); @@ -54,7 +54,7 @@ void CRYLRaceBase::RenderInterface( LPDIRECT3DDEVICE8 lpD3DDevice ) lpD3DDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); } -void CRYLRaceBase::RenderMsgBox( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CRYLRaceBase::RenderMsgBox( LPDIRECT3DDEVICE9 lpD3DDevice ) { // Popup if (m_bPopupShow) @@ -101,7 +101,7 @@ void CRYLRaceBase::RenderMsgBox( LPDIRECT3DDEVICE8 lpD3DDevice ) } } -void CRYLRaceBase::RenderEtcInterface( LPDIRECT3DDEVICE8 lpD3DDevice ) +void CRYLRaceBase::RenderEtcInterface( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData* pGame = CRYLGameData::Instance() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.cpp b/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.cpp index 36443cc..65f5a2c 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.cpp @@ -259,12 +259,12 @@ VOID CRYLRaceDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLRaceDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLRaceDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLRaceDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLRaceDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } @@ -326,12 +326,12 @@ CRYLRaceSelectScene::~CRYLRaceSelectScene() FinalCleanup() ; } -HRESULT CRYLRaceSelectScene::SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLRaceSelectScene::SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLRaceSelectScene::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLRaceSelectScene::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.h b/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.h index 2acdc68..0672f02 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.h +++ b/Client/Client/RYLClient/RYLClient/RYLRaceSelectScene.h @@ -42,8 +42,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; @@ -57,9 +57,9 @@ public : CRYLRaceSelectScene( INT iID ) ; virtual ~CRYLRaceSelectScene() ; - virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update() ; virtual HRESULT InitResourceObject() ; diff --git a/Client/Client/RYLClient/RYLClient/RYLRankingDlg.h b/Client/Client/RYLClient/RYLClient/RYLRankingDlg.h index 29f1040..29055e5 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRankingDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLRankingDlg.h @@ -84,8 +84,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLRefusalPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLRefusalPanel.cpp index 352003f..89debec 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRefusalPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLRefusalPanel.cpp @@ -630,7 +630,7 @@ VOID CRYLRefusalPanel::UpdateWhisperCharacter(char* szName) CRYLGuildInfoPanel* pPanel = ( CRYLGuildInfoPanel* )pDlg->GetGuildInfoPanel(); // ũ - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); CRYLSprite* pSprite = NULL; @@ -696,7 +696,7 @@ VOID CRYLRefusalPanel::SetWhisperCharacter() CRYLGuildInfoPanel* pPanel = ( CRYLGuildInfoPanel* )pDlg->GetGuildInfoPanel(); // ũ - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice(); CRYLSprite* pSprite = NULL; diff --git a/Client/Client/RYLClient/RYLClient/RYLRespawnDlg.h b/Client/Client/RYLClient/RYLClient/RYLRespawnDlg.h index d672717..77ac60f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLRespawnDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLRespawnDlg.h @@ -37,8 +37,8 @@ public : virtual VOID SetVisible( BOOL bVisible ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSceneObject.h b/Client/Client/RYLClient/RYLClient/RYLSceneObject.h index 5d0b6b0..2c5e881 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSceneObject.h +++ b/Client/Client/RYLClient/RYLClient/RYLSceneObject.h @@ -7,7 +7,7 @@ #define __RYL_SCENEOBJECT_H__ #include -#include +#include #include "GMBase.h" @@ -27,9 +27,9 @@ public : virtual ~CRYLSceneObject() ; public : - virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) PURE ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) PURE ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) PURE ; + virtual HRESULT SetRYLRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) PURE ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) PURE ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) PURE ; virtual HRESULT Update() PURE ; virtual HRESULT InitResourceObject() PURE ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.cpp index d17e4b0..9cfc010 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.cpp @@ -121,7 +121,7 @@ HRESULT CRYLSecondCreateDlg::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLSecondCreateDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSecondCreateDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.h b/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.h index e11c41e..8fbe447 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSecondCreateDlg.h @@ -29,8 +29,8 @@ public: virtual VOID Hide( CGMUIObject* Sender ) ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSelectedConfirmDlg.h b/Client/Client/RYLClient/RYLClient/RYLSelectedConfirmDlg.h index 033ba9d..94effb0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSelectedConfirmDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSelectedConfirmDlg.h @@ -57,8 +57,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.cpp index c465d98..ab09951 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.cpp @@ -222,12 +222,12 @@ VOID CRYLSiegeArmsCreatingDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLSiegeArmsCreatingDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSiegeArmsCreatingDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLSiegeArmsCreatingDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSiegeArmsCreatingDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.h b/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.h index 62b3a2f..13d343a 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSiegeArmsCreatingDlg.h @@ -49,8 +49,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.cpp index 7a1843d..c6cf347 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.cpp @@ -470,12 +470,12 @@ VOID CRYLSiegeTimeDlg::DlgClick( CGMUIObject* Sender, INT X, INT Y ) } } /* -HRESULT CRYLSiegeTimeDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSiegeTimeDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } -HRESULT CRYLSiegeTimeDlg::FinalRender(LPDIRECT3DDEVICE8 lpD3DDevice) +HRESULT CRYLSiegeTimeDlg::FinalRender(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.h b/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.h index 5aa6ff8..c1b065f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSiegeTimeDlg.h @@ -59,8 +59,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.cpp index e1f99ae..c372e8d 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.cpp @@ -159,12 +159,12 @@ VOID CRYLSkillDescDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLSkillDescDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSkillDescDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLSkillDescDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSkillDescDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.h b/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.h index fb418c0..26e1fd0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSkillDescDlg.h @@ -55,8 +55,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; void RestoreSkillUI( unsigned short wSkillID, unsigned char cSkillStep, unsigned char cSkillLevel, unsigned char cWeaponType ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSkillPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLSkillPanel.cpp index 49afe4b..5572afb 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSkillPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLSkillPanel.cpp @@ -890,13 +890,13 @@ HRESULT CRYLSkillPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLSkillPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSkillPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLSkillPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSkillPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -930,7 +930,7 @@ HRESULT CRYLSkillPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) return S_OK ; } -VOID CRYLSkillPanel::RenderClassSlot( LPDIRECT3DDEVICE8 lpD3DDevice, CItemInstance *lpSkill, LONG lSlot, +VOID CRYLSkillPanel::RenderClassSlot( LPDIRECT3DDEVICE9 lpD3DDevice, CItemInstance *lpSkill, LONG lSlot, LONG lMoveX, LONG lMoveY ) { if (lpSkill) @@ -949,7 +949,7 @@ VOID CRYLSkillPanel::RenderClassSlot( LPDIRECT3DDEVICE8 lpD3DDevice, CItemInsta } } -VOID CRYLSkillPanel::RenderSkillSlot( LPDIRECT3DDEVICE8 lpD3DDevice, +VOID CRYLSkillPanel::RenderSkillSlot( LPDIRECT3DDEVICE9 lpD3DDevice, VIRTUAL_SKILL_SLOT* lpSlot, LONG lMoveX, LONG lMoveY, bool bAlterSkill ) { diff --git a/Client/Client/RYLClient/RYLClient/RYLSkillPanel.h b/Client/Client/RYLClient/RYLClient/RYLSkillPanel.h index 54d9130..5cce5f6 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSkillPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLSkillPanel.h @@ -10,7 +10,7 @@ #include "GMUICustomPanel.h" #include "RYLButton.h" -#include +#include #include #include @@ -141,8 +141,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; @@ -160,9 +160,9 @@ public : unsigned char cPos, UINT uiKind ) ; - VOID RenderClassSlot( LPDIRECT3DDEVICE8 lpD3DDevice, CItemInstance *lpSkill, LONG lSlot, + VOID RenderClassSlot( LPDIRECT3DDEVICE9 lpD3DDevice, CItemInstance *lpSkill, LONG lSlot, LONG lMoveX, LONG lMoveY ) ; - VOID RenderSkillSlot( LPDIRECT3DDEVICE8 lpD3DDevice, + VOID RenderSkillSlot( LPDIRECT3DDEVICE9 lpD3DDevice, VIRTUAL_SKILL_SLOT* lpSlot, LONG lMoveX, LONG lMoveY, bool bAlterSkill = false ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.cpp b/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.cpp index b64aa43..592c718 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.cpp @@ -271,12 +271,12 @@ HRESULT CRYLSocialActionPanel::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLSocialActionPanel::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSocialActionPanel::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLSocialActionPanel::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLSocialActionPanel::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { unsigned long dwPrintSlotNum = 0; unsigned long dwActionNum = m_vecActionSlot.size(); diff --git a/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.h b/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.h index efb0182..368e6a2 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.h +++ b/Client/Client/RYLClient/RYLClient/RYLSocialActionPanel.h @@ -9,7 +9,7 @@ #define __RYL_SOCIALACTIONPANEL_H__ #include "GMUICustomPanel.h" -#include +#include #include class CRYLLabel ; @@ -67,8 +67,8 @@ public : VOID FinalCtrl() ; HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSocietyDlg.h b/Client/Client/RYLClient/RYLClient/RYLSocietyDlg.h index 6592e1c..1d3e958 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSocietyDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSocietyDlg.h @@ -36,7 +36,7 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update() ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSocietyFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLSocietyFrameDlg.h index d362b8c..3307dc2 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSocietyFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSocietyFrameDlg.h @@ -39,8 +39,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSprite.cpp b/Client/Client/RYLClient/RYLClient/RYLSprite.cpp index 23f1087..94cf267 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSprite.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLSprite.cpp @@ -7,7 +7,7 @@ #include "BaseGraphicsLayer.h" #include "GMMemory.h" -LPDIRECT3DDEVICE8 CRYLSprite::m_lpD3DDevice = NULL ; +LPDIRECT3DDEVICE9 CRYLSprite::m_lpD3DDevice = NULL ; CRYLSprite::CRYLSprite() { @@ -37,7 +37,7 @@ BOOL CRYLSprite::Create( long nPutX, long nPutY, long nTexX1, long nTexY1, long return TRUE ; } -void CRYLSprite::Render( LPDIRECT3DDEVICE8 m_lpD3DDevice, unsigned char Alpha, long fx, long fy ) +void CRYLSprite::Render( LPDIRECT3DDEVICE9 m_lpD3DDevice, unsigned char Alpha, long fx, long fy ) { if ( !this ) return ; if ( !m_lpTexture ) return ; @@ -94,7 +94,7 @@ void CRYLSprite::Render( LPDIRECT3DDEVICE8 m_lpD3DDevice, unsigned char Alpha, l m_lpD3DDevice->DrawPrimitiveUP( D3DPT_TRIANGLESTRIP, 2, pVertices, sizeof( TLVertex ) ) ; } -void CRYLSprite::Render(LPDIRECT3DDEVICE8 m_lpD3DDevice, float fDirection, unsigned char Alpha) +void CRYLSprite::Render(LPDIRECT3DDEVICE9 m_lpD3DDevice, float fDirection, unsigned char Alpha) { if ( !this ) return ; if ( !m_lpTexture ) return ; @@ -156,7 +156,7 @@ void CRYLSprite::Render(LPDIRECT3DDEVICE8 m_lpD3DDevice, float fDirection, unsig m_lpD3DDevice->DrawPrimitiveUP( D3DPT_TRIANGLESTRIP, 2, pVertices, sizeof( TLVertex ) ) ; } -void CRYLSprite::Render( LPDIRECT3DDEVICE8 m_lpD3DDevice, unsigned char Alpha, LPRECT pRect ) +void CRYLSprite::Render( LPDIRECT3DDEVICE9 m_lpD3DDevice, unsigned char Alpha, LPRECT pRect ) { if ( !this ) return ; if ( !m_lpTexture ) return ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSprite.h b/Client/Client/RYLClient/RYLClient/RYLSprite.h index f192ac9..5737bbc 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSprite.h +++ b/Client/Client/RYLClient/RYLClient/RYLSprite.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include #include @@ -22,7 +22,7 @@ class CRYLSprite CTexture* m_lpTexture ; float m_fRate ; BOOL m_bHorizon ; - static LPDIRECT3DDEVICE8 m_lpD3DDevice ; + static LPDIRECT3DDEVICE9 m_lpD3DDevice ; CRYLSprite() ; ~CRYLSprite() ; @@ -39,9 +39,9 @@ class CRYLSprite } BOOL Create( long nPutX, long nPutY, long nTexX1, long nTexY1, long nTexX2, long nTexY2, CTexture *lpTexture ) ; - void Render( LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha = 0xFF, long fx = 0, long fy = 0 ) ; - void Render( LPDIRECT3DDEVICE8 lpD3DDevice, float fDirection, unsigned char Alpha = 0xFF ) ; - void Render( LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha, LPRECT pRect ) ; + void Render( LPDIRECT3DDEVICE9 lpD3DDevice, unsigned char Alpha = 0xFF, long fx = 0, long fy = 0 ) ; + void Render( LPDIRECT3DDEVICE9 lpD3DDevice, float fDirection, unsigned char Alpha = 0xFF ) ; + void Render( LPDIRECT3DDEVICE9 lpD3DDevice, unsigned char Alpha, LPRECT pRect ) ; CTexture* GetTextureEnable() { if ( this ) return m_lpTexture ; } }; diff --git a/Client/Client/RYLClient/RYLClient/RYLStallDlg.h b/Client/Client/RYLClient/RYLClient/RYLStallDlg.h index d2f7860..246c792 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStallDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLStallDlg.h @@ -51,8 +51,8 @@ public : virtual VOID GMUIPaint(INT xx, INT yy) = 0; - virtual HRESULT Render(LPDIRECT3DDEVICE8 lpD3DDevice) = 0; - virtual HRESULT FinalRender(LPDIRECT3DDEVICE8 lpD3DDevice) = 0; + virtual HRESULT Render(LPDIRECT3DDEVICE9 lpD3DDevice) = 0; + virtual HRESULT FinalRender(LPDIRECT3DDEVICE9 lpD3DDevice) = 0; virtual HRESULT Update(BOOL &bClick, BOOL &bEdge) = 0; virtual bool SendChat(char* szChatMessage) = 0; diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusAndQuestFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLStatusAndQuestFrameDlg.h index 99a7c86..4564a18 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusAndQuestFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLStatusAndQuestFrameDlg.h @@ -39,8 +39,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusDlg.h b/Client/Client/RYLClient/RYLClient/RYLStatusDlg.h index 99aef4a..e291c8b 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLStatusDlg.h @@ -54,8 +54,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.cpp b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.cpp index 06ce658..aff753a 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.cpp @@ -138,13 +138,13 @@ HRESULT CRYLStatusExtensionSlotOne::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLStatusExtensionSlotOne::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLStatusExtensionSlotOne::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLStatusExtensionSlotOne::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLStatusExtensionSlotOne::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.h b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.h index 6cbb4b6..47af2db 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.h +++ b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotOne.h @@ -35,8 +35,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.cpp b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.cpp index ede057c..fa2a9a0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.cpp @@ -136,13 +136,13 @@ HRESULT CRYLStatusExtensionSlotTwo::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLStatusExtensionSlotTwo::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLStatusExtensionSlotTwo::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLStatusExtensionSlotTwo::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLStatusExtensionSlotTwo::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.h b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.h index 7d202a4..93e1f5f 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.h +++ b/Client/Client/RYLClient/RYLClient/RYLStatusExtensionSlotTwo.h @@ -35,8 +35,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusFrameDlg.h b/Client/Client/RYLClient/RYLClient/RYLStatusFrameDlg.h index 20df303..127c170 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusFrameDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLStatusFrameDlg.h @@ -56,8 +56,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; }; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; }; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; }; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; }; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/RYLStatusRetrainDlg.h b/Client/Client/RYLClient/RYLClient/RYLStatusRetrainDlg.h index e7a8ee6..6702a2e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStatusRetrainDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLStatusRetrainDlg.h @@ -127,8 +127,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.cpp index 3569029..19cfd16 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.cpp @@ -314,7 +314,7 @@ VOID CRYLStreetStallDlg::Hide( CGMUIObject* Sender ) VOID CRYLStreetStallDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; std::list::iterator it; @@ -363,12 +363,12 @@ VOID CRYLStreetStallDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLStreetStallDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLStreetStallDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLStreetStallDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLStreetStallDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; diff --git a/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.h b/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.h index 97c63fa..3ab1e50 100644 --- a/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLStreetStallDlg.h @@ -53,8 +53,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; virtual bool SendChat(char* szChatMessage); diff --git a/Client/Client/RYLClient/RYLClient/RYLSummonDlg.h b/Client/Client/RYLClient/RYLClient/RYLSummonDlg.h index a6b7f12..91ea833 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSummonDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSummonDlg.h @@ -42,8 +42,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLSystemDlg.h b/Client/Client/RYLClient/RYLClient/RYLSystemDlg.h index c85da41..11e8658 100644 --- a/Client/Client/RYLClient/RYLClient/RYLSystemDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLSystemDlg.h @@ -42,8 +42,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.cpp index b8ab9b6..6220230 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.cpp @@ -189,12 +189,12 @@ VOID CRYLTaxpresentDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLTaxpresentDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLTaxpresentDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLTaxpresentDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLTaxpresentDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.h b/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.h index 0b6c5d2..8381554 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLTaxpresentDlg.h @@ -45,8 +45,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.cpp index f293240..f75527d 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.cpp @@ -185,12 +185,12 @@ VOID CRYLTaxrateDlg::GMUIPaint( INT xx, INT yy ) CRYLDialog::GMUIPaint( xx, yy ) ; } -HRESULT CRYLTaxrateDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLTaxrateDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLTaxrateDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLTaxrateDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.h b/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.h index 1d83706..a480f24 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLTaxrateDlg.h @@ -46,8 +46,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.cpp index b941524..61e4c5e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.cpp @@ -243,7 +243,7 @@ VOID CRYLTempInventoryDlg::GMUIPaint( INT xx, INT yy ) { CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CItemInstance* pItem; pItem = pGame->m_csStatus.GetTempInventory(); @@ -255,7 +255,7 @@ VOID CRYLTempInventoryDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLTempInventoryDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLTempInventoryDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.h b/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.h index c5afac0..3c09b83 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLTempInventoryDlg.h @@ -49,10 +49,10 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; virtual HRESULT Update() ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; VOID CheckTime(); diff --git a/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.cpp index 0740ae7..7a63c81 100644 --- a/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.cpp @@ -121,7 +121,7 @@ HRESULT CRYLThirdCreateDlg::Update( BOOL &bClick, BOOL &bEdge ) return S_OK ; } -HRESULT CRYLThirdCreateDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLThirdCreateDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.h b/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.h index 6762801..8bd62f0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLThirdCreateDlg.h @@ -29,8 +29,8 @@ public: virtual VOID Hide( CGMUIObject* Sender ) ; virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLTradeDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLTradeDlg.cpp index 173b308..7caf306 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTradeDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLTradeDlg.cpp @@ -495,7 +495,7 @@ VOID CRYLTradeDlg::Hide( CGMUIObject* Sender ) VOID CRYLTradeDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; vector::iterator it; @@ -515,12 +515,12 @@ VOID CRYLTradeDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLTradeDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLTradeDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLTradeDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLTradeDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLTradeDlg.h b/Client/Client/RYLClient/RYLClient/RYLTradeDlg.h index a15b907..fa761a0 100644 --- a/Client/Client/RYLClient/RYLClient/RYLTradeDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLTradeDlg.h @@ -100,8 +100,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLVaultDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLVaultDlg.cpp index 02ff95f..8e901e4 100644 --- a/Client/Client/RYLClient/RYLClient/RYLVaultDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLVaultDlg.cpp @@ -236,7 +236,7 @@ VOID CRYLVaultDlg::InitValue() VOID CRYLVaultDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLGameData* pGame = CRYLGameData::Instance() ; CRYLDialog::GMUIPaint( xx, yy ) ; @@ -289,12 +289,12 @@ VOID CRYLVaultDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLVaultDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLVaultDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLVaultDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLVaultDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLVaultDlg.h b/Client/Client/RYLClient/RYLClient/RYLVaultDlg.h index 8d91952..ad85e67 100644 --- a/Client/Client/RYLClient/RYLClient/RYLVaultDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLVaultDlg.h @@ -62,8 +62,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLVaultPasswordDlg.h b/Client/Client/RYLClient/RYLClient/RYLVaultPasswordDlg.h index ff950e2..de6943e 100644 --- a/Client/Client/RYLClient/RYLClient/RYLVaultPasswordDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLVaultPasswordDlg.h @@ -49,8 +49,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; @@ -93,8 +93,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.cpp index 54ac269..6f7f517 100644 --- a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.cpp @@ -296,7 +296,7 @@ VOID CRYLWorldWeaponLaunchDlg::Hide( CGMUIObject* Sender ) VOID CRYLWorldWeaponLaunchDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -304,12 +304,12 @@ VOID CRYLWorldWeaponLaunchDlg::GMUIPaint( INT xx, INT yy ) } -HRESULT CRYLWorldWeaponLaunchDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLWorldWeaponLaunchDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLWorldWeaponLaunchDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLWorldWeaponLaunchDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.h b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.h index 75eec48..d8dc591 100644 --- a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLaunchDlg.h @@ -66,8 +66,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.cpp b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.cpp index bfa6c8a..356fe49 100644 --- a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.cpp @@ -245,7 +245,7 @@ VOID CRYLWorldWeaponLoadDlg::Hide( CGMUIObject* Sender ) VOID CRYLWorldWeaponLoadDlg::GMUIPaint( INT xx, INT yy ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; CRYLDialog::GMUIPaint( xx, yy ) ; CRYLGameData* pGame = CRYLGameData::Instance() ; @@ -270,12 +270,12 @@ VOID CRYLWorldWeaponLoadDlg::GMUIPaint( INT xx, INT yy ) } } -HRESULT CRYLWorldWeaponLoadDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLWorldWeaponLoadDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } -HRESULT CRYLWorldWeaponLoadDlg::FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLWorldWeaponLoadDlg::FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.h b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.h index 3f21a33..21a372a 100644 --- a/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.h +++ b/Client/Client/RYLClient/RYLClient/RYLWorldWeaponLoadDlg.h @@ -51,8 +51,8 @@ public : virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) ; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.cpp b/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.cpp index 896146f..c45fd01 100644 --- a/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.cpp +++ b/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.cpp @@ -224,12 +224,12 @@ VOID CRYLGuildWarPenaltyDlg::DlgClick( CGMUIObject* Sender, INT X, INT Y ) { } -HRESULT CRYLGuildWarPenaltyDlg::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +HRESULT CRYLGuildWarPenaltyDlg::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } -HRESULT CRYLGuildWarPenaltyDlg::FinalRender(LPDIRECT3DDEVICE8 lpD3DDevice) +HRESULT CRYLGuildWarPenaltyDlg::FinalRender(LPDIRECT3DDEVICE9 lpD3DDevice) { return S_OK ; } diff --git a/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.h b/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.h index bb88fc2..80e4850 100644 --- a/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.h +++ b/Client/Client/RYLClient/RYLClient/RylGuildWarPenaltyDlg.h @@ -45,8 +45,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ); - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ); + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ); + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ); virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundChangeMoneyDlg.h b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundChangeMoneyDlg.h index 5ea9b1f..e57d4b5 100644 --- a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundChangeMoneyDlg.h +++ b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundChangeMoneyDlg.h @@ -78,8 +78,8 @@ public: virtual VOID GMUIPaint( INT nPosX, INT nPosY ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; }; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; }; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundGameStatusDlg.h b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundGameStatusDlg.h index b252c8c..6b905f2 100644 --- a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundGameStatusDlg.h +++ b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundGameStatusDlg.h @@ -100,8 +100,8 @@ public: virtual VOID GMUIPaint( INT nPosX, INT nPosY ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; }; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; }; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundPrevResultDlg.h b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundPrevResultDlg.h index 8369711..623e122 100644 --- a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundPrevResultDlg.h +++ b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundPrevResultDlg.h @@ -76,8 +76,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; }; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; }; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundResultDlg.h b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundResultDlg.h index 41dec56..bfbca75 100644 --- a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundResultDlg.h +++ b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundResultDlg.h @@ -92,8 +92,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; }; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; }; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundStatusDlg.h b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundStatusDlg.h index e8bcc3a..f1a5c26 100644 --- a/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundStatusDlg.h +++ b/Client/Client/RYLClient/RYLClient/battleground client/BattleGroundStatusDlg.h @@ -131,8 +131,8 @@ public: virtual VOID GMUIPaint( INT nPosX, INT nPosY ); - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; }; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; }; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ); static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ); diff --git a/Client/Client/RYLClient/RYLUI/GMFont.cpp b/Client/Client/RYLClient/RYLUI/GMFont.cpp index a93c0c7..97291f2 100644 --- a/Client/Client/RYLClient/RYLUI/GMFont.cpp +++ b/Client/Client/RYLClient/RYLUI/GMFont.cpp @@ -66,7 +66,7 @@ HRESULT CGMFont::FontBegin() GMASSERT( s_pInstance, "CGMFont::Instance Failed!" ) ; GMASSERT( !m_bBegin, "CGMFont::m_bBegin Failed!" ) ; - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; lpD3DDevice->SetRenderState(D3DRS_ALPHATESTENABLE , TRUE ) ; lpD3DDevice->SetRenderState(D3DRS_ALPHAREF, 0xFF); @@ -88,7 +88,7 @@ HRESULT CGMFont::FontBegin() HRESULT CGMFont::FontEnd() { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; lpD3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE ) ; lpD3DDevice->SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD) ; diff --git a/Client/Client/RYLClient/RYLUI/GMFont.h b/Client/Client/RYLClient/RYLUI/GMFont.h index 37dcb4e..ae21ff9 100644 --- a/Client/Client/RYLClient/RYLUI/GMFont.h +++ b/Client/Client/RYLClient/RYLUI/GMFont.h @@ -29,7 +29,7 @@ public: CGMFont() ; virtual ~CGMFont() ; - typedef HRESULT ( __stdcall *FGMFontInitDeviceObjects )( LPDIRECT3DDEVICE8 pd3dDevice ) ; + typedef HRESULT ( __stdcall *FGMFontInitDeviceObjects )( LPDIRECT3DDEVICE9 pd3dDevice ) ; typedef HRESULT ( __stdcall *FGMFontDeleteDeviceObjects )() ; // ġ typedef HRESULT ( __stdcall *FGMFontRestoreDeviceObjects )() ; // ü typedef HRESULT ( __stdcall *FGMFontInvalidateDeviceObjects )() ; // ü diff --git a/Client/Client/RYLClient/RYLUI/GMUITooltip.h b/Client/Client/RYLClient/RYLUI/GMUITooltip.h index daf9492..2ab65c0 100644 --- a/Client/Client/RYLClient/RYLUI/GMUITooltip.h +++ b/Client/Client/RYLClient/RYLUI/GMUITooltip.h @@ -9,7 +9,7 @@ #define __GMUI_TOOLTIP__ #include -#include +#include enum TOOLTIP_CTRL { @@ -46,7 +46,7 @@ public: virtual BOOL GetIsTooltip() = 0 ; virtual VOID DestroyTooltip() = 0 ; - virtual VOID Render( LPDIRECT3DDEVICE8 lpD3DDevice ) = 0 ; + virtual VOID Render( LPDIRECT3DDEVICE9 lpD3DDevice ) = 0 ; }; #endif //__GMUI_TOOLTIP__ diff --git a/Client/Client/RYLClient/RYLUI/GMUITooltipBox.cpp b/Client/Client/RYLClient/RYLUI/GMUITooltipBox.cpp index c309788..a3cc1f3 100644 --- a/Client/Client/RYLClient/RYLUI/GMUITooltipBox.cpp +++ b/Client/Client/RYLClient/RYLUI/GMUITooltipBox.cpp @@ -100,7 +100,7 @@ VOID CGMUITooltipBox::DestroyTooltip() m_lstTooltip.clear() ; } -VOID CGMUITooltipBox::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +VOID CGMUITooltipBox::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { POINT *ptMousePos = g_DeviceInput.GetMouseLocal() ; diff --git a/Client/Client/RYLClient/RYLUI/GMUITooltipBox.h b/Client/Client/RYLClient/RYLUI/GMUITooltipBox.h index 4a73c75..056a7a9 100644 --- a/Client/Client/RYLClient/RYLUI/GMUITooltipBox.h +++ b/Client/Client/RYLClient/RYLUI/GMUITooltipBox.h @@ -25,7 +25,7 @@ public: VOID InitTooltip( LPCTSTR strTooltip, DWORD dwKey, DWORD dwCtrlType = FALSE ) ; BOOL GetIsTooltip() ; VOID DestroyTooltip() ; - VOID Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + VOID Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; } ; #endif //__GMUI_TOOLTIPBOX__ diff --git a/Client/Client/RYLClient/RYLUI/GMUITooltipManager.cpp b/Client/Client/RYLClient/RYLUI/GMUITooltipManager.cpp index aac86e5..e969e01 100644 --- a/Client/Client/RYLClient/RYLUI/GMUITooltipManager.cpp +++ b/Client/Client/RYLClient/RYLUI/GMUITooltipManager.cpp @@ -88,7 +88,7 @@ VOID CGMUITooltipManager::Update( LONG lMoveX, LONG lMoveY ) } } -VOID CGMUITooltipManager::Render( LPDIRECT3DDEVICE8 lpD3DDevice ) +VOID CGMUITooltipManager::Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { if ( m_ttRenderTarget && m_ttRenderTarget->m_bShow ) { diff --git a/Client/Client/RYLClient/RYLUI/GMUITooltipManager.h b/Client/Client/RYLClient/RYLUI/GMUITooltipManager.h index 6835466..a3f3895 100644 --- a/Client/Client/RYLClient/RYLUI/GMUITooltipManager.h +++ b/Client/Client/RYLClient/RYLUI/GMUITooltipManager.h @@ -21,7 +21,7 @@ public : CGMUITooltipManager() ; virtual ~CGMUITooltipManager() ; - VOID Render( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + VOID Render( LPDIRECT3DDEVICE9 lpD3DDevice ) ; VOID Update( LONG lMoveX = 0, LONG lMoveY = 0 ) ; VOID DestroyAllTooltip() ; BOOL AddTooltip( CGMUITooltip *pTooltip ) ; diff --git a/Client/Client/RYLClient/RYLUI/RYLDialog.h b/Client/Client/RYLClient/RYLUI/RYLDialog.h index ef809c9..f182d52 100644 --- a/Client/Client/RYLClient/RYLUI/RYLDialog.h +++ b/Client/Client/RYLClient/RYLUI/RYLDialog.h @@ -8,7 +8,7 @@ #ifndef __RYLDIALOG_H__ #define __RYLDIALOG_H__ -#include +#include #include "GMUICustomDlg.h" #include "RYLButton.h" @@ -147,8 +147,8 @@ public: virtual VOID SetVisible( BOOL bVisible ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) PURE ; - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) PURE ; + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) PURE ; + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) PURE ; virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) PURE ; }; diff --git a/Client/Client/RYLClient/RYLUI/RYLImage.cpp b/Client/Client/RYLClient/RYLUI/RYLImage.cpp index 166bdbf..d7564f8 100644 --- a/Client/Client/RYLClient/RYLUI/RYLImage.cpp +++ b/Client/Client/RYLClient/RYLUI/RYLImage.cpp @@ -82,7 +82,7 @@ HRESULT CRYLImage::ReImageRenderState () CreateVB(); } - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; lpD3DDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA ) ; lpD3DDevice->SetRenderState( D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA ) ; diff --git a/Client/Client/RYLClient/RYLUI/RYLMessageBox.h b/Client/Client/RYLClient/RYLUI/RYLMessageBox.h index 48c4033..87f9bda 100644 --- a/Client/Client/RYLClient/RYLUI/RYLMessageBox.h +++ b/Client/Client/RYLClient/RYLUI/RYLMessageBox.h @@ -172,8 +172,8 @@ public: virtual VOID GMUIPaint( INT xx, INT yy ) ; - virtual HRESULT Render( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } - virtual HRESULT FinalRender( LPDIRECT3DDEVICE8 lpD3DDevice ) { return S_OK ; } + virtual HRESULT Render( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } + virtual HRESULT FinalRender( LPDIRECT3DDEVICE9 lpD3DDevice ) { return S_OK ; } virtual HRESULT Update( BOOL &bClick, BOOL &bEdge ) { return S_OK ; }; static VOID DlgClick( CGMUIObject* Sender, INT X, INT Y ) ; diff --git a/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.cpp b/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.cpp index ca31c74..38e611d 100644 --- a/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.cpp +++ b/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.cpp @@ -97,7 +97,7 @@ BOOL CRYLMessageBoxManager::Update() return TRUE;*/ } -void CRYLMessageBoxManager::Render(LPDIRECT3DDEVICE8 lpD3DDevice) +void CRYLMessageBoxManager::Render(LPDIRECT3DDEVICE9 lpD3DDevice) { vector::iterator it; for(it = m_lstMessageBox.begin(); it != m_lstMessageBox.end(); it++) diff --git a/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.h b/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.h index c85e57c..7cb50f6 100644 --- a/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.h +++ b/Client/Client/RYLClient/RYLUI/RYLMessageBoxManager.h @@ -19,7 +19,7 @@ class CRYLMessageBoxManager { public: void DestroyList(bool bChk = false); - void Render(LPDIRECT3DDEVICE8 lpD3DDevice); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice); BOOL Update(void); void DeleteMessageBox(CRYLMessageBox *lpMessageBox); void Create(void); diff --git a/Client/Client/RYLClient/RYLUI/RYLProgressBar.cpp b/Client/Client/RYLClient/RYLUI/RYLProgressBar.cpp index 5235480..0efa8e1 100644 --- a/Client/Client/RYLClient/RYLUI/RYLProgressBar.cpp +++ b/Client/Client/RYLClient/RYLUI/RYLProgressBar.cpp @@ -116,7 +116,7 @@ VOID CRYLProgressBar::DefaultBarDraw () VOID CRYLProgressBar::DoDraw( CGMUIObject* Sender, RECT r, INT State ) { - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; if ( m_iPosition == 0 || m_iValueMax == 0 ) return ; diff --git a/Client/Client/RYLClient/RYLUI/RYLRectangle.cpp b/Client/Client/RYLClient/RYLUI/RYLRectangle.cpp index 16757e7..8024568 100644 --- a/Client/Client/RYLClient/RYLUI/RYLRectangle.cpp +++ b/Client/Client/RYLClient/RYLUI/RYLRectangle.cpp @@ -38,7 +38,7 @@ HRESULT CRYLRectangle::ReRectangleRenderState() CreateVB() ; } - LPDIRECT3DDEVICE8 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; + LPDIRECT3DDEVICE9 lpD3DDevice = BaseGraphicsLayer::GetDevice() ; lpD3DDevice->SetRenderState( D3DRS_ALPHABLENDENABLE, TRUE ) ; lpD3DDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA ) ; diff --git a/Client/Client/RYLClient/RYLUI/RYLSpriteEX.h b/Client/Client/RYLClient/RYLUI/RYLSpriteEX.h index adf843d..9cb9c1e 100644 --- a/Client/Client/RYLClient/RYLUI/RYLSpriteEX.h +++ b/Client/Client/RYLClient/RYLUI/RYLSpriteEX.h @@ -9,7 +9,7 @@ #define __RYLSPRITEEX_H__ #include "GMUILabel.h" -#include +#include class CRYLSprite ; class CTexture ; @@ -23,7 +23,7 @@ public : CRYLSprite* m_pSprite ; CTexture* m_pTexture ; - LPDIRECT3DDEVICE8 m_lpD3DDevice ; + LPDIRECT3DDEVICE9 m_lpD3DDevice ; public: CRYLSpriteEx( CGMUICustomDlg *pParentDlg ) ; diff --git a/Client/Client/RYLClient/Sprite.cpp b/Client/Client/RYLClient/Sprite.cpp index 161daec..9e335be 100644 --- a/Client/Client/RYLClient/Sprite.cpp +++ b/Client/Client/RYLClient/Sprite.cpp @@ -48,7 +48,7 @@ BOOL CSprite::Create(long nPutX, long nPutY, long nTexX1, long nTexY1, long nTex return TRUE; } -void CSprite::Render(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha, long fx, long fy) +void CSprite::Render(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned char Alpha, long fx, long fy) { if(!this) return; @@ -99,7 +99,7 @@ void CSprite::Render(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha, long fx } -void CSprite::Render(LPDIRECT3DDEVICE8 lpD3DDevice, float fDirection, unsigned char Alpha) +void CSprite::Render(LPDIRECT3DDEVICE9 lpD3DDevice, float fDirection, unsigned char Alpha) { if(!this) return; @@ -161,7 +161,7 @@ void CSprite::Render(LPDIRECT3DDEVICE8 lpD3DDevice, float fDirection, unsigned c lpD3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, pVertices, sizeof(TLVertex)); } -void CSprite::Render(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha, LPRECT pRect ) +void CSprite::Render(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned char Alpha, LPRECT pRect ) { if(!this) return; @@ -210,7 +210,7 @@ void CSprite::Render(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha, LPRECT lpD3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, pVertices, sizeof(TLVertex)); } -VOID CSprite::SetRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) +VOID CSprite::SetRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) { /* lpD3DDevice->SetRenderState( D3DRS_ZENABLE ,1 ) ; //= 7, diff --git a/Client/Client/RYLClient/Sprite.h b/Client/Client/RYLClient/Sprite.h index e3ebb9a..1d4e4b3 100644 --- a/Client/Client/RYLClient/Sprite.h +++ b/Client/Client/RYLClient/Sprite.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include #include @@ -39,12 +39,12 @@ class CSprite } BOOL Create(long nPutX, long nPutY, long nTexX1, long nTexY1, long nTexX2, long nTexY2, CTexture *lpTexture); - void Render(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha = 0xFF, long fx = 0, long fy = 0); - void Render(LPDIRECT3DDEVICE8 lpD3DDevice, float fDirection, unsigned char Alpha = 0xFF) ; - void Render(LPDIRECT3DDEVICE8 lpD3DDevice, unsigned char Alpha, LPRECT pRect ) ; + void Render(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned char Alpha = 0xFF, long fx = 0, long fy = 0); + void Render(LPDIRECT3DDEVICE9 lpD3DDevice, float fDirection, unsigned char Alpha = 0xFF) ; + void Render(LPDIRECT3DDEVICE9 lpD3DDevice, unsigned char Alpha, LPRECT pRect ) ; CTexture* GetTextureEnable() { if ( this ) return m_lpTexture ; } - VOID SetRenderState( LPDIRECT3DDEVICE8 lpD3DDevice ) ; + VOID SetRenderState( LPDIRECT3DDEVICE9 lpD3DDevice ) ; }; diff --git a/Client/Engine/Caldron/Include/Caldron.h b/Client/Engine/Caldron/Include/Caldron.h index 522e1a9..663057d 100644 --- a/Client/Engine/Caldron/Include/Caldron.h +++ b/Client/Engine/Caldron/Include/Caldron.h @@ -17,7 +17,7 @@ #include //#include -#include +#include #include #include #include diff --git a/Client/Engine/Caldron/Src/Scene/DrawElement.cpp b/Client/Engine/Caldron/Src/Scene/DrawElement.cpp index 67b73b1..9f2523c 100644 --- a/Client/Engine/Caldron/Src/Scene/DrawElement.cpp +++ b/Client/Engine/Caldron/Src/Scene/DrawElement.cpp @@ -6,7 +6,7 @@ namespace Caldron { namespace Scene { - IDirect3DDevice8* CDrawElementMgr::ms_pDevice; + IDirect3DDevice9* CDrawElementMgr::ms_pDevice; std::vector< DRAW_ELEMENT > CDrawElementMgr::ms_avecDynamicDrawElement[MAX_DRAW_ELEMENT_LAYER]; // std::vector< DRAW_ELEMENT > CDrawElementMgr::ms_avecStaticDrawElement[MAX_DRAW_ELEMENT_LAYER]; @@ -23,10 +23,10 @@ namespace Scene // int CDrawElementMgr::ms_nStaticIndexBufferCount; // DWORD CDrawElementMgr::ms_dwStaticIndexBufferSize; -// IDirect3DVertexBuffer8** CDrawElementMgr::ms_apDynamicVertexBuffer; -// IDirect3DIndexBuffer8** CDrawElementMgr::ms_apDynaicIndexBuffer; - IDirect3DVertexBuffer8* CDrawElementMgr::ms_pDynamicVertexBuffer; - IDirect3DIndexBuffer8* CDrawElementMgr::ms_pDynamicIndexBuffer; +// IDirect3DVertexBuffer9** CDrawElementMgr::ms_apDynamicVertexBuffer; +// IDirect3DIndexBuffer9** CDrawElementMgr::ms_apDynaicIndexBuffer; + IDirect3DVertexBuffer9* CDrawElementMgr::ms_pDynamicVertexBuffer; + IDirect3DIndexBuffer9* CDrawElementMgr::ms_pDynamicIndexBuffer; std::map< CBaseMesh*, UINT > CDrawElementMgr::ms_mapVBAllocationInfo; std::map< CBaseMesh*, UINT > CDrawElementMgr::ms_mapIBAllocationInfo; @@ -34,13 +34,13 @@ namespace Scene int CDrawElementMgr::ms_nIBUsedInByte; -// IDirect3DVertexBuffer8** CDrawElementMgr::ms_apStaticVertexBuffer; -// IDirect3DIndexBuffer8** CDrawElementMgr::ms_apStaticIndexBuffer; +// IDirect3DVertexBuffer9** CDrawElementMgr::ms_apStaticVertexBuffer; +// IDirect3DIndexBuffer9** CDrawElementMgr::ms_apStaticIndexBuffer; DRAW_ELEMENT CDrawElementMgr::ms_LastTimeDE; - bool CDrawElementMgr::_Init( IDirect3DDevice8* pDevice, DRAW_ELEMENT_MGR_INIT_PARAM* pInitParam ) + bool CDrawElementMgr::_Init( IDirect3DDevice9* pDevice, DRAW_ELEMENT_MGR_INIT_PARAM* pInitParam ) { ms_pDevice = pDevice; diff --git a/Client/Engine/Caldron/Src/Scene/DrawElement.h b/Client/Engine/Caldron/Src/Scene/DrawElement.h index a4a5bd9..f27b9dd 100644 --- a/Client/Engine/Caldron/Src/Scene/DrawElement.h +++ b/Client/Engine/Caldron/Src/Scene/DrawElement.h @@ -105,8 +105,8 @@ namespace Scene struct VIB_PACKET { - //IDirect3DVertexBuffer8* pVB; - //IDirect3DIndexBuffer8* pIB; + //IDirect3DVertexBuffer9* pVB; + //IDirect3DIndexBuffer9* pIB; UINT uPositionInVB; UINT uPositionInIB; @@ -122,7 +122,7 @@ namespace Scene { public: // ʱȭ( InitDevice ʱȭ) - static bool _Init( IDirect3DDevice8* pDevice, DRAW_ELEMENT_MGR_INIT_PARAM* pInitParam ); + static bool _Init( IDirect3DDevice9* pDevice, DRAW_ELEMENT_MGR_INIT_PARAM* pInitParam ); // Draw Element static bool _RegisterDrawElement( int nLayer, DRAW_ELEMENT& rDE ); @@ -137,7 +137,7 @@ namespace Scene static void _Close(); private: - static IDirect3DDevice8* ms_pDevice; + static IDirect3DDevice9* ms_pDevice; static std::vector< DRAW_ELEMENT > ms_avecDynamicDrawElement[MAX_DRAW_ELEMENT_LAYER]; // static std::vector< DRAW_ELEMENT > ms_avecStaticDrawElement[MAX_DRAW_ELEMENT_LAYER]; @@ -155,13 +155,13 @@ namespace Scene // static int ms_nStaticIndexBufferCount; // static DWORD ms_dwStaticIndexBufferSize; -// static IDirect3DVertexBuffer8** ms_apDynamicVertexBuffer; -// static IDirect3DIndexBuffer8** ms_apDynaicIndexBuffer; - static IDirect3DVertexBuffer8* ms_pDynamicVertexBuffer; - static IDirect3DIndexBuffer8* ms_pDynamicIndexBuffer; +// static IDirect3DVertexBuffer9** ms_apDynamicVertexBuffer; +// static IDirect3DIndexBuffer9** ms_apDynaicIndexBuffer; + static IDirect3DVertexBuffer9* ms_pDynamicVertexBuffer; + static IDirect3DIndexBuffer9* ms_pDynamicIndexBuffer; -// static IDirect3DVertexBuffer8** ms_apStaticVertexBuffer; -// static IDirect3DIndexBuffer8** ms_apStaticIndexBuffer; +// static IDirect3DVertexBuffer9** ms_apStaticVertexBuffer; +// static IDirect3DIndexBuffer9** ms_apStaticIndexBuffer; static std::map< CBaseMesh*, UINT > ms_mapVBAllocationInfo; diff --git a/Client/Engine/Caldron/Src/Scene/StateSet.h b/Client/Engine/Caldron/Src/Scene/StateSet.h index f1f3dee..c006874 100644 --- a/Client/Engine/Caldron/Src/Scene/StateSet.h +++ b/Client/Engine/Caldron/Src/Scene/StateSet.h @@ -22,7 +22,7 @@ namespace Scene { public: // ʱȭ( InitDevice ʱȭ) - static bool _Init( IDirect3DDevice8* pDevice ); + static bool _Init( IDirect3DDevice9* pDevice ); // StateSet Manager ܺο d3d device õ state change ˻ device StateSet Mgr state ȭ static void _GetCurrentDeviceState(); diff --git a/Client/Engine/CrossM/Include/OctreeCollider.h b/Client/Engine/CrossM/Include/OctreeCollider.h index 879e48c..df68fca 100644 --- a/Client/Engine/CrossM/Include/OctreeCollider.h +++ b/Client/Engine/CrossM/Include/OctreeCollider.h @@ -13,7 +13,7 @@ #include // forward decl. -struct IDirect3DDevice8; +struct IDirect3DDevice9; namespace CrossM{ @@ -110,7 +110,7 @@ public: // ׽Ʈ ޼ҵ, 浹 Ͼ ִ° Ȯε ﰢ -void RenderCollidableNodeTriangles(IDirect3DDevice8* pDevice); +void RenderCollidableNodeTriangles(IDirect3DDevice9* pDevice); private: diff --git a/Client/Engine/CrossM/Src/OctreeCollider.cpp b/Client/Engine/CrossM/Src/OctreeCollider.cpp index 24c79cb..293965b 100644 --- a/Client/Engine/CrossM/Src/OctreeCollider.cpp +++ b/Client/Engine/CrossM/Src/OctreeCollider.cpp @@ -6,8 +6,8 @@ #include -#include -#include +#include +#include namespace CrossM{ @@ -478,7 +478,7 @@ m_nColTriIndex = nMinCollisionTriangleIndex; } -void COctreeCollider::RenderCollidableNodeTriangles(IDirect3DDevice8* pDevice) +void COctreeCollider::RenderCollidableNodeTriangles(IDirect3DDevice9* pDevice) { size_t nRenderTriCount; //j, i, nTriFilled; diff --git a/Client/Engine/Effect/CEffscript.cpp b/Client/Engine/Effect/CEffscript.cpp index bff6e0a..ea787c0 100644 --- a/Client/Engine/Effect/CEffscript.cpp +++ b/Client/Engine/Effect/CEffscript.cpp @@ -2029,7 +2029,7 @@ void CEffScript::SetSkillInfo(int s,int w) { m_Weapone = w; } -void CEffScript::SetDevice(LPDIRECT3DDEVICE8 device) { +void CEffScript::SetDevice(LPDIRECT3DDEVICE9 device) { int i; m_Device = device; for (i=0;i -#include +#include #include #include "CEffscriptDefine.h" @@ -861,7 +861,7 @@ public: //interface effect projection vector D3DXVECTOR3 m_Projection; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; matrix m_View; unsigned long m_dwTick; @@ -1011,7 +1011,7 @@ public: void GetEffPlayTime(); void GetEffChar(); void GetEffWeaponLine(); - void SetDevice(LPDIRECT3DDEVICE8 device); + void SetDevice(LPDIRECT3DDEVICE9 device); // slide character CCreature address setting void SetPlayer( RYLCreature* pCreature, unsigned long ulCreatureID ) diff --git a/Client/Engine/Effect/CGemRender.cpp b/Client/Engine/Effect/CGemRender.cpp index c722eaf..da89f30 100644 --- a/Client/Engine/Effect/CGemRender.cpp +++ b/Client/Engine/Effect/CGemRender.cpp @@ -175,7 +175,7 @@ void CGemRender::SetAxis(D3DXMATRIX &world) { D3DXMatrixMultiply(&world,&world,&tmp_matrix); } -bool CGemRender::LoadGemFile(char *filename,LPDIRECT3DDEVICE8 device,bool bVisibility) { +bool CGemRender::LoadGemFile(char *filename,LPDIRECT3DDEVICE9 device,bool bVisibility) { char buffer[BUF_SIZE] = {0}; char msg[BUF_SIZE] = {0}; diff --git a/Client/Engine/Effect/CGemRender.h b/Client/Engine/Effect/CGemRender.h index 5bdfbd0..8454595 100644 --- a/Client/Engine/Effect/CGemRender.h +++ b/Client/Engine/Effect/CGemRender.h @@ -6,8 +6,8 @@ #include "texture.h" #include "BaseDataDefine.h" -#include -#include +#include +#include #define BUF_SIZE 256 @@ -307,7 +307,7 @@ public: void PosAni(int object_index,D3DXMATRIX &); void RotAni(int object_index,D3DXMATRIX &); - bool LoadGemFile(char *,LPDIRECT3DDEVICE8 ,bool bVisibility = true); + bool LoadGemFile(char *,LPDIRECT3DDEVICE9 ,bool bVisibility = true); bool LoadUvFile(char *); bool LoadMorph(int ); @@ -395,7 +395,7 @@ public: DWORD m_SrcBlend,m_DstBlend; float m_CurrentF; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; D3DXMATRIX m_Scale; D3DXMATRIX m_TrMatrix; D3DXVECTOR3 m_Pos; diff --git a/Client/Engine/Effect/CLightning.cpp b/Client/Engine/Effect/CLightning.cpp index b58b274..91363fb 100644 --- a/Client/Engine/Effect/CLightning.cpp +++ b/Client/Engine/Effect/CLightning.cpp @@ -47,7 +47,7 @@ CLightning ::CLightning() { } -CLightning ::CLightning(LPDIRECT3DDEVICE8 device) { +CLightning ::CLightning(LPDIRECT3DDEVICE9 device) { m_EndCount = 0; m_Alpha = 1.0f; m_bFadeOut = false; @@ -92,7 +92,7 @@ CLightning ::CLightning(LPDIRECT3DDEVICE8 device) { } -CLightning ::CLightning(int num,LPDIRECT3DDEVICE8 device) { +CLightning ::CLightning(int num,LPDIRECT3DDEVICE9 device) { m_Alpha = 1.0f; m_bFadeOut = false; m_FadeSpeed = 0.001f; diff --git a/Client/Engine/Effect/CLightning.h b/Client/Engine/Effect/CLightning.h index 78f906b..04d790b 100644 --- a/Client/Engine/Effect/CLightning.h +++ b/Client/Engine/Effect/CLightning.h @@ -1,7 +1,7 @@ #ifndef __CLIGHTNING_H__ #define __CLIGHTNING_H__ -#include -#include +#include +#include #include #include @@ -90,7 +90,7 @@ public: int m_RenderCount; int m_MaxRenderCount; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; // ÷ LPDIRECT3DVERTEXBUFFER8 *m_Vert; // ÷ @@ -135,8 +135,8 @@ public: CLightVertex *tmp_Vertex3; - CLightning(LPDIRECT3DDEVICE8 ); - CLightning(int ,LPDIRECT3DDEVICE8 ); + CLightning(LPDIRECT3DDEVICE9 ); + CLightning(int ,LPDIRECT3DDEVICE9 ); CLightning(); ~CLightning(); @@ -148,7 +148,7 @@ public: void SetSize(float s) {m_QuadHalfWidth = s;} - void SetDevice(LPDIRECT3DDEVICE8 device) {m_Device = device;} + void SetDevice(LPDIRECT3DDEVICE9 device) {m_Device = device;} void SetShakeValue(float smin,float smax) {m_ShakeMin = smin; m_ShakeMax = smax;} diff --git a/Client/Engine/Effect/EffMeshloader.cpp b/Client/Engine/Effect/EffMeshloader.cpp index 5b83073..9b6b41c 100644 --- a/Client/Engine/Effect/EffMeshloader.cpp +++ b/Client/Engine/Effect/EffMeshloader.cpp @@ -109,7 +109,7 @@ void CEffectMesh::SetTexAniFrame(int object_index,float frame){ void CEffectMesh::SetStartTexAni(int object_index,float frame) { Model.pobject[object_index].texstart_frame = frame; } -bool CEffectMesh::LoadWadfile(char *filename,LPDIRECT3DDEVICE8 device) { +bool CEffectMesh::LoadWadfile(char *filename,LPDIRECT3DDEVICE9 device) { char buf[BUF_SIZE] = {0}; char *token; char *tmp_ptr = NULL; @@ -396,7 +396,7 @@ bool CEffectMesh::LoadWadfile(char *filename,LPDIRECT3DDEVICE8 device) { return true; } -float CEffectMesh::Render(LPDIRECT3DDEVICE8 device,D3DXVECTOR3 vecCenter) { +float CEffectMesh::Render(LPDIRECT3DDEVICE9 device,D3DXVECTOR3 vecCenter) { int i,j; int tex_id; int tex_i; @@ -677,7 +677,7 @@ float CEffectMesh::Render(LPDIRECT3DDEVICE8 device,D3DXVECTOR3 vecCenter) { device->SetTransform(D3DTS_WORLD,&back); return frame; } -D3DXMATRIX CEffectMesh ::RotateObject(LPDIRECT3DDEVICE8 d_device,int object_index,float frame,D3DXMATRIX *w) { +D3DXMATRIX CEffectMesh ::RotateObject(LPDIRECT3DDEVICE9 d_device,int object_index,float frame,D3DXMATRIX *w) { D3DXMATRIX trans; D3DXMATRIX tk; @@ -728,7 +728,7 @@ D3DXMATRIX CEffectMesh ::RotateObject(LPDIRECT3DDEVICE8 d_device,int object_inde } } -D3DXMATRIX CEffectMesh::ScaleObject(LPDIRECT3DDEVICE8 d_device,int object_index,float frame,D3DXMATRIX *w) { +D3DXMATRIX CEffectMesh::ScaleObject(LPDIRECT3DDEVICE9 d_device,int object_index,float frame,D3DXMATRIX *w) { int k=0; double interpol = 0.0; D3DXVECTOR3 tmp_scale; @@ -777,7 +777,7 @@ D3DXMATRIX CEffectMesh::ScaleObject(LPDIRECT3DDEVICE8 d_device,int object_index, D3DXMatrixMultiply(&ta,&ta,&sm); return ta; } -D3DXMATRIX CEffectMesh::TranslateObject(LPDIRECT3DDEVICE8 d_device,int object_index,float frame,D3DXMATRIX *w) { +D3DXMATRIX CEffectMesh::TranslateObject(LPDIRECT3DDEVICE9 d_device,int object_index,float frame,D3DXMATRIX *w) { int k = 0; double interpol = 0.0; D3DXVECTOR3 tmp_pos; @@ -851,7 +851,7 @@ D3DXMATRIX CEffectMesh::TranslateObject(LPDIRECT3DDEVICE8 d_device,int object_in return ta; } } -void CEffectMesh::Create_Vertex(int i,LPDIRECT3DDEVICE8 device) { +void CEffectMesh::Create_Vertex(int i,LPDIRECT3DDEVICE9 device) { int index_num = Model.pobject[i].face_num; if(Model.pobject[i].btexture) { device->CreateVertexBuffer( index_num*sizeof(custom_vertex) * 3,0, @@ -1084,7 +1084,7 @@ int CEffectMesh::vertex_interpolation(int object_index,float now_frame) { } return 0; } -void CEffectMesh ::CreateAniTexture(LPDIRECT3DDEVICE8 device,int obj_num) { +void CEffectMesh ::CreateAniTexture(LPDIRECT3DDEVICE9 device,int obj_num) { int tex_num = Model.pobject[obj_num].AniTexNum; int i; int length; @@ -1141,7 +1141,7 @@ void CEffectMesh ::CreateAniTexture(LPDIRECT3DDEVICE8 device,int obj_num) { } } -void CEffectMesh ::CreateTexture(LPDIRECT3DDEVICE8 device) { +void CEffectMesh ::CreateTexture(LPDIRECT3DDEVICE9 device) { int i,j; int texture_num = 0; diff --git a/Client/Engine/Effect/EffMeshloader.h b/Client/Engine/Effect/EffMeshloader.h index 0c145a4..1a5ee01 100644 --- a/Client/Engine/Effect/EffMeshloader.h +++ b/Client/Engine/Effect/EffMeshloader.h @@ -7,8 +7,8 @@ #include "EffAseDefine.h" #include "texture.h" #include "BaseDataDefine.h" -#include -#include +#include +#include #define EFF_FILE "GEMDatafile" #define VOT 1.0f @@ -23,17 +23,17 @@ public: ~CEffectMesh(); - bool LoadWadfile(char *filename,LPDIRECT3DDEVICE8 ); - float Render(LPDIRECT3DDEVICE8 ,D3DXVECTOR3 ); - D3DXMATRIX RotateObject(LPDIRECT3DDEVICE8 ,int object_index,float frame,D3DXMATRIX *w); - D3DXMATRIX TranslateObject(LPDIRECT3DDEVICE8 d_device,int object_index,float frame,D3DXMATRIX *w); - D3DXMATRIX ScaleObject(LPDIRECT3DDEVICE8 ,int object_index,float frame,D3DXMATRIX *w); + bool LoadWadfile(char *filename,LPDIRECT3DDEVICE9 ); + float Render(LPDIRECT3DDEVICE9 ,D3DXVECTOR3 ); + D3DXMATRIX RotateObject(LPDIRECT3DDEVICE9 ,int object_index,float frame,D3DXMATRIX *w); + D3DXMATRIX TranslateObject(LPDIRECT3DDEVICE9 d_device,int object_index,float frame,D3DXMATRIX *w); + D3DXMATRIX ScaleObject(LPDIRECT3DDEVICE9 ,int object_index,float frame,D3DXMATRIX *w); int vertex_interpolation(int object_index,float now_frame); void Change_Vertexbuffer(int object_index); void SetObjectColor(int obj_num,int r,int g,int b,int a); - void Create_Vertex(int i,LPDIRECT3DDEVICE8 ); - void CreateTexture(LPDIRECT3DDEVICE8 device); - void CreateAniTexture(LPDIRECT3DDEVICE8 device,int obj_num); + void Create_Vertex(int i,LPDIRECT3DDEVICE9 ); + void CreateTexture(LPDIRECT3DDEVICE9 device); + void CreateAniTexture(LPDIRECT3DDEVICE9 device,int obj_num); void LoadSubface(int object_index); void SetTexAniFrame(int object_index,float frame); void SetStartTexAni(int object_index,float frame); diff --git a/Client/Engine/Effect/SMRHeader.h b/Client/Engine/Effect/SMRHeader.h index d657cf9..6d402be 100644 --- a/Client/Engine/Effect/SMRHeader.h +++ b/Client/Engine/Effect/SMRHeader.h @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include namespace SGEngine { diff --git a/Client/Engine/Effect/SMRObj.cpp b/Client/Engine/Effect/SMRObj.cpp index 1c74b98..4dab4b2 100644 --- a/Client/Engine/Effect/SMRObj.cpp +++ b/Client/Engine/Effect/SMRObj.cpp @@ -413,7 +413,7 @@ void CSMRObj::UpdateTm(SGEngine::Core::CMeshObjNode *pNode,const float &fFrame) } -void CSMRObj::Render(LPDIRECT3DDEVICE8 lpDevice,D3DXVECTOR3 vecPos,D3DXVECTOR3 vecScale,D3DXQUATERNION quatRot,float fFrame) +void CSMRObj::Render(LPDIRECT3DDEVICE9 lpDevice,D3DXVECTOR3 vecPos,D3DXVECTOR3 vecScale,D3DXQUATERNION quatRot,float fFrame) { diff --git a/Client/Engine/Effect/SMRObj.h b/Client/Engine/Effect/SMRObj.h index ff57a5e..fec843b 100644 --- a/Client/Engine/Effect/SMRObj.h +++ b/Client/Engine/Effect/SMRObj.h @@ -86,7 +86,7 @@ public: m_pRootNode = NULL; } } - void Render(LPDIRECT3DDEVICE8 lpDevice,D3DXVECTOR3 vecPos,D3DXVECTOR3 vecScale,D3DXQUATERNION quatRot,float fFrame); + void Render(LPDIRECT3DDEVICE9 lpDevice,D3DXVECTOR3 vecPos,D3DXVECTOR3 vecScale,D3DXQUATERNION quatRot,float fFrame); void UpdateTm(SGEngine::Core::CMeshObjNode *pNode,const float &fFrame); void UpdateBuffer(const float &fFrame); void UpdateSkinning(SGEngine::Core::CMeshObjNode *pNode); diff --git a/Client/Engine/Effect/X3DEffect.h b/Client/Engine/Effect/X3DEffect.h index 2a684e2..39e03b1 100644 --- a/Client/Engine/Effect/X3DEffect.h +++ b/Client/Engine/Effect/X3DEffect.h @@ -22,7 +22,7 @@ class CX3DEffect { protected: list m_lstEffect; - LPDIRECT3DDEVICE8 m_lpD3DDevice; + LPDIRECT3DDEVICE9 m_lpD3DDevice; matrix *m_lpViewMatrix; unsigned long m_dwFrameTick; @@ -91,8 +91,8 @@ class CX3DEffect { return m_lstFlash.Find(dwTick, lColor); } - void SetDevice(LPDIRECT3DDEVICE8 lpD3DDevice) { m_lpD3DDevice = lpD3DDevice; } - LPDIRECT3DDEVICE8 GetDevice(void) { return m_lpD3DDevice; } + void SetDevice(LPDIRECT3DDEVICE9 lpD3DDevice) { m_lpD3DDevice = lpD3DDevice; } + LPDIRECT3DDEVICE9 GetDevice(void) { return m_lpD3DDevice; } void SetViewMatrix(matrix *pViewMatrix) { m_lpViewMatrix = pViewMatrix; } matrix *GetViewMatrix(void) { return m_lpViewMatrix; } diff --git a/Client/Engine/Effect/X3DEffectBase.h b/Client/Engine/Effect/X3DEffectBase.h index 8f40677..30330a2 100644 --- a/Client/Engine/Effect/X3DEffectBase.h +++ b/Client/Engine/Effect/X3DEffectBase.h @@ -28,7 +28,7 @@ class CX3DEffectBase // 2 : Ǹ 3 : ÷ // 4 : Ǿ 5 : ޽ - LPDIRECT3DDEVICE8 m_lpD3DDevice; + LPDIRECT3DDEVICE9 m_lpD3DDevice; CTexture *m_lpTexture; char m_strTextureFile[256]; unsigned long m_dwStartFrame, m_dwEndFrame; @@ -84,8 +84,8 @@ class CX3DEffectBase void SetLocalView(matrix *matLocalView) { m_matLocalView = matLocalView; } matrix *GetLocalView(void) { return m_matLocalView; } - void SetLocalDevice(LPDIRECT3DDEVICE8 lpD3DDevice) { m_lpD3DDevice = lpD3DDevice; } - LPDIRECT3DDEVICE8 GetLocalDevice(void) { return m_lpD3DDevice; } + void SetLocalDevice(LPDIRECT3DDEVICE9 lpD3DDevice) { m_lpD3DDevice = lpD3DDevice; } + LPDIRECT3DDEVICE9 GetLocalDevice(void) { return m_lpD3DDevice; } // world map effect ϴ Լ void SetWorldEffect(bool b) {m_bWorldEffect = b;} bool GetWorldEffect() { return m_bWorldEffect;} diff --git a/Client/Engine/Effect/X3DEffectManager.h b/Client/Engine/Effect/X3DEffectManager.h index 7248853..1625e79 100644 --- a/Client/Engine/Effect/X3DEffectManager.h +++ b/Client/Engine/Effect/X3DEffectManager.h @@ -11,8 +11,8 @@ #pragma warning(disable:4786) // don't warn about browse name overflow. -#include -#include +#include +#include #include #include "X3DEffect.h" @@ -34,7 +34,7 @@ typedef vector LightningList; class CX3DEffectManager { protected: - LPDIRECT3DDEVICE8 m_lpD3DDevice; + LPDIRECT3DDEVICE9 m_lpD3DDevice; matrix m_matView; matrix m_matWorld; @@ -121,8 +121,8 @@ class CX3DEffectManager // ũƮ void DeleteAllWorldScript(); - void SetDevice(LPDIRECT3DDEVICE8 pD3DDevice) { m_lpD3DDevice = pD3DDevice; } - LPDIRECT3DDEVICE8 GetDevice(void) { return m_lpD3DDevice; } + void SetDevice(LPDIRECT3DDEVICE9 pD3DDevice) { m_lpD3DDevice = pD3DDevice; } + LPDIRECT3DDEVICE9 GetDevice(void) { return m_lpD3DDevice; } matrix *GetViewMatrix(void) { return &m_matView; } }; diff --git a/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.cpp b/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.cpp index 24e1685..d6b5853 100644 --- a/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.cpp +++ b/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.cpp @@ -3,8 +3,8 @@ ////////////////////////////////////////////////////////////////////// #include "BaseGraphicsLayer.h" -#include -#include +#include +#include #include "Vertex.h" #include "FastMath.h" #include "dxutil.h" @@ -18,8 +18,8 @@ CViewCamera BaseGraphicsLayer::m_ViewCamera; -LPDIRECT3DDEVICE8 BaseGraphicsLayer::m_pd3dDevice; -LPDIRECT3D8 BaseGraphicsLayer:: m_pD3D; +LPDIRECT3DDEVICE9 BaseGraphicsLayer::m_pd3dDevice; +LPDIRECT3D9 BaseGraphicsLayer:: m_pD3D; D3DPRESENT_PARAMETERS BaseGraphicsLayer::m_d3dpp; long BaseGraphicsLayer::m_lScreenSx; @@ -76,7 +76,7 @@ void BaseGraphicsLayer::Create(HWND hWnd, bool bWindowed,bool Editor, long scree GetWindowRect( m_hWnd, &m_rcWindowBounds ); GetClientRect( m_hWnd, &m_rcWindowClient ); - if(NULL == (m_pD3D=Direct3DCreate8(D3D_SDK_VERSION))) + if(NULL == (m_pD3D=Direct3DCreate9(D3D_SDK_VERSION))) { throw CGraphicLayerError("BaseGraphicsLayer:Create,GetDirect3D Interface getting fail"); } diff --git a/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.h b/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.h index e0774aa..2690bac 100644 --- a/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.h +++ b/Client/Engine/Zalla3D Base Class/BaseGraphicsLayer.h @@ -10,7 +10,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include "ViewCamera.h" #include "list.h" @@ -23,8 +23,8 @@ class BaseGraphicsLayer { static HWND m_hWnd; - static LPDIRECT3DDEVICE8 m_pd3dDevice; - static LPDIRECT3D8 m_pD3D; + static LPDIRECT3DDEVICE9 m_pd3dDevice; + static LPDIRECT3D9 m_pD3D; bool m_bWindowed; bool m_bEditorMode; //Projection Parameter// @@ -66,7 +66,7 @@ public: void Create(HWND hWnd,bool bWindowed,bool Editor,long screenx,long screeny, long screenwidth, long screenheight); BaseGraphicsLayer(); virtual ~BaseGraphicsLayer(); - static LPDIRECT3DDEVICE8 GetDevice(){return m_pd3dDevice;}; + static LPDIRECT3DDEVICE9 GetDevice(){return m_pd3dDevice;}; static int GetGraphicCard() { return m_iGraphicCards;} static void SetCustomMsg(size_t index, const char* sz); diff --git a/Client/Engine/Zalla3D Base Class/ConvertTexture.cpp b/Client/Engine/Zalla3D Base Class/ConvertTexture.cpp index 6639495..eac067b 100644 --- a/Client/Engine/Zalla3D Base Class/ConvertTexture.cpp +++ b/Client/Engine/Zalla3D Base Class/ConvertTexture.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include +#include #include "ConvertTexture.h" #include "GMMemory.h" diff --git a/Client/Engine/Zalla3D Base Class/EnumD3D.cpp b/Client/Engine/Zalla3D Base Class/EnumD3D.cpp index a51e852..7055cfe 100644 --- a/Client/Engine/Zalla3D Base Class/EnumD3D.cpp +++ b/Client/Engine/Zalla3D Base Class/EnumD3D.cpp @@ -14,7 +14,7 @@ D3DAdapterInfo CEnumD3D::m_Adapters[10]; DWORD CEnumD3D::m_dwNumAdapters; DWORD CEnumD3D::m_dwAdapter; BOOL CEnumD3D::m_bWindowed; -LPDIRECT3D8 CEnumD3D::m_pD3D; +LPDIRECT3D9 CEnumD3D::m_pD3D; BOOL CEnumD3D::m_bUseDepthBuffer; long CEnumD3D::m_dwMinDepthBits; long CEnumD3D::m_dwMinStencilBits; @@ -62,7 +62,7 @@ CEnumD3D::~CEnumD3D() HRESULT CEnumD3D::Enum() { - m_pD3D=Direct3DCreate8(D3D_SDK_VERSION); + m_pD3D=Direct3DCreate9(D3D_SDK_VERSION); const DWORD dwNumDeviceTypes = 2; const TCHAR* strDeviceDescs[] = { "HAL", "REF" }; const D3DDEVTYPE DeviceTypes[] = { D3DDEVTYPE_HAL, D3DDEVTYPE_REF }; @@ -434,7 +434,7 @@ BOOL CEnumD3D::FindDepthStencilFormat(UINT iAdapter, D3DDEVTYPE DeviceType, D3DF return FALSE; } -HRESULT CEnumD3D::ConfirmDevice(D3DCAPS8 *, DWORD, D3DFORMAT) +HRESULT CEnumD3D::ConfirmDevice(D3DCAPS9 *, DWORD, D3DFORMAT) { return S_OK; } diff --git a/Client/Engine/Zalla3D Base Class/EnumD3D.h b/Client/Engine/Zalla3D Base Class/EnumD3D.h index d5d2439..5fad8db 100644 --- a/Client/Engine/Zalla3D Base Class/EnumD3D.h +++ b/Client/Engine/Zalla3D Base Class/EnumD3D.h @@ -8,7 +8,7 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include +#include #include //----------------------------------------------------------------------------- @@ -37,7 +37,7 @@ struct D3DDeviceInfo { // Device data D3DDEVTYPE DeviceType; // Reference, HAL, etc. - D3DCAPS8 d3dCaps; // Capabilities of this device + D3DCAPS9 d3dCaps; // Capabilities of this device const TCHAR* strDesc; // Name of this device BOOL bCanDoWindowed; // Whether this device can work in windowed mode @@ -62,7 +62,7 @@ struct D3DDeviceInfo struct D3DAdapterInfo { // Adapter data - D3DADAPTER_IDENTIFIER8 d3dAdapterIdentifier; + D3DADAPTER_IDENTIFIER9 d3dAdapterIdentifier; D3DDISPLAYMODE d3ddmDesktop; // Desktop display mode for this adapter // Devices for this adapter @@ -89,7 +89,7 @@ class CEnumD3D static long m_dwMinStencilBits; public: static long m_nAdapter,m_nDevice,m_nMode; - static LPDIRECT3D8 m_pD3D; + static LPDIRECT3D9 m_pD3D; static DWORD m_dwNumAdapters; static BOOL m_bUseDepthBuffer; static DWORD m_dwAdapter; @@ -97,7 +97,7 @@ public: static TCHAR m_strSoundCard[64]; static TCHAR m_strSoundCardDrv[64]; - static HRESULT ConfirmDevice(D3DCAPS8*,DWORD,D3DFORMAT); + static HRESULT ConfirmDevice(D3DCAPS9*,DWORD,D3DFORMAT); static BOOL FindDepthStencilFormat(UINT iAdapter, D3DDEVTYPE DeviceType, D3DFORMAT TargetFormat, D3DFORMAT *pDepthStencilFormat); static HRESULT Enum(); CEnumD3D(); diff --git a/Client/Engine/Zalla3D Base Class/FastMath.h b/Client/Engine/Zalla3D Base Class/FastMath.h index c934822..c106de7 100644 --- a/Client/Engine/Zalla3D Base Class/FastMath.h +++ b/Client/Engine/Zalla3D Base Class/FastMath.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include "MathBase.h" #define FP_BITS(fp) (*(DWORD *)&(fp)) diff --git a/Client/Engine/Zalla3D Base Class/FrameTimer.h b/Client/Engine/Zalla3D Base Class/FrameTimer.h index 2eb2e98..271a881 100644 --- a/Client/Engine/Zalla3D Base Class/FrameTimer.h +++ b/Client/Engine/Zalla3D Base Class/FrameTimer.h @@ -8,7 +8,7 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include +#include #include class CFrameTimer diff --git a/Client/Engine/Zalla3D Base Class/GlareTexture.cpp b/Client/Engine/Zalla3D Base Class/GlareTexture.cpp index e1e97b4..fa56d6e 100644 --- a/Client/Engine/Zalla3D Base Class/GlareTexture.cpp +++ b/Client/Engine/Zalla3D Base Class/GlareTexture.cpp @@ -89,7 +89,7 @@ CGlareTexture::~CGlareTexture() } -void CGlareTexture::GenerateGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth) +void CGlareTexture::GenerateGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth) { LPDIRECT3DSURFACE8 m_pTempRenderSurface; LPDIRECT3DSURFACE8 m_pTempRenderZBuffer; @@ -435,7 +435,7 @@ void CGlareTexture::CreateAndWriteUVOffsets(int width, int height) } -void CGlareTexture::ProcedualGenerateGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture, vector3 vecNeighbor, int nDepth) +void CGlareTexture::ProcedualGenerateGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture, vector3 vecNeighbor, int nDepth) { if(pTexture) m_nFinalRenderTexture=0; @@ -629,7 +629,7 @@ void CGlareTexture::ProcedualGenerateGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice, pd3dDevice->SetPixelShader(NULL); } -void CGlareTexture::GenerateGlareTexture2(LPDIRECT3DDEVICE8 pd3dDevice,LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth) +void CGlareTexture::GenerateGlareTexture2(LPDIRECT3DDEVICE9 pd3dDevice,LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth) { LPDIRECT3DSURFACE8 m_pTempRenderSurface; diff --git a/Client/Engine/Zalla3D Base Class/GlareTexture.h b/Client/Engine/Zalla3D Base Class/GlareTexture.h index 8ee22c2..586f400 100644 --- a/Client/Engine/Zalla3D Base Class/GlareTexture.h +++ b/Client/Engine/Zalla3D Base Class/GlareTexture.h @@ -43,13 +43,13 @@ class CGlareTexture int m_nSize; int m_nFinalRenderTexture; public: - void GenerateGlareTexture2(LPDIRECT3DDEVICE8 pd3dDevice,LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth); - void ProcedualGenerateGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth); + void GenerateGlareTexture2(LPDIRECT3DDEVICE9 pd3dDevice,LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth); + void ProcedualGenerateGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth); LPDIRECT3DTEXTURE8 GetTexture(){return m_pRenderTexture[m_nFinalRenderTexture];}; void CreateAndWriteUVOffsets(int width, int height); void Create(int nSize); - void GenerateGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice,LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth); + void GenerateGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice,LPDIRECT3DBASETEXTURE8 pTexture,vector3 vecNeighbor,int nDepth); CGlareTexture(); virtual ~CGlareTexture(); }; diff --git a/Client/Engine/Zalla3D Base Class/IMEFont.cpp b/Client/Engine/Zalla3D Base Class/IMEFont.cpp index 788800c..e7988d9 100644 --- a/Client/Engine/Zalla3D Base Class/IMEFont.cpp +++ b/Client/Engine/Zalla3D Base Class/IMEFont.cpp @@ -26,7 +26,7 @@ CIMEFont::~CIMEFont() m_pTexture->Release(); } -void CIMEFont::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CIMEFont::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(isRewirte()) MakeTexture(); @@ -86,7 +86,7 @@ void CIMEFont::Render(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->SetTextureStageState(0,D3DTSS_COLOROP,D3DTOP_SELECTARG1); } -void CIMEFont::Create(LPDIRECT3DDEVICE8 pd3dDevice,long sizeX,long sizeY) +void CIMEFont::Create(LPDIRECT3DDEVICE9 pd3dDevice,long sizeX,long sizeY) { m_SizeX=sizeX; m_SizeY=sizeY; @@ -189,7 +189,7 @@ void CIMEFont::MakeTexture() DeleteObject( hFont ); } -void CIMEFont::Render(LPDIRECT3DDEVICE8 pd3dDevice, DWORD dwColor) +void CIMEFont::Render(LPDIRECT3DDEVICE9 pd3dDevice, DWORD dwColor) { if(isRewirte()) MakeTexture(); diff --git a/Client/Engine/Zalla3D Base Class/IMEFont.h b/Client/Engine/Zalla3D Base Class/IMEFont.h index d256d4e..83c3afe 100644 --- a/Client/Engine/Zalla3D Base Class/IMEFont.h +++ b/Client/Engine/Zalla3D Base Class/IMEFont.h @@ -9,8 +9,8 @@ #pragma once #endif // _MSC_VER > 1000 -#include -#include +#include +#include #include "Vertex.h" class CIMEFont @@ -20,12 +20,12 @@ class CIMEFont char m_strPrinted[20][256]; int m_cLine; public: - void Render(LPDIRECT3DDEVICE8 pd3dDevice,DWORD dwColor); + void Render(LPDIRECT3DDEVICE9 pd3dDevice,DWORD dwColor); void MakeTexture(); bool isRewirte(); void PrintToTexture(char *str,long line); - void Create(LPDIRECT3DDEVICE8 pd3dDevice,long sizeX,long sizeY); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Create(LPDIRECT3DDEVICE9 pd3dDevice,long sizeX,long sizeY); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); LPDIRECT3DTEXTURE8 m_pTexture; CIMEFont(); virtual ~CIMEFont(); diff --git a/Client/Engine/Zalla3D Base Class/NTexture.cpp b/Client/Engine/Zalla3D Base Class/NTexture.cpp index 81ef699..85ec796 100644 --- a/Client/Engine/Zalla3D Base Class/NTexture.cpp +++ b/Client/Engine/Zalla3D Base Class/NTexture.cpp @@ -1,19 +1,19 @@ #include ".\ntexture.h" -#include +#include #include "./GraphicLayerError.h" #include "GMMemory.h" namespace CROSSM { char CNTexture::m_strPath[256]; -LPDIRECT3DDEVICE8 CNTexture::ms_pd3dDevice = NULL; +LPDIRECT3DDEVICE9 CNTexture::ms_pd3dDevice = NULL; int CNTexture::m_SkipMipLevel=0; -IDirect3DTexture8* CNTexture::ms_pNullTexture = NULL; +IDirect3DTexture9* CNTexture::ms_pNullTexture = NULL; bool CNTexture::ms_bNullTextureMode = false; -void CNTexture::Init(LPDIRECT3DDEVICE8 lpDevice) +void CNTexture::Init(LPDIRECT3DDEVICE9 lpDevice) { ms_pd3dDevice = lpDevice; ms_pd3dDevice->AddRef(); diff --git a/Client/Engine/Zalla3D Base Class/NTexture.h b/Client/Engine/Zalla3D Base Class/NTexture.h index a232bd7..c5be965 100644 --- a/Client/Engine/Zalla3D Base Class/NTexture.h +++ b/Client/Engine/Zalla3D Base Class/NTexture.h @@ -3,7 +3,7 @@ #include "./resourceobj.h" #include "./dds.h" -#include +#include #ifndef ReleasePpo #define ReleasePpo(ppo) \ @@ -32,7 +32,7 @@ public: static void SetPath(char *strPath){strcpy(m_strPath,strPath);}; static const char* GetPath(){ return m_strPath; }; - static void Init(LPDIRECT3DDEVICE8 lpDevice); + static void Init(LPDIRECT3DDEVICE9 lpDevice); static void Close(); static void NullTextureMode(bool bNullTexture); @@ -48,7 +48,7 @@ protected: bool m_bInterface; public: - static LPDIRECT3DDEVICE8 ms_pd3dDevice; + static LPDIRECT3DDEVICE9 ms_pd3dDevice; static int m_SkipMipLevel; @@ -59,7 +59,7 @@ public: private: LPDIRECT3DBASETEXTURE8 m_pddTexture; - static IDirect3DTexture8* ms_pNullTexture; + static IDirect3DTexture9* ms_pNullTexture; static bool ms_bNullTextureMode; }; diff --git a/Client/Engine/Zalla3D Base Class/RenderDevice.cpp b/Client/Engine/Zalla3D Base Class/RenderDevice.cpp index 98c76e8..72d718a 100644 --- a/Client/Engine/Zalla3D Base Class/RenderDevice.cpp +++ b/Client/Engine/Zalla3D Base Class/RenderDevice.cpp @@ -19,7 +19,7 @@ CRenderDevice::~CRenderDevice() } -void CRenderDevice::Init(LPDIRECT3DDEVICE8 pd3dDevice) +void CRenderDevice::Init(LPDIRECT3DDEVICE9 pd3dDevice) { } diff --git a/Client/Engine/Zalla3D Base Class/RenderDevice.h b/Client/Engine/Zalla3D Base Class/RenderDevice.h index 2f34edf..eab78b8 100644 --- a/Client/Engine/Zalla3D Base Class/RenderDevice.h +++ b/Client/Engine/Zalla3D Base Class/RenderDevice.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include "3DMath.h" enum RenderState @@ -19,11 +19,11 @@ enum RenderState class CRenderDevice { - LPDIRECT3DDEVICE8 m_pd3dDevice; + LPDIRECT3DDEVICE9 m_pd3dDevice; public: matrix m_matWorld[4],m_matView,m_matProj; - LPDIRECT3DDEVICE8 GetDeivce(){return m_pd3dDevice;}; - void Init(LPDIRECT3DDEVICE8 pd3dDevice); + LPDIRECT3DDEVICE9 GetDeivce(){return m_pd3dDevice;}; + void Init(LPDIRECT3DDEVICE9 pd3dDevice); CRenderDevice(); virtual ~CRenderDevice(); diff --git a/Client/Engine/Zalla3D Base Class/RenderEnvTexture.cpp b/Client/Engine/Zalla3D Base Class/RenderEnvTexture.cpp index 57aaa1d..8d07e73 100644 --- a/Client/Engine/Zalla3D Base Class/RenderEnvTexture.cpp +++ b/Client/Engine/Zalla3D Base Class/RenderEnvTexture.cpp @@ -63,7 +63,7 @@ CRenderEnvTexture::~CRenderEnvTexture() } -void CRenderEnvTexture::RenderCubeMap(LPDIRECT3DDEVICE8 pd3dDevice) +void CRenderEnvTexture::RenderCubeMap(LPDIRECT3DDEVICE9 pd3dDevice) { ///////// !!!!!!!!!!!!!!/////////////// HRESULT hr; @@ -141,7 +141,7 @@ void CRenderEnvTexture::RenderCubeMap(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->SetTransform(D3DTS_PROJECTION,&matOldProjection); } -void CRenderEnvTexture::RenderSkymap(LPDIRECT3DDEVICE8 pd3dDevice) +void CRenderEnvTexture::RenderSkymap(LPDIRECT3DDEVICE9 pd3dDevice) { //D3DXMATRIX matWorld; //D3DXMatrixScaling( &matWorld, 1.0f, 1.0f, 1.0f ); @@ -278,7 +278,7 @@ void CRenderEnvTexture::RenderSkymap(LPDIRECT3DDEVICE8 pd3dDevice) //pd3dDevice->SetRenderState( D3DRS_ZFUNC, D3DCMP_LESSEQUAL ); } -void CRenderEnvTexture::Create(LPDIRECT3DDEVICE8 pd3dDevice,char strSkyTexturename[256],char strTexturePath[256],bool bCube) +void CRenderEnvTexture::Create(LPDIRECT3DDEVICE9 pd3dDevice,char strSkyTexturename[256],char strTexturePath[256],bool bCube) { D3DDISPLAYMODE mode; BaseGraphicsLayer::GetDevice()->GetDisplayMode(&mode); diff --git a/Client/Engine/Zalla3D Base Class/RenderEnvTexture.h b/Client/Engine/Zalla3D Base Class/RenderEnvTexture.h index 579b6f7..5387223 100644 --- a/Client/Engine/Zalla3D Base Class/RenderEnvTexture.h +++ b/Client/Engine/Zalla3D Base Class/RenderEnvTexture.h @@ -19,11 +19,11 @@ class CRenderEnvTexture CTexture m_SkyTexture[6]; bool m_bCube; public: - IDirect3DCubeTexture8* m_pCubeMap; - IDirect3DTexture8* m_pSphereMap; - void Create(LPDIRECT3DDEVICE8 pd3dDevice,char strSkyTexturename[256],char strTexturePath[256],bool bCube=true); - void RenderSkymap(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderCubeMap(LPDIRECT3DDEVICE8 pd3dDevice); + IDirect3DCubeTexture9* m_pCubeMap; + IDirect3DTexture9* m_pSphereMap; + void Create(LPDIRECT3DDEVICE9 pd3dDevice,char strSkyTexturename[256],char strTexturePath[256],bool bCube=true); + void RenderSkymap(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderCubeMap(LPDIRECT3DDEVICE9 pd3dDevice); LPDIRECT3DBASETEXTURE8 GetTexture() { if(m_bCube) diff --git a/Client/Engine/Zalla3D Base Class/RenderTargetTexture.cpp b/Client/Engine/Zalla3D Base Class/RenderTargetTexture.cpp index 0cbfd31..d3d1b3d 100644 --- a/Client/Engine/Zalla3D Base Class/RenderTargetTexture.cpp +++ b/Client/Engine/Zalla3D Base Class/RenderTargetTexture.cpp @@ -21,12 +21,12 @@ CRenderTargetTexture::~CRenderTargetTexture() } -void CRenderTargetTexture::Create(LPDIRECT3DDEVICE8 pd3dDevice,int nSizeX,int nSizeY) +void CRenderTargetTexture::Create(LPDIRECT3DDEVICE9 pd3dDevice,int nSizeX,int nSizeY) { pd3dDevice->CreateTexture(nSizeX,nSizeY,1,0,BaseGraphicsLayer::m_d3dpp.BackBufferFormat,D3DPOOL_DEFAULT,&m_pTexture); } -LPDIRECT3DTEXTURE8 CRenderTargetTexture::GetTexture(LPDIRECT3DDEVICE8 pd3dDevice,RECT rcCopy) +LPDIRECT3DTEXTURE8 CRenderTargetTexture::GetTexture(LPDIRECT3DDEVICE9 pd3dDevice,RECT rcCopy) { LPDIRECT3DSURFACE8 pSurface; m_pTexture->GetSurfaceLevel(0,&pSurface); diff --git a/Client/Engine/Zalla3D Base Class/RenderTargetTexture.h b/Client/Engine/Zalla3D Base Class/RenderTargetTexture.h index f2bfbbf..a668d2d 100644 --- a/Client/Engine/Zalla3D Base Class/RenderTargetTexture.h +++ b/Client/Engine/Zalla3D Base Class/RenderTargetTexture.h @@ -9,14 +9,14 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include class CRenderTargetTexture { static LPDIRECT3DTEXTURE8 m_pTexture; public: - static LPDIRECT3DTEXTURE8 GetTexture(LPDIRECT3DDEVICE8 pd3dDevice,RECT rcCopy); - static void Create(LPDIRECT3DDEVICE8 pd3dDevice,int nSizeX,int nSizeY); + static LPDIRECT3DTEXTURE8 GetTexture(LPDIRECT3DDEVICE9 pd3dDevice,RECT rcCopy); + static void Create(LPDIRECT3DDEVICE9 pd3dDevice,int nSizeX,int nSizeY); CRenderTargetTexture(); virtual ~CRenderTargetTexture(); diff --git a/Client/Engine/Zalla3D Base Class/RenderTexture.cpp b/Client/Engine/Zalla3D Base Class/RenderTexture.cpp index 8d1304a..a7b4985 100644 --- a/Client/Engine/Zalla3D Base Class/RenderTexture.cpp +++ b/Client/Engine/Zalla3D Base Class/RenderTexture.cpp @@ -56,7 +56,7 @@ void CRenderTexture::Create(long SizeX,long SizeY) } } -void CRenderTexture::Begin(LPDIRECT3DDEVICE8 pd3dDevice) +void CRenderTexture::Begin(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->GetRenderTarget(&m_pTempRenderSurface); pd3dDevice->GetDepthStencilSurface(&m_pTempRenderZBuffer); @@ -67,7 +67,7 @@ void CRenderTexture::Begin(LPDIRECT3DDEVICE8 pd3dDevice) } -void CRenderTexture::End(LPDIRECT3DDEVICE8 pd3dDevice) +void CRenderTexture::End(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetRenderTarget(m_pTempRenderSurface,m_pTempRenderZBuffer); m_pTempRenderSurface->Release(); diff --git a/Client/Engine/Zalla3D Base Class/RenderTexture.h b/Client/Engine/Zalla3D Base Class/RenderTexture.h index ab0c783..d215048 100644 --- a/Client/Engine/Zalla3D Base Class/RenderTexture.h +++ b/Client/Engine/Zalla3D Base Class/RenderTexture.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include class CRenderTexture { @@ -26,8 +26,8 @@ class CRenderTexture public: void Unlock(); void* Lock(); - void Begin(LPDIRECT3DDEVICE8 pd3dDevice); - void End(LPDIRECT3DDEVICE8 pd3dDevice); + void Begin(LPDIRECT3DDEVICE9 pd3dDevice); + void End(LPDIRECT3DDEVICE9 pd3dDevice); LPDIRECT3DTEXTURE8 GetTexture(){return m_pRenderTexture;}; LPDIRECT3DSURFACE8 GetSurface(){return m_pRenderSurface;}; long m_SizeX,m_Sizey; diff --git a/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.cpp b/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.cpp index 4e397fb..1600034 100644 --- a/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.cpp +++ b/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.cpp @@ -59,7 +59,7 @@ LPDIRECT3DTEXTURE8 CRenderTextureMipmap::GetTexture(int nTexture) return NULL; } -void CRenderTextureMipmap::GenerateMipmap(LPDIRECT3DDEVICE8 pd3dDevice) +void CRenderTextureMipmap::GenerateMipmap(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->EndScene(); LPDIRECT3DSURFACE8 m_pTempRenderSurface; diff --git a/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.h b/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.h index 90a3455..d5e561a 100644 --- a/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.h +++ b/Client/Engine/Zalla3D Base Class/RenderTextureMipmap.h @@ -20,7 +20,7 @@ class CRenderTextureMipmap int m_nSize; public: LPDIRECT3DSURFACE8 GetSurface(); - void GenerateMipmap(LPDIRECT3DDEVICE8 pd3dDevice); + void GenerateMipmap(LPDIRECT3DDEVICE9 pd3dDevice); LPDIRECT3DTEXTURE8 GetTexture(int nTexture=0); LPDIRECT3DSURFACE8 GetZBuffer(){return m_pRenderZBuffer;}; int GetTextureCount(){return (int)m_pRenderTextureList.size();}; diff --git a/Client/Engine/Zalla3D Base Class/ShadowMap.cpp b/Client/Engine/Zalla3D Base Class/ShadowMap.cpp index 0483e59..b2fd939 100644 --- a/Client/Engine/Zalla3D Base Class/ShadowMap.cpp +++ b/Client/Engine/Zalla3D Base Class/ShadowMap.cpp @@ -56,7 +56,7 @@ void CShadowMap::Create(long SizeX, long SizeY) } -void CShadowMap::Begin(LPDIRECT3DDEVICE8 pd3dDevice) +void CShadowMap::Begin(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->GetViewport(&m_pTempViewPort); pd3dDevice->GetRenderTarget(&m_pTempRenderSurface); @@ -66,7 +66,7 @@ void CShadowMap::Begin(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->SetViewport(&m_Viewport); } -void CShadowMap::End(LPDIRECT3DDEVICE8 pd3dDevice) +void CShadowMap::End(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetRenderTarget(m_pTempRenderSurface,m_pTempRenderZBuffer); pd3dDevice->SetViewport(&m_pTempViewPort); diff --git a/Client/Engine/Zalla3D Base Class/ShadowMap.h b/Client/Engine/Zalla3D Base Class/ShadowMap.h index c5da9d9..5f6d122 100644 --- a/Client/Engine/Zalla3D Base Class/ShadowMap.h +++ b/Client/Engine/Zalla3D Base Class/ShadowMap.h @@ -9,13 +9,13 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include class CShadowMap { public: - void End(LPDIRECT3DDEVICE8 pd3dDevice); - void Begin(LPDIRECT3DDEVICE8 pd3dDevice); + void End(LPDIRECT3DDEVICE9 pd3dDevice); + void Begin(LPDIRECT3DDEVICE9 pd3dDevice); LPDIRECT3DSURFACE8 m_pShadowMapColorSurface,m_pShadowMapZSurface; LPDIRECT3DTEXTURE8 m_pShadowMapColorTexture,m_pShadowMapZTexture; diff --git a/Client/Engine/Zalla3D Base Class/Sphere.cpp b/Client/Engine/Zalla3D Base Class/Sphere.cpp index 3322ba3..19254bc 100644 --- a/Client/Engine/Zalla3D Base Class/Sphere.cpp +++ b/Client/Engine/Zalla3D Base Class/Sphere.cpp @@ -3,7 +3,7 @@ #include //#include -#include +#include #include #include "matrix.h" #include "GMMemory.h" @@ -77,7 +77,7 @@ CSphere::~CSphere() //////////////////////////////////////////////////////////////////////////// // -void CSphere::Create( IDirect3DDevice8 * pd3dDevice, unsigned rings, unsigned segments ) +void CSphere::Create( IDirect3DDevice9 * pd3dDevice, unsigned rings, unsigned segments ) { m_pd3dDevice = pd3dDevice; m_uiRings = rings; @@ -166,7 +166,7 @@ void CSphere::SetColor( float r, float g, float b ) //////////////////////////////////////////////////////////////////////////// // -HRESULT SetShader( LPDIRECT3DDEVICE8 pd3dDevice, DWORD color ) +HRESULT SetShader( LPDIRECT3DDEVICE9 pd3dDevice, DWORD color ) { pd3dDevice->SetRenderState(D3DRS_TEXTUREFACTOR,color); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TFACTOR ); diff --git a/Client/Engine/Zalla3D Base Class/Sphere.h b/Client/Engine/Zalla3D Base Class/Sphere.h index f22a3f4..e46b8cb 100644 --- a/Client/Engine/Zalla3D Base Class/Sphere.h +++ b/Client/Engine/Zalla3D Base Class/Sphere.h @@ -4,16 +4,16 @@ #pragma once -struct IDirect3DVertexBuffer8; -struct IDirect3DDevice8; +struct IDirect3DVertexBuffer9; +struct IDirect3DDevice9; //////////////////////////////////////////////////////////////////////////// // class CSphere { - IDirect3DDevice8 * m_pd3dDevice; - IDirect3DVertexBuffer8 * m_pVB; + IDirect3DDevice9 * m_pd3dDevice; + IDirect3DVertexBuffer9 * m_pVB; unsigned m_uiRings, m_uiSegments; // , 浵 float m_fRed, m_fGreen, m_fBlue; @@ -23,7 +23,7 @@ public: CSphere(); ~CSphere(); - void Create( IDirect3DDevice8 *, unsigned rings, unsigned segments ); + void Create( IDirect3DDevice9 *, unsigned rings, unsigned segments ); void Destroy(); void SetPosition( float x, float y, float z ); diff --git a/Client/Engine/Zalla3D Base Class/TexttureCacheMgr.h b/Client/Engine/Zalla3D Base Class/TexttureCacheMgr.h index 0089e38..7e94f24 100644 --- a/Client/Engine/Zalla3D Base Class/TexttureCacheMgr.h +++ b/Client/Engine/Zalla3D Base Class/TexttureCacheMgr.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include diff --git a/Client/Engine/Zalla3D Base Class/Texture.cpp b/Client/Engine/Zalla3D Base Class/Texture.cpp index 6c04960..18697f9 100644 --- a/Client/Engine/Zalla3D Base Class/Texture.cpp +++ b/Client/Engine/Zalla3D Base Class/Texture.cpp @@ -12,13 +12,13 @@ ////////////////////////////////////////////////////////////////////// typedef LPDIRECT3DTEXTURE8 DXTEXTURE; -LPDIRECT3DDEVICE8 CTexture::ms_pd3dDevice; +LPDIRECT3DDEVICE9 CTexture::ms_pd3dDevice; char CTexture::m_strPath[TEXTURENAMEBUFFER]; //CTextureContainer CTexture::m_TextureContainer; CTextureCacheMgr CTexture::m_TextureContainer; int CTexture::m_SkipMipLevel=0; -IDirect3DTexture8* CTexture::ms_pNullTexture = NULL; +IDirect3DTexture9* CTexture::ms_pNullTexture = NULL; bool CTexture::ms_bNullTextureMode = false; @@ -48,7 +48,7 @@ CTexture::~CTexture() Unload(); } -void CTexture::Init(LPDIRECT3DDEVICE8 pd3dDevice) +void CTexture::Init(LPDIRECT3DDEVICE9 pd3dDevice) { ms_pd3dDevice=pd3dDevice; ms_pd3dDevice->AddRef(); diff --git a/Client/Engine/Zalla3D Base Class/Texture.h b/Client/Engine/Zalla3D Base Class/Texture.h index 4a35667..2d05d62 100644 --- a/Client/Engine/Zalla3D Base Class/Texture.h +++ b/Client/Engine/Zalla3D Base Class/Texture.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include //#include #include "list.h" #include "TextureContainer.h" @@ -120,7 +120,7 @@ const DDS_PIXELFORMAT DDSPF_R5G6B5 = class CTexture { private: - static IDirect3DTexture8* ms_pNullTexture; + static IDirect3DTexture9* ms_pNullTexture; static bool ms_bNullTextureMode; bool m_bCreateEmpty; @@ -130,7 +130,7 @@ private: protected: IDirect3DBaseTexture8* m_pddTexture; - static LPDIRECT3DDEVICE8 ms_pd3dDevice; + static LPDIRECT3DDEVICE9 ms_pd3dDevice; static char m_strPath[TEXTURENAMEBUFFER]; //char m_strFullName[TEXTURENAMEBUFFER]; @@ -155,7 +155,7 @@ public: IDirect3DBaseTexture8* GetTexture(); void ReadDDSTexture( LPDIRECT3DBASETEXTURE8& pddsTemp,int nMethod ); virtual void Load(char *filename,DWORD stage=0); - static void Init(LPDIRECT3DDEVICE8 pd3dDevice); + static void Init(LPDIRECT3DDEVICE9 pd3dDevice); static void Close(); CTexture(); diff --git a/Client/Engine/Zalla3D Base Class/TextureContainer.h b/Client/Engine/Zalla3D Base Class/TextureContainer.h index b4b09d1..f1d29d2 100644 --- a/Client/Engine/Zalla3D Base Class/TextureContainer.h +++ b/Client/Engine/Zalla3D Base Class/TextureContainer.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include #include "Exception.h" #include diff --git a/Client/Engine/Zalla3D Base Class/VertexBuffer.cpp b/Client/Engine/Zalla3D Base Class/VertexBuffer.cpp index 36e8c13..0165058 100644 --- a/Client/Engine/Zalla3D Base Class/VertexBuffer.cpp +++ b/Client/Engine/Zalla3D Base Class/VertexBuffer.cpp @@ -8,7 +8,7 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -LPDIRECT3D8 CVertexBuffer::m_pD3D; +LPDIRECT3D9 CVertexBuffer::m_pD3D; CVertexBuffer::CVertexBuffer() @@ -40,7 +40,7 @@ void CVertexBuffer::Create() */ } -void CVertexBuffer::Render(LPDIRECT3DDEVICE8 pd3dDevice,WORD *pIndices,long &nIndices) +void CVertexBuffer::Render(LPDIRECT3DDEVICE9 pd3dDevice,WORD *pIndices,long &nIndices) { /* m_pd3dDevice->SetVertexShader( m_dwDolphinVertexShader ); diff --git a/Client/Engine/Zalla3D Base Class/VertexBuffer.h b/Client/Engine/Zalla3D Base Class/VertexBuffer.h index 897763a..159443e 100644 --- a/Client/Engine/Zalla3D Base Class/VertexBuffer.h +++ b/Client/Engine/Zalla3D Base Class/VertexBuffer.h @@ -8,15 +8,15 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include +#include #include "Exception.h" class CVertexBuffer { - static LPDIRECT3D8 m_pD3D; + static LPDIRECT3D9 m_pD3D; public: - void Render(LPDIRECT3DDEVICE8 pd3dDevice,WORD *pIndices,long &nIndices); + void Render(LPDIRECT3DDEVICE9 pd3dDevice,WORD *pIndices,long &nIndices); DWORD m_nVertex; LPDIRECT3DVERTEXBUFFER8 m_pVertexBuffer; DWORD m_FVF; diff --git a/Client/Engine/Zalla3D Base Class/ViewCamera.cpp b/Client/Engine/Zalla3D Base Class/ViewCamera.cpp index c03ece0..ce0f1a0 100644 --- a/Client/Engine/Zalla3D Base Class/ViewCamera.cpp +++ b/Client/Engine/Zalla3D Base Class/ViewCamera.cpp @@ -4,7 +4,7 @@ #include "ViewCamera.h" #include "Vertex.h" -#include +#include #include "GMMemory.h" #define KeyPressed( key ) HIBYTE( GetAsyncKeyState( key ) ) @@ -88,7 +88,7 @@ void CViewCamera::BuildFrustum(float fAspect, float fFov,float fNearPlane,float } -void CViewCamera::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CViewCamera::Render(LPDIRECT3DDEVICE9 pd3dDevice) { /* if(m_cFade==-1) diff --git a/Client/Engine/Zalla3D Base Class/ViewCamera.h b/Client/Engine/Zalla3D Base Class/ViewCamera.h index 15a53ad..91a5f87 100644 --- a/Client/Engine/Zalla3D Base Class/ViewCamera.h +++ b/Client/Engine/Zalla3D Base Class/ViewCamera.h @@ -105,7 +105,7 @@ public: void InterfaceCharlook(int MouseX,int MouseY,float fCharMove); void InterfaceFreelook(int MouseX,int MouseY); void MoveFrustum(); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void BuildFrustum(float fAspect,float fFov,float fNearPlane,float fFarPlane); diff --git a/Client/Engine/Zalla3D Base Class/WBValue.h b/Client/Engine/Zalla3D Base Class/WBValue.h index 4cebee6..5808c2c 100644 --- a/Client/Engine/Zalla3D Base Class/WBValue.h +++ b/Client/Engine/Zalla3D Base Class/WBValue.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include diff --git a/Client/Engine/Zalla3D Base Class/d3dfont.cpp b/Client/Engine/Zalla3D Base Class/d3dfont.cpp index 0dfcb7e..9921a52 100644 --- a/Client/Engine/Zalla3D Base Class/d3dfont.cpp +++ b/Client/Engine/Zalla3D Base Class/d3dfont.cpp @@ -59,8 +59,8 @@ CD3DFont::CD3DFont( TCHAR* strFontName, DWORD dwHeight, DWORD dwFlags ) m_pTexture = NULL; m_pVB = NULL; - m_dwSavedStateBlock = 0L; - m_dwDrawTextStateBlock = 0L; + m_pSavedStateBlock = NULL; + m_pDrawTextStateBlock = NULL; } @@ -84,7 +84,7 @@ CD3DFont::~CD3DFont() // Desc: Initializes device-dependent objects, including the vertex buffer used // for rendering text and the texture map which stores the font image. //----------------------------------------------------------------------------- -HRESULT CD3DFont::InitDeviceObjects( LPDIRECT3DDEVICE8 pd3dDevice ) +HRESULT CD3DFont::InitDeviceObjects( LPDIRECT3DDEVICE9 pd3dDevice ) { HRESULT hr; @@ -104,7 +104,7 @@ HRESULT CD3DFont::InitDeviceObjects( LPDIRECT3DDEVICE8 pd3dDevice ) // If requested texture is too big, use a smaller texture and smaller font, // and scale up when rendering. - D3DCAPS8 d3dCaps; + D3DCAPS9 d3dCaps; m_pd3dDevice->GetDeviceCaps( &d3dCaps ); if( m_dwTexWidth > d3dCaps.MaxTextureWidth ) @@ -252,9 +252,9 @@ HRESULT CD3DFont::RestoreDeviceObjects() m_pd3dDevice->SetRenderState( D3DRS_ZENABLE, FALSE ); m_pd3dDevice->SetRenderState( D3DRS_STENCILENABLE, FALSE ); m_pd3dDevice->SetRenderState( D3DRS_CLIPPING, TRUE ); - m_pd3dDevice->SetRenderState( D3DRS_EDGEANTIALIAS, FALSE ); + m_pd3dDevice->SetRenderState( D3DRS_ANTIALIASEDLINEENABLE, FALSE ); m_pd3dDevice->SetRenderState( D3DRS_CLIPPLANEENABLE, FALSE ); - m_pd3dDevice->SetRenderState( D3DRS_VERTEXBLEND, FALSE ); + m_pd3dDevice->SetRenderState( D3DRS_VERTEXBLEND, D3DVBF_DISABLE ); m_pd3dDevice->SetRenderState( D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE ); m_pd3dDevice->SetRenderState( D3DRS_FOGENABLE, FALSE ); m_pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_MODULATE ); @@ -263,18 +263,18 @@ HRESULT CD3DFont::RestoreDeviceObjects() m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE ); m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE ); m_pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE ); - m_pd3dDevice->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_POINT ); - m_pd3dDevice->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_POINT ); - m_pd3dDevice->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_NONE ); + m_pd3dDevice->SetSamplerState( 0, D3DSAMP_MINFILTER, D3DTEXF_POINT ); + m_pd3dDevice->SetSamplerState( 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT ); + m_pd3dDevice->SetSamplerState( 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE ); m_pd3dDevice->SetTextureStageState( 0, D3DTSS_TEXCOORDINDEX, 0 ); m_pd3dDevice->SetTextureStageState( 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE ); m_pd3dDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE ); m_pd3dDevice->SetTextureStageState( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE ); if( which==0 ) - m_pd3dDevice->EndStateBlock( &m_dwSavedStateBlock ); + m_pd3dDevice->EndStateBlock( &m_pSavedStateBlock ); else - m_pd3dDevice->EndStateBlock( &m_dwDrawTextStateBlock ); + m_pd3dDevice->EndStateBlock( &m_pDrawTextStateBlock ); } return S_OK; @@ -296,16 +296,16 @@ HRESULT CD3DFont::InvalidateDeviceObjects() } // Delete the state blocks - if( m_pd3dDevice ) + if( m_pSavedStateBlock ) { - if( m_dwSavedStateBlock ) - m_pd3dDevice->DeleteStateBlock( m_dwSavedStateBlock ); - if( m_dwDrawTextStateBlock ) - m_pd3dDevice->DeleteStateBlock( m_dwDrawTextStateBlock ); + m_pSavedStateBlock->Release(); + m_pSavedStateBlock = NULL; + } + if( m_pDrawTextStateBlock ) + { + m_pDrawTextStateBlock->Release(); + m_pDrawTextStateBlock = NULL; } - - m_dwSavedStateBlock = 0L; - m_dwDrawTextStateBlock = 0L; return S_OK; } @@ -392,8 +392,8 @@ HRESULT CD3DFont::DrawTextScaled( FLOAT x, FLOAT y, FLOAT z, return E_FAIL; // Set up renderstate - m_pd3dDevice->CaptureStateBlock( m_dwSavedStateBlock ); - m_pd3dDevice->ApplyStateBlock( m_dwDrawTextStateBlock ); + m_pSavedStateBlock->Capture(); + m_pDrawTextStateBlock->Apply(); m_pd3dDevice->SetVertexShader( D3DFVF_FONT2DVERTEX ); m_pd3dDevice->SetStreamSource( 0, m_pVB, sizeof(FONT2DVERTEX) ); @@ -468,7 +468,7 @@ HRESULT CD3DFont::DrawTextScaled( FLOAT x, FLOAT y, FLOAT z, m_pd3dDevice->DrawPrimitive( D3DPT_TRIANGLELIST, 0, dwNumTriangles ); // Restore the modified renderstates - m_pd3dDevice->ApplyStateBlock( m_dwSavedStateBlock ); + m_pSavedStateBlock->Apply(); return S_OK; } @@ -487,8 +487,8 @@ HRESULT CD3DFont::DrawText( FLOAT sx, FLOAT sy, DWORD dwColor, return E_FAIL; // Setup renderstate - m_pd3dDevice->CaptureStateBlock( m_dwSavedStateBlock ); - m_pd3dDevice->ApplyStateBlock( m_dwDrawTextStateBlock ); + m_pSavedStateBlock->Capture(); + m_pDrawTextStateBlock->Apply(); m_pd3dDevice->SetVertexShader( D3DFVF_FONT2DVERTEX ); m_pd3dDevice->SetStreamSource( 0, m_pVB, sizeof(FONT2DVERTEX) ); @@ -553,7 +553,7 @@ HRESULT CD3DFont::DrawText( FLOAT sx, FLOAT sy, DWORD dwColor, m_pd3dDevice->DrawPrimitive( D3DPT_TRIANGLELIST, 0, dwNumTriangles ); // Restore the modified renderstates - m_pd3dDevice->ApplyStateBlock( m_dwSavedStateBlock ); + m_pSavedStateBlock->Apply(); return S_OK; } @@ -571,8 +571,8 @@ HRESULT CD3DFont::Render3DText( TCHAR* strText, DWORD dwFlags ) return E_FAIL; // Setup renderstate - m_pd3dDevice->CaptureStateBlock( m_dwSavedStateBlock ); - m_pd3dDevice->ApplyStateBlock( m_dwDrawTextStateBlock ); + m_pSavedStateBlock->Capture(); + m_pDrawTextStateBlock->Apply(); m_pd3dDevice->SetVertexShader( D3DFVF_FONT3DVERTEX ); m_pd3dDevice->SetStreamSource( 0, m_pVB, sizeof(FONT3DVERTEX) ); @@ -653,7 +653,7 @@ HRESULT CD3DFont::Render3DText( TCHAR* strText, DWORD dwFlags ) m_pd3dDevice->DrawPrimitive( D3DPT_TRIANGLELIST, 0, dwNumTriangles ); // Restore the modified renderstates - m_pd3dDevice->ApplyStateBlock( m_dwSavedStateBlock ); + m_pSavedStateBlock->Apply(); return S_OK; } diff --git a/Client/Engine/Zalla3D Base Class/d3dfont.h b/Client/Engine/Zalla3D Base Class/d3dfont.h index f9ef228..b66e4a3 100644 --- a/Client/Engine/Zalla3D Base Class/d3dfont.h +++ b/Client/Engine/Zalla3D Base Class/d3dfont.h @@ -11,7 +11,7 @@ #pragma once #include -#include +#include // Font creation flags #define D3DFONT_BOLD 0x0001 @@ -35,17 +35,17 @@ class CD3DFont DWORD m_dwFontHeight; DWORD m_dwFontFlags; - LPDIRECT3DDEVICE8 m_pd3dDevice; // A D3DDevice used for rendering - LPDIRECT3DTEXTURE8 m_pTexture; // The d3d texture for this font - LPDIRECT3DVERTEXBUFFER8 m_pVB; // VertexBuffer for rendering text + LPDIRECT3DDEVICE9 m_pd3dDevice; // A D3DDevice used for rendering + LPDIRECT3DTEXTURE9 m_pTexture; // The d3d texture for this font + LPDIRECT3DVERTEXBUFFER9 m_pVB; // VertexBuffer for rendering text DWORD m_dwTexWidth; // Texture dimensions DWORD m_dwTexHeight; FLOAT m_fTextScale; FLOAT m_fTexCoords[128-32][4]; // Stateblocks for setting and restoring render states - DWORD m_dwSavedStateBlock; - DWORD m_dwDrawTextStateBlock; + IDirect3DStateBlock9* m_pSavedStateBlock; + IDirect3DStateBlock9* m_pDrawTextStateBlock; public: // 2D and 3D text drawing functions @@ -60,7 +60,7 @@ public: HRESULT GetTextExtent( TCHAR* strText, SIZE* pSize ); // Initializing and destroying device-dependent objects - HRESULT InitDeviceObjects( LPDIRECT3DDEVICE8 pd3dDevice ); + HRESULT InitDeviceObjects( LPDIRECT3DDEVICE9 pd3dDevice ); HRESULT RestoreDeviceObjects(); HRESULT InvalidateDeviceObjects(); HRESULT DeleteDeviceObjects(); diff --git a/Client/Engine/Zalla3D Base Class/matrix.h b/Client/Engine/Zalla3D Base Class/matrix.h index 9056b0f..ee514b4 100644 --- a/Client/Engine/Zalla3D Base Class/matrix.h +++ b/Client/Engine/Zalla3D Base Class/matrix.h @@ -9,8 +9,8 @@ #pragma once #endif // _MSC_VER > 1000 -#include -#include +#include +#include #include "MathBase.h" #include "vector.h" diff --git a/Client/Engine/Zalla3D Scene Class/AmbienceManager.cpp b/Client/Engine/Zalla3D Scene Class/AmbienceManager.cpp index acb9be4..98956be 100644 --- a/Client/Engine/Zalla3D Scene Class/AmbienceManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/AmbienceManager.cpp @@ -391,7 +391,7 @@ void CAmbienceManager::GetTextureLockPos( int& outX, int& outY, D3DXVECTOR3 inPo void CAmbienceManager::TestScreen( D3DXVECTOR3 Pos ) { - LPDIRECT3DDEVICE8 pd3dDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = BaseGraphicsLayer::GetDevice(); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 ); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE ); pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE ); diff --git a/Client/Engine/Zalla3D Scene Class/BaseCloth.h b/Client/Engine/Zalla3D Scene Class/BaseCloth.h index 92671d1..ccfc408 100644 --- a/Client/Engine/Zalla3D Scene Class/BaseCloth.h +++ b/Client/Engine/Zalla3D Scene Class/BaseCloth.h @@ -1,6 +1,6 @@ #pragma once -#include "d3dx8.h" +#include "d3dx9.h" #include using namespace std; diff --git a/Client/Engine/Zalla3D Scene Class/BgmManager.cpp b/Client/Engine/Zalla3D Scene Class/BgmManager.cpp index ab966bb..754fa66 100644 --- a/Client/Engine/Zalla3D Scene Class/BgmManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/BgmManager.cpp @@ -417,7 +417,7 @@ void CBgmManager::TestScreen( D3DXVECTOR3 Pos ) { if( !m_bTestShow ) return; - LPDIRECT3DDEVICE8 pd3dDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = BaseGraphicsLayer::GetDevice(); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 ); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE ); diff --git a/Client/Engine/Zalla3D Scene Class/BgmManager.h b/Client/Engine/Zalla3D Scene Class/BgmManager.h index 933ed94..c9b67c0 100644 --- a/Client/Engine/Zalla3D Scene Class/BgmManager.h +++ b/Client/Engine/Zalla3D Scene Class/BgmManager.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "d3dx8.h" +#include "d3dx9.h" #include "SectorBGMTrigger.h" class CSceneEventMgr; diff --git a/Client/Engine/Zalla3D Scene Class/BoidScene.cpp b/Client/Engine/Zalla3D Scene Class/BoidScene.cpp index bb2f568..72068a4 100644 --- a/Client/Engine/Zalla3D Scene Class/BoidScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/BoidScene.cpp @@ -228,7 +228,7 @@ void CBoidScene::UpdateFlock() } } -void CBoidScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CBoidScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { /* pd3dDevice->SetRenderState( D3DRS_SRCBLEND, D3DBLEND_SRCALPHA ); diff --git a/Client/Engine/Zalla3D Scene Class/BoidScene.h b/Client/Engine/Zalla3D Scene Class/BoidScene.h index 7882b4e..a01c912 100644 --- a/Client/Engine/Zalla3D Scene Class/BoidScene.h +++ b/Client/Engine/Zalla3D Scene Class/BoidScene.h @@ -49,7 +49,7 @@ public: float m_AngleTweak; float m_PitchToSpeedRatio; - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void UpdateFlock(); void Update(float fUpdate); vector3 m_vecGoal; diff --git a/Client/Engine/Zalla3D Scene Class/BoidScene2.cpp b/Client/Engine/Zalla3D Scene Class/BoidScene2.cpp index 1a4a315..e34a701 100644 --- a/Client/Engine/Zalla3D Scene Class/BoidScene2.cpp +++ b/Client/Engine/Zalla3D Scene Class/BoidScene2.cpp @@ -738,7 +738,7 @@ void CBoidGroup::butterfly(CBoidGroup::BoidUnit &Unit){ } } - bool CBoidGroup::Render(LPDIRECT3DDEVICE8 device) { + bool CBoidGroup::Render(LPDIRECT3DDEVICE9 device) { D3DXMATRIX world; device->GetTransform(D3DTS_WORLD,&world); diff --git a/Client/Engine/Zalla3D Scene Class/BoidScene2.h b/Client/Engine/Zalla3D Scene Class/BoidScene2.h index 5b488dd..919ec2b 100644 --- a/Client/Engine/Zalla3D Scene Class/BoidScene2.h +++ b/Client/Engine/Zalla3D Scene Class/BoidScene2.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include "CGemRender.h" #include @@ -165,7 +165,7 @@ public: } // Boid Render failed : 0 return - bool Render(LPDIRECT3DDEVICE8 ); + bool Render(LPDIRECT3DDEVICE9 ); //  (0 : 1: ൿ) void SetPat(int v) {pat = v;} int GetPat() { return pat;} diff --git a/Client/Engine/Zalla3D Scene Class/BspScene.cpp b/Client/Engine/Zalla3D Scene Class/BspScene.cpp index c7d95ee..99775d6 100644 --- a/Client/Engine/Zalla3D Scene Class/BspScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/BspScene.cpp @@ -191,7 +191,7 @@ int CBspScene::CopyLump(DHeader *header, int lump, void **dest, int size) return len/size; } -void CBspScene::Render(LPDIRECT3DDEVICE8 pd3dDevice, vector3 vecViewPos) +void CBspScene::Render(LPDIRECT3DDEVICE9 pd3dDevice, vector3 vecViewPos) { //vecViewPos=vector3(56,32,32); @@ -639,7 +639,7 @@ void CBspScene::RenderInit() SurfaceLightArrange(); } -void CBspScene::RenderBackend(LPDIRECT3DDEVICE8 pd3dDevice) +void CBspScene::RenderBackend(LPDIRECT3DDEVICE9 pd3dDevice) { DSurface *pSurface; //WORD *pIndices; @@ -1342,14 +1342,14 @@ void CBspScene::CurveBuffer::FillPatch3(int *numcp, int *size, vector3 *p) } } -void CBspScene::CurveBuffer::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CBspScene::CurveBuffer::Render(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetVertexShader(BSPVERTEXFVF); pd3dDevice->DrawIndexedPrimitiveUP(D3DPT_TRIANGLELIST,0,m_PatchSizeHeight*m_PatchSizeWidth, m_nIndices/3,m_pIndices,D3DFMT_INDEX16,m_pVertex,sizeof(BspVertex)); } -void CBspScene::RenderBox(LPDIRECT3DDEVICE8 pd3dDevice,DWORD dwColor) +void CBspScene::RenderBox(LPDIRECT3DDEVICE9 pd3dDevice,DWORD dwColor) { LPDIRECT3DVERTEXBUFFER8 pBoxVB; MultiVertex *BoxVertex; @@ -1525,7 +1525,7 @@ void CBspScene::UpdateLightmapVector3(int n) } -void CBspScene::RenderLight(LPDIRECT3DDEVICE8 pd3dDevice) +void CBspScene::RenderLight(LPDIRECT3DDEVICE9 pd3dDevice) { matrix matWorld,matPos; diff --git a/Client/Engine/Zalla3D Scene Class/BspScene.h b/Client/Engine/Zalla3D Scene Class/BspScene.h index 202e7e8..1282ebb 100644 --- a/Client/Engine/Zalla3D Scene Class/BspScene.h +++ b/Client/Engine/Zalla3D Scene Class/BspScene.h @@ -41,7 +41,7 @@ class CBspScene class CurveBuffer { public: - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void FillPatch3(int *numcp, int *size, vector3 *p); void FillPatch2(int *numcp, int *size, vector2 *p); void FillCurve3(int numcp, int size, int stride,vector3 *p); @@ -144,25 +144,25 @@ public: void InitShader(); void CullCollisionPoly(vector3 vecPos); void DeleteLight(); - void RenderLight(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderLight(LPDIRECT3DDEVICE9 pd3dDevice); void UpdateLightmapVector3(int n); void AddLight(vector3 vecLightPos,float fRange,color clr); bool m_bLightmapVector; void LoadLightmapVector3(); bool m_bSkyRender; - void RenderBox(LPDIRECT3DDEVICE8 pd3dDevice,DWORD dwColor); + void RenderBox(LPDIRECT3DDEVICE9 pd3dDevice,DWORD dwColor); void CullWalkLeaf(int n); void CullWalkNodes(int n); void CullPoly(vector3 vecMax,vector3 vecMin,std::vector &PolyList); bool LeafInFrustum(vector3 &vecMax,vector3 &vecMin); - void RenderBackend(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderBackend(LPDIRECT3DDEVICE9 pd3dDevice); void RenderInit(); void RenderWalkFace(int n); void RenderWalkLeaf(int n); void RenderWalkNode(int n); int ClassfyPoint(vector3 p, int nPlane); int FindCluster(vector3 vecPos); - void Render(LPDIRECT3DDEVICE8 pd3dDevice,vector3 vecViewPos); + void Render(LPDIRECT3DDEVICE9 pd3dDevice,vector3 vecViewPos); int CopyLump(DHeader *header,int lump,void **dest,int size); void Load(char *strFilename); CBspScene(); diff --git a/Client/Engine/Zalla3D Scene Class/CharacterCape.cpp b/Client/Engine/Zalla3D Scene Class/CharacterCape.cpp index 8d2e55c..5024be4 100644 --- a/Client/Engine/Zalla3D Scene Class/CharacterCape.cpp +++ b/Client/Engine/Zalla3D Scene Class/CharacterCape.cpp @@ -54,7 +54,7 @@ void CCharacterCape::Render() if( !m_bEnable ) return; CClothMgr::_Instance()->m_CapeRenderer.SetupCloth( this ); - LPDIRECT3DDEVICE8 pd3dDevice = CSceneManager::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = CSceneManager::GetDevice(); pd3dDevice->SetTexture( 0, m_pDecalTexture ); pd3dDevice->LightEnable( 0, TRUE ); pd3dDevice->SetRenderState( D3DRS_LIGHTING, TRUE ); diff --git a/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.cpp b/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.cpp index fc40cfe..ee8b6c8 100644 --- a/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.cpp @@ -320,7 +320,7 @@ void CCharacterLightShadowManager::Create() } } -void CCharacterLightShadowManager::RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice) { //CSceneManager::m_bEnv = true; @@ -847,7 +847,7 @@ void CCharacterLightShadowManager::RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice) } -void CCharacterLightShadowManager::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(!CRenderOption::m_CharacterPerPixelLighting) { @@ -1474,7 +1474,7 @@ void CCharacterLightShadowManager::Render(LPDIRECT3DDEVICE8 pd3dDevice) CZ3DRenderable::Process(); */ } -void CCharacterLightShadowManager::RenderGlow(IDirect3DDevice8* pDevice) +void CCharacterLightShadowManager::RenderGlow(IDirect3DDevice9* pDevice) { CZ3DGlowHandler::_PrepareGlowRender(); @@ -1488,7 +1488,7 @@ void CCharacterLightShadowManager::RenderGlow(IDirect3DDevice8* pDevice) CZ3DGlowHandler::_EndGlowRender(); } -void CCharacterLightShadowManager::HeightFieldCharacterLightRender(LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::HeightFieldCharacterLightRender(LPDIRECT3DDEVICE9 pd3dDevice) { if(CSceneManager::m_bCharacterLight == true) { @@ -1674,7 +1674,7 @@ void CCharacterLightShadowManager::HeightFieldCharacterLightRender(LPDIRECT3DDEV pd3dDevice->BeginScene(); } } -void CCharacterLightShadowManager::HeightFieldShadowRender(LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::HeightFieldShadowRender(LPDIRECT3DDEVICE9 pd3dDevice) { if(!CRenderOption::m_CharacterProjectShadowTerrain) return; @@ -2205,7 +2205,7 @@ void CCharacterLightShadowManager::UpdateFrame(int m_nFocuesCharacter) -void CCharacterLightShadowManager::CharacterLightSetting(int nChr,LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::CharacterLightSetting(int nChr,LPDIRECT3DDEVICE9 pd3dDevice) { vector3 vecCharPos; std::vector LightList; @@ -2267,7 +2267,7 @@ void CCharacterLightShadowManager::CharacterLightSetting(int nChr,LPDIRECT3DDEVI */ } -void CCharacterLightShadowManager::InHouseShadowRender(LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::InHouseShadowRender(LPDIRECT3DDEVICE9 pd3dDevice) { //if(MAXCHRSHADOW==0) return; @@ -2413,7 +2413,7 @@ float CCharacterLightShadowManager::GetCollisionChrCamera(vector3 vecStart,vecto return fCollisionLens; } -void CCharacterLightShadowManager::CameraTest(LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::CameraTest(LPDIRECT3DDEVICE9 pd3dDevice) { vector3 vecStart,vecEnd; @@ -3558,7 +3558,7 @@ void CCharacterLightShadowManager::CharacterRandomPos(CZ3DGeneralChrModel *pChrm } } -void CCharacterLightShadowManager::RenderGlare(LPDIRECT3DDEVICE8 pd3dDevice) +void CCharacterLightShadowManager::RenderGlare(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetRenderState( D3DRS_ALPHABLENDENABLE,FALSE); //pd3dDevice->SetVertexShader(m_dwCharacterVertexShader); diff --git a/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.h b/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.h index 0395980..88e226c 100644 --- a/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.h +++ b/Client/Engine/Zalla3D Scene Class/CharacterLightShadowManager.h @@ -145,7 +145,7 @@ public: CollisionType GetCharacterCollisionType(CZ3DGeneralChrModel *pChrmodel); static std::vector m_CharacterList; - void RenderGlare(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderGlare(LPDIRECT3DDEVICE9 pd3dDevice); void CharacterRandomPos(CZ3DGeneralChrModel *pChrmodel,int nTimer,vector3 vecRand); vector3 GetCharacterMovementVector(CZ3DGeneralChrModel *pChrmodel); void CharacterMovementVector(CZ3DGeneralChrModel *pChrmodel,vector3 vecChrMove,float fAccelate=0.0f); @@ -162,7 +162,7 @@ public: static CRenderTexture m_pShadowTexture;//׸ CTexture *m_pCharacterLight;// light - void CameraTest(LPDIRECT3DDEVICE8 pd3dDevice); + void CameraTest(LPDIRECT3DDEVICE9 pd3dDevice); void SetHeightField(CHeightFieldScene *pHeightField){m_pHeightField=pHeightField;}; void UpdateFrame(int m_nFocuesCharacter); @@ -198,16 +198,16 @@ public: void DeleteElement(CZ3DGeneralChrModel* pDelChr); float GetCollisionChrCamera(vector3 vecStart,vector3 vecEnd); - void HeightFieldShadowRender(LPDIRECT3DDEVICE8 pd3dDevice); - void HeightFieldCharacterLightRender(LPDIRECT3DDEVICE8 pd3dDevice); + void HeightFieldShadowRender(LPDIRECT3DDEVICE9 pd3dDevice); + void HeightFieldCharacterLightRender(LPDIRECT3DDEVICE9 pd3dDevice); - void InHouseShadowRender(LPDIRECT3DDEVICE8 pd3dDevice); - void CharacterLightSetting(int nChr,LPDIRECT3DDEVICE8 pd3dDevice); + void InHouseShadowRender(LPDIRECT3DDEVICE9 pd3dDevice); + void CharacterLightSetting(int nChr,LPDIRECT3DDEVICE9 pd3dDevice); void Create(); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderGlow(IDirect3DDevice8* pDevice); - void RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderGlow(IDirect3DDevice9* pDevice); + void RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice); CCharacterLightShadowManager(); virtual ~CCharacterLightShadowManager(); diff --git a/Client/Engine/Zalla3D Scene Class/ChristmasParticle.cpp b/Client/Engine/Zalla3D Scene Class/ChristmasParticle.cpp index 9abfb4b..588454a 100644 --- a/Client/Engine/Zalla3D Scene Class/ChristmasParticle.cpp +++ b/Client/Engine/Zalla3D Scene Class/ChristmasParticle.cpp @@ -57,7 +57,7 @@ void CChristmasParticle::Init(int iNodesNum,char *strTexture) { m_pDevice = CSceneManager::GetDevice(); // Point Sprite Check - D3DCAPS8 CapsTest; + D3DCAPS9 CapsTest; m_pDevice->GetDeviceCaps(&CapsTest); diff --git a/Client/Engine/Zalla3D Scene Class/ChristmasParticle.h b/Client/Engine/Zalla3D Scene Class/ChristmasParticle.h index 8db54c6..aaf7870 100644 --- a/Client/Engine/Zalla3D Scene Class/ChristmasParticle.h +++ b/Client/Engine/Zalla3D Scene Class/ChristmasParticle.h @@ -56,7 +56,7 @@ public: protected: LPDIRECT3DVERTEXBUFFER8 m_pVertexBuffer; LPDIRECT3DINDEXBUFFER8 m_pIndexBuffer; - LPDIRECT3DDEVICE8 m_pDevice; + LPDIRECT3DDEVICE9 m_pDevice; CTexture *m_pImageTexture; bool m_bPointSprite; diff --git a/Client/Engine/Zalla3D Scene Class/CircleParticle.cpp b/Client/Engine/Zalla3D Scene Class/CircleParticle.cpp index 5d91ac3..3bd8895 100644 --- a/Client/Engine/Zalla3D Scene Class/CircleParticle.cpp +++ b/Client/Engine/Zalla3D Scene Class/CircleParticle.cpp @@ -85,7 +85,7 @@ bool CCircleParticle::Update(float fUpdateTime) return false; } -void CCircleParticle::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CCircleParticle::Render(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); diff --git a/Client/Engine/Zalla3D Scene Class/CircleParticle.h b/Client/Engine/Zalla3D Scene Class/CircleParticle.h index 7a1a46b..9ca7024 100644 --- a/Client/Engine/Zalla3D Scene Class/CircleParticle.h +++ b/Client/Engine/Zalla3D Scene Class/CircleParticle.h @@ -14,7 +14,7 @@ class CCircleParticle : public CParticle { public: - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); vector3 m_vecPos,m_vecTarget,m_vecNowPos; float m_fNowVelocity,m_fAcceleration; float m_TotalRemainTime; diff --git a/Client/Engine/Zalla3D Scene Class/ClothMgr.cpp b/Client/Engine/Zalla3D Scene Class/ClothMgr.cpp index 86c6b4a..c5c0aed 100644 --- a/Client/Engine/Zalla3D Scene Class/ClothMgr.cpp +++ b/Client/Engine/Zalla3D Scene Class/ClothMgr.cpp @@ -24,7 +24,7 @@ void CQuadClothResource::Init( int iRow, int iCol ) m_iCol = iCol; m_iRow = iRow; - LPDIRECT3DDEVICE8 pd3dDevice = CSceneManager::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = CSceneManager::GetDevice(); m_iNumVertex = (iRow+1) * (iCol+1); m_iNumFace = iRow * iCol * 2; @@ -83,7 +83,7 @@ void CQuadClothResource::Init( int iRow, int iCol ) void CQuadClothResource::Render() { D3DXMATRIX matWorld; - LPDIRECT3DDEVICE8 pd3dDevice = CSceneManager::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = CSceneManager::GetDevice(); D3DXMatrixIdentity( &matWorld ); pd3dDevice->SetVertexShader( ClothVertex::FVF ); pd3dDevice->SetStreamSource( 0, m_pVB, sizeof(ClothVertex) ); diff --git a/Client/Engine/Zalla3D Scene Class/ClothMgr.h b/Client/Engine/Zalla3D Scene Class/ClothMgr.h index 0d8f05c..bd7528c 100644 --- a/Client/Engine/Zalla3D Scene Class/ClothMgr.h +++ b/Client/Engine/Zalla3D Scene Class/ClothMgr.h @@ -1,6 +1,6 @@ #pragma once -#include "d3dx8.h" +#include "d3dx9.h" #include "CharacterCape.h" #include "CharacterLightShadowManager.h" #include diff --git a/Client/Engine/Zalla3D Scene Class/ClothSimulation.cpp b/Client/Engine/Zalla3D Scene Class/ClothSimulation.cpp index f001112..e6c7ef3 100644 --- a/Client/Engine/Zalla3D Scene Class/ClothSimulation.cpp +++ b/Client/Engine/Zalla3D Scene Class/ClothSimulation.cpp @@ -18,7 +18,7 @@ CClothSimulation::~CClothSimulation(void) SAFE_RELEASE( m_pTexture ); } -void CClothSimulation::Create( LPDIRECT3DDEVICE8 pd3dDevice, int iNumRow, int iNumCol, int iWidth, int iHeight ) +void CClothSimulation::Create( LPDIRECT3DDEVICE9 pd3dDevice, int iNumRow, int iNumCol, int iWidth, int iHeight ) { assert( iNumRow > 0 ); assert( iNumCol > 0 ); diff --git a/Client/Engine/Zalla3D Scene Class/ClothSimulation.h b/Client/Engine/Zalla3D Scene Class/ClothSimulation.h index 137a570..8e9c591 100644 --- a/Client/Engine/Zalla3D Scene Class/ClothSimulation.h +++ b/Client/Engine/Zalla3D Scene Class/ClothSimulation.h @@ -1,6 +1,6 @@ #pragma once -#include "d3dx8.h" +#include "d3dx9.h" #include #include using namespace std; @@ -104,7 +104,7 @@ public: typedef map PARTICLEMAP; public: - LPDIRECT3DDEVICE8 m_pd3dDevice; + LPDIRECT3DDEVICE9 m_pd3dDevice; LPDIRECT3DVERTEXBUFFER8 m_pVB; LPDIRECT3DINDEXBUFFER8 m_pIB; LPDIRECT3DTEXTURE8 m_pTexture; @@ -146,7 +146,7 @@ public: virtual ~CClothSimulation(void); void Render(); - void Create( LPDIRECT3DDEVICE8 pd3dDevice, int iNumRow, int iNumCol, int iWidth, int iHeight ); + void Create( LPDIRECT3DDEVICE9 pd3dDevice, int iNumRow, int iNumCol, int iWidth, int iHeight ); void AddCollisionPlane( const D3DXPLANE& Plane ); void Update( float dt = 0.032f ); void LockParticle( int iRow, int iCol ); diff --git a/Client/Engine/Zalla3D Scene Class/CloudScene.cpp b/Client/Engine/Zalla3D Scene Class/CloudScene.cpp index 5b66085..1c5fd5d 100644 --- a/Client/Engine/Zalla3D Scene Class/CloudScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/CloudScene.cpp @@ -104,7 +104,7 @@ inline float CCloudScene::Noise3D(int x, int y, int z) * 0.000000000931322574615478515625f); } -void CCloudScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CCloudScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { vector3 *vecViewPos=CSceneManager::GetCamera()->GetPosition(); @@ -144,7 +144,7 @@ void CCloudScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) //pd3dDevice->SetRenderState( D3DRS_FOGENABLE,TRUE); } -void CCloudScene::Update(LPDIRECT3DDEVICE8 pd3dDevice,float fTime) +void CCloudScene::Update(LPDIRECT3DDEVICE9 pd3dDevice,float fTime) { TLVertex pVertex[4]; float fTextureSize=SHADOWSIZE; diff --git a/Client/Engine/Zalla3D Scene Class/CloudScene.h b/Client/Engine/Zalla3D Scene Class/CloudScene.h index 7d93aeb..9894a41 100644 --- a/Client/Engine/Zalla3D Scene Class/CloudScene.h +++ b/Client/Engine/Zalla3D Scene Class/CloudScene.h @@ -30,8 +30,8 @@ class CCloudScene : public CSceneNode public: void SetColor(DWORD dwColor,DWORD dwCenterColor,DWORD *dwLayerColor); CRenderTexture m_CloudOctaveBlendTexture; - void Update(LPDIRECT3DDEVICE8 pd3dDevice,float fTime); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Update(LPDIRECT3DDEVICE9 pd3dDevice,float fTime); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); float Noise3D(int x, int y, int z); void Create(); CCloudScene(); diff --git a/Client/Engine/Zalla3D Scene Class/EffectObject.h b/Client/Engine/Zalla3D Scene Class/EffectObject.h index 2951f7a..596f27c 100644 --- a/Client/Engine/Zalla3D Scene Class/EffectObject.h +++ b/Client/Engine/Zalla3D Scene Class/EffectObject.h @@ -9,13 +9,13 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include "SceneNode.h" class CEffectObject : public CSceneNode { public: - virtual void Render(LPDIRECT3DDEVICE8 pd3dDevice)=0; + virtual void Render(LPDIRECT3DDEVICE9 pd3dDevice)=0; virtual void Load(char *strFilename)=0; CEffectObject(); virtual ~CEffectObject(); diff --git a/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.cpp b/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.cpp index d328b73..0adbbda 100644 --- a/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.cpp +++ b/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.cpp @@ -199,7 +199,7 @@ void CEffectObjectAnimation::Load(char *strFilename) */ } -void CEffectObjectAnimation::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CEffectObjectAnimation::Render(LPDIRECT3DDEVICE9 pd3dDevice) { static int KeyFrame=0; KeyFrame+=30; diff --git a/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.h b/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.h index 7047d0b..8d25769 100644 --- a/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.h +++ b/Client/Engine/Zalla3D Scene Class/EffectObjectAnimation.h @@ -30,7 +30,7 @@ class CEffectObjectAnimation : public CEffectObject std::vector m_AnimationPackList; std::vector m_pNodeMeshObjectList; public: - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Load(char *strFilename); CEffectObjectAnimation(); virtual ~CEffectObjectAnimation(); diff --git a/Client/Engine/Zalla3D Scene Class/FallScene.cpp b/Client/Engine/Zalla3D Scene Class/FallScene.cpp index 191ca20..c88c072 100644 --- a/Client/Engine/Zalla3D Scene Class/FallScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/FallScene.cpp @@ -114,7 +114,7 @@ void CFallScene::Update() //*/ } -void CFallScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CFallScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { for(int i=0;i<(int)m_MapFall->m_FallHeightList.size();i++) diff --git a/Client/Engine/Zalla3D Scene Class/FallScene.h b/Client/Engine/Zalla3D Scene Class/FallScene.h index 4e9f1c0..8c6d8fe 100644 --- a/Client/Engine/Zalla3D Scene Class/FallScene.h +++ b/Client/Engine/Zalla3D Scene Class/FallScene.h @@ -30,7 +30,7 @@ class CFallScene : public CSceneNode static CTexture m_WaterFallTexture; public: void MakeFallScene(CSectorFallMap *MapFall); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Update(); void Create(); CFallScene(); diff --git a/Client/Engine/Zalla3D Scene Class/FogScene.h b/Client/Engine/Zalla3D Scene Class/FogScene.h index 5f3b505..f729cd2 100644 --- a/Client/Engine/Zalla3D Scene Class/FogScene.h +++ b/Client/Engine/Zalla3D Scene Class/FogScene.h @@ -8,7 +8,7 @@ #include "SceneManager.h" #include "3dmath.h" -#include +#include #include #include #define INIT_NUM 50 @@ -218,7 +218,7 @@ private: //LPDIRECT3DTEXTURE8 *m_TextureId; CTexture *m_BaseTexture; int m_TextureNum; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; LPDIRECT3DVERTEXBUFFER8 m_FogBuffer; LPDIRECT3DVERTEXBUFFER8 m_FogPointSpriteBuffer; float m_BackFadeIn; diff --git a/Client/Engine/Zalla3D Scene Class/FullSceneEffect.cpp b/Client/Engine/Zalla3D Scene Class/FullSceneEffect.cpp index dfeecff..59639dd 100644 --- a/Client/Engine/Zalla3D Scene Class/FullSceneEffect.cpp +++ b/Client/Engine/Zalla3D Scene Class/FullSceneEffect.cpp @@ -29,7 +29,7 @@ enum FULLSCENE_EFFECTS { class CFullSceneEffect { protected: - LPDIRECT3DDEVICE8 m_pDevice; + LPDIRECT3DDEVICE9 m_pDevice; LPDIRECT3DTEXTURE8 m_pBlurTexture[FULLSCENE_BLURTEXNUM]; LPDIRECT3DSURFACE8 m_pBlurTextureSurf[FULLSCENE_BLURTEXNUM]; @@ -44,7 +44,7 @@ protected: public: - void Init(LPDIRECT3DDEVICE8 lpDevice); + void Init(LPDIRECT3DDEVICE9 lpDevice); void BeginRender(); void EndRender(); @@ -143,7 +143,7 @@ CFullSceneEffect::~CFullSceneEffect() } -void CFullSceneEffect::Init(LPDIRECT3DDEVICE8 lpDevice) +void CFullSceneEffect::Init(LPDIRECT3DDEVICE9 lpDevice) { m_iCurrentTextureNum = 0; m_iMaxCountNum = 0; diff --git a/Client/Engine/Zalla3D Scene Class/FullSceneEffect.h b/Client/Engine/Zalla3D Scene Class/FullSceneEffect.h index 6420b14..35c291e 100644 --- a/Client/Engine/Zalla3D Scene Class/FullSceneEffect.h +++ b/Client/Engine/Zalla3D Scene Class/FullSceneEffect.h @@ -8,8 +8,8 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include -#include +#include +#include #include #include "Vertex.h" @@ -40,8 +40,8 @@ enum FULLSCENE_EFFECTS { class CFullSceneEffect { protected: - LPDIRECT3DDEVICE8 m_pDevice; - D3DCAPS8 m_pCaps; + LPDIRECT3DDEVICE9 m_pDevice; + D3DCAPS9 m_pCaps; bool m_bPixelShader; /* LPDIRECT3DTEXTURE8 m_pBlurTexture[FULLSCENE_BLURTEXNUM]; @@ -87,7 +87,7 @@ public: CFullSceneEffect(); virtual ~CFullSceneEffect(); - void Init(LPDIRECT3DDEVICE8 lpDevice); + void Init(LPDIRECT3DDEVICE9 lpDevice); void CreateVertexBuffer(); diff --git a/Client/Engine/Zalla3D Scene Class/GrassManager.cpp b/Client/Engine/Zalla3D Scene Class/GrassManager.cpp index d04806d..4b938e5 100644 --- a/Client/Engine/Zalla3D Scene Class/GrassManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/GrassManager.cpp @@ -170,7 +170,7 @@ void CGrassManager::UpdateRange() } -void CGrassManager::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CGrassManager::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_GrassRendering) // Ǯ׸ { @@ -262,7 +262,7 @@ void CGrassManager::Update(float fUpdate) //*/ } -void CGrassManager::RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice,CRenderTexture &pShadowTexture) +void CGrassManager::RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice,CRenderTexture &pShadowTexture) { if(CRenderOption::m_GrassRendering) { diff --git a/Client/Engine/Zalla3D Scene Class/GrassManager.h b/Client/Engine/Zalla3D Scene Class/GrassManager.h index 2464672..e6b372b 100644 --- a/Client/Engine/Zalla3D Scene Class/GrassManager.h +++ b/Client/Engine/Zalla3D Scene Class/GrassManager.h @@ -17,9 +17,9 @@ class CGrassManager int m_NowPositionX,m_NowPositionY; float m_fGrassRot[20]; public: - void RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice,CRenderTexture &pShadowTexture); + void RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice,CRenderTexture &pShadowTexture); void Update(float fUpdate); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void UpdateRange(); void Create(); CGrassManager(); diff --git a/Client/Engine/Zalla3D Scene Class/GrassScene.cpp b/Client/Engine/Zalla3D Scene Class/GrassScene.cpp index 004af31..7b64b62 100644 --- a/Client/Engine/Zalla3D Scene Class/GrassScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/GrassScene.cpp @@ -147,7 +147,7 @@ void CGrassScene::UnloadData() { } -//DEL void CGrassScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +//DEL void CGrassScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) //DEL { //DEL if(m_cGrass==0) //DEL return; @@ -729,7 +729,7 @@ void CGrassScene::Create() */ } -void CGrassScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CGrassScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(m_cGrassElement==0) return; @@ -1614,7 +1614,7 @@ void CGrassScene::Update(float fUpdate) } -void CGrassScene::RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice,CRenderTexture &pShadowTexture) +void CGrassScene::RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice,CRenderTexture &pShadowTexture) { if(m_cGrassElement==0) return; diff --git a/Client/Engine/Zalla3D Scene Class/GrassScene.h b/Client/Engine/Zalla3D Scene Class/GrassScene.h index a9ee688..cf0f0b0 100644 --- a/Client/Engine/Zalla3D Scene Class/GrassScene.h +++ b/Client/Engine/Zalla3D Scene Class/GrassScene.h @@ -48,12 +48,12 @@ class CGrassScene : public CSceneNode public: - void RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice,CRenderTexture &pShadowTexture); + void RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice,CRenderTexture &pShadowTexture); static CTexture *m_NormalTexture; void Update(float fUpdate); int m_GrassPosX,m_GrassPosY; void Generate(float fx,float fz,int cGrassElement); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Create(); void UpdateRange(); CGrassScene(); diff --git a/Client/Engine/Zalla3D Scene Class/HazeScene.cpp b/Client/Engine/Zalla3D Scene Class/HazeScene.cpp index 702fd5e..2b476d5 100644 --- a/Client/Engine/Zalla3D Scene Class/HazeScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/HazeScene.cpp @@ -21,7 +21,7 @@ CHazeScene::~CHazeScene() } -void CHazeScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CHazeScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { /* TLVertex pVertex[8]; @@ -96,7 +96,7 @@ void CHazeScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) */ } -void CHazeScene::Create(LPDIRECT3DDEVICE8 pd3dDevice) +void CHazeScene::Create(LPDIRECT3DDEVICE9 pd3dDevice) { if(GF3OPTION) { diff --git a/Client/Engine/Zalla3D Scene Class/HazeScene.h b/Client/Engine/Zalla3D Scene Class/HazeScene.h index 7a7c004..0faf057 100644 --- a/Client/Engine/Zalla3D Scene Class/HazeScene.h +++ b/Client/Engine/Zalla3D Scene Class/HazeScene.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include "3DMath.h" #include "vertex.h" @@ -17,8 +17,8 @@ class CHazeScene { public: DWORD m_dwSampleFilterPixelShader; - void Create(LPDIRECT3DDEVICE8 pd3dDevice); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Create(LPDIRECT3DDEVICE9 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); CHazeScene(); virtual ~CHazeScene(); diff --git a/Client/Engine/Zalla3D Scene Class/HeightFieldScene.cpp b/Client/Engine/Zalla3D Scene Class/HeightFieldScene.cpp index e2349ad..b7084a4 100644 --- a/Client/Engine/Zalla3D Scene Class/HeightFieldScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/HeightFieldScene.cpp @@ -355,7 +355,7 @@ void CHeightFieldScene::DeleteSectorNotCull() { } } -void CHeightFieldScene::RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice) +void CHeightFieldScene::RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->LightEnable(0,TRUE); pd3dDevice->SetRenderState( D3DRS_LIGHTING,TRUE); @@ -731,7 +731,7 @@ void CHeightFieldScene::SetNationFlag(unsigned char cNation) } } -void CHeightFieldScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CHeightFieldScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->LightEnable(0,TRUE); pd3dDevice->SetRenderState( D3DRS_LIGHTING,TRUE); @@ -1895,7 +1895,7 @@ void CHeightFieldScene::GenerateSectorSceneObjects( int sectorX, int sectorY ) } } -void CHeightFieldScene::RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice) +void CHeightFieldScene::RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice) { int ix,iy; @@ -1987,7 +1987,7 @@ void CHeightFieldScene::RebuildShadowPoly() } } -void CHeightFieldScene::RenderGlare(LPDIRECT3DDEVICE8 pd3dDevice) +void CHeightFieldScene::RenderGlare(LPDIRECT3DDEVICE9 pd3dDevice) { // bool *IsCulling=new bool[m_LSizeX*m_LSizeY]; int ix,iy; diff --git a/Client/Engine/Zalla3D Scene Class/HeightFieldScene.h b/Client/Engine/Zalla3D Scene Class/HeightFieldScene.h index 90b0256..f4c3ac9 100644 --- a/Client/Engine/Zalla3D Scene Class/HeightFieldScene.h +++ b/Client/Engine/Zalla3D Scene Class/HeightFieldScene.h @@ -42,7 +42,7 @@ public: int m_LSizeX,m_LSizeY; int m_NowPositionX,m_NowPositionY; - void RenderGlare(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderGlare(LPDIRECT3DDEVICE9 pd3dDevice); void RebuildShadowPoly(); class CShadowedPoly @@ -61,7 +61,7 @@ public: std::vector m_ShadowedVertexList; int AddShadowPoly(vector3 vecPos,int nMethod); - void RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice); CGrassManager m_GrassSceneManager; void Update(float fUpdate); char* GetHeightFieldShadowCollision(vector3 vecPos); @@ -80,8 +80,8 @@ public: std::vector m_AlreadyLoad; bool CheckingTessellate(); void Tessellate(); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice); void RenderMapEffect(); diff --git a/Client/Engine/Zalla3D Scene Class/HouseObject.cpp b/Client/Engine/Zalla3D Scene Class/HouseObject.cpp index 6effbc6..cdb4b26 100644 --- a/Client/Engine/Zalla3D Scene Class/HouseObject.cpp +++ b/Client/Engine/Zalla3D Scene Class/HouseObject.cpp @@ -108,7 +108,7 @@ void CHouseObject::GenerateLightmap(matrix matSet,matrix matHouseTM,int Lightmap } -void CHouseObject::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CHouseObject::Render(LPDIRECT3DDEVICE9 pd3dDevice) { /**/D3DMATERIAL8 mtrl; ZeroMemory( &mtrl, sizeof(D3DMATERIAL8) ); @@ -756,7 +756,7 @@ void CHouseObject::ReleaseOctree() } -void CHouseObject::RenderOctree(IDirect3DDevice8* pDevice) +void CHouseObject::RenderOctree(IDirect3DDevice9* pDevice) { if (m_pOctree) { diff --git a/Client/Engine/Zalla3D Scene Class/HouseObject.h b/Client/Engine/Zalla3D Scene Class/HouseObject.h index 0b31ac2..e7ca0ba 100644 --- a/Client/Engine/Zalla3D Scene Class/HouseObject.h +++ b/Client/Engine/Zalla3D Scene Class/HouseObject.h @@ -50,7 +50,7 @@ public: void GetPolygon(); void CalcBox(vector3 &MinBox,vector3 &MaxBox,int iCalcObject = 0); void GenerateOctree(); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void GenerateLightmap(matrix matSet,matrix matHouseTM,int LightmapMode); void GenerateNewLightmap(int ivalue,matrix matSet,matrix matHouseTM,CSectorLight *pLights,int iLights); @@ -73,14 +73,14 @@ public: void ReleaseOctree(); - void RenderOctree(IDirect3DDevice8* pDevice); + void RenderOctree(IDirect3DDevice9* pDevice); }; /* class CHouseObject { public: - void RenderGlare(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderGlare(LPDIRECT3DDEVICE9 pd3dDevice); static DWORD m_dwShadowMapVertexShader; static DWORD m_dwShadowMapPixelShader; @@ -92,14 +92,14 @@ public: static LPDIRECT3DCUBETEXTURE8 m_pNormalizeCubeMap; - matrix RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice); + matrix RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice); COctreeScene *m_pOctree; void GetPolygon(); void CalcBox(vector3 &MinBox,vector3 &MaxBox,int iCalcObject = 0); //List m_LightList; //List m_ObjectList; void GenerateOctree(); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void GenerateLightmap(matrix matSet,matrix matHouseTM,int LightmapMode); void GenerateNewLightmap(int ivalue,matrix matSet,matrix matHouseTM,CSectorLight *pLights,int iLights); diff --git a/Client/Engine/Zalla3D Scene Class/HouseObjectScene.cpp b/Client/Engine/Zalla3D Scene Class/HouseObjectScene.cpp index b1ccbe8..6c8e319 100644 --- a/Client/Engine/Zalla3D Scene Class/HouseObjectScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/HouseObjectScene.cpp @@ -12,7 +12,7 @@ ////////////////////////////////////////////////////////////////////// /* bool m_SelfLoadOut,m_SelfLoadMed,m_SelfLoadIn,m_SelfLoadInObject; - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); long m_HouseSceneID; CHouseObject *m_HouseObject; char m_strInName[MAX_NAMEBUFFER]; @@ -55,7 +55,7 @@ CHouseObjectScene::~CHouseObjectScene() m_pImposterScene = NULL; } -void CHouseObjectScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CHouseObjectScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(isCulling()==false || m_bSkip || !m_HouseObject) return; diff --git a/Client/Engine/Zalla3D Scene Class/HouseObjectScene.h b/Client/Engine/Zalla3D Scene Class/HouseObjectScene.h index 9b932ff..cf96026 100644 --- a/Client/Engine/Zalla3D Scene Class/HouseObjectScene.h +++ b/Client/Engine/Zalla3D Scene Class/HouseObjectScene.h @@ -40,7 +40,7 @@ public: CHouseObjectScene(); virtual ~CHouseObjectScene(); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void SetSkipFlag(bool bSkip) { m_bSkip = bSkip;} bool GetSkipFlag() { return m_bSkip;} @@ -54,11 +54,11 @@ public: class CHouseObjectScene : public CSceneNode { public: - void RenderGlare(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderGlare(LPDIRECT3DDEVICE9 pd3dDevice); void DeleteBspPosition(); void UpdateBspPosition(); bool m_SelfLoadOut,m_SelfLoadMed,m_SelfLoadIn,m_SelfLoadInObject; - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); long m_HouseSceneID; CHouseObject *m_HouseObject; char m_strInName[MAX_NAMEBUFFER]; diff --git a/Client/Engine/Zalla3D Scene Class/ImposterScene.cpp b/Client/Engine/Zalla3D Scene Class/ImposterScene.cpp index 44db412..56f5aeb 100644 --- a/Client/Engine/Zalla3D Scene Class/ImposterScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/ImposterScene.cpp @@ -43,7 +43,7 @@ CImposterScene::~CImposterScene() bool CImposterScene::Init() { - LPDIRECT3DDEVICE8 pDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pDevice = BaseGraphicsLayer::GetDevice(); int i; HRESULT hr; @@ -151,7 +151,7 @@ void CImposterScene::Render( D3DXVECTOR3& vCamPos, D3DXVECTOR3& vScenePos ) //ؽĸ ٷ ׸ ʰ ӿ ׸ if( GenerateRenderTexture(vCamPos, vScenePos) ) return; - LPDIRECT3DDEVICE8 pDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pDevice = BaseGraphicsLayer::GetDevice(); //Set RenderState !! pDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 ); @@ -219,7 +219,7 @@ void CImposterScene::Render( D3DXVECTOR3& vCamPos, D3DXVECTOR3& vScenePos ) void CImposterScene::BeginImposter() { - LPDIRECT3DDEVICE8 pDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pDevice = BaseGraphicsLayer::GetDevice(); pDevice->GetViewport( &ms_TempViewport ); pDevice->GetRenderTarget( &ms_pTempSurface ); pDevice->GetDepthStencilSurface( &ms_pTempZBuffer ); @@ -237,7 +237,7 @@ void CImposterScene::BeginImposter() void CImposterScene::EndImposter() { - LPDIRECT3DDEVICE8 pDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pDevice = BaseGraphicsLayer::GetDevice(); pDevice->EndScene(); pDevice->SetRenderTarget( ms_pTempSurface, ms_pTempZBuffer ); @@ -286,7 +286,7 @@ bool CImposterScene::GenerateRenderTexture( D3DXVECTOR3& vCamPos, D3DXVECTOR3& v m_vOldCamToScene = vCamToScene; - LPDIRECT3DDEVICE8 pd3dDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = BaseGraphicsLayer::GetDevice(); D3DXMATRIX mView, mSaveView; D3DXMatrixIdentity( &mView ); D3DXMatrixLookAtLH( &mView, &vCamPos, &vScenePos, &D3DXVECTOR3(0, 1, 0) ); diff --git a/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.cpp b/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.cpp index 40a731c..bbd7617 100644 --- a/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.cpp @@ -75,7 +75,7 @@ void CInstanceObjectManager::DeleteInstanceObject(int InstanceObjectID) } } -void CInstanceObjectManager::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CInstanceObjectManager::Render(LPDIRECT3DDEVICE9 pd3dDevice) { //pd3dDevice->CaptureStateBlock(oldStateBlock); //pd3dDevice->ApplyStateBlock(m_ObjectRenderStateBlock); @@ -189,7 +189,7 @@ void CInstanceObjectManager::Render(LPDIRECT3DDEVICE8 pd3dDevice) //pd3dDevice->ApplyStateBlock(oldStateBlock); } -void CInstanceObjectManager::Create(LPDIRECT3DDEVICE8 pd3dDevice) +void CInstanceObjectManager::Create(LPDIRECT3DDEVICE9 pd3dDevice) { /* pd3dDevice->CreateStateBlock(D3DSBT_ALL,&m_ObjectRenderStateBlock); diff --git a/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.h b/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.h index a90e9c1..46f56bd 100644 --- a/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.h +++ b/Client/Engine/Zalla3D Scene Class/InstanceObjectManager.h @@ -31,8 +31,8 @@ public: void SetAllObjectColor(color Color); void SetInstanceObjectColor(int ID,color Color); int MouseOnCheckInstanceObject(int px,int py); - void Create(LPDIRECT3DDEVICE8 pd3dDevice); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Create(LPDIRECT3DDEVICE9 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); long m_TotalInstanceObjectID; std::vector m_InstanceObjectList; void DeleteInstanceObject(int InstanceObjectID); diff --git a/Client/Engine/Zalla3D Scene Class/LayerFogScene.cpp b/Client/Engine/Zalla3D Scene Class/LayerFogScene.cpp index 6c6ffa9..e2eeb6e 100644 --- a/Client/Engine/Zalla3D Scene Class/LayerFogScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/LayerFogScene.cpp @@ -145,7 +145,7 @@ void CLayerFogScene::BuildFogTexture(float fMax, float fMin) pFogTexture->Release(); } -void CLayerFogScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CLayerFogScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { matrix *matViewPosition=(matrix*)CSceneManager::GetCamera()->GetMatPosition(); diff --git a/Client/Engine/Zalla3D Scene Class/LayerFogScene.h b/Client/Engine/Zalla3D Scene Class/LayerFogScene.h index 464f238..37deb5f 100644 --- a/Client/Engine/Zalla3D Scene Class/LayerFogScene.h +++ b/Client/Engine/Zalla3D Scene Class/LayerFogScene.h @@ -12,13 +12,13 @@ #include "SectorDefine.h" #include #include <3DMath.h> -#include +#include class CLayerFogScene { public: - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); CTexture m_FogTexture; LPDIRECT3DVERTEXBUFFER8 m_pFogVertexBuffer; void BuildFogTexture(float fMax,float fMin); diff --git a/Client/Engine/Zalla3D Scene Class/LightEffectManager.cpp b/Client/Engine/Zalla3D Scene Class/LightEffectManager.cpp index 3e6cd25..7460044 100644 --- a/Client/Engine/Zalla3D Scene Class/LightEffectManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/LightEffectManager.cpp @@ -131,7 +131,7 @@ void CLightEffectManager::Create(int nSize) } } -void CLightEffectManager::PrepareLightingEnvmap(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::PrepareLightingEnvmap(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneGlare) { @@ -255,7 +255,7 @@ void CLightEffectManager::PrepareLightingEnvmap(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CLightEffectManager::RenderFullSceneTextureBegin(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderFullSceneTextureBegin(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneGlare) { @@ -277,7 +277,7 @@ void CLightEffectManager::RenderFullSceneTextureBegin(LPDIRECT3DDEVICE8 pd3dDevi } } -void CLightEffectManager::RenderGlareScene(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderGlareScene(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneGlare) { @@ -324,7 +324,7 @@ void CLightEffectManager::RenderGlareScene(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CLightEffectManager::RenderGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneGlare) { @@ -494,7 +494,7 @@ void CLightEffectManager::RenderGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CLightEffectManager::RenderSpecularGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderSpecularGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneSpecularGlare) { @@ -616,7 +616,7 @@ void CLightEffectManager::RenderSpecularGlareTexture(LPDIRECT3DDEVICE8 pd3dDevic } } -void CLightEffectManager::RenderFullSceneGlare(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderFullSceneGlare(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneGlare) { @@ -799,7 +799,7 @@ void CLightEffectManager::RenderFullSceneGlare(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CLightEffectManager::RenderFullSceneAnti(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderFullSceneAnti(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneGlare) { @@ -975,7 +975,7 @@ void CLightEffectManager::RenderFullSceneAnti(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CLightEffectManager::RenderFullSceneTextureEnd(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderFullSceneTextureEnd(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_FullSceneGlare) { @@ -1056,7 +1056,7 @@ void CLightEffectManager::RenderFullSceneTextureEnd(LPDIRECT3DDEVICE8 pd3dDevice } } -void CLightEffectManager::RenderDOFZBuffer(LPDIRECT3DDEVICE8 pd3dDevice) +void CLightEffectManager::RenderDOFZBuffer(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_DepthOfField) { @@ -1261,7 +1261,7 @@ void CLightEffectManager::RenderDOFZBuffer(LPDIRECT3DDEVICE8 pd3dDevice) //m_DOFSmoothTexture.ProcedualGenerateGlareTexture(pd3dDevice,NULL,vector3(0.25f,0.25f,0.25f),1); //m_DOFSmoothTexture.ProcedualGenerateGlareTexture(pd3dDevice,NULL,vector3(0.25f,0.25f,0.25f),1); - //ProcedualGenerateGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture, vector3 vecNeighbor, int nDepth) + //ProcedualGenerateGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice, LPDIRECT3DBASETEXTURE8 pTexture, vector3 vecNeighbor, int nDepth) //pd3dDevice->SetTexture(0,m_DOFSmoothTexture.GetTexture()); diff --git a/Client/Engine/Zalla3D Scene Class/LightEffectManager.h b/Client/Engine/Zalla3D Scene Class/LightEffectManager.h index 303f777..cbabe67 100644 --- a/Client/Engine/Zalla3D Scene Class/LightEffectManager.h +++ b/Client/Engine/Zalla3D Scene Class/LightEffectManager.h @@ -22,7 +22,7 @@ public: static int m_RenderSizeX; static int m_RenderSizeY; - static void RenderDOFZBuffer(LPDIRECT3DDEVICE8 pd3dDevice); + static void RenderDOFZBuffer(LPDIRECT3DDEVICE9 pd3dDevice); static DWORD m_DepthAlphaShader; @@ -61,14 +61,14 @@ public: static CRenderTexture m_SpGlareTexture; - void RenderFullSceneTextureEnd(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderFullSceneAnti(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderFullSceneGlare(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderSpecularGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderGlareTexture(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderGlareScene(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderFullSceneTextureBegin(LPDIRECT3DDEVICE8 pd3dDevice); - void PrepareLightingEnvmap(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderFullSceneTextureEnd(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderFullSceneAnti(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderFullSceneGlare(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderSpecularGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderGlareTexture(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderGlareScene(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderFullSceneTextureBegin(LPDIRECT3DDEVICE9 pd3dDevice); + void PrepareLightingEnvmap(LPDIRECT3DDEVICE9 pd3dDevice); void Create(int nSize); CLightEffectManager(); virtual ~CLightEffectManager(); diff --git a/Client/Engine/Zalla3D Scene Class/MeshObject.cpp b/Client/Engine/Zalla3D Scene Class/MeshObject.cpp index 1dc909d..326b64c 100644 --- a/Client/Engine/Zalla3D Scene Class/MeshObject.cpp +++ b/Client/Engine/Zalla3D Scene Class/MeshObject.cpp @@ -13,7 +13,7 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -LPDIRECT3DDEVICE8 CMeshObject::m_pd3dDevice; +LPDIRECT3DDEVICE9 CMeshObject::m_pd3dDevice; CMeshObject::CMeshObject() { @@ -674,7 +674,7 @@ void CMeshObject::CalcBox() } } -void CMeshObject::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CMeshObject::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(!m_bRender) return; @@ -830,7 +830,7 @@ void CMeshObject::Render(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CMeshObject::RenderBox(LPDIRECT3DDEVICE8 pd3dDevice) +void CMeshObject::RenderBox(LPDIRECT3DDEVICE9 pd3dDevice) { LPDIRECT3DVERTEXBUFFER8 pBoxVB; MultiVertex *BoxVertex; diff --git a/Client/Engine/Zalla3D Scene Class/MeshObject.h b/Client/Engine/Zalla3D Scene Class/MeshObject.h index 42b745f..cf78f0a 100644 --- a/Client/Engine/Zalla3D Scene Class/MeshObject.h +++ b/Client/Engine/Zalla3D Scene Class/MeshObject.h @@ -19,7 +19,7 @@ class CMeshObject : public Caldron::Base::CLoadedObj { - static LPDIRECT3DDEVICE8 m_pd3dDevice; + static LPDIRECT3DDEVICE9 m_pd3dDevice; public: void MeshReload(); char m_strMeshName[256]; @@ -66,8 +66,8 @@ public: bool m_bRender; long GetObjectCount(){return (long)m_nVertex.size();}; - void RenderBox(LPDIRECT3DDEVICE8 pd3dDevice); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderBox(LPDIRECT3DDEVICE9 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void CalcBox(); void Load(char *strFilename); CMeshObject(); diff --git a/Client/Engine/Zalla3D Scene Class/NMesh.cpp b/Client/Engine/Zalla3D Scene Class/NMesh.cpp index bc3018f..8e4b5ae 100644 --- a/Client/Engine/Zalla3D Scene Class/NMesh.cpp +++ b/Client/Engine/Zalla3D Scene Class/NMesh.cpp @@ -799,7 +799,7 @@ void CNMesh::AllLockBuffer() m_pIndices.push_back(pIndicesData); } } -void CNMesh::RenderBox(LPDIRECT3DDEVICE8 pd3dDevice) +void CNMesh::RenderBox(LPDIRECT3DDEVICE9 pd3dDevice) { CRenderBoundingBox::Render(pd3dDevice, m_MinBox, m_MaxBox); @@ -808,7 +808,7 @@ void CNMesh::RenderBox(LPDIRECT3DDEVICE8 pd3dDevice) // CRenderBoundingBox::Render(pd3dDevice, m_vecMeshPieceBoundingBoxInfo[i].vBoxMin, m_vecMeshPieceBoundingBoxInfo[i].vBoxMax); // } } -void CNMesh::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CNMesh::Render(LPDIRECT3DDEVICE9 pd3dDevice) { static int only = 1; if(!m_bRender) @@ -927,7 +927,7 @@ void CNMesh::CalcBox() } -void CNMesh::RenderName(IDirect3DDevice8* pDevice) +void CNMesh::RenderName(IDirect3DDevice9* pDevice) { vector3 vPosition ,vPos2D; vPosition.x = (m_MinBox.x + m_MaxBox.x)/2.0f; diff --git a/Client/Engine/Zalla3D Scene Class/NMesh.h b/Client/Engine/Zalla3D Scene Class/NMesh.h index 06f11e7..3ee4560 100644 --- a/Client/Engine/Zalla3D Scene Class/NMesh.h +++ b/Client/Engine/Zalla3D Scene Class/NMesh.h @@ -31,9 +31,9 @@ public: void AllLockBuffer(); long GetObjectCount(){return (int)m_nVertex.size();}; - void RenderName(IDirect3DDevice8* pDevice); - void RenderBox(LPDIRECT3DDEVICE8 pd3dDevice); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderName(IDirect3DDevice9* pDevice); + void RenderBox(LPDIRECT3DDEVICE9 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void CalcBox(); void SetShader(DWORD Shader){m_dwShader=Shader;}; void SetPostConvert(DWORD Shader) { m_dwConvertShader = Shader; }; diff --git a/Client/Engine/Zalla3D Scene Class/NatureParticle.h b/Client/Engine/Zalla3D Scene Class/NatureParticle.h index 3d0cffd..8d71d68 100644 --- a/Client/Engine/Zalla3D Scene Class/NatureParticle.h +++ b/Client/Engine/Zalla3D Scene Class/NatureParticle.h @@ -8,7 +8,7 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include +#include #include "Texture.h" #define PI 3.1415926535897932384626433832795f @@ -148,7 +148,7 @@ protected: float m_fStartVisible; float m_fEndVisible; - LPDIRECT3DDEVICE8 m_pDevice; + LPDIRECT3DDEVICE9 m_pDevice; int m_iVertexBufferNum; int m_iIndexBufferNum; diff --git a/Client/Engine/Zalla3D Scene Class/Octree.cpp b/Client/Engine/Zalla3D Scene Class/Octree.cpp index 050087c..5db1587 100644 --- a/Client/Engine/Zalla3D Scene Class/Octree.cpp +++ b/Client/Engine/Zalla3D Scene Class/Octree.cpp @@ -383,7 +383,7 @@ void COctree::CalcBoundBox(std::vector &PolyList) m_MinBox.z=minz-Remain; } -void COctree::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void COctree::Render(LPDIRECT3DDEVICE9 pd3dDevice) { /* MultiVertex BoxVertex[8]; diff --git a/Client/Engine/Zalla3D Scene Class/Octree.h b/Client/Engine/Zalla3D Scene Class/Octree.h index 4fe3bda..74e95c5 100644 --- a/Client/Engine/Zalla3D Scene Class/Octree.h +++ b/Client/Engine/Zalla3D Scene Class/Octree.h @@ -57,7 +57,7 @@ public: int IntersectionRay(const D3DXVECTOR3 &vecRayOrigin,const D3DXVECTOR3 &vecRayDir,float &fNear,float &fFar); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Save(FILE *fp); void Load(FILE *fp); diff --git a/Client/Engine/Zalla3D Scene Class/OctreeScene.cpp b/Client/Engine/Zalla3D Scene Class/OctreeScene.cpp index d52a773..5173017 100644 --- a/Client/Engine/Zalla3D Scene Class/OctreeScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/OctreeScene.cpp @@ -64,7 +64,7 @@ void COctreeScene::GenerateOctree() //m_pOctree->SplitNode(3); } -void COctreeScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void COctreeScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { m_pOctree->Render(pd3dDevice); } @@ -316,7 +316,7 @@ bool COctreeScene::CollisionTriangleToRay(long iFaceIndex,const D3DXVECTOR3 &vec } -void COctreeScene::RenderOctreeTriangle(IDirect3DDevice8* pDevice) +void COctreeScene::RenderOctreeTriangle(IDirect3DDevice9* pDevice) { if (m_PolyList.empty()) { diff --git a/Client/Engine/Zalla3D Scene Class/OctreeScene.h b/Client/Engine/Zalla3D Scene Class/OctreeScene.h index 55c86b0..12f115c 100644 --- a/Client/Engine/Zalla3D Scene Class/OctreeScene.h +++ b/Client/Engine/Zalla3D Scene Class/OctreeScene.h @@ -25,8 +25,8 @@ public: void CullSphere(vector3 vecCenter,float fRad,std::vector &CullPoly); void Load(FILE *fp); void Save(FILE *fp); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderOctreeTriangle(IDirect3DDevice8* pDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderOctreeTriangle(IDirect3DDevice9* pDevice); void GenerateOctree(); void AddPoly(vector3 *vecPoly); COctreeScene(); diff --git a/Client/Engine/Zalla3D Scene Class/Particle.cpp b/Client/Engine/Zalla3D Scene Class/Particle.cpp index 73868c5..c788499 100644 --- a/Client/Engine/Zalla3D Scene Class/Particle.cpp +++ b/Client/Engine/Zalla3D Scene Class/Particle.cpp @@ -27,7 +27,7 @@ void CParticle::Create() } -void CParticle::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CParticle::Render(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); diff --git a/Client/Engine/Zalla3D Scene Class/Particle.h b/Client/Engine/Zalla3D Scene Class/Particle.h index 07421ca..9f969d1 100644 --- a/Client/Engine/Zalla3D Scene Class/Particle.h +++ b/Client/Engine/Zalla3D Scene Class/Particle.h @@ -44,7 +44,7 @@ public: static void SetMatPosition(matrix *matPosition){m_matPosition=matPosition;}; virtual bool Update(float fUpdateTime); - virtual void Render(LPDIRECT3DDEVICE8 pd3dDevice); + virtual void Render(LPDIRECT3DDEVICE9 pd3dDevice); virtual void Create(); CParticle(); virtual ~CParticle(); diff --git a/Client/Engine/Zalla3D Scene Class/ParticleManager.cpp b/Client/Engine/Zalla3D Scene Class/ParticleManager.cpp index 7a48bba..88b777a 100644 --- a/Client/Engine/Zalla3D Scene Class/ParticleManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/ParticleManager.cpp @@ -50,7 +50,7 @@ CParticleSequence* CParticleManager::AddParticle(PartcleType Type,vector3 vecPos return AddNode; } -void CParticleManager::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CParticleManager::Render(LPDIRECT3DDEVICE9 pd3dDevice) { for(int cParticleSeq=0;cParticleSeq<(int)m_ParticleList.size();cParticleSeq++) { @@ -85,7 +85,7 @@ bool CParticleSequence::Update(float fUpdateTime) return false; } -void CParticleSequence::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CParticleSequence::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(m_ParticleSeq>=(int)m_ParticleList.size()) return; diff --git a/Client/Engine/Zalla3D Scene Class/ParticleManager.h b/Client/Engine/Zalla3D Scene Class/ParticleManager.h index 644dd98..27b1e31 100644 --- a/Client/Engine/Zalla3D Scene Class/ParticleManager.h +++ b/Client/Engine/Zalla3D Scene Class/ParticleManager.h @@ -28,7 +28,7 @@ public: { m_ParticleSeq=0; }; - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); bool Update(float fUpdateTime); std::vector m_ParticleList; long m_ParticleSeq; @@ -39,7 +39,7 @@ class CParticleManager static std::vector m_ParticleList; public: void Update(float fUpdateTime); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); static CParticleSequence* AddParticle(PartcleType Type,vector3 vecPos,vector3 vecTarget); CParticleManager(); virtual ~CParticleManager(); diff --git a/Client/Engine/Zalla3D Scene Class/RBspScene.h b/Client/Engine/Zalla3D Scene Class/RBspScene.h index 8568de0..0f71f69 100644 --- a/Client/Engine/Zalla3D Scene Class/RBspScene.h +++ b/Client/Engine/Zalla3D Scene Class/RBspScene.h @@ -17,7 +17,7 @@ #include "ObjectScene.h" #include -#include +#include #include "ViewFrustum.h" using namespace std; @@ -1091,7 +1091,7 @@ typedef vector LstTrigger; bool m_bVisible; int m_iRBspLeafIndex; - LPDIRECT3DDEVICE8 m_D3Device; + LPDIRECT3DDEVICE9 m_D3Device; bool m_bVisEffectBox; bool m_bVisSoundBox; diff --git a/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.cpp b/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.cpp index 2bb4a21..2adf442 100644 --- a/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.cpp +++ b/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.cpp @@ -1,11 +1,11 @@ #include "./RenderBoundingBox.h" -#include +#include #include #include -void CRenderBoundingBox::Render(IDirect3DDevice8* pDevice, const vector3 &vMin, const vector3 &vMax) +void CRenderBoundingBox::Render(IDirect3DDevice9* pDevice, const vector3 &vMin, const vector3 &vMax) { if (NULL == pDevice) { diff --git a/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.h b/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.h index 9a4df51..ec32249 100644 --- a/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.h +++ b/Client/Engine/Zalla3D Scene Class/RenderBoundingBox.h @@ -1,7 +1,7 @@ #pragma once // forward decl. -struct IDirect3DDevice8; +struct IDirect3DDevice9; struct vector3; @@ -9,7 +9,7 @@ struct vector3; class CRenderBoundingBox { public: - static void Render(IDirect3DDevice8* pDevice, const vector3 &vMin, const vector3 &vMax); + static void Render(IDirect3DDevice9* pDevice, const vector3 &vMin, const vector3 &vMax); private: // üȭŰ ʴ ƿƼŬ ȭ diff --git a/Client/Engine/Zalla3D Scene Class/SceneEventMgr.h b/Client/Engine/Zalla3D Scene Class/SceneEventMgr.h index febda6a..9bd7a2e 100644 --- a/Client/Engine/Zalla3D Scene Class/SceneEventMgr.h +++ b/Client/Engine/Zalla3D Scene Class/SceneEventMgr.h @@ -1,6 +1,6 @@ #pragma once -#include "d3dx8.h" +#include "d3dx9.h" class CSceneEventMgr { diff --git a/Client/Engine/Zalla3D Scene Class/SceneManager.cpp b/Client/Engine/Zalla3D Scene Class/SceneManager.cpp index bd87c43..1a6aeae 100644 --- a/Client/Engine/Zalla3D Scene Class/SceneManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/SceneManager.cpp @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #include "SceneManager.h" -#include +#include #include "ConvertTexture.h" #include "BaseGraphicsLayer.h" //#include @@ -64,7 +64,7 @@ long CSceneManager::m_DetailWaterReflection; long CSceneManager::m_DetailLensflare; long CSceneManager::m_DetailTreeDetail; // -LPDIRECT3DDEVICE8 CSceneManager::m_pd3dDevice; +LPDIRECT3DDEVICE9 CSceneManager::m_pd3dDevice; CCollisionDetection CSceneManager::m_CollisionDetection; bool CSceneManager::m_isCollisionDetection; // @@ -162,7 +162,7 @@ Caldron::Base::CResourceLoader *CSceneManager::ms_pResourceLoader = NULL; Caldron::Base::CBaseCacheMgr *CSceneManager::ms_pNewMeshContainer = NULL; CMapStorage CSceneManager::m_MapStorage; //dynamic cube water -IDirect3DCubeTexture8* CSceneManager::m_pWorldCubemap = NULL; +IDirect3DCubeTexture9* CSceneManager::m_pWorldCubemap = NULL; ID3DXRenderToEnvMap* CSceneManager::m_pRenderEnvMap = NULL; //Event diff --git a/Client/Engine/Zalla3D Scene Class/SceneManager.h b/Client/Engine/Zalla3D Scene Class/SceneManager.h index 385bf6d..79c308a 100644 --- a/Client/Engine/Zalla3D Scene Class/SceneManager.h +++ b/Client/Engine/Zalla3D Scene Class/SceneManager.h @@ -395,8 +395,8 @@ public: CSceneManager(); virtual ~CSceneManager(); - static LPDIRECT3DDEVICE8 GetDevice(){return m_pd3dDevice;}; - static void SetDevice(LPDIRECT3DDEVICE8 pd3dDevice){m_pd3dDevice=pd3dDevice;}; + static LPDIRECT3DDEVICE9 GetDevice(){return m_pd3dDevice;}; + static void SetDevice(LPDIRECT3DDEVICE9 pd3dDevice){m_pd3dDevice=pd3dDevice;}; static CSectorLight *m_pPickSectorLight; static bool m_bRenderSectorLight; @@ -431,7 +431,7 @@ public: void RenderInCubemap(); static D3DXMATRIX GetCubeMatrix(int i,vector3 &vecDir); - static IDirect3DCubeTexture8* m_pWorldCubemap; + static IDirect3DCubeTexture9* m_pWorldCubemap; static ID3DXRenderToEnvMap* m_pRenderEnvMap; static CSceneEventMgr* ms_pSceneEventMgr; //Ѱ ̺Ʈ ޴ @@ -470,7 +470,7 @@ private: void BuildCollisionOctree(); static CMapStorage m_MapStorage; - static LPDIRECT3DDEVICE8 m_pd3dDevice; + static LPDIRECT3DDEVICE9 m_pd3dDevice; static unsigned char m_cNationFlag; CrossM::Scene::COctreeCollider m_octreeCollider; diff --git a/Client/Engine/Zalla3D Scene Class/SectorAmbienceMap.cpp b/Client/Engine/Zalla3D Scene Class/SectorAmbienceMap.cpp index c06353d..33e30ca 100644 --- a/Client/Engine/Zalla3D Scene Class/SectorAmbienceMap.cpp +++ b/Client/Engine/Zalla3D Scene Class/SectorAmbienceMap.cpp @@ -436,7 +436,7 @@ void CSectorAmbienceMap::LoadAmbTexture( char* strFile ) pVertex[3].v = 1.0f; pVertex[3].color = 0x55ffffff; - LPDIRECT3DDEVICE8 pd3dDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = BaseGraphicsLayer::GetDevice(); pd3dDevice->SetTexture( 0, m_pAmbTexture ); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 ); diff --git a/Client/Engine/Zalla3D Scene Class/SectorBGMTrigger.cpp b/Client/Engine/Zalla3D Scene Class/SectorBGMTrigger.cpp index e0197e5..ec7d35a 100644 --- a/Client/Engine/Zalla3D Scene Class/SectorBGMTrigger.cpp +++ b/Client/Engine/Zalla3D Scene Class/SectorBGMTrigger.cpp @@ -552,7 +552,7 @@ void CSectorBGMTrigger::LoadBgmTexture( char* strFile ) pVertex[3].v = 1.0f; pVertex[3].color = 0x55ffffff; - LPDIRECT3DDEVICE8 pd3dDevice = BaseGraphicsLayer::GetDevice(); + LPDIRECT3DDEVICE9 pd3dDevice = BaseGraphicsLayer::GetDevice(); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 ); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE ); pd3dDevice->SetTextureStageState( 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE ); diff --git a/Client/Engine/Zalla3D Scene Class/SectorEffectMap.h b/Client/Engine/Zalla3D Scene Class/SectorEffectMap.h index 3541cb0..5ee3055 100644 --- a/Client/Engine/Zalla3D Scene Class/SectorEffectMap.h +++ b/Client/Engine/Zalla3D Scene Class/SectorEffectMap.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include #include "3DMath.h" #include "SectorDefine.h" diff --git a/Client/Engine/Zalla3D Scene Class/SectorLight.cpp b/Client/Engine/Zalla3D Scene Class/SectorLight.cpp index 0814116..e9a7d50 100644 --- a/Client/Engine/Zalla3D Scene Class/SectorLight.cpp +++ b/Client/Engine/Zalla3D Scene Class/SectorLight.cpp @@ -165,7 +165,7 @@ void CSectorLightManager::RenderTerrainLight() void CSectorLightManager::RenderLight() { int i; - LPDIRECT3DDEVICE8 m_D3Device = CSceneManager::GetDevice(); + LPDIRECT3DDEVICE9 m_D3Device = CSceneManager::GetDevice(); m_D3Device->SetRenderState(D3DRS_LIGHTING,FALSE); m_D3Device->SetRenderState(D3DRS_ALPHABLENDENABLE,FALSE); diff --git a/Client/Engine/Zalla3D Scene Class/SectorLight.h b/Client/Engine/Zalla3D Scene Class/SectorLight.h index 16e2f5c..7b8c0f9 100644 --- a/Client/Engine/Zalla3D Scene Class/SectorLight.h +++ b/Client/Engine/Zalla3D Scene Class/SectorLight.h @@ -9,8 +9,8 @@ #pragma once #endif // _MSC_VER > 1000 -#include -#include +#include +#include #include #include "CEffScript.h" diff --git a/Client/Engine/Zalla3D Scene Class/SectorMustDivideVertexMap.h b/Client/Engine/Zalla3D Scene Class/SectorMustDivideVertexMap.h index 21f62ca..236247e 100644 --- a/Client/Engine/Zalla3D Scene Class/SectorMustDivideVertexMap.h +++ b/Client/Engine/Zalla3D Scene Class/SectorMustDivideVertexMap.h @@ -8,7 +8,7 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include +#include #include #include "SectorDefine.h" diff --git a/Client/Engine/Zalla3D Scene Class/SectorScene.cpp b/Client/Engine/Zalla3D Scene Class/SectorScene.cpp index 6f9fdc7..b5d9ef5 100644 --- a/Client/Engine/Zalla3D Scene Class/SectorScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/SectorScene.cpp @@ -3,7 +3,7 @@ #include "SectorScene.h" #include #include "SceneManager.h" -#include +#include #include "BaseGraphicsLayer.h" #include "convertTexture.h" #include "FogScene.h" @@ -478,7 +478,7 @@ void CSectorScene::RenderSectorLight() m_SectorLightManager.RenderTerrainLight(); } } -void CSectorScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTextureStageState(0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP); pd3dDevice->SetTextureStageState(0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP); @@ -1320,7 +1320,7 @@ void CSectorScene::GenerateWideMap() else DeterminTerrainTexture(m_fAvgHeight,m_TM._41,m_TM._43); } -void CSectorScene::RenderNotCullHouseObject(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderNotCullHouseObject(LPDIRECT3DDEVICE9 pd3dDevice) { int i; @@ -1365,7 +1365,7 @@ void CSectorScene::RenderNotCullHouseObject(LPDIRECT3DDEVICE8 pd3dDevice) } -void CSectorScene::RenderEnvHouseObject(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderEnvHouseObject(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTransform(D3DTS_WORLD,(D3DMATRIX*)(&m_AccumulateTM)); float fFar = CSceneManager::m_WeatherManager.m_InterFogFar + 200.0f; @@ -1405,7 +1405,7 @@ void CSectorScene::RenderEnvHouseObject(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CSectorScene::RenderHouseObject(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderHouseObject(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTransform(D3DTS_WORLD,(D3DMATRIX*)(&m_AccumulateTM)); @@ -1554,14 +1554,14 @@ void CSectorScene::GeneratePlant() } //m_GrassObjectNode.GeneratePlant(m_AccumulateTM._41,m_AccumulateTM._43,m_HeightData,m_fAvgHeight,m_AccumulateTM); } -void CSectorScene::RenderEnvPlant(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderEnvPlant(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTransform(D3DTS_WORLD,(D3DMATRIX*)(&m_AccumulateTM)); pd3dDevice->SetTexture(0,m_NormalPlantTexture.GetTexture()); pd3dDevice->SetTexture(1,NULL); m_TreeObjectNode.RenderEnv(pd3dDevice); } -void CSectorScene::RenderPlant(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderPlant(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTransform(D3DTS_WORLD,(D3DMATRIX*)(&m_AccumulateTM)); pd3dDevice->SetTexture(0,m_NormalPlantTexture.GetTexture()); @@ -1569,7 +1569,7 @@ void CSectorScene::RenderPlant(LPDIRECT3DDEVICE8 pd3dDevice) m_TreeObjectNode.Render(pd3dDevice); } -//DEL void CSectorScene::RenderLayerFog(LPDIRECT3DDEVICE8 pd3dDevice) +//DEL void CSectorScene::RenderLayerFog(LPDIRECT3DDEVICE9 pd3dDevice) //DEL { //DEL pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE ); //DEL pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE ); @@ -1913,7 +1913,7 @@ void CSectorScene::GenerateWater() m_MapWater=m_pMapStorage->FindWaterMap(m_TM._41,m_TM._43); } -void CSectorScene::RenderWater(LPDIRECT3DDEVICE8 pd3dDevice,bool bFlare) +void CSectorScene::RenderWater(LPDIRECT3DDEVICE9 pd3dDevice,bool bFlare) { if(m_MapWater) { @@ -1955,7 +1955,7 @@ void CSectorScene::GenerateFall() m_FallScene.MakeFallScene(m_MapFall); } -void CSectorScene::RenderFall(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderFall(LPDIRECT3DDEVICE9 pd3dDevice) { if(m_MapFall) { @@ -2004,7 +2004,7 @@ void CSectorScene::GenerateObject() } } -void CSectorScene::RenderObject(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderObject(LPDIRECT3DDEVICE9 pd3dDevice) { matrix *matViewPosition=(matrix*)CSceneManager::GetCamera()->GetMatPosition(); @@ -2384,7 +2384,7 @@ float CSectorScene::GetHeight(vector3 vecPos) */ } -void CSectorScene::GenerateShadow(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::GenerateShadow(LPDIRECT3DDEVICE9 pd3dDevice) { GenerateWideMap(); @@ -3603,7 +3603,7 @@ void CSectorScene::GetLineIntersectPoly(vector3 vecStart, vector3 vecEnd,std::ve } } -void CSectorScene::RenderGrass(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderGrass(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_RangeGrassRender) { @@ -4165,7 +4165,7 @@ void CSectorScene::GenerateObjectShadowed() } } -void CSectorScene::RenderDetail(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderDetail(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetVertexShader(SectorFVF); @@ -4599,7 +4599,7 @@ public: CHouseObjectScene *m_House; matrix m_matHousePos; }; -void CSectorScene::GenerateTerrainLightmap(LPDIRECT3DDEVICE8 pd3dDevice,CSectorScene *NeighborSector[8]) +void CSectorScene::GenerateTerrainLightmap(LPDIRECT3DDEVICE9 pd3dDevice,CSectorScene *NeighborSector[8]) { vector3 vecSectorMovePos[8]; vecSectorMovePos[0]=vector3(-SECTORSIZE,0.0f,-SECTORSIZE); @@ -5589,7 +5589,7 @@ float CSectorScene::GetHighPolyHeight(vector3 vecPos) } -void CSectorScene::RenderTerrainSelfShadow(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderTerrainSelfShadow(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetRenderState( D3DRS_ZWRITEENABLE, FALSE ); @@ -5721,7 +5721,7 @@ void CSectorScene::UpdateEffect(bool bCull) { m_WorldEffectManager.ProcessWScript(i,bCull); } } -void CSectorScene::RenderLandscapeEffect(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderLandscapeEffect(LPDIRECT3DDEVICE9 pd3dDevice) { matrix *matViewPosition=CSceneManager::GetCamera()->GetMatPosition(); @@ -6413,7 +6413,7 @@ void CSectorScene::UnloadAllData() } -void CSectorScene::RenderObjectShadow(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderObjectShadow(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->EndScene(); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG2); @@ -6670,7 +6670,7 @@ void CSectorScene::RenderObjectShadow(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->BeginScene(); } -void CSectorScene::RenderGlare(LPDIRECT3DDEVICE8 pd3dDevice) +void CSectorScene::RenderGlare(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTransform(D3DTS_WORLD,(D3DMATRIX*)(&m_AccumulateTM)); /*for(int i=0;i m_ShadowPolyList; static CRenderTexture m_pShadowTexture;//׸ - void RenderObjectShadow(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderObjectShadow(LPDIRECT3DDEVICE9 pd3dDevice); void UnloadAllData(); void GetPickHousePoly(vector3 vecStart,vector3 vecEnd,std::vector &vecPolyList); static color m_TerrainDetailFixColor; void GenerateLandscapeEffect(); - void RenderLandscapeEffect(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderLandscapeEffect(LPDIRECT3DDEVICE9 pd3dDevice); void UpdateLandscapeEffect(); void FullVertexROAMVertex(); CShadowVolume m_ShadowVolume; - void RenderTerrainSelfShadow(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderTerrainSelfShadow(LPDIRECT3DDEVICE9 pd3dDevice); float GetHighPolyHeight(vector3 vecPos); - void GenerateTerrainLightmap(LPDIRECT3DDEVICE8 pd3dDevice,CSectorScene *NeighborSector[8]); - void RenderDetail(LPDIRECT3DDEVICE8 pd3dDevice); + void GenerateTerrainLightmap(LPDIRECT3DDEVICE9 pd3dDevice,CSectorScene *NeighborSector[8]); + void RenderDetail(LPDIRECT3DDEVICE9 pd3dDevice); void GenerateObjectShadowed(); void GetHeightFieldRangePoly(vector3 vecPos,std::vector &vecPolyList,float fRange); // void GenerateSound(); void AllObjectCalcLens(); void GenerateEffect(); void GenerateMustDivideVertex(); - void RenderGrass(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderGrass(LPDIRECT3DDEVICE9 pd3dDevice); void DynamicLoad(); void GetLight(vector3 vecPos,std::vector &LightList); void GetLineIntersectPoly(vector3 vecStart,vector3 vecEnd, std::vector &vecPolyList); @@ -174,7 +174,7 @@ public: void GenerateObject(); void GenerateFall(); void GenerateWater(); - void GenerateShadow(LPDIRECT3DDEVICE8 pd3dDevice); + void GenerateShadow(LPDIRECT3DDEVICE9 pd3dDevice); void GenerateSectorLight(); void CalcNormal(); @@ -189,23 +189,23 @@ public: void DeterminTerrainTexture(float fHeight,float fPosx,float fPosy); //Scene & Terrain Rendering func// - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void RenderEffect(bool bCull = true); void RenderSectorLight(); void UpdateEffect(bool bCull = true); - void RenderNotCullHouseObject(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderNotCullHouseObject(LPDIRECT3DDEVICE9 pd3dDevice); - void RenderHouseObject(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderEnvHouseObject(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderHouseObject(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderEnvHouseObject(LPDIRECT3DDEVICE9 pd3dDevice); - void RenderPlant(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderEnvPlant(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderPlant(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderEnvPlant(LPDIRECT3DDEVICE9 pd3dDevice); - void RenderObject(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderFall(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderWater(LPDIRECT3DDEVICE8 pd3dDevice,bool bFlare); + void RenderObject(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderFall(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderWater(LPDIRECT3DDEVICE9 pd3dDevice,bool bFlare); //boid void SetBoidMesh(); void DeleteBoidMesh(); diff --git a/Client/Engine/Zalla3D Scene Class/ShaderScene.h b/Client/Engine/Zalla3D Scene Class/ShaderScene.h index aa11050..da7e4d4 100644 --- a/Client/Engine/Zalla3D Scene Class/ShaderScene.h +++ b/Client/Engine/Zalla3D Scene Class/ShaderScene.h @@ -5,8 +5,8 @@ #include "ShaderConstants.h" // Shader define header #include -#include -#include +#include +#include /* *************************************************** Vertex Shader, Pixel Shader, Shader @@ -58,7 +58,7 @@ class CShaderScene { // Shader protected: char m_strName[256]; - LPDIRECT3DDEVICE8 m_pDevice; + LPDIRECT3DDEVICE9 m_pDevice; DWORD m_dwSrcBlend; DWORD m_dwDestBlend; diff --git a/Client/Engine/Zalla3D Scene Class/ShadowVolume.cpp b/Client/Engine/Zalla3D Scene Class/ShadowVolume.cpp index b5fe509..b688e93 100644 --- a/Client/Engine/Zalla3D Scene Class/ShadowVolume.cpp +++ b/Client/Engine/Zalla3D Scene Class/ShadowVolume.cpp @@ -91,7 +91,7 @@ void CShadowVolume::AddEdge(WORD *pEdges, int &nEdges, WORD v0, WORD v1) nEdges++; } -void CShadowVolume::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CShadowVolume::Render(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetVertexShader(D3DFVF_XYZ); if(m_ShadowVolumeVertexList.size()>0) diff --git a/Client/Engine/Zalla3D Scene Class/ShadowVolume.h b/Client/Engine/Zalla3D Scene Class/ShadowVolume.h index 120dd64..4e9230d 100644 --- a/Client/Engine/Zalla3D Scene Class/ShadowVolume.h +++ b/Client/Engine/Zalla3D Scene Class/ShadowVolume.h @@ -19,7 +19,7 @@ class CShadowVolume std::vector m_ShadowVolumeVertexList; public: void Reset(); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void AddEdge(WORD* pEdges,int &nEdges,WORD v0,WORD v1); void MakeShadowVolumeDirectionLight(vector3 *pVertex,int nVertex,WORD *pIndices,int nIndices,vector3 vecLightDir); CShadowVolume(); diff --git a/Client/Engine/Zalla3D Scene Class/SkyScene.cpp b/Client/Engine/Zalla3D Scene Class/SkyScene.cpp index f0b7b63..43e6123 100644 --- a/Client/Engine/Zalla3D Scene Class/SkyScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/SkyScene.cpp @@ -144,7 +144,7 @@ void CSkyScene::Create() */ } -void CSkyScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CSkyScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { //RenderSkyBox(pd3dDevice); ///* @@ -243,7 +243,7 @@ void CSkyScene::SetColor(DWORD dwColor,DWORD dwCenterColor,DWORD *dwLayerColor) */ } -void CSkyScene::RenderSkyBox(LPDIRECT3DDEVICE8 pd3dDevice) +void CSkyScene::RenderSkyBox(LPDIRECT3DDEVICE9 pd3dDevice) { float fSize=200000.0f; LVertex Vertex[4]; @@ -344,7 +344,7 @@ void CSkyScene::RenderSkyBox(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->SetRenderState( D3DRS_FOGENABLE,TRUE); } -void CSkyScene::RenderCloud(LPDIRECT3DDEVICE8 pd3dDevice) +void CSkyScene::RenderCloud(LPDIRECT3DDEVICE9 pd3dDevice) { matrix matWorld; pd3dDevice->GetTransform(D3DTS_WORLD,(D3DMATRIX*)(&matWorld)); @@ -420,7 +420,7 @@ void CSkyScene::Update(float fUpdate) } } -void CSkyScene::RenderForGlare(LPDIRECT3DDEVICE8 pd3dDevice) +void CSkyScene::RenderForGlare(LPDIRECT3DDEVICE9 pd3dDevice) { matrix matWorld; pd3dDevice->GetTransform(D3DTS_WORLD,(D3DMATRIX*)(&matWorld)); diff --git a/Client/Engine/Zalla3D Scene Class/SkyScene.h b/Client/Engine/Zalla3D Scene Class/SkyScene.h index eedb12b..834bc36 100644 --- a/Client/Engine/Zalla3D Scene Class/SkyScene.h +++ b/Client/Engine/Zalla3D Scene Class/SkyScene.h @@ -33,13 +33,13 @@ class CSkyScene : public CSceneNode //color m_FogLayer[MAX_CLOUD]; float m_fFogLayerHeight[MAX_CLOUD]; public: - void RenderForGlare(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderForGlare(LPDIRECT3DDEVICE9 pd3dDevice); void Update(float fUpdate); static CTexture m_CloudTexture; - void RenderCloud(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderSkyBox(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderCloud(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderSkyBox(LPDIRECT3DDEVICE9 pd3dDevice); void SetColor(DWORD dwColor,DWORD dwCenterColor,DWORD *dwLayerColor); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Create(); CSkyScene(); virtual ~CSkyScene(); diff --git a/Client/Engine/Zalla3D Scene Class/SmokeParticle.cpp b/Client/Engine/Zalla3D Scene Class/SmokeParticle.cpp index eaa51b2..17084e9 100644 --- a/Client/Engine/Zalla3D Scene Class/SmokeParticle.cpp +++ b/Client/Engine/Zalla3D Scene Class/SmokeParticle.cpp @@ -53,7 +53,7 @@ void CSmokeParticle::Create(vector3 vecPos, vector3 vecDir) m_ParticleTexture.Load("Circle.dds"); } -void CSmokeParticle::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CSmokeParticle::Render(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE); diff --git a/Client/Engine/Zalla3D Scene Class/SmokeParticle.h b/Client/Engine/Zalla3D Scene Class/SmokeParticle.h index 5e0cfec..1bd3243 100644 --- a/Client/Engine/Zalla3D Scene Class/SmokeParticle.h +++ b/Client/Engine/Zalla3D Scene Class/SmokeParticle.h @@ -16,7 +16,7 @@ class CSmokeParticle : public CParticle vector3 m_vecNowPos; public: bool Update(float fUpdateTime); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Create(vector3 vecPos,vector3 vecDir); CSmokeParticle(); virtual ~CSmokeParticle(); diff --git a/Client/Engine/Zalla3D Scene Class/SnowFall.cpp b/Client/Engine/Zalla3D Scene Class/SnowFall.cpp index b1e4145..2437521 100644 --- a/Client/Engine/Zalla3D Scene Class/SnowFall.cpp +++ b/Client/Engine/Zalla3D Scene Class/SnowFall.cpp @@ -61,14 +61,14 @@ public: D3DXVECTOR3 m_Gravity; D3DXVECTOR3 m_WindSpeed; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; SnowUnit *m_Units; CSnowFall(); ~CSnowFall(); void Init(int num); - void SetDevice(LPDIRECT3DDEVICE8 device) { m_Device = device;} + void SetDevice(LPDIRECT3DDEVICE9 device) { m_Device = device;} void SetVertexBuffer(); @@ -231,7 +231,7 @@ void CSnowFall::SetWorldValue(float gx,float gy,float gz,float wx,float wy,float } } -void CSnowFall::Init(LPDIRECT3DDEVICE8 device,int num,float x,float y,float z,float xsize,float zsize,float height) { +void CSnowFall::Init(LPDIRECT3DDEVICE9 device,int num,float x,float y,float z,float xsize,float zsize,float height) { m_bValueSet = true; SetDevice(device); diff --git a/Client/Engine/Zalla3D Scene Class/SnowFall.h b/Client/Engine/Zalla3D Scene Class/SnowFall.h index a769b9c..36dc296 100644 --- a/Client/Engine/Zalla3D Scene Class/SnowFall.h +++ b/Client/Engine/Zalla3D Scene Class/SnowFall.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include #include "texture.h" #include "BaseDataDefine.h" @@ -73,7 +73,7 @@ public: D3DXVECTOR3 m_WindSpeed; float m_Color[3]; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; LPDIRECT3DVERTEXBUFFER8 m_VBuffer; CTexture *m_STexture; @@ -83,13 +83,13 @@ public: CSnowFall(); ~CSnowFall(); - void Init(LPDIRECT3DDEVICE8 device,int num,float x,float y,float z,float xsize,float zsize,float height); + void Init(LPDIRECT3DDEVICE9 device,int num,float x,float y,float z,float xsize,float zsize,float height); void SetColor(float r,float g,float b); void SetUnitInfo(int num); void SetWorldValue(float gx,float gy,float gz,float wx,float wy,float wz,char *texture); - void SetDevice(LPDIRECT3DDEVICE8 device) { m_Device = device;} + void SetDevice(LPDIRECT3DDEVICE9 device) { m_Device = device;} void SetVertexBuffer(); void Render(); diff --git a/Client/Engine/Zalla3D Scene Class/SunScene.cpp b/Client/Engine/Zalla3D Scene Class/SunScene.cpp index 1f8135c..f33addf 100644 --- a/Client/Engine/Zalla3D Scene Class/SunScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/SunScene.cpp @@ -182,7 +182,7 @@ void CSunScene::Create() //LogMessage("SunScene Create Complete"); } -void CSunScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CSunScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { matrix matWorld; //pd3dDevice->GetTransform(D3DTS_WORLD,(D3DMATRIX*)(&matWorld)); @@ -342,7 +342,7 @@ void CSunScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->SetRenderState(D3DRS_ZWRITEENABLE,TRUE); } -void CSunScene::RenderFlare(LPDIRECT3DDEVICE8 pd3dDevice) +void CSunScene::RenderFlare(LPDIRECT3DDEVICE9 pd3dDevice) { //if(LENSFLARE==0 || m_vecSunPosition.y<0.0f) pd3dDevice->SetRenderState(D3DRS_ZWRITEENABLE,FALSE); diff --git a/Client/Engine/Zalla3D Scene Class/SunScene.h b/Client/Engine/Zalla3D Scene Class/SunScene.h index 69f29fb..72f9b16 100644 --- a/Client/Engine/Zalla3D Scene Class/SunScene.h +++ b/Client/Engine/Zalla3D Scene Class/SunScene.h @@ -34,9 +34,9 @@ public: CTexture m_MoonTexture; CTexture m_MoonFlareTexture; - void RenderFlare(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderFlare(LPDIRECT3DDEVICE9 pd3dDevice); void SetSunDirection(vector3 &vecSunDir){m_vecSunPosition=vecSunDir;}; - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Reload(); void Create(); diff --git a/Client/Engine/Zalla3D Scene Class/TreeScene.cpp b/Client/Engine/Zalla3D Scene Class/TreeScene.cpp index 7b356cb..dc497ce 100644 --- a/Client/Engine/Zalla3D Scene Class/TreeScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/TreeScene.cpp @@ -171,7 +171,7 @@ void CTreeScene::GeneratePlant(int SeedX,int SeedY,float *pHeightData,float fAvg m_ViewPlants = new TreeNode_t[cPlant]; } -void CTreeScene::RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice) +void CTreeScene::RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice) { if(m_cPlant==0) return; @@ -515,7 +515,7 @@ void CTreeScene::RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->SetTransform(D3DTS_WORLD,(D3DMATRIX*)&matParent); pd3dDevice->SetRenderState(D3DRS_VERTEXBLEND,D3DVBF_DISABLE); } -void CTreeScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CTreeScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(m_cPlant==0) return; @@ -1009,7 +1009,7 @@ void CTreeScene::CalcObjectLens() } } -void CTreeScene::RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice, CRenderTexture &pShadowTexture) +void CTreeScene::RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice, CRenderTexture &pShadowTexture) { pd3dDevice->EndScene(); pd3dDevice->SetTextureStageState( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG2); diff --git a/Client/Engine/Zalla3D Scene Class/TreeScene.h b/Client/Engine/Zalla3D Scene Class/TreeScene.h index f968127..a6037e1 100644 --- a/Client/Engine/Zalla3D Scene Class/TreeScene.h +++ b/Client/Engine/Zalla3D Scene Class/TreeScene.h @@ -36,7 +36,7 @@ class CTreeScene : public CSceneNode public: void Update(float fUpdate); - void RenderShadow(LPDIRECT3DDEVICE8 pd3dDevice,CRenderTexture &pShadowTexture); + void RenderShadow(LPDIRECT3DDEVICE9 pd3dDevice,CRenderTexture &pShadowTexture); float m_fRot; unsigned char m_usDetailTree[SECTORSX*SECTORSY]; float *m_pHeight; @@ -57,8 +57,8 @@ public: //short m_IndexPlantKind[MAX_TREE]; void GeneratePlant(CSectorPlantMap *PlantMap,float *pHeightData); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice); void GeneratePlant(int SeedX,int SeedY,float *pHeightData,float fAvgHeight); void Create(); CTreeScene(); diff --git a/Client/Engine/Zalla3D Scene Class/ViewFrustum.cpp b/Client/Engine/Zalla3D Scene Class/ViewFrustum.cpp index f28d499..d85ad6d 100644 --- a/Client/Engine/Zalla3D Scene Class/ViewFrustum.cpp +++ b/Client/Engine/Zalla3D Scene Class/ViewFrustum.cpp @@ -21,7 +21,7 @@ CViewFrustum::~CViewFrustum() } void CViewFrustum::Update() { - LPDIRECT3DDEVICE8 device; + LPDIRECT3DDEVICE9 device; D3DXMATRIX view; D3DXMATRIX project; D3DXMATRIX clip; diff --git a/Client/Engine/Zalla3D Scene Class/ViewFrustum.h b/Client/Engine/Zalla3D Scene Class/ViewFrustum.h index 2a091f5..d04f3af 100644 --- a/Client/Engine/Zalla3D Scene Class/ViewFrustum.h +++ b/Client/Engine/Zalla3D Scene Class/ViewFrustum.h @@ -8,7 +8,7 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 -#include +#include enum WBPLAN { LEFT_P,RIGHT_P,TOP_P,BOTTOM_P,NEAR_P,FAR_P}; enum WBAXIS {X,Y,Z}; diff --git a/Client/Engine/Zalla3D Scene Class/WaterScene.cpp b/Client/Engine/Zalla3D Scene Class/WaterScene.cpp index 805a4fd..abb3d23 100644 --- a/Client/Engine/Zalla3D Scene Class/WaterScene.cpp +++ b/Client/Engine/Zalla3D Scene Class/WaterScene.cpp @@ -365,7 +365,7 @@ void CWaterScene::Create() } } -void CWaterScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CWaterScene::Render(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_WaterBumpEnvRendering) { @@ -581,7 +581,7 @@ void CWaterScene::Render(LPDIRECT3DDEVICE8 pd3dDevice) } } -void CWaterScene::DeterminWaterTexture(LPDIRECT3DDEVICE8 pd3dDevice,bool isRelection) +void CWaterScene::DeterminWaterTexture(LPDIRECT3DDEVICE9 pd3dDevice,bool isRelection) { if(isRelection) //pd3dDevice->SetTexture(1,m_pRelectionTexture.GetTexture()); @@ -627,7 +627,7 @@ void CWaterScene::UpdateWave() } -void CWaterScene::RenderRipple(LPDIRECT3DDEVICE8 pd3dDevice) +void CWaterScene::RenderRipple(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->SetTextureStageState( 0, D3DTSS_COLORARG1, D3DTA_TEXTURE ); @@ -776,7 +776,7 @@ void CWaterScene::CalcBasicVector3(Dot3Vertex *pVertex) } } -void CWaterScene::RenderFlare(LPDIRECT3DDEVICE8 pd3dDevice) +void CWaterScene::RenderFlare(LPDIRECT3DDEVICE9 pd3dDevice) { if(CRenderOption::m_WaterBumpEnvRendering) { diff --git a/Client/Engine/Zalla3D Scene Class/WaterScene.h b/Client/Engine/Zalla3D Scene Class/WaterScene.h index f3e34ad..0acd88e 100644 --- a/Client/Engine/Zalla3D Scene Class/WaterScene.h +++ b/Client/Engine/Zalla3D Scene Class/WaterScene.h @@ -33,10 +33,10 @@ class CWaterScene : public CSceneNode //static DWORD m_dwWaterPixelShader; public: static CTexture m_WaterTexture[MAX_WATERTEXTURE]; - void RenderFlare(LPDIRECT3DDEVICE8 pd3dDevice); + void RenderFlare(LPDIRECT3DDEVICE9 pd3dDevice); void CalcBasicVector3(Dot3Vertex *pVertex); void CreateWaterBumpTexture(); - static void RenderRipple(LPDIRECT3DDEVICE8 pd3dDevice); + static void RenderRipple(LPDIRECT3DDEVICE9 pd3dDevice); static void UpdateWave(); static LPDIRECT3DVERTEXBUFFER8 m_pWaterVertexBuffer; @@ -48,8 +48,8 @@ public: static CRenderTexture m_pRippleTexture; static TLVertex m_RippleVertex[RippleVertexCount*RippleVertexCount]; static WORD m_RippleIndices[(RippleVertexCount-1)*(RippleVertexCount-1)*6]; - void DeterminWaterTexture(LPDIRECT3DDEVICE8 pd3dDevice,bool isRelection); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); + void DeterminWaterTexture(LPDIRECT3DDEVICE9 pd3dDevice,bool isRelection); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); void Create(); CWaterScene(); virtual ~CWaterScene(); diff --git a/Client/Engine/Zalla3D Scene Class/WaterW.cpp b/Client/Engine/Zalla3D Scene Class/WaterW.cpp index 6fb5909..ec0b941 100644 --- a/Client/Engine/Zalla3D Scene Class/WaterW.cpp +++ b/Client/Engine/Zalla3D Scene Class/WaterW.cpp @@ -20,7 +20,7 @@ CWaterW ::CWaterW() { } -CWaterW ::CWaterW(int size,double lh,float chop,float x,float z,float quadsize,LPDIRECT3DDEVICE8 device) { +CWaterW ::CWaterW(int size,double lh,float chop,float x,float z,float quadsize,LPDIRECT3DDEVICE9 device) { m_pWaterSpace = NULL; m_pWaterChangeValue = NULL; m_pWaterCoord = NULL; @@ -44,7 +44,7 @@ CWaterW ::CWaterW(int size,double lh,float chop,float x,float z,float quadsize,L } -CWaterW ::CWaterW(int w,int h,double lh,float chop,float x,float z,float quadsize,LPDIRECT3DDEVICE8 device){ +CWaterW ::CWaterW(int w,int h,double lh,float chop,float x,float z,float quadsize,LPDIRECT3DDEVICE9 device){ m_pWaterSpace = NULL; m_pWaterChangeValue = NULL; m_pWaterCoord = NULL; @@ -534,8 +534,8 @@ void CWaterW ::CreateTexture() { for(int i = 0; i < 6; i++) { if(m_pSkyTex[i]) { - IDirect3DSurface8 *pSrc; - IDirect3DSurface8 *pDest; + IDirect3DSurface9 *pSrc; + IDirect3DSurface9 *pDest; m_pSkyTex[i]->GetSurfaceLevel(0, &pSrc); m_pSkyCubeTex->GetCubeMapSurface((D3DCUBEMAP_FACES) i, 0, &pDest); diff --git a/Client/Engine/Zalla3D Scene Class/WaterW.h b/Client/Engine/Zalla3D Scene Class/WaterW.h index 5601f4d..bb88aba 100644 --- a/Client/Engine/Zalla3D Scene Class/WaterW.h +++ b/Client/Engine/Zalla3D Scene Class/WaterW.h @@ -3,8 +3,8 @@ #pragma once -#include -#include +#include +#include #include #include "texture.h" #include "BaseDataDefine.h" @@ -77,7 +77,7 @@ private: CTexture m_WaterTexture; CTexture m_WaterEnv; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; LPDIRECT3DTEXTURE8 m_pSkyTex[6]; LPDIRECT3DCUBETEXTURE8 m_pSkyCubeTex; @@ -85,8 +85,8 @@ private: public: CWaterW(); - CWaterW(int size,double limitheight,float choppower,float x,float z,float quadsize,LPDIRECT3DDEVICE8 device); - CWaterW(int width,int height,double limitheight,float choppower,float x,float z,float size,LPDIRECT3DDEVICE8 device); + CWaterW(int size,double limitheight,float choppower,float x,float z,float quadsize,LPDIRECT3DDEVICE9 device); + CWaterW(int width,int height,double limitheight,float choppower,float x,float z,float size,LPDIRECT3DDEVICE9 device); bool CreateWaterWSpace(); void InitWaterW(); @@ -94,7 +94,7 @@ public: void CreateVertexBuffer(); void CreateTexture(); - void SetDevice(LPDIRECT3DDEVICE8 device) { m_Device = device;} + void SetDevice(LPDIRECT3DDEVICE9 device) { m_Device = device;} bool SetTexture(char *filename,char *envfile); void SetZeroPos(float x,float y,float z) {m_ZeroPos.x = x;m_ZeroPos.y = y;m_ZeroPos.z = z;} void SetQuadSize(float size) { m_QuadSize = size;} diff --git a/Client/Engine/Zalla3D Scene Class/WaveLine.cpp b/Client/Engine/Zalla3D Scene Class/WaveLine.cpp index 6107447..f73cfbb 100644 --- a/Client/Engine/Zalla3D Scene Class/WaveLine.cpp +++ b/Client/Engine/Zalla3D Scene Class/WaveLine.cpp @@ -38,7 +38,7 @@ CWaveLine::CWaveLine() { } -CWaveLine ::CWaveLine(LPDIRECT3DDEVICE8 device) { +CWaveLine ::CWaveLine(LPDIRECT3DDEVICE9 device) { m_Pick = false; m_Normal.x = m_Normal.z = 0.0f; m_Normal.y = 1.0f; diff --git a/Client/Engine/Zalla3D Scene Class/WaveLine.h b/Client/Engine/Zalla3D Scene Class/WaveLine.h index 5fecfbc..9933922 100644 --- a/Client/Engine/Zalla3D Scene Class/WaveLine.h +++ b/Client/Engine/Zalla3D Scene Class/WaveLine.h @@ -6,8 +6,8 @@ #include #include "texture.h" #include "BaseDataDefine.h" -#include -#include +#include +#include using namespace std; @@ -120,7 +120,7 @@ public: LPDIRECT3DVERTEXBUFFER8 *m_Vert; LPDIRECT3DVERTEXBUFFER8 *m_Bubble; - LPDIRECT3DDEVICE8 m_Device; + LPDIRECT3DDEVICE9 m_Device; CTexture *m_WaveTex; int m_WaveTexNum; @@ -136,7 +136,7 @@ public: float t_value3; CWaveLine(); - CWaveLine(LPDIRECT3DDEVICE8 ); + CWaveLine(LPDIRECT3DDEVICE9 ); ~CWaveLine(); void Render(); @@ -151,7 +151,7 @@ public: void SetDownLayerNum(int num) {m_DownLayerNum = num;} void SetUpLayerNum(int num) {m_UpLayerNum = num;} - void SetDevice(LPDIRECT3DDEVICE8 de) {m_Device = de; } + void SetDevice(LPDIRECT3DDEVICE9 de) {m_Device = de; } void SetInterpol(float vot); void CreateTexture(int num); void SetTexture(int num,char *); diff --git a/Client/Engine/Zalla3D Scene Class/WeatherManager.cpp b/Client/Engine/Zalla3D Scene Class/WeatherManager.cpp index 3de7bbf..837c127 100644 --- a/Client/Engine/Zalla3D Scene Class/WeatherManager.cpp +++ b/Client/Engine/Zalla3D Scene Class/WeatherManager.cpp @@ -439,7 +439,7 @@ void CWeatherManager::Create() // m_FallScene.Create(); // m_CloudScene.Create(); } -void CWeatherManager::RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice) +void CWeatherManager::RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice) { pd3dDevice->LightEnable(0,FALSE); pd3dDevice->SetRenderState( D3DRS_LIGHTING,FALSE); @@ -461,7 +461,7 @@ void CWeatherManager::RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice) pd3dDevice->SetRenderState( D3DRS_LIGHTING,TRUE); pd3dDevice->LightEnable(0,TRUE); } -void CWeatherManager::Render(LPDIRECT3DDEVICE8 pd3dDevice) +void CWeatherManager::Render(LPDIRECT3DDEVICE9 pd3dDevice) { ///* pd3dDevice->LightEnable(0,FALSE); @@ -536,7 +536,7 @@ CTexture *CWeatherManager::GetCurrentSubGrassTexture() return NULL; } -void CWeatherManager::SetWeather(float fTime,LPDIRECT3DDEVICE8 pd3dDevice) +void CWeatherManager::SetWeather(float fTime,LPDIRECT3DDEVICE9 pd3dDevice) { if(m_CustomWaterColor) { @@ -2121,7 +2121,7 @@ void CWeatherManager::Update(float fUpdate) m_SkyScene.Update(fUpdate); } -void CWeatherManager::SecondRender(LPDIRECT3DDEVICE8 pd3dDevice) +void CWeatherManager::SecondRender(LPDIRECT3DDEVICE9 pd3dDevice) { matrix matInit; matInit.MakeIdent(); diff --git a/Client/Engine/Zalla3D Scene Class/WeatherManager.h b/Client/Engine/Zalla3D Scene Class/WeatherManager.h index f793070..923fa03 100644 --- a/Client/Engine/Zalla3D Scene Class/WeatherManager.h +++ b/Client/Engine/Zalla3D Scene Class/WeatherManager.h @@ -56,7 +56,7 @@ public: float m_fWeatherTime; bool m_CustomWaterColor; float m_CustomWaterRate; - void SecondRender(LPDIRECT3DDEVICE8 pd3dDevice); + void SecondRender(LPDIRECT3DDEVICE9 pd3dDevice); void Update(float fUpdate); CSkyScene m_SkyScene; CSunScene m_SunScene; @@ -145,9 +145,9 @@ public: int GetWeatherCorlor(); - void SetWeather(float fTime,LPDIRECT3DDEVICE8 pd3dDevice); - void Render(LPDIRECT3DDEVICE8 pd3dDevice); - void RenderEnv(LPDIRECT3DDEVICE8 pd3dDevice); + void SetWeather(float fTime,LPDIRECT3DDEVICE9 pd3dDevice); + void Render(LPDIRECT3DDEVICE9 pd3dDevice); + void RenderEnv(LPDIRECT3DDEVICE9 pd3dDevice); void Reload(); diff --git a/Client/Engine/Zalla3D Scene Class/Z3DAttachment.cpp b/Client/Engine/Zalla3D Scene Class/Z3DAttachment.cpp index 9fdcd64..6981b2a 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DAttachment.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DAttachment.cpp @@ -283,7 +283,7 @@ void CZ3DAttachment::Render() } -void CZ3DAttachment::RenderShadow( IDirect3DDevice8* pDevice, DWORD vertexShader ) +void CZ3DAttachment::RenderShadow( IDirect3DDevice9* pDevice, DWORD vertexShader ) { // _ASSERT( m_tagAMesh.GetObject() ); // _ASSERT( m_tagAMesh.GetObject()->m_pVertices ); @@ -338,7 +338,7 @@ void CZ3DAttachment::RenderShadow( IDirect3DDevice8* pDevice, DWORD vertexShader } -void CZ3DAttachment::RenderGlowShape( IDirect3DDevice8* pDevice ) +void CZ3DAttachment::RenderGlowShape( IDirect3DDevice9* pDevice ) { if( NULL == m_pVertexBuffer || NULL == m_pIndexBuffer ) { diff --git a/Client/Engine/Zalla3D Scene Class/Z3DAttachment.h b/Client/Engine/Zalla3D Scene Class/Z3DAttachment.h index 48bb7d3..988d459 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DAttachment.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DAttachment.h @@ -64,8 +64,8 @@ public: void SecondRender() {} - void RenderShadow( IDirect3DDevice8* pDevice, DWORD vertexShader = 0xFFFFFFFF ); - void RenderGlowShape( IDirect3DDevice8* pDevice ); + void RenderShadow( IDirect3DDevice9* pDevice, DWORD vertexShader = 0xFFFFFFFF ); + void RenderGlowShape( IDirect3DDevice9* pDevice ); void SetScale( float s ) { @@ -109,10 +109,10 @@ public: protected: //BumpVertex* m_pVertices; - IDirect3DVertexBuffer8* m_pVertexBuffer; + IDirect3DVertexBuffer9* m_pVertexBuffer; long m_lVertexCount; - IDirect3DIndexBuffer8* m_pIndexBuffer; + IDirect3DIndexBuffer9* m_pIndexBuffer; long m_lIndexCount; float m_fScaleFactor; diff --git a/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.cpp b/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.cpp index 7d076ba..ab74bc0 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.cpp @@ -94,7 +94,7 @@ void CZ3DBladeTrail::SetTexture( const char* szFileName ) } } -void CZ3DBladeTrail::SetTexture( IDirect3DTexture8* pTexture ) +void CZ3DBladeTrail::SetTexture( IDirect3DTexture9* pTexture ) { m_pTexture = NULL; // Release() ޼ҵ尡 diff --git a/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.h b/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.h index b9f760b..e1e8500 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DBladeTrail.h @@ -48,7 +48,7 @@ public: } void SetTexture( const char* szFileName ); - void SetTexture( IDirect3DTexture8* pTexture ); + void SetTexture( IDirect3DTexture9* pTexture ); void Disable() diff --git a/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.cpp b/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.cpp index f05c6f0..29a8df3 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.cpp @@ -1638,7 +1638,7 @@ void CZ3DGeneralChrModel::Render() } -void CZ3DGeneralChrModel::DrawShadow( IDirect3DDevice8* pDevice, DWORD vertexShader ) +void CZ3DGeneralChrModel::DrawShadow( IDirect3DDevice9* pDevice, DWORD vertexShader ) { if( this != m_rpThis ) { @@ -1663,7 +1663,7 @@ void CZ3DGeneralChrModel::DrawShadow( IDirect3DDevice8* pDevice, DWORD vertexSha } -void CZ3DGeneralChrModel::RenderGlowShape( IDirect3DDevice8* pDevice ) +void CZ3DGeneralChrModel::RenderGlowShape( IDirect3DDevice9* pDevice ) { if( this != m_rpThis ) { diff --git a/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.h b/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.h index 146af4f..4809962 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DGeneralChrModel.h @@ -353,8 +353,8 @@ public: virtual void FrameMove(); void Render(); - virtual void DrawShadow( IDirect3DDevice8* pDevice, DWORD vertexShader = 0xFFFFFFFF ); - void RenderGlowShape( IDirect3DDevice8* pDevice ); + virtual void DrawShadow( IDirect3DDevice9* pDevice, DWORD vertexShader = 0xFFFFFFFF ); + void RenderGlowShape( IDirect3DDevice9* pDevice ); void PreRender(); diff --git a/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.cpp b/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.cpp index 11143a4..ccf9b7b 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.cpp @@ -7,12 +7,12 @@ #define Z3D_GLOW_MAX_LEVEL 7 -IDirect3DDevice8* CZ3DGlowHandler::ms_pDevice = NULL; -IDirect3DTexture8* CZ3DGlowHandler::ms_pRenderTargetTexture = NULL; -IDirect3DSurface8* CZ3DGlowHandler::ms_pRenderTargetDepth = NULL; +IDirect3DDevice9* CZ3DGlowHandler::ms_pDevice = NULL; +IDirect3DTexture9* CZ3DGlowHandler::ms_pRenderTargetTexture = NULL; +IDirect3DSurface9* CZ3DGlowHandler::ms_pRenderTargetDepth = NULL; -IDirect3DSurface8* CZ3DGlowHandler::ms_pOldBackBuffer = NULL; -IDirect3DSurface8* CZ3DGlowHandler::ms_pOldDepthBuffer = NULL; +IDirect3DSurface9* CZ3DGlowHandler::ms_pOldBackBuffer = NULL; +IDirect3DSurface9* CZ3DGlowHandler::ms_pOldDepthBuffer = NULL; Z3D_GLOW_CONSTANTS CZ3DGlowHandler::ms_aGlowParameter[Z3D_GLOW_MAX_LEVEL]; std::list< CZ3DGlowHandler* > CZ3DGlowHandler::ms_listInstance; @@ -65,7 +65,7 @@ void CZ3DGlowHandler::SetLevel( int nLevel ) m_nCurrentFrame = 0; } -void CZ3DGlowHandler::ApplySetting( IDirect3DDevice8* pDevice ) +void CZ3DGlowHandler::ApplySetting( IDirect3DDevice9* pDevice ) { if( m_nLevelIndex == 0 ) { @@ -98,7 +98,7 @@ void CZ3DGlowHandler::_Process() } } -bool CZ3DGlowHandler::_Init( IDirect3DDevice8* pDevice, bool bLowSpec ) +bool CZ3DGlowHandler::_Init( IDirect3DDevice9* pDevice, bool bLowSpec ) { ms_pDevice = pDevice; @@ -123,7 +123,7 @@ bool CZ3DGlowHandler::_Init( IDirect3DDevice8* pDevice, bool bLowSpec ) ms_RenderViewport.Height = DWORD(fHeight); - IDirect3DSurface8* pCurrentDepth; + IDirect3DSurface9* pCurrentDepth; ms_pDevice->GetDepthStencilSurface( &pCurrentDepth ); D3DSURFACE_DESC sd; pCurrentDepth->GetDesc(&sd); @@ -232,7 +232,7 @@ void CZ3DGlowHandler::_PrepareGlowRender() ms_pDevice->GetDepthStencilSurface( &ms_pOldDepthBuffer ); // glow render target texture - IDirect3DSurface8* pRenderTarget = NULL; + IDirect3DSurface9* pRenderTarget = NULL; ms_pRenderTargetTexture->GetSurfaceLevel( 0, &pRenderTarget ); HRESULT hr = ms_pDevice->SetRenderTarget( pRenderTarget, ms_pRenderTargetDepth ); SAFE_RELEASE( pRenderTarget ); diff --git a/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.h b/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.h index da34828..a0d38ec 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DGlowHandler.h @@ -1,6 +1,6 @@ #pragma once -#include "d3dx8.h" +#include "d3dx9.h" #include #include @@ -44,7 +44,7 @@ public: ~CZ3DGlowHandler(); void SetLevel( int nLevel ); - void ApplySetting( IDirect3DDevice8* pDevice ); + void ApplySetting( IDirect3DDevice9* pDevice ); static void _SetRenderViewport( D3DVIEWPORT8& vp ); @@ -52,7 +52,7 @@ public: static void _Process(); // ī Ӵ ѹ ȣ - static bool _Init( IDirect3DDevice8* pDevice, bool bLowSpec = false ); + static bool _Init( IDirect3DDevice9* pDevice, bool bLowSpec = false ); static void _Close(); @@ -65,7 +65,7 @@ public: static Z3D_GLOW_CONSTANTS& _GetGlowConstantField( int nLevelIndex ); static void _AddGlowConstantKeyframe( int nLevelndex, D3DXCOLOR& c, int nDuration ); -static IDirect3DTexture8* TestGetRenderTexture() +static IDirect3DTexture9* TestGetRenderTexture() { return ms_pRenderTargetTexture; } @@ -82,12 +82,12 @@ private: std::list< CZ3DGlowHandler* >::iterator m_itrThis; - static IDirect3DDevice8* ms_pDevice; - static IDirect3DTexture8* ms_pRenderTargetTexture; - static IDirect3DSurface8* ms_pRenderTargetDepth; + static IDirect3DDevice9* ms_pDevice; + static IDirect3DTexture9* ms_pRenderTargetTexture; + static IDirect3DSurface9* ms_pRenderTargetDepth; - static IDirect3DSurface8* ms_pOldBackBuffer; - static IDirect3DSurface8* ms_pOldDepthBuffer; + static IDirect3DSurface9* ms_pOldBackBuffer; + static IDirect3DSurface9* ms_pOldDepthBuffer; static Z3D_GLOW_CONSTANTS ms_aGlowParameter[]; diff --git a/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.cpp b/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.cpp index eb82878..893a378 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.cpp @@ -77,7 +77,7 @@ void CZ3DGradeEffectHandler::SetLevel( int n ) } -void CZ3DGradeEffectHandler::ApplySetting( IDirect3DDevice8* pDevice ) +void CZ3DGradeEffectHandler::ApplySetting( IDirect3DDevice9* pDevice ) { if( 0 == m_nCurrentLevel ) { @@ -123,7 +123,7 @@ void CZ3DGradeEffectHandler::ApplySetting( IDirect3DDevice8* pDevice ) } -void CZ3DGradeEffectHandler::DisableSetting( IDirect3DDevice8* pDevice ) +void CZ3DGradeEffectHandler::DisableSetting( IDirect3DDevice9* pDevice ) { pDevice->SetTextureStageState( 1, D3DTSS_COLOROP, D3DTOP_DISABLE ); } diff --git a/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.h b/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.h index c8a9ee5..613fd6d 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DGradeEffectHandler.h @@ -1,7 +1,7 @@ #pragma once -#include "d3d8.h" -#include "d3dx8.h" +#include "d3d9.h" +#include "d3dx9.h" #include #include "Z3DTexture.h" @@ -22,8 +22,8 @@ public: ~CZ3DGradeEffectHandler(void); void SetLevel( int n ); - void ApplySetting( IDirect3DDevice8* pDevice ); - void DisableSetting( IDirect3DDevice8* pDevice ); + void ApplySetting( IDirect3DDevice9* pDevice ); + void DisableSetting( IDirect3DDevice9* pDevice ); void FrameMove(); diff --git a/Client/Engine/Zalla3D Scene Class/Z3DMath.h b/Client/Engine/Zalla3D Scene Class/Z3DMath.h index 285ee7e..b22499d 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DMath.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DMath.h @@ -18,7 +18,7 @@ #include "quaternion.h" #include "matrix.h" -#include +#include // dummy.. ӽÿ. extern vector3 g_vecDummy; diff --git a/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.cpp b/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.cpp index 9495fd6..d0bf278 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.cpp @@ -119,7 +119,7 @@ Z3DMultipartPortion::~Z3DMultipartPortion() // δ LODܰ躰 indexڷ vertex Ҵ -void Z3DMultipartPortion::BuildMesh( IDirect3DDevice8* pDevice ) +void Z3DMultipartPortion::BuildMesh( IDirect3DDevice9* pDevice ) { if( this != m_rpThis ) { @@ -624,7 +624,7 @@ bool Z3DMultipartPortion::BatchOpen() } -bool Z3DMultipartPortion::BatchClose( IDirect3DDevice8* pDevice ) +bool Z3DMultipartPortion::BatchClose( IDirect3DDevice9* pDevice ) { if( this != m_rpThis ) { @@ -654,7 +654,7 @@ bool Z3DMultipartPortion::BatchClose( IDirect3DDevice8* pDevice ) } -void Z3DMultipartPortion::CheckLoadedStatus( IDirect3DDevice8* pDevice ) +void Z3DMultipartPortion::CheckLoadedStatus( IDirect3DDevice9* pDevice ) { if( false == m_bNeedLoadedCheck ) { @@ -683,10 +683,10 @@ void Z3DMultipartPortion::CheckLoadedStatus( IDirect3DDevice8* pDevice ) } -IDirect3DVertexBuffer8* Z3DMultipartPortion::_GetVertexBufferInterface( IDirect3DDevice8* pDevice, long& rlVertexCount ) +IDirect3DVertexBuffer9* Z3DMultipartPortion::_GetVertexBufferInterface( IDirect3DDevice9* pDevice, long& rlVertexCount ) { -/* IDirect3DVertexBuffer8* pVB = NULL; +/* IDirect3DVertexBuffer9* pVB = NULL; Z3DVBCacheNode* pChainNode = ms_pVBCacheChainHeader; Z3DVBCacheNode* pPrevNode = NULL; @@ -763,7 +763,7 @@ IDirect3DVertexBuffer8* Z3DMultipartPortion::_GetVertexBufferInterface( IDirect3 } -void Z3DMultipartPortion::_ReleaseVertexBufferInterface( IDirect3DVertexBuffer8* pVB ) +void Z3DMultipartPortion::_ReleaseVertexBufferInterface( IDirect3DVertexBuffer9* pVB ) { @@ -808,9 +808,9 @@ void Z3DMultipartPortion::_ReleaseVertexBufferInterface( IDirect3DVertexBuffer8* } -IDirect3DIndexBuffer8* Z3DMultipartPortion::_GetIndexBufferInterface( long lLODIndex, IDirect3DDevice8* pDevice, long rlIndexCount ) +IDirect3DIndexBuffer9* Z3DMultipartPortion::_GetIndexBufferInterface( long lLODIndex, IDirect3DDevice9* pDevice, long rlIndexCount ) { -/* IDirect3DIndexBuffer8* pIB = NULL; +/* IDirect3DIndexBuffer9* pIB = NULL; Z3DIBCacheNode* pChainNode = ms_apIBCacheChainHeader[lLODIndex]; Z3DIBCacheNode* pPrevNode = NULL; @@ -863,7 +863,7 @@ IDirect3DIndexBuffer8* Z3DMultipartPortion::_GetIndexBufferInterface( long lLODI } -void Z3DMultipartPortion::_ReleaseIndexBufferInterface( long lLODIndex, IDirect3DIndexBuffer8* pIB ) +void Z3DMultipartPortion::_ReleaseIndexBufferInterface( long lLODIndex, IDirect3DIndexBuffer9* pIB ) { if( NULL == pIB ) { diff --git a/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.h b/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.h index 04889fd..a3deb56 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DMultipartPortion.h @@ -45,7 +45,7 @@ enum Z3D_MULTIPART_PORTION_TYPE { struct Z3DVBCacheNode { long lVertexCount; - IDirect3DVertexBuffer8* pVB; + IDirect3DVertexBuffer9* pVB; Z3DVBCacheNode* pNext; }; @@ -53,7 +53,7 @@ struct Z3DVBCacheNode struct Z3DIBCacheNode { long lIndexCount; - IDirect3DIndexBuffer8* pIB; + IDirect3DIndexBuffer9* pIB; Z3DIBCacheNode* pNext; }; @@ -67,9 +67,9 @@ public: Z3DMultipartPortion( Z3D_MULTIPART_PORTION_TYPE mpt = Z3D_MPT_TEXPIECE ); ~Z3DMultipartPortion(); - void CheckLoadedStatus( IDirect3DDevice8* pDevice ); // ε ϷǾ Ȯϰ ϷǾ BuildMesh() ȣ + void CheckLoadedStatus( IDirect3DDevice9* pDevice ); // ε ϷǾ Ȯϰ ϷǾ BuildMesh() ȣ - void BuildMesh( IDirect3DDevice8* pDevice ); + void BuildMesh( IDirect3DDevice9* pDevice ); bool SetMesh( const int nPartId, Z3DLODMesh* pMesh ); bool DeleteMesh( const int nPartId ); @@ -79,7 +79,7 @@ public: bool DeleteTexPiece( const int nPartId ); bool BatchOpen(); - bool BatchClose( IDirect3DDevice8* pDevice ); + bool BatchClose( IDirect3DDevice9* pDevice ); bool SetTexture( const int nPartId, Z3DTexture* pTexture ); bool SetTexture2( const int nPartId, Z3DTexture* pTexture ); @@ -89,11 +89,11 @@ public: bool SetGradeEffectIndex( const int nPartId, const int nIndex ); bool SetGlowIndex( const int nPartId, const int nIndex ); - static IDirect3DVertexBuffer8* _GetVertexBufferInterface( IDirect3DDevice8* pDevice, long& rlVertexCount ); - static void _ReleaseVertexBufferInterface( IDirect3DVertexBuffer8* pVB ); + static IDirect3DVertexBuffer9* _GetVertexBufferInterface( IDirect3DDevice9* pDevice, long& rlVertexCount ); + static void _ReleaseVertexBufferInterface( IDirect3DVertexBuffer9* pVB ); - static IDirect3DIndexBuffer8* _GetIndexBufferInterface( long lLODIndex, IDirect3DDevice8* pDevice, long rlIndexCount ); - static void _ReleaseIndexBufferInterface( long lLODIndex, IDirect3DIndexBuffer8* pIB ); + static IDirect3DIndexBuffer9* _GetIndexBufferInterface( long lLODIndex, IDirect3DDevice9* pDevice, long rlIndexCount ); + static void _ReleaseIndexBufferInterface( long lLODIndex, IDirect3DIndexBuffer9* pIB ); static void _Close(); @@ -110,10 +110,10 @@ public: // std::map m_map_IdMeshTag; std::map m_map_Id2MeshData; - IDirect3DVertexBuffer8* m_pVertexBuffer; + IDirect3DVertexBuffer9* m_pVertexBuffer; long m_lVertexCount; - IDirect3DIndexBuffer8* m_apIndexBuffer[Z3D_LOD_LEVEL]; + IDirect3DIndexBuffer9* m_apIndexBuffer[Z3D_LOD_LEVEL]; long m_alIndexCount[Z3D_LOD_LEVEL]; std::map m_map_IdTexPieceTag; diff --git a/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.cpp b/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.cpp index c07f3ab..55a7050 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.cpp @@ -875,7 +875,7 @@ void CZ3DMultipartSkin::Render() } -void CZ3DMultipartSkin::RenderShadow( IDirect3DDevice8* pDevice, DWORD vertexShader, int nLevel ) +void CZ3DMultipartSkin::RenderShadow( IDirect3DDevice9* pDevice, DWORD vertexShader, int nLevel ) { if( this != m_rpThis ) { @@ -969,7 +969,7 @@ void CZ3DMultipartSkin::RenderShadow( IDirect3DDevice8* pDevice, DWORD vertexSha } -void CZ3DMultipartSkin::RenderGlowShape( IDirect3DDevice8* pDevice ) +void CZ3DMultipartSkin::RenderGlowShape( IDirect3DDevice9* pDevice ) { if( this != m_rpThis ) { diff --git a/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.h b/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.h index 2b66626..efc5f1b 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DMultipartSkin.h @@ -31,7 +31,7 @@ public: m_rpThis = this; // set 0xFFFFFFFF to mean 'instance manages texture' - m_pTexture = (IDirect3DTexture8*)0xFFFFFFFF; + m_pTexture = (IDirect3DTexture9*)0xFFFFFFFF; m_rpSkeleton = NULL; m_rpSkeletonLocalizer = NULL; @@ -191,8 +191,8 @@ public: m_lAniLODCounter = 0; // reset counter } - void RenderShadow( IDirect3DDevice8* pDevice, DWORD vertexShader = 0xFFFFFFFF, int nLevel = -1 ); - void RenderGlowShape( IDirect3DDevice8* pDevice ); + void RenderShadow( IDirect3DDevice9* pDevice, DWORD vertexShader = 0xFFFFFFFF, int nLevel = -1 ); + void RenderGlowShape( IDirect3DDevice9* pDevice ); bool CheckRecalcByAniLOD() { diff --git a/Client/Engine/Zalla3D Scene Class/Z3DObject.h b/Client/Engine/Zalla3D Scene Class/Z3DObject.h index f61f5e3..b584b02 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DObject.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DObject.h @@ -10,7 +10,7 @@ #endif // _MSC_VER > 1000 //#include -#include +#include #include "misc.h" diff --git a/Client/Engine/Zalla3D Scene Class/Z3DRenderable.cpp b/Client/Engine/Zalla3D Scene Class/Z3DRenderable.cpp index 9d92434..4085a88 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DRenderable.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DRenderable.cpp @@ -11,7 +11,7 @@ #include "GMMemory.h" -IDirect3DDevice8* CZ3DRenderable::ms_pDevice; +IDirect3DDevice9* CZ3DRenderable::ms_pDevice; std::list CZ3DRenderable::ms_listpObjects; std::vector CZ3DRenderable::ms_vec_pRenderObjects; std::vector CZ3DRenderable::ms_vec_pSecondRenderObjects; @@ -157,13 +157,13 @@ void CZ3DRenderable::Process() // render CZ3DRenderable* pRenderable; GetDevice()->SetTexture( 0, NULL ); - IDirect3DTexture8* pPrevTexture = NULL; + IDirect3DTexture9* pPrevTexture = NULL; for( int i = 0; i < (int)ms_vec_pRenderObjects.size(); i++ ) { pRenderable = ms_vec_pRenderObjects[i]; if( pPrevTexture != pRenderable->GetTexturePtr() && - (IDirect3DTexture8*)0xFFFFFFFF != pRenderable->GetTexturePtr() ) + (IDirect3DTexture9*)0xFFFFFFFF != pRenderable->GetTexturePtr() ) { // texture change GetDevice()->SetTexture( 0, pRenderable->GetTexturePtr() ); @@ -273,12 +273,12 @@ void CZ3DRenderable::SecondProcess() // render CZ3DRenderable* pRenderable; GetDevice()->SetTexture( 0, NULL ); - IDirect3DTexture8* pPrevTexture = NULL; + IDirect3DTexture9* pPrevTexture = NULL; for( int i = 0; i < (int)ms_vec_pSecondRenderObjects.size(); i++ ) { pRenderable = ms_vec_pSecondRenderObjects[i]; if( pPrevTexture != pRenderable->GetTexturePtr() && - (IDirect3DTexture8*)0xFFFFFFFF != pRenderable->GetTexturePtr() ) + (IDirect3DTexture9*)0xFFFFFFFF != pRenderable->GetTexturePtr() ) { // texture change GetDevice()->SetTexture( 0, pRenderable->GetTexturePtr() ); diff --git a/Client/Engine/Zalla3D Scene Class/Z3DRenderable.h b/Client/Engine/Zalla3D Scene Class/Z3DRenderable.h index ec54a89..02ff65c 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DRenderable.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DRenderable.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include "misc.h" @@ -73,8 +73,8 @@ public: return m_fTranparency; } - IDirect3DTexture8* GetTexturePtr() { return m_pTexture; } - void SetTexturePtr( IDirect3DTexture8* pTexture ) + IDirect3DTexture9* GetTexturePtr() { return m_pTexture; } + void SetTexturePtr( IDirect3DTexture9* pTexture ) { _ASSERT( pTexture ); @@ -116,7 +116,7 @@ public: return; } - if( m_pTexture != (IDirect3DTexture8*)0xFFFFFFFF ) + if( m_pTexture != (IDirect3DTexture9*)0xFFFFFFFF ) { GetDevice()->SetTexture( 0, m_pTexture ); } @@ -158,7 +158,7 @@ public: static bool _Init(PDIRECT3DDEVICE8 pDevice); static bool _Close(); - static IDirect3DDevice8* GetDevice() + static IDirect3DDevice9* GetDevice() { _ASSERT( ms_pDevice ); @@ -175,7 +175,7 @@ protected: bool m_bIndividualRender; bool m_bCull; - IDirect3DTexture8* m_pTexture; + IDirect3DTexture9* m_pTexture; std::list::iterator m_iterThis; @@ -183,7 +183,7 @@ protected: float m_fTranparency; - static IDirect3DDevice8* ms_pDevice; + static IDirect3DDevice9* ms_pDevice; static std::list ms_listpObjects; diff --git a/Client/Engine/Zalla3D Scene Class/Z3DTexture.cpp b/Client/Engine/Zalla3D Scene Class/Z3DTexture.cpp index 3af6a9c..530489d 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DTexture.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DTexture.cpp @@ -8,7 +8,7 @@ #include "GMMemory.h" -IDirect3DDevice8* Z3DTexture::ms_pDevice = NULL; +IDirect3DDevice9* Z3DTexture::ms_pDevice = NULL; //char* Z3DTexture::ms_szDataPath = NULL; SimpleString Z3DTexture::ms_strDataPath; long Z3DTexture::ms_lDetailLevel = 0; @@ -17,11 +17,11 @@ long Z3DTexture::ms_lMaxCacheCount; long Z3DTexture::ms_lCacheCount; Z3DTextureCacheNode* Z3DTexture::ms_pCacheChainHeader; -IDirect3DTexture8* Z3DTexture::ms_pNullTexture = NULL; +IDirect3DTexture9* Z3DTexture::ms_pNullTexture = NULL; bool Z3DTexture::ms_bNullTextureMode = false; -bool Z3DTexture::_Init( IDirect3DDevice8* pDevice, const char* szPath, long level, long lMaxCacheCount ) +bool Z3DTexture::_Init( IDirect3DDevice9* pDevice, const char* szPath, long level, long lMaxCacheCount ) { _ASSERT( pDevice ); ms_pDevice = pDevice; @@ -88,9 +88,9 @@ void Z3DTexture::_Close() } } -IDirect3DTexture8* Z3DTexture::_GetD3DTextureInterface( long lWidth, long lHeight, long lMipCount, D3DFORMAT fmt ) +IDirect3DTexture9* Z3DTexture::_GetD3DTextureInterface( long lWidth, long lHeight, long lMipCount, D3DFORMAT fmt ) { - IDirect3DTexture8* pTexture = NULL; + IDirect3DTexture9* pTexture = NULL; Z3DTextureCacheNode* pChainNode = ms_pCacheChainHeader; Z3DTextureCacheNode* pPrevNode = NULL; @@ -139,7 +139,7 @@ IDirect3DTexture8* Z3DTexture::_GetD3DTextureInterface( long lWidth, long lHeigh return pTexture; } -void Z3DTexture::_ReleaseD3DTextureInterface( IDirect3DTexture8* pTexture ) +void Z3DTexture::_ReleaseD3DTextureInterface( IDirect3DTexture9* pTexture ) { if( NULL == pTexture ) { @@ -630,15 +630,15 @@ bool Z3DTexture::Convert( const D3DFORMAT targetFormat ) int l = m_pTexture->GetLevelCount(); - IDirect3DTexture8* pTextureDest = NULL; + IDirect3DTexture9* pTextureDest = NULL; if( FAILED( ms_pDevice->CreateTexture( sd.Width, sd.Width, l, 0, targetFormat, D3DPOOL_MANAGED, &pTextureDest ) ) ) { return false; } - IDirect3DSurface8* pSurfSrc = NULL; - IDirect3DSurface8* pSurfDest = NULL; + IDirect3DSurface9* pSurfSrc = NULL; + IDirect3DSurface9* pSurfDest = NULL; for( int i = 0; i < l; i++ ) { @@ -658,7 +658,7 @@ bool Z3DTexture::Convert( const D3DFORMAT targetFormat ) return true; } -IDirect3DTexture8* Z3DTexture::GetD3dTexture() +IDirect3DTexture9* Z3DTexture::GetD3dTexture() { if (ms_bNullTextureMode) { diff --git a/Client/Engine/Zalla3D Scene Class/Z3DTexture.h b/Client/Engine/Zalla3D Scene Class/Z3DTexture.h index 10ef250..3569437 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DTexture.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DTexture.h @@ -11,8 +11,8 @@ #include "misc.h" #include "SimpleString.h" -#include -#include +#include +#include #include #include @@ -27,7 +27,7 @@ struct Z3DTextureCacheNode long lHeight; long lMipCount; D3DFORMAT format; - IDirect3DTexture8* pTexture; + IDirect3DTexture9* pTexture; Z3DTextureCacheNode* pNext; }; @@ -85,11 +85,11 @@ public: return sd.Format; } - IDirect3DTexture8* GetD3dTexture(); + IDirect3DTexture9* GetD3dTexture(); - static bool _Init( IDirect3DDevice8* pDevice, const char* szPath, long level = 0, long lMaxCacheCount = 20 ); + static bool _Init( IDirect3DDevice9* pDevice, const char* szPath, long level = 0, long lMaxCacheCount = 20 ); static void _Close(); @@ -98,21 +98,21 @@ public: return ms_lDetailLevel; } - static IDirect3DTexture8* _GetD3DTextureInterface( long lWidth, long lHeight, long lMipCount, D3DFORMAT fmt ); - static void _ReleaseD3DTextureInterface( IDirect3DTexture8* pTexture ); + static IDirect3DTexture9* _GetD3DTextureInterface( long lWidth, long lHeight, long lMipCount, D3DFORMAT fmt ); + static void _ReleaseD3DTextureInterface( IDirect3DTexture9* pTexture ); static void NullTextureMode(bool bNullTexture); protected: - IDirect3DTexture8* m_pTexture; + IDirect3DTexture9* m_pTexture; - static IDirect3DDevice8* ms_pDevice; + static IDirect3DDevice9* ms_pDevice; //static char* ms_szDataPath; static SimpleString ms_strDataPath; static long ms_lDetailLevel; - static IDirect3DTexture8* ms_pNullTexture; + static IDirect3DTexture9* ms_pNullTexture; static bool ms_bNullTextureMode; // ij Ʈ. SLL ̸ ߰ header, tail Ͼ diff --git a/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.cpp b/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.cpp index a1491e2..5d4d80e 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.cpp @@ -84,7 +84,7 @@ bool Z3DTexturePiece::Load( const char* szFileName ) } -bool Z3DTexturePiece::Blt2Texture( IDirect3DTexture8* pTex ) +bool Z3DTexturePiece::Blt2Texture( IDirect3DTexture9* pTex ) { _ASSERT( pTex ); diff --git a/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.h b/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.h index 52b78c5..154d83f 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.h +++ b/Client/Engine/Zalla3D Scene Class/Z3DTexturePiece.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include #include #include "misc.h" @@ -62,7 +62,7 @@ struct Z3DTexturePiece bool Load( const char* szFileName ); - bool Blt2Texture( IDirect3DTexture8* pTex ); + bool Blt2Texture( IDirect3DTexture9* pTex ); }; diff --git a/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.cpp b/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.cpp index 8ea357d..4491dd4 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.cpp +++ b/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.cpp @@ -68,7 +68,7 @@ CZ3DMapTok2FileName g_MapEvent2SndFile; -bool _Z3DGlobalInit( const char* szDataRoot, IDirect3DDevice8* pDevice ) +bool _Z3DGlobalInit( const char* szDataRoot, IDirect3DDevice9* pDevice ) { char szFullPath[300]; @@ -131,7 +131,7 @@ bool _Z3DGlobalInit( const char* szDataRoot, IDirect3DDevice8* pDevice ) } -void _Z3DGlobalClose( IDirect3DDevice8* pDevice ) +void _Z3DGlobalClose( IDirect3DDevice9* pDevice ) { /*if( g_dwAMeshVertexShader ) { diff --git a/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.h b/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.h index 9a14714..f26e08f 100644 --- a/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.h +++ b/Client/Engine/Zalla3D Scene Class/Z3D_GLOBALS.h @@ -77,7 +77,7 @@ extern CZ3DMapTok2FileName g_MapEvent2SndFile; //extern DWORD g_dwAMeshVertexShader; -bool _Z3DGlobalInit( const char* szDataRoot, IDirect3DDevice8* pDevice ); -void _Z3DGlobalClose( IDirect3DDevice8* pDevice ); +bool _Z3DGlobalInit( const char* szDataRoot, IDirect3DDevice9* pDevice ); +void _Z3DGlobalClose( IDirect3DDevice9* pDevice ); #endif // !defined(AFX_Z3D_GLOBALS_H__C9E8B261_2F2A_11D5_A644_0000E8EB4C69__INCLUDED_) diff --git a/Client/Engine/Zalla3D Scene Class/misc.h b/Client/Engine/Zalla3D Scene Class/misc.h index f79b0b6..32a08ad 100644 --- a/Client/Engine/Zalla3D Scene Class/misc.h +++ b/Client/Engine/Zalla3D Scene Class/misc.h @@ -13,7 +13,7 @@ //#define _ASSERT(p) ((void)(p)) #include -#include +#include #include #ifdef _DEBUG diff --git a/Client/Engine/Zalla3D Scene Class/wadloader.cpp b/Client/Engine/Zalla3D Scene Class/wadloader.cpp index 37e561b..05335f2 100644 --- a/Client/Engine/Zalla3D Scene Class/wadloader.cpp +++ b/Client/Engine/Zalla3D Scene Class/wadloader.cpp @@ -120,7 +120,7 @@ int CMeshMorph::UpdateMesh(D3DXVECTOR3 center,D3DXVECTOR3 user){ } return frame; } -bool CMeshMorph::LoadWadfile(char *filename,LPDIRECT3DDEVICE8 device) { +bool CMeshMorph::LoadWadfile(char *filename,LPDIRECT3DDEVICE9 device) { char buf[BUF_SIZE] = {0}; char *tmp_ptr = NULL; @@ -354,7 +354,7 @@ bool CMeshMorph::LoadWadfile(char *filename,LPDIRECT3DDEVICE8 device) { return true; } -int CMeshMorph::Render(LPDIRECT3DDEVICE8 device,D3DXVECTOR3 vecCenter) { +int CMeshMorph::Render(LPDIRECT3DDEVICE9 device,D3DXVECTOR3 vecCenter) { int i,j; int tex_id; int tex_i; @@ -586,7 +586,7 @@ int CMeshMorph::Render(LPDIRECT3DDEVICE8 device,D3DXVECTOR3 vecCenter) { device->SetTransform(D3DTS_WORLD,&back); return frame; } -D3DXMATRIX CMeshMorph ::RotateObject(LPDIRECT3DDEVICE8 d_device,int object_index,float frame,D3DXMATRIX *w) { +D3DXMATRIX CMeshMorph ::RotateObject(LPDIRECT3DDEVICE9 d_device,int object_index,float frame,D3DXMATRIX *w) { D3DXMATRIX trans; D3DXMATRIX tk; @@ -637,7 +637,7 @@ D3DXMATRIX CMeshMorph ::RotateObject(LPDIRECT3DDEVICE8 d_device,int object_index } } -D3DXMATRIX CMeshMorph::TranslateObject(LPDIRECT3DDEVICE8 d_device,int object_index,float frame,D3DXMATRIX *w) { +D3DXMATRIX CMeshMorph::TranslateObject(LPDIRECT3DDEVICE9 d_device,int object_index,float frame,D3DXMATRIX *w) { int k = 0; double interpol = 0.0; D3DXVECTOR3 tmp_pos; @@ -711,7 +711,7 @@ D3DXMATRIX CMeshMorph::TranslateObject(LPDIRECT3DDEVICE8 d_device,int object_ind return ta; } } -void CMeshMorph::Create_Vertex(int i,LPDIRECT3DDEVICE8 device) { +void CMeshMorph::Create_Vertex(int i,LPDIRECT3DDEVICE9 device) { int index_num = Model.pobject[i].face_num; if(Model.pobject[i].btexture) { device->CreateVertexBuffer( index_num*sizeof(custom_vertex) * 3,0, @@ -909,7 +909,7 @@ void CMeshMorph::vertex_interpolation(int object_index,float now_frame) { } } -void CMeshMorph ::CreateTexture(LPDIRECT3DDEVICE8 device) { +void CMeshMorph ::CreateTexture(LPDIRECT3DDEVICE9 device) { int i,j; int texture_num = 0; diff --git a/Client/Engine/Zalla3D Scene Class/wadloader.h b/Client/Engine/Zalla3D Scene Class/wadloader.h index de50034..58e012f 100644 --- a/Client/Engine/Zalla3D Scene Class/wadloader.h +++ b/Client/Engine/Zalla3D Scene Class/wadloader.h @@ -7,8 +7,8 @@ #include "asedefine.h" #include "texture.h" #include "BaseDataDefine.h" -#include -#include +#include +#include #define WAD_FILE "GEMDatafile" #define VOT 1.0f @@ -24,14 +24,14 @@ public: ~CMeshMorph(); - bool LoadWadfile(char *filename,LPDIRECT3DDEVICE8 ); - int Render(LPDIRECT3DDEVICE8 ,D3DXVECTOR3 ); - D3DXMATRIX RotateObject(LPDIRECT3DDEVICE8 ,int object_index,float frame,D3DXMATRIX *w); - D3DXMATRIX TranslateObject(LPDIRECT3DDEVICE8 d_device,int object_index,float frame,D3DXMATRIX *w); + bool LoadWadfile(char *filename,LPDIRECT3DDEVICE9 ); + int Render(LPDIRECT3DDEVICE9 ,D3DXVECTOR3 ); + D3DXMATRIX RotateObject(LPDIRECT3DDEVICE9 ,int object_index,float frame,D3DXMATRIX *w); + D3DXMATRIX TranslateObject(LPDIRECT3DDEVICE9 d_device,int object_index,float frame,D3DXMATRIX *w); void vertex_interpolation(int object_index,float now_frame); void Change_Vertexbuffer(int object_index); - void Create_Vertex(int i,LPDIRECT3DDEVICE8 ); - void CreateTexture(LPDIRECT3DDEVICE8 device); + void Create_Vertex(int i,LPDIRECT3DDEVICE9 ); + void CreateTexture(LPDIRECT3DDEVICE9 device); void LoadSubface(int object_index); void SetNullTexture(bool b) {m_NullTexture = b;} int UpdateMesh(D3DXVECTOR3 ,D3DXVECTOR3 ); diff --git a/Client/Tools/ClientSetup/ClientSetupDlg.h b/Client/Tools/ClientSetup/ClientSetupDlg.h index 0bfd73b..a201fb2 100644 --- a/Client/Tools/ClientSetup/ClientSetupDlg.h +++ b/Client/Tools/ClientSetup/ClientSetupDlg.h @@ -4,7 +4,7 @@ #pragma once #include "afxwin.h" #include "afxcmn.h" -#include +#include namespace RYLMAINWINDOW diff --git a/Client/Tools/ClientSetup/SystemInfo.cpp b/Client/Tools/ClientSetup/SystemInfo.cpp index 0f4e575..037a682 100644 --- a/Client/Tools/ClientSetup/SystemInfo.cpp +++ b/Client/Tools/ClientSetup/SystemInfo.cpp @@ -374,7 +374,7 @@ BOOL CSystemInfo::GetSoundCardInfo(void) return FALSE; } -typedef IDirect3D8 * (WINAPI* Direct3DCreate8_PROC) (UINT SDKVersion); +typedef IDirect3D9 * (WINAPI* Direct3DCreate8_PROC) (UINT SDKVersion); HRESULT CSystemInfo::EnumulationD3D(void) { @@ -385,7 +385,7 @@ HRESULT CSystemInfo::EnumulationD3D(void) } Direct3DCreate8_PROC d3dCreate; - d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate8"); + d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate9"); if(!d3dCreate) { @@ -896,7 +896,7 @@ BOOL CSystemInfo::FindDepthStencilFormat(UINT iAdapter, D3DDEVTYPE DeviceType, D return FALSE; } -HRESULT CSystemInfo::ConfirmDevice(D3DCAPS8 *, DWORD, D3DFORMAT) +HRESULT CSystemInfo::ConfirmDevice(D3DCAPS9 *, DWORD, D3DFORMAT) { return S_OK; } @@ -1004,7 +1004,7 @@ BOOL CSystemInfo::GetAvailableCompressTexture(D3DFORMAT d3dFormat) } Direct3DCreate8_PROC d3dCreate; - d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate8"); + d3dCreate = (Direct3DCreate8_PROC)GetProcAddress(hLibrary, "Direct3DCreate9"); if(!d3dCreate) { diff --git a/Client/Tools/ClientSetup/SystemInfo.h b/Client/Tools/ClientSetup/SystemInfo.h index 4674b3b..3b8ec5f 100644 --- a/Client/Tools/ClientSetup/SystemInfo.h +++ b/Client/Tools/ClientSetup/SystemInfo.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include namespace SystemInfo @@ -31,7 +31,7 @@ namespace SystemInfo { // Device data D3DDEVTYPE DeviceType; // Reference, HAL, etc. - D3DCAPS8 d3dCaps; // Capabilities of this device + D3DCAPS9 d3dCaps; // Capabilities of this device const TCHAR* strDesc; // Name of this device BOOL bCanDoWindowed; // Whether this device can work in windowed mode @@ -60,7 +60,7 @@ namespace SystemInfo { // Device data D3DDEVTYPE DeviceType; // Reference, HAL, etc. - D3DCAPS8 d3dCaps; // Capabilities of this device + D3DCAPS9 d3dCaps; // Capabilities of this device const TCHAR* strDesc; // Name of this device BOOL bCanDoWindowed; // Whether this device can work in windowed mode @@ -85,7 +85,7 @@ namespace SystemInfo struct D3DAdapterInfo { // Adapter data - D3DADAPTER_IDENTIFIER8 d3dAdapterIdentifier; + D3DADAPTER_IDENTIFIER9 d3dAdapterIdentifier; D3DDISPLAYMODE d3ddmDesktop; // Desktop display mode for this adapter // Devices for this adapter @@ -119,7 +119,7 @@ namespace SystemInfo unsigned long m_dwMinDepthBits; // ּ Ʈ unsigned long m_dwMinStencilBits; // ּ ٽ Ʈ - HRESULT ConfirmDevice(D3DCAPS8*,DWORD,D3DFORMAT); + HRESULT ConfirmDevice(D3DCAPS9*,DWORD,D3DFORMAT); BOOL FindDepthStencilFormat(UINT iAdapter, D3DDEVTYPE DeviceType, D3DFORMAT TargetFormat, D3DFORMAT *pDepthStencilFormat); OSVERSIONINFOEX m_osvi; @@ -135,7 +135,7 @@ namespace SystemInfo char m_strSoundCard[MAX_PATH]; char m_strSoundCardVersion[MAX_PATH]; - LPDIRECT3D8 m_lpD3D; + LPDIRECT3D9 m_lpD3D; DDCAPS m_ddHALCaps, m_ddHELCaps; diff --git a/Client/Tools/Launcher/RYLLogin_P2_foreign.vcproj b/Client/Tools/Launcher/RYLLogin_P2_foreign.vcproj index 59986f3..a1ed7bb 100644 --- a/Client/Tools/Launcher/RYLLogin_P2_foreign.vcproj +++ b/Client/Tools/Launcher/RYLLogin_P2_foreign.vcproj @@ -105,7 +105,7 @@ Name="VCCustomBuildTool"/> Default - dxguid.lib;dsound.lib;dxerr8.lib;Ws2_32.lib;ogg_static_d.lib;vorbis_static_d.lib;vorbisenc_static_d.lib;vorbisfile_static_d.lib;wininet.lib;soundlib_d.lib;ZipArchive_MFCSTATIC_d.lib;%(AdditionalDependencies) + dxguid.lib;dsound.lib;dxerr.lib;Ws2_32.lib;ogg_static_d.lib;vorbis_static_d.lib;vorbisenc_static_d.lib;vorbisfile_static_d.lib;wininet.lib;soundlib_d.lib;ZipArchive_MFCSTATIC_d.lib;%(AdditionalDependencies) $(Configuration)/Login.exe true ../SoundLib/Lib;../ZipArchive/Lib;../../Engine/SoundLib/vorbis_sdk/lib;../../Client/RYLClient/MyFirewall;%(AdditionalLibraryDirectories) diff --git a/Client/Tools/LauncherMY/RYLLogin_MY.vcproj b/Client/Tools/LauncherMY/RYLLogin_MY.vcproj index 53e88a1..e2cad74 100644 --- a/Client/Tools/LauncherMY/RYLLogin_MY.vcproj +++ b/Client/Tools/LauncherMY/RYLLogin_MY.vcproj @@ -105,7 +105,7 @@ Name="VCCustomBuildTool"/> Default - dxguid.lib;dsound.lib;dxerr8.lib;Ws2_32.lib;ogg_static_d.lib;vorbis_static_d.lib;vorbisenc_static_d.lib;vorbisfile_static_d.lib;wininet.lib;soundlib_d.lib;ZipArchive_MFCSTATIC_d.lib;%(AdditionalDependencies) + dxguid.lib;dsound.lib;dxerr.lib;Ws2_32.lib;ogg_static_d.lib;vorbis_static_d.lib;vorbisenc_static_d.lib;vorbisfile_static_d.lib;wininet.lib;soundlib_d.lib;ZipArchive_MFCSTATIC_d.lib;%(AdditionalDependencies) $(Configuration)/Login.exe true ../SoundLib/Lib;../ZipArchive/Lib;../../Engine/SoundLib/vorbis_sdk/lib;../../Client/RYLClient/MyFirewall;%(AdditionalLibraryDirectories) diff --git a/DX8_TO_DX9_MIGRATION_PLAN.md b/DX8_TO_DX9_MIGRATION_PLAN.md new file mode 100644 index 0000000..87d72d0 --- /dev/null +++ b/DX8_TO_DX9_MIGRATION_PLAN.md @@ -0,0 +1,348 @@ +# DirectX 8 to DirectX 9 Migration Plan +## RiskYourLife Client + +--- + +## 1. 현재 DX8 사용 현황 분석 + +### 1.1 DX8 의존성 통계 +- **DX8 헤더 include 수**: 74개 파일 +- **DX8 인터페이스 사용**: 1002회 참조 +- **주요 링크 라이브러리**: + - `d3d8.lib` (2.4 KB) + - `d3dx8.lib` (2.1 MB) + - `d3dx8dt.lib` (2.7 MB - 디버그) + - `dxerr8.lib` (1.1 MB) + +### 1.2 핵심 DX8 인터페이스 사용 위치 + +#### A. 엔진 코어 (Zalla3D Base Class) +**파일**: `BaseGraphicsLayer.h` / `BaseGraphicsLayer.cpp` +```cpp +static LPDIRECT3DDEVICE8 m_pd3dDevice; +static LPDIRECT3D8 m_pD3D; +``` +- **역할**: 전체 그래픽 시스템의 루트 클래스 +- **영향도**: ⭐⭐⭐⭐⭐ (최상위 - 모든 렌더링 의존) + +**파일**: `RenderDevice.h` / `RenderDevice.cpp` +```cpp +LPDIRECT3DDEVICE8 m_pd3dDevice; +``` +- **역할**: 렌더링 디바이스 래퍼 +- **영향도**: ⭐⭐⭐⭐⭐ + +**파일**: `EnumD3D.h` / `EnumD3D.cpp` +```cpp +static LPDIRECT3D8 m_pD3D; +static D3DADAPTER_IDENTIFIER8 d3dAdapterIdentifier; +static D3DCAPS8 d3dCaps; +``` +- **역할**: 디바이스 열거 및 기능 확인 +- **영향도**: ⭐⭐⭐⭐ + +**파일**: `Texture.h` / `Texture.cpp`, `NTexture.h` / `NTexture.cpp` +- **역할**: 텍스처 관리 시스템 +- **DX8 함수**: `D3DXCreateTextureFromFile`, `CreateTexture` +- **영향도**: ⭐⭐⭐⭐ + +**파일**: `d3dfont.h` / `d3dfont.cpp` +- **역할**: 폰트 렌더링 +- **영향도**: ⭐⭐⭐ + +#### B. 엔진 렌더링 (Zalla3D Scene Class) +**주요 파일**: +- `Z3DRenderable.h/cpp` - 렌더링 가능 오브젝트 베이스 +- `Z3DTexture.h/cpp` - 텍스처 관리 +- `Z3DGeneralChrModel.h/cpp` - 캐릭터 모델 +- `Z3DMultipartSkin.h/cpp` - 멀티파트 스킨 시스템 +- `NMesh.h/cpp` - 메시 관리 +- `OctreeScene.h/cpp` - 옥트리 씬 +- `WaterW.h/cpp` - 워터 렌더링 +- `SectorScene.cpp` - 섹터 기반 씬 +- `SceneManager.cpp` - 씬 매니저 + +**영향도**: ⭐⭐⭐⭐ + +#### C. 이펙트 시스템 +**주요 파일**: +- `Effect/CGemRender.h/cpp` - 보석 렌더링 +- `Effect/EffMeshloader.h/cpp` - 이펙트 메시 로더 +- `Effect/SMRHeader.h/cpp` - SMR 포맷 +- `Effect/CEffscript.h/cpp` - 이펙트 스크립트 + +**영향도**: ⭐⭐⭐ + +#### D. 클라이언트 UI (RYLClient) +**주요 파일**: +- `RYLClient/Sprite.h` - 스프라이트 시스템 +- `RYLClient/RYLUI/RYLSpriteEX.h` - 확장 스프라이트 +- `RYLClient/GUITextEdit.h` - UI 텍스트 +- `RYLClient/GUITooltip.h` - 툴팁 + +**영향도**: ⭐⭐⭐ + +#### E. 카메라 및 액션 제어 +**주요 파일**: +- `CharacterActionControl/CameraControl.h` +- `CharacterActionControl/CCameraScript.h` + +**영향도**: ⭐⭐ + +### 1.3 D3DX8 헬퍼 함수 사용 현황 +**많이 사용되는 함수들**: +- `D3DXCreateTextureFromFile` / `D3DXCreateTextureFromFileEx` - 텍스처 로드 +- `D3DXLoadMeshFromX` - X파일 메시 로드 +- `D3DXMatrixMultiply` / `D3DXMatrixInverse` - 매트릭스 연산 +- `D3DXVec3TransformCoord` - 벡터 변환 +- `D3DXCreateFont` - 폰트 생성 + +**사용 파일**: 29개 파일 + +--- + +## 2. DX8 → DX9 주요 변경사항 + +### 2.1 인터페이스 버전 변경 +| DX8 | DX9 | +|-----|-----| +| `LPDIRECT3D8` | `LPDIRECT3D9` | +| `LPDIRECT3DDEVICE8` | `LPDIRECT3DDEVICE9` | +| `IDirect3DTexture8` | `IDirect3DTexture9` | +| `IDirect3DSurface8` | `IDirect3DSurface9` | +| `IDirect3DVertexBuffer8` | `IDirect3DVertexBuffer9` | +| `IDirect3DIndexBuffer8` | `IDirect3DIndexBuffer9` | +| `D3DCAPS8` | `D3DCAPS9` | +| `D3DADAPTER_IDENTIFIER8` | `D3DADAPTER_IDENTIFIER9` | + +### 2.2 헤더 파일 변경 +```cpp +// 변경 전 +#include +#include + +// 변경 후 +#include +#include +``` + +### 2.3 라이브러리 변경 +``` +d3d8.lib → d3d9.lib +d3dx8.lib → d3dx9.lib +d3dx8dt.lib → d3dx9d.lib (디버그) +dxerr8.lib → dxerr9.lib +``` + +### 2.4 디바이스 생성 변경 +```cpp +// DX8 +Direct3DCreate8(D3D_SDK_VERSION); +CreateDevice(..., &d3dpp, &m_pd3dDevice); + +// DX9 +Direct3DCreate9(D3D_SDK_VERSION); +CreateDevice(..., &d3dpp, &m_pd3dDevice); +``` + +### 2.5 Present 파라미터 변경 +```cpp +// DX8 +D3DPRESENT_PARAMETERS d3dpp; + +// DX9 - 동일하지만 일부 플래그 추가됨 +D3DPRESENT_PARAMETERS d3dpp; +// PresentationInterval 옵션 확장 +``` + +### 2.6 셰이더 관련 변경 +- **Vertex Shader**: 버전 1.x → 2.0/3.0 지원 +- **Pixel Shader**: 버전 1.x → 2.0/3.0 지원 +- 셰이더 상수 테이블 관리 개선 + +### 2.7 리소스 관리 변경 +- **Lock 플래그**: `D3DLOCK_NOSYSLOCK` 제거됨 +- **쿼리 시스템**: 새로운 쿼리 인터페이스 추가 + +--- + +## 3. 마이그레이션 전략 + +### 3.1 단계별 접근 (Phase-by-Phase) + +#### **Phase 1: 준비 단계** ✅ +- [x] 현재 코드 분석 완료 +- [x] DX9 SDK 설치 확인 +- [x] dx9 브랜치 생성 +- [ ] DX9 라이브러리 준비 + +#### **Phase 2: 코어 인터페이스 변환** (우선순위: 최상) +1. **EnumD3D.h/cpp** - 디바이스 열거 시스템 + - `LPDIRECT3D8` → `LPDIRECT3D9` + - `D3DCAPS8` → `D3DCAPS9` + - `D3DADAPTER_IDENTIFIER8` → `D3DADAPTER_IDENTIFIER9` + - `Direct3DCreate8()` → `Direct3DCreate9()` + +2. **BaseGraphicsLayer.h/cpp** - 그래픽 시스템 루트 + - `LPDIRECT3DDEVICE8` → `LPDIRECT3DDEVICE9` + - `LPDIRECT3D8` → `LPDIRECT3D9` + - 디바이스 생성 코드 수정 + +3. **RenderDevice.h/cpp** - 렌더 디바이스 + - `LPDIRECT3DDEVICE8` → `LPDIRECT3DDEVICE9` + +#### **Phase 3: 텍스처 및 리소스 시스템** (우선순위: 상) +4. **Texture.h/cpp, NTexture.h/cpp** - 텍스처 관리 + - `IDirect3DTexture8` → `IDirect3DTexture9` + - `IDirect3DSurface8` → `IDirect3DSurface9` + - `D3DXCreateTextureFromFile` 호환성 확인 + +5. **VertexBuffer.h/cpp** - 버텍스 버퍼 + - `IDirect3DVertexBuffer8` → `IDirect3DVertexBuffer9` + - `IDirect3DIndexBuffer8` → `IDirect3DIndexBuffer9` + +6. **RenderTexture.h/cpp, RenderTargetTexture.h/cpp** + - 렌더 타겟 관련 코드 업데이트 + +#### **Phase 4: 렌더링 시스템** (우선순위: 상) +7. **Zalla3D Scene Class** - 씬 렌더링 + - `Z3DRenderable.h/cpp` + - `Z3DTexture.h/cpp` + - `Z3DGeneralChrModel.h/cpp` + - `Z3DMultipartSkin.h/cpp` + - `NMesh.h/cpp` + - `OctreeScene.h/cpp` + +8. **Effect 시스템** + - `EffMeshloader.h/cpp` + - `SMRHeader.h/cpp` + - `CGemRender.h/cpp` + +#### **Phase 5: UI 및 폰트** (우선순위: 중) +9. **d3dfont.h/cpp** - 폰트 시스템 + - `ID3DXFont` 인터페이스 업데이트 + +10. **Sprite 시스템** + - `Sprite.h` + - `RYLSpriteEX.h` + +#### **Phase 6: 고급 기능** (우선순위: 중) +11. **셰이더 시스템** + - 버텍스/픽셀 셰이더 코드 검토 + - 셰이더 버전 확인 및 업데이트 + +12. **워터 및 특수 효과** + - `WaterW.h/cpp` + - `WaterScene.h/cpp` + +#### **Phase 7: 프로젝트 설정** (우선순위: 최상) +13. **vcxproj 파일 수정** + - 링크 라이브러리 변경 + - 인클루드 경로 업데이트 + - 프리프로세서 정의 수정 + +#### **Phase 8: 테스트 및 검증** (우선순위: 최상) +14. **빌드 및 테스트** + - 컴파일 오류 수정 + - 런타임 테스트 + - 성능 비교 + - 렌더링 결과 검증 + +### 3.2 자동화 스크립트 +```bash +# 헤더 파일 일괄 변경 +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's///g' {} + +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's///g' {} + + +# 인터페이스 변경 +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/LPDIRECT3D8/LPDIRECT3D9/g' {} + +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/LPDIRECT3DDEVICE8/LPDIRECT3DDEVICE9/g' {} + +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/IDirect3DTexture8/IDirect3DTexture9/g' {} + +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/IDirect3DSurface8/IDirect3DSurface9/g' {} + +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/IDirect3DVertexBuffer8/IDirect3DVertexBuffer9/g' {} + +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/IDirect3DIndexBuffer8/IDirect3DIndexBuffer9/g' {} + + +# 구조체 변경 +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/D3DCAPS8/D3DCAPS9/g' {} + +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/D3DADAPTER_IDENTIFIER8/D3DADAPTER_IDENTIFIER9/g' {} + + +# API 함수 변경 +find . -type f \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/Direct3DCreate8/Direct3DCreate9/g' {} + +``` + +--- + +## 4. 리스크 및 주의사항 + +### 4.1 높은 리스크 영역 +1. **셰이더 코드**: 버전 차이로 인한 호환성 문제 가능 +2. **렌더 스테이트**: 일부 스테이트 동작 변경 +3. **텍스처 포맷**: 일부 포맷 지원 차이 +4. **성능**: DX9가 더 최적화되어 있을 수 있음 + +### 4.2 테스트 체크리스트 +- [ ] 디바이스 생성 및 초기화 +- [ ] 텍스처 로드 및 렌더링 +- [ ] 캐릭터 모델 렌더링 +- [ ] UI 렌더링 +- [ ] 이펙트 시스템 +- [ ] 폰트 렌더링 +- [ ] 워터 렌더링 +- [ ] 전체 게임 실행 + +--- + +## 5. DX9 SDK 요구사항 + +### 5.1 필요 파일 +- **Include**: `d3d9.h`, `d3dx9.h`, `d3dx9core.h`, `d3dx9math.h`, `d3dx9mesh.h`, `d3dx9tex.h` +- **Lib**: `d3d9.lib`, `d3dx9.lib`, `d3dx9d.lib`, `dxerr9.lib`, `dxguid.lib` +- **DLL**: `d3d9.dll`, `d3dx9_43.dll` (재배포 필요) + +### 5.2 SDK 버전 +- **권장**: DirectX 9.0c (August 2009) - 가장 안정적 +- **최소**: DirectX 9.0b + +--- + +## 6. 예상 작업 시간 + +| Phase | 작업 | 예상 시간 | +|-------|------|----------| +| 1 | 준비 | 0.5일 | +| 2 | 코어 인터페이스 | 1일 | +| 3 | 텍스처/리소스 | 1일 | +| 4 | 렌더링 시스템 | 2일 | +| 5 | UI/폰트 | 1일 | +| 6 | 고급 기능 | 1일 | +| 7 | 프로젝트 설정 | 0.5일 | +| 8 | 테스트/검증 | 2일 | +| **합계** | | **9일** | + +--- + +## 7. 롤백 계획 + +### 7.1 브랜치 전략 +- `master`: DX8 원본 유지 +- `dx9`: DX9 마이그레이션 작업 +- 문제 발생 시 언제든 master로 복귀 가능 + +### 7.2 백업 +- 현재 작업 중인 Client 디렉토리 전체 백업 권장 +- Git 커밋을 단계별로 세밀하게 진행 + +--- + +## 8. 다음 단계 + +1. ✅ 이 문서 검토 +2. ⏳ DX9 SDK 라이브러리 준비 +3. ⏳ Phase 2 시작: EnumD3D 변환 +4. ⏳ 단계별 커밋 및 테스트 + +--- + +**작성일**: 2025-11-30 +**작성자**: Claude (AI Assistant) +**현재 브랜치**: dx9