Merge pull request #110 from onurcan488/main

rtw1x1 · web-flow · commit 498c351d4cfe · 2026-02-18T15:52:06.000Z
diff --git a/src/GameLib/ActorInstance.cpp b/src/GameLib/ActorInstance.cpp
@@ -2,7 +2,7 @@
 #include "ActorInstance.h"
 #include "AreaTerrain.h"
 #include "RaceData.h"
-#include "SpeedTreeLib/SpeedTreeForestDirectX8.h"
+#include "SpeedTreeLib/SpeedTreeForestDirectX.h"
 #include "SpeedTreeLib/SpeedTreeWrapper.h"
 
 enum
@@ -813,7 +813,7 @@ void CActorInstance::__CreateTree(const char * c_szFileName)
 {
 	__DestroyTree();
 
-	CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();
+	CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();
 	m_pkTree=rkForest.CreateInstance(m_x, m_y, m_z, GetCaseCRC32(c_szFileName, strlen(c_szFileName)), c_szFileName);
 	m_pkTree->SetPosition(m_x, m_y, m_z);
 	m_pkTree->UpdateBoundingSphere();
@@ -825,7 +825,7 @@ void CActorInstance::__DestroyTree()
 	if (!m_pkTree)
 		return;
 
-	CSpeedTreeForestDirectX8::Instance().DeleteInstance(m_pkTree);
+	CSpeedTreeForestDirectX::Instance().DeleteInstance(m_pkTree);
 }
 
 void CActorInstance::__SetTreePosition(float fx, float fy, float fz)
diff --git a/src/GameLib/Area.cpp b/src/GameLib/Area.cpp
@@ -3,7 +3,7 @@
 #include "EterLib/ResourceManager.h"
 #include "EterLib/StateManager.h"
 #include "EffectLib/EffectManager.h"
-#include "SpeedTreeLib/SpeedTreeForestDirectX8.h"
+#include "SpeedTreeLib/SpeedTreeForestDirectX.h"
 #include "EterBase/Timer.h"
 
 #include "Area.h"
@@ -550,7 +550,7 @@ void CArea::__SetObjectInstance_SetTree(TObjectInstance * pObjectInstance, const
 
 void CArea::TObjectInstance::SetTree(float x, float y, float z, DWORD dwTreeCRC, const char* c_szTreeName)
 {
-	CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();
+	CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();
 	pTree=rkForest.CreateInstance(x, y, z, dwTreeCRC, c_szTreeName);
 	dwType = prt::PROPERTY_TYPE_TREE;
 }
@@ -1106,7 +1106,7 @@ void CArea::__Clear_DestroyObjectInstance(TObjectInstance * pObjectInstance)
 	if (pObjectInstance->pTree)
 	{
 		pObjectInstance->pTree->Clear();
-		CSpeedTreeForestDirectX8::Instance().DeleteInstance(pObjectInstance->pTree);
+		CSpeedTreeForestDirectX::Instance().DeleteInstance(pObjectInstance->pTree);
 		pObjectInstance->pTree = NULL;
 	}
 
diff --git a/src/GameLib/MapManager.cpp b/src/GameLib/MapManager.cpp
@@ -290,7 +290,7 @@ void CMapManager::BeginEnvironment()
 		// MR-14: -- END OF -- Fog update by Alaric
 		else
 		{
-			CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();
+			CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();
 			rkForest.SetFog(
 				mc_pcurEnvironmentData->GetFogNearDistance(), 
 				mc_pcurEnvironmentData->GetFogFarDistance()
diff --git a/src/GameLib/MapManager.h b/src/GameLib/MapManager.h
@@ -107,7 +107,7 @@ class CMapManager : public CScreen, public IPhysicsWorld
 		// Map
 		//////////////////////////////////////////////////////////////////////////
 		CMapOutdoor *				m_pkMap;
-		CSpeedTreeForestDirectX8	m_Forest;
+		CSpeedTreeForestDirectX	m_Forest;
 
 	public:
 		// 2004.10.14.myevan.TEMP_CAreaLoaderThread
diff --git a/src/GameLib/MapOutdoor.cpp b/src/GameLib/MapOutdoor.cpp
@@ -209,7 +209,7 @@ bool CMapOutdoor::Destroy()
 
 	m_rkList_kGuildArea.clear();
 	m_kPool_kMonsterAreaInfo.Destroy();
-	CSpeedTreeForestDirectX8::Instance().Clear();
+	CSpeedTreeForestDirectX::Instance().Clear();
 
 	return true;
 }
@@ -239,7 +239,7 @@ void CMapOutdoor::OnBeginEnvironment()
 	if (!mc_pEnvironmentData)
 		return;
 
-	CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();
+	CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();
 	rkForest.SetFog(
 		mc_pEnvironmentData->GetFogNearDistance(), 
 		mc_pEnvironmentData->GetFogFarDistance()
@@ -1251,7 +1251,7 @@ void CMapOutdoor::XMasTree_Destroy()
 {
 	if (m_kXMas.m_pkTree)
 	{
-		CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();
+		CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();
 		m_kXMas.m_pkTree->Clear();
 		rkForest.DeleteInstance(m_kXMas.m_pkTree);
 		m_kXMas.m_pkTree=NULL;
@@ -1269,7 +1269,7 @@ void CMapOutdoor::__XMasTree_Create(float x, float y, float z, const char* c_szT
 	assert(NULL==m_kXMas.m_pkTree);
 	assert(-1==m_kXMas.m_iEffectID);
 
-	CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();
+	CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();
 	DWORD dwCRC32 = GetCaseCRC32(c_szTreeName, strlen(c_szTreeName));
 	m_kXMas.m_pkTree=rkForest.CreateInstance(x, y, z, dwCRC32, c_szTreeName);
 
diff --git a/src/GameLib/MapOutdoor.h b/src/GameLib/MapOutdoor.h
@@ -7,7 +7,7 @@
 #include "PRTerrainLib/TerrainType.h"
 #include "PRTerrainLib/TextureSet.h"
 
-#include "SpeedTreeLib/SpeedTreeForestDirectX8.h"
+#include "SpeedTreeLib/SpeedTreeForestDirectX.h"
 
 #include "MapBase.h"
 #include "Area.h"
diff --git a/src/GameLib/MapOutdoorLoad.cpp b/src/GameLib/MapOutdoorLoad.cpp
@@ -33,7 +33,7 @@ bool CMapOutdoor::Load(float x, float y, float z)
 	m_lOldReadX = -1;
 
 	// TODO: SetRenderingDevice에서 Environment로 부터 라이트 속성을 넘겨줘야 스태틱 라이트가 제대로 작동한다.
-	CSpeedTreeForestDirectX8::Instance().SetRenderingDevice(ms_lpd3dDevice);
+	CSpeedTreeForestDirectX::Instance().SetRenderingDevice(ms_lpd3dDevice);
 
 	Update(x, y, z);
 
diff --git a/src/GameLib/MapOutdoorRender.cpp b/src/GameLib/MapOutdoorRender.cpp
@@ -238,7 +238,7 @@ void CMapOutdoor::RenderCloud()
 void CMapOutdoor::RenderTree()
 {
 	if (IsVisiblePart(PART_TREE))
-		CSpeedTreeForestDirectX8::Instance().Render();
+		CSpeedTreeForestDirectX::Instance().Render();
 }
 
 void CMapOutdoor::SetInverseViewAndDynamicShaodwMatrices()
diff --git a/src/GameLib/MapOutdoorUpdate.cpp b/src/GameLib/MapOutdoorUpdate.cpp
@@ -112,7 +112,7 @@ bool CMapOutdoor::Update(float fX, float fY, float fZ)
 #ifdef __PERFORMANCE_CHECKER__
 	DWORD t3=ELTimer_GetMSec();
 #endif
-	CSpeedTreeForestDirectX8::Instance().UpdateSystem(CTimer::Instance().GetCurrentSecond());
+	CSpeedTreeForestDirectX::Instance().UpdateSystem(CTimer::Instance().GetCurrentSecond());
 #ifdef __PERFORMANCE_CHECKER__
 	DWORD t4=ELTimer_GetMSec();
 #endif
diff --git a/src/SpeedTreeLib/SpeedTreeForestDirectX.cpp b/src/SpeedTreeLib/SpeedTreeForestDirectX.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////  
-//	CSpeedTreeForestDirectX8 Class
+//	CSpeedTreeForestDirectX Class
 //
 //	(c) 2003 IDV, Inc.
 //
@@ -38,29 +38,29 @@
 #include "EterLib/StateManager.h"
 #include "EterLib/Camera.h"
 
-#include "SpeedTreeForestDirectX8.h"
+#include "SpeedTreeForestDirectX.h"
 #include "SpeedTreeConfig.h"
 #include "VertexShaders.h"
 
 ///////////////////////////////////////////////////////////////////////  
-//	CSpeedTreeForestDirectX8::CSpeedTreeForestDirectX8
+//	CSpeedTreeForestDirectX::CSpeedTreeForestDirectX
 
-CSpeedTreeForestDirectX8::CSpeedTreeForestDirectX8()  : m_dwBranchVertexShader(nullptr), m_pLeafVertexShaderDecl(nullptr), m_pLeafVertexShader(nullptr)
+CSpeedTreeForestDirectX::CSpeedTreeForestDirectX()  : m_dwBranchVertexShader(nullptr), m_pLeafVertexShaderDecl(nullptr), m_pLeafVertexShader(nullptr)
 {
 }
 
 
 ///////////////////////////////////////////////////////////////////////  
-//	CSpeedTreeForestDirectX8::~CSpeedTreeForestDirectX8
+//	CSpeedTreeForestDirectX::~CSpeedTreeForestDirectX
 
-CSpeedTreeForestDirectX8::~CSpeedTreeForestDirectX8()
+CSpeedTreeForestDirectX::~CSpeedTreeForestDirectX()
 {
 }
 
 
 ///////////////////////////////////////////////////////////////////////  
-//	CSpeedTreeForestDirectX8::InitVertexShaders
-bool CSpeedTreeForestDirectX8::InitVertexShaders(void)
+//	CSpeedTreeForestDirectX::InitVertexShaders
+bool CSpeedTreeForestDirectX::InitVertexShaders(void)
 {
 	// load the vertex shaders
 	if (!m_dwBranchVertexShader)
@@ -78,7 +78,7 @@ bool CSpeedTreeForestDirectX8::InitVertexShaders(void)
 	return false;
 }
 
-bool CSpeedTreeForestDirectX8::SetRenderingDevice(LPDIRECT3DDEVICE9 lpDevice)
+bool CSpeedTreeForestDirectX::SetRenderingDevice(LPDIRECT3DDEVICE9 lpDevice)
 {
 	m_pDx = lpDevice;
 
@@ -108,14 +108,14 @@ bool CSpeedTreeForestDirectX8::SetRenderingDevice(LPDIRECT3DDEVICE9 lpDevice)
 }
 
 ///////////////////////////////////////////////////////////////////////  
-//	CSpeedTreeForestDirectX8::UploadWindMatrix
+//	CSpeedTreeForestDirectX::UploadWindMatrix
 
-void CSpeedTreeForestDirectX8::UploadWindMatrix(UINT uiLocation, const float* pMatrix) const
+void CSpeedTreeForestDirectX::UploadWindMatrix(UINT uiLocation, const float* pMatrix) const
 {
 	STATEMANAGER.SetVertexShaderConstant(uiLocation, pMatrix, 4);
 }
 
-void CSpeedTreeForestDirectX8::UpdateCompundMatrix(const D3DXVECTOR3& c_rEyeVec, const D3DXMATRIX& c_rmatView, const D3DXMATRIX& c_rmatProj)
+void CSpeedTreeForestDirectX::UpdateCompundMatrix(const D3DXVECTOR3& c_rEyeVec, const D3DXMATRIX& c_rmatView, const D3DXMATRIX& c_rmatProj)
 {
     // setup composite matrix for shader
 	D3DXMATRIX matBlend;
@@ -135,9 +135,9 @@ void CSpeedTreeForestDirectX8::UpdateCompundMatrix(const D3DXVECTOR3& c_rEyeVec,
 }
 
 ///////////////////////////////////////////////////////////////////////  
-//	CSpeedTreeForestDirectX8::Render
+//	CSpeedTreeForestDirectX::Render
 
-void CSpeedTreeForestDirectX8::Render(unsigned long ulRenderBitVector)
+void CSpeedTreeForestDirectX::Render(unsigned long ulRenderBitVector)
 {
 	UpdateSystem(CTimer::Instance().GetCurrentSecond());
 
diff --git a/src/SpeedTreeLib/SpeedTreeForestDirectX.h b/src/SpeedTreeLib/SpeedTreeForestDirectX.h
@@ -40,12 +40,12 @@
 #include "SpeedTreeMaterial.h"
 
 ///////////////////////////////////////////////////////////////////////  
-//	class CSpeedTreeForestDirectX8 declaration
-class CSpeedTreeForestDirectX8 : public CSpeedTreeForest, public CGraphicBase, public CSingleton<CSpeedTreeForestDirectX8>
+//	class CSpeedTreeForestDirectX declaration
+class CSpeedTreeForestDirectX : public CSpeedTreeForest, public CGraphicBase, public CSingleton<CSpeedTreeForestDirectX>
 {
 	public:
-		CSpeedTreeForestDirectX8();
-		virtual ~CSpeedTreeForestDirectX8();
+		CSpeedTreeForestDirectX();
+		virtual ~CSpeedTreeForestDirectX();
 
 		void			UploadWindMatrix(unsigned int uiLocation, const float* pMatrix) const;
 		void			UpdateCompundMatrix(const D3DXVECTOR3 & c_rEyeVec, const D3DXMATRIX & c_rmatView, const D3DXMATRIX& c_rmatProj);
diff --git a/src/SpeedTreeLib/SpeedTreeWrapper.cpp b/src/SpeedTreeLib/SpeedTreeWrapper.cpp
@@ -44,7 +44,7 @@
 #include "EterLib/StateManager.h"
 
 #include "SpeedTreeConfig.h"
-#include "SpeedTreeForestDirectX8.h"
+#include "SpeedTreeForestDirectX.h"
 #include "SpeedTreeWrapper.h"
 #include "VertexShaders.h"
 
@@ -92,21 +92,20 @@ void CSpeedTreeWrapper::SetVertexShaders(LPDIRECT3DVERTEXDECLARATION9 pBranchVer
 void CSpeedTreeWrapper::OnRenderPCBlocker()
 {
 	if (!ms_dwBranchVertexShader || !ms_pLeafVertexShaderDecl || !ms_pLeafVertexShader)
-		CSpeedTreeForestDirectX8::Instance().EnsureVertexShaders();
+		CSpeedTreeForestDirectX::Instance().EnsureVertexShaders();
 
 	if (ms_dwBranchVertexShader == 0)
 	{
 		ms_dwBranchVertexShader = LoadBranchShader(ms_lpd3dDevice);
 		//LogBox("Vertex Shader not assigned. You must call CSpeedTreeWrapper::SetVertexShader for this");
 	}
 	
-	CSpeedTreeForestDirectX8::Instance().UpdateSystem(ELTimer_GetMSec() / 1000.0f);
+	CSpeedTreeForestDirectX::Instance().UpdateSystem(ELTimer_GetMSec() / 1000.0f);
 	
-	// ï¿½Ï³ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ LOD ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½
 	m_pSpeedTree->SetLodLevel(1.0f);
 	//Advance();
 	
-	CSpeedTreeForestDirectX8::Instance().UpdateCompundMatrix(CCameraManager::Instance().GetCurrentCamera()->GetEye(), ms_matView, ms_matProj);
+	CSpeedTreeForestDirectX::Instance().UpdateCompundMatrix(CCameraManager::Instance().GetCurrentCamera()->GetEye(), ms_matView, ms_matProj);
 	
 	STATEMANAGER.SetTextureStageState(0, D3DTSS_COLORARG1,	D3DTA_TEXTURE);
 	STATEMANAGER.SetTextureStageState(0, D3DTSS_COLORARG2,	D3DTA_DIFFUSE);
@@ -241,21 +240,21 @@ void CSpeedTreeWrapper::OnRenderPCBlocker()
 void CSpeedTreeWrapper::OnRender()
 {
 	if (!ms_dwBranchVertexShader || !ms_pLeafVertexShaderDecl || !ms_pLeafVertexShader)
-		CSpeedTreeForestDirectX8::Instance().EnsureVertexShaders();
+		CSpeedTreeForestDirectX::Instance().EnsureVertexShaders();
 
 	if (ms_dwBranchVertexShader == 0)
 	{
 		ms_dwBranchVertexShader = LoadBranchShader(ms_lpd3dDevice);
 		//LogBox("Vertex Shader not assigned. You must call CSpeedTreeWrapper::SetVertexShader for this");
 	}
 	
-	CSpeedTreeForestDirectX8::Instance().UpdateSystem(ELTimer_GetMSec() / 1000.0f);
+	CSpeedTreeForestDirectX::Instance().UpdateSystem(ELTimer_GetMSec() / 1000.0f);
 	
 	// ï¿½Ï³ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ LOD ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½
 	m_pSpeedTree->SetLodLevel(1.0f);
 	//Advance();
 	
-	CSpeedTreeForestDirectX8::Instance().UpdateCompundMatrix(CCameraManager::Instance().GetCurrentCamera()->GetEye(), ms_matView, ms_matProj);
+	CSpeedTreeForestDirectX::Instance().UpdateCompundMatrix(CCameraManager::Instance().GetCurrentCamera()->GetEye(), ms_matView, ms_matProj);
 	
 	STATEMANAGER.SetTextureStageState(0, D3DTSS_COLORARG1,	D3DTA_TEXTURE);
 	STATEMANAGER.SetTextureStageState(0, D3DTSS_COLORARG2,	D3DTA_DIFFUSE);
diff --git a/src/SpeedTreeLib/StdAfx.h b/src/SpeedTreeLib/StdAfx.h
@@ -5,4 +5,4 @@
 //#include <crtdbg.h>
 
 //#include "Forest.h"
-#include "SpeedTreeForestDirectX8.h"
+#include "SpeedTreeForestDirectX.h"
diff --git a/src/UserInterface/PythonApplication.cpp b/src/UserInterface/PythonApplication.cpp
@@ -1127,8 +1127,7 @@ void CPythonApplication::Destroy()
 
 	m_grpDevice.Destroy();
 
-	// FIXME : ¸¸µé¾îÁ® ÀÖÁö ¾ÊÀ½ - [levites]
-	//CSpeedTreeForestDirectX8::Instance().Clear();
+	//CSpeedTreeForestDirectX::Instance().Clear();
 
 	CAttributeInstance::DestroySystem();
 	CTextFileLoader::DestroySystem();

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include "EterLib/ResourceManager.h"`
`4`	`4`	`#include "EterLib/StateManager.h"`
`5`	`5`	`#include "EffectLib/EffectManager.h"`
`6`		`-#include "SpeedTreeLib/SpeedTreeForestDirectX8.h"`
	`6`	`+#include "SpeedTreeLib/SpeedTreeForestDirectX.h"`
`7`	`7`	`#include "EterBase/Timer.h"`
`8`	`8`
`9`	`9`	`#include "Area.h"`
`@@ -550,7 +550,7 @@ void CArea::__SetObjectInstance_SetTree(TObjectInstance * pObjectInstance, const`
`550`	`550`
`551`	`551`	`void CArea::TObjectInstance::SetTree(float x, float y, float z, DWORD dwTreeCRC, const char* c_szTreeName)`
`552`	`552`	`{`
`553`		`- CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();`
	`553`	`+ CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();`
`554`	`554`	`pTree=rkForest.CreateInstance(x, y, z, dwTreeCRC, c_szTreeName);`
`555`	`555`	`dwType = prt::PROPERTY_TYPE_TREE;`
`556`	`556`	`}`
`@@ -1106,7 +1106,7 @@ void CArea::__Clear_DestroyObjectInstance(TObjectInstance * pObjectInstance)`
`1106`	`1106`	`if (pObjectInstance->pTree)`
`1107`	`1107`	`{`
`1108`	`1108`	`pObjectInstance->pTree->Clear();`
`1109`		`- CSpeedTreeForestDirectX8::Instance().DeleteInstance(pObjectInstance->pTree);`
	`1109`	`+ CSpeedTreeForestDirectX::Instance().DeleteInstance(pObjectInstance->pTree);`
`1110`	`1110`	`pObjectInstance->pTree = NULL;`
`1111`	`1111`	`}`
`1112`	`1112`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ void CMapManager::BeginEnvironment()`
`290`	`290`	`// MR-14: -- END OF -- Fog update by Alaric`
`291`	`291`	`else`
`292`	`292`	`{`
`293`		`- CSpeedTreeForestDirectX8& rkForest=CSpeedTreeForestDirectX8::Instance();`
	`293`	`+ CSpeedTreeForestDirectX& rkForest=CSpeedTreeForestDirectX::Instance();`
`294`	`294`	`rkForest.SetFog(`
`295`	`295`	`mc_pcurEnvironmentData->GetFogNearDistance(),`
`296`	`296`	`mc_pcurEnvironmentData->GetFogFarDistance()`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ void CMapOutdoor::RenderCloud()`
`238`	`238`	`void CMapOutdoor::RenderTree()`
`239`	`239`	`{`
`240`	`240`	`if (IsVisiblePart(PART_TREE))`
`241`		`- CSpeedTreeForestDirectX8::Instance().Render();`
	`241`	`+ CSpeedTreeForestDirectX::Instance().Render();`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`void CMapOutdoor::SetInverseViewAndDynamicShaodwMatrices()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`///////////////////////////////////////////////////////////////////////`
`2`		`-// CSpeedTreeForestDirectX8 Class`
	`2`	`+// CSpeedTreeForestDirectX Class`
`3`	`3`	`//`
`4`	`4`	`// (c) 2003 IDV, Inc.`
`5`	`5`	`//`
`@@ -38,29 +38,29 @@`
`38`	`38`	`#include "EterLib/StateManager.h"`
`39`	`39`	`#include "EterLib/Camera.h"`
`40`	`40`
`41`		`-#include "SpeedTreeForestDirectX8.h"`
	`41`	`+#include "SpeedTreeForestDirectX.h"`
`42`	`42`	`#include "SpeedTreeConfig.h"`
`43`	`43`	`#include "VertexShaders.h"`
`44`	`44`
`45`	`45`	`///////////////////////////////////////////////////////////////////////`
`46`		`-// CSpeedTreeForestDirectX8::CSpeedTreeForestDirectX8`
	`46`	`+// CSpeedTreeForestDirectX::CSpeedTreeForestDirectX`
`47`	`47`
`48`		`-CSpeedTreeForestDirectX8::CSpeedTreeForestDirectX8() : m_dwBranchVertexShader(nullptr), m_pLeafVertexShaderDecl(nullptr), m_pLeafVertexShader(nullptr)`
	`48`	`+CSpeedTreeForestDirectX::CSpeedTreeForestDirectX() : m_dwBranchVertexShader(nullptr), m_pLeafVertexShaderDecl(nullptr), m_pLeafVertexShader(nullptr)`
`49`	`49`	`{`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
`53`	`53`	`///////////////////////////////////////////////////////////////////////`
`54`		`-// CSpeedTreeForestDirectX8::~CSpeedTreeForestDirectX8`
	`54`	`+// CSpeedTreeForestDirectX::~CSpeedTreeForestDirectX`
`55`	`55`
`56`		`-CSpeedTreeForestDirectX8::~CSpeedTreeForestDirectX8()`
	`56`	`+CSpeedTreeForestDirectX::~CSpeedTreeForestDirectX()`
`57`	`57`	`{`
`58`	`58`	`}`
`59`	`59`
`60`	`60`
`61`	`61`	`///////////////////////////////////////////////////////////////////////`
`62`		`-// CSpeedTreeForestDirectX8::InitVertexShaders`
`63`		`-bool CSpeedTreeForestDirectX8::InitVertexShaders(void)`
	`62`	`+// CSpeedTreeForestDirectX::InitVertexShaders`
	`63`	`+bool CSpeedTreeForestDirectX::InitVertexShaders(void)`
`64`	`64`	`{`
`65`	`65`	`// load the vertex shaders`
`66`	`66`	`if (!m_dwBranchVertexShader)`
`@@ -78,7 +78,7 @@ bool CSpeedTreeForestDirectX8::InitVertexShaders(void)`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
`81`		`-bool CSpeedTreeForestDirectX8::SetRenderingDevice(LPDIRECT3DDEVICE9 lpDevice)`
	`81`	`+bool CSpeedTreeForestDirectX::SetRenderingDevice(LPDIRECT3DDEVICE9 lpDevice)`
`82`	`82`	`{`
`83`	`83`	`m_pDx = lpDevice;`
`84`	`84`
`@@ -108,14 +108,14 @@ bool CSpeedTreeForestDirectX8::SetRenderingDevice(LPDIRECT3DDEVICE9 lpDevice)`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`///////////////////////////////////////////////////////////////////////`
`111`		`-// CSpeedTreeForestDirectX8::UploadWindMatrix`
	`111`	`+// CSpeedTreeForestDirectX::UploadWindMatrix`
`112`	`112`
`113`		`-void CSpeedTreeForestDirectX8::UploadWindMatrix(UINT uiLocation, const float* pMatrix) const`
	`113`	`+void CSpeedTreeForestDirectX::UploadWindMatrix(UINT uiLocation, const float* pMatrix) const`
`114`	`114`	`{`
`115`	`115`	`STATEMANAGER.SetVertexShaderConstant(uiLocation, pMatrix, 4);`
`116`	`116`	`}`
`117`	`117`
`118`		`-void CSpeedTreeForestDirectX8::UpdateCompundMatrix(const D3DXVECTOR3& c_rEyeVec, const D3DXMATRIX& c_rmatView, const D3DXMATRIX& c_rmatProj)`
	`118`	`+void CSpeedTreeForestDirectX::UpdateCompundMatrix(const D3DXVECTOR3& c_rEyeVec, const D3DXMATRIX& c_rmatView, const D3DXMATRIX& c_rmatProj)`
`119`	`119`	`{`
`120`	`120`	`// setup composite matrix for shader`
`121`	`121`	`D3DXMATRIX matBlend;`
`@@ -135,9 +135,9 @@ void CSpeedTreeForestDirectX8::UpdateCompundMatrix(const D3DXVECTOR3& c_rEyeVec,`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`///////////////////////////////////////////////////////////////////////`
`138`		`-// CSpeedTreeForestDirectX8::Render`
	`138`	`+// CSpeedTreeForestDirectX::Render`
`139`	`139`
`140`		`-void CSpeedTreeForestDirectX8::Render(unsigned long ulRenderBitVector)`
	`140`	`+void CSpeedTreeForestDirectX::Render(unsigned long ulRenderBitVector)`
`141`	`141`	`{`
`142`	`142`	`UpdateSystem(CTimer::Instance().GetCurrentSecond());`
`143`	`143`