add bUseDynamicSinCos. DrawCircle and DrawRing will calculate sin and cos in runtime.

Author: Nikita

README.md

@@ -16,8 +16,11 @@ git submodule add https://github.com/Bulb4/renderer.git
 
 ***
 #### Initializing:
+If bUseDynamicSinCos is true, circle drawing will be faster but also it will take more memory.
+Use it if you do not change points count in runtime
+
 ```cpp
-cRender* pRender = new cRender(g_pd3dDevice);//g_pd3dDevice is our IDirect3DDevice9
+cRender* pRender = new cRender(g_pd3dDevice, true);//g_pd3dDevice is our IDirect3DDevice9
 
 ID3DXFont* font1 = nullptr;
 pRender->AddFont(&font1, "Consolas", 48, false);

example/main.cpp

@@ -18,7 +18,6 @@ static D3DPRESENT_PARAMETERS g_d3dpp;
 LPDIRECT3DTEXTURE9 pRadarTexture = nullptr;
 LPD3DXSPRITE pRadarSprite = nullptr;
 
-
 short GetUsageOfCPU()
 {
 	const static HANDLE hCurrentProcess = GetCurrentProcess();
@@ -129,10 +128,9 @@ int CALLBACK WinMain(
 	ShowWindow(hwnd, SW_SHOWDEFAULT);
 	UpdateWindow(hwnd);
 
-	cRender* pRender = new cRender(g_pd3dDevice);
+	cRender* pRender = new cRender(g_pd3dDevice, true);
 
-	ID3DXFont* font1 = nullptr;
-	pRender->AddFont(&font1, "System", 24, false);
+	cFont font1(g_pd3dDevice, "System", 24);
 
 	pRender->SetFramerateUpdateRate(400U);
 
@@ -176,14 +174,14 @@ int CALLBACK WinMain(
 			pRender->DrawGradientBox(460, 20, 200, 50, rainbow_color[0], rainbow_color[1], rainbow_color[2], rainbow_color[3]);
 			pRender->DrawBox(680, 20, 200, 50, 8, Colors::Pink);
 
-			pRender->DrawCircle(120, 190, 100, 32, RenderDrawType_Outlined, Colors::Red);
-			pRender->DrawCircle(340, 190, 100, 32, RenderDrawType_Filled, Colors::Green);
+			pRender->DrawCircle(120, 190, 100, 32, RenderDrawType_Outlined, Colors::Red, 0);
+			pRender->DrawCircle(340, 190, 100, 32, RenderDrawType_Filled, Colors::Green, 0);
 			pRender->DrawCircle(560, 190, 100, 32, RenderDrawType_Gradient, rainbow_color[0], rainbow_color[1]);
 
-			pRender->DrawRing(780, 190, 100, 80, 64, RenderDrawType_Filled, Colors::Blue);
+			pRender->DrawRing(780, 190, 100, 80, 64, RenderDrawType_Filled, Colors::Blue, 0);
 
-			pRender->DrawTriangle(120, 310, 20, 480, 220, 480, RenderDrawType_Outlined, Colors::Green);
-			pRender->DrawTriangle(340, 310, 240, 480, 440, 480, RenderDrawType_Filled, Colors::SkyBlue);
+			pRender->DrawTriangle(120, 310, 20, 480, 220, 480, RenderDrawType_Outlined, Colors::Green, 0, 0);
+			pRender->DrawTriangle(340, 310, 240, 480, 440, 480, RenderDrawType_Filled, Colors::SkyBlue, 0, 0);
 			pRender->DrawTriangle(560, 310, 460, 480, 660, 480, RenderDrawType_FilledGradient, rainbow_color[0], rainbow_color[1], rainbow_color[2]);
 
 			pRender->DrawCircleSector(780, 380, 80, 30, time, time + 45, rainbow_color[0], rainbow_color[1]);
@@ -202,7 +200,7 @@ int CALLBACK WinMain(
 				last_fps = current_fps;
 
 				pRender->DrawString(
-					900, 10, Colors::White, font1, true, false,
+					900, 10, Colors::White, &font1, true, false,
 					"CPU: %i%%\nFPS: %d\nCPU Cores: %i\n%s",
 					cpu_usage, current_fps,
 					info.dwNumberOfProcessors,

include/font.hpp

@@ -0,0 +1,77 @@
+#pragma once
+
+#include "renderer.h"
+
+class cFont
+{
+public:
+	cFont(IDirect3DDevice9* pDevice)
+	{
+		this->pDevice = pDevice;
+		Update();
+	}
+	cFont(IDirect3DDevice9* pDevice, const char* szName, uint8_t iSize)
+	{
+		sprintf(this->szName, szName);
+
+		this->iSize = iSize;
+		this->pDevice = pDevice;
+
+		Update();
+	}
+	cFont(IDirect3DDevice9* pDevice, const char* szName, uint8_t iSize, uint16_t iFontWeight, uint16_t iCharset, bool bItalic, bool bAntiAliased)
+	{
+		sprintf(this->szName, szName);
+
+		this->iSize = iSize;
+		this->iFontWeight = iFontWeight;
+		this->iCharset = iCharset;
+		this->bItalic = bItalic;
+		this->bAntiAliased = bAntiAliased;
+		this->pDevice = pDevice;
+
+		Update();
+	}
+
+	~cFont()
+	{
+		RELEASE_INTERFACE(pFont);
+	}
+
+	char szName[32] = "System";
+	int32_t iSize = 14;
+	//0, 100, 200 ... 1000
+	uint32_t iFontWeight = FW_NORMAL;
+	uint32_t iCharset = DEFAULT_CHARSET;
+	bool bItalic = false;
+	bool bAntiAliased = false;
+
+	bool Update()
+	{
+		RELEASE_INTERFACE(pFont);
+
+		return D3DXCreateFontA(pDevice, iSize, 0, 
+			iFontWeight, 1, BOOL(bItalic), iCharset, OUT_DEFAULT_PRECIS, 
+			bAntiAliased ? ANTIALIASED_QUALITY : NONANTIALIASED_QUALITY, 
+			DEFAULT_PITCH, szName, &pFont) == D3D_OK;
+	}
+
+	ID3DXFont* GetFont() { return pFont; }
+
+	void OnLostDevice()
+	{
+		if (pFont)
+			pFont->OnLostDevice();
+	}
+	void OnResetDevice()
+	{
+		if (pFont)
+		{
+			pFont->OnResetDevice();
+			Update();
+		}
+	}
+private:
+	IDirect3DDevice9* pDevice;
+	ID3DXFont* pFont = nullptr;
+};

include/renderer.cpp

@@ -1,6 +1,7 @@
 #include "renderer.h"
 
-cRender::cRender(IDirect3DDevice9* device)
+cRender::cRender(IDirect3DDevice9* device, bool bUseDynamicSinCos) : 
+	m_bUseDynamicSinCos(bUseDynamicSinCos)
 {
 	if (!device)
 		throw std::exception("device == nullptr");
@@ -15,14 +16,7 @@ cRender::~cRender()
 		delete[] i->second;
 		i->second = nullptr;
 	}
-
-	for (auto& a : m_FontsList)
-		if (*a.pFont)
-		{
-			(*a.pFont)->Release();
-			*a.pFont = nullptr;
-		}
-
+	
 	m_pDevice = nullptr;
 }
 
@@ -76,42 +70,10 @@ void cRender::PushRenderState(const D3DRENDERSTATETYPE dwState, DWORD dwValue)
 	m_pDevice->SetRenderState(dwState, dwValue);
 }
 
-void cRender::OnLostDevice()
-{
-	for (auto& a : m_FontsList)
-		if (*a.pFont)
-			(*a.pFont)->OnLostDevice();
-}
-
-void cRender::OnResetDevice()
-{
-	for (auto& a : m_FontsList)
-		if (*a.pFont)
-		{
-			(*a.pFont)->OnResetDevice();
-			a.update();
-		}
-}
-
-bool cRender::AddFont(ID3DXFont** pFont, const char* szName, uint8_t iSize, bool bAntiAliased)
-{
-	font_t font;
-
-	font.pDevice = m_pDevice;
-	font.pFont = pFont;
-	font.iSize = iSize;
-	font.bAntiAliased = bAntiAliased;
-	sprintf_s(font.szName, szName);
+void cRender::OnLostDevice() { }
+void cRender::OnResetDevice() { }
 
-	if (!font.update())
-		return false;
-
-	m_FontsList.push_back(font);
-
-	return true;
-}
-
-void cRender::DrawString(int16_t x, int16_t y, color_t color, ID3DXFont* font, bool outlined, bool centered, const char* text, ...)
+void cRender::DrawString(int16_t x, int16_t y, color_t color, cFont* font, bool outlined, bool centered, const char* text, ...)
 {
 	va_list args;
 	char buf[256];
@@ -126,7 +88,7 @@ void cRender::DrawString(int16_t x, int16_t y, color_t color, ID3DXFont* font, b
 	if (centered)
 	{
 		RECT size_rect = { 0 };
-		font->DrawTextA(NULL, buf, size, &size_rect, DT_CALCRECT | DT_NOCLIP, 0);
+		font->GetFont()->DrawTextA(NULL, buf, size, &size_rect, DT_CALCRECT | DT_NOCLIP, 0);
 
 		rect.left -= size_rect.right / 2;
 		rect.top -= size_rect.bottom / 2;
@@ -138,17 +100,17 @@ void cRender::DrawString(int16_t x, int16_t y, color_t color, ID3DXFont* font, b
 		auto outline_color = static_cast<const color_t>((color.color >> 24) << 24);
 
 		rect.top++;
-		font->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x; y + 1
+		font->GetFont()->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x; y + 1
 		rect.left++; rect.top--;
-		font->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x + 1; y
+		font->GetFont()->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x + 1; y
 		rect.left--; rect.top--;
-		font->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x; y - 1
+		font->GetFont()->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x; y - 1
 		rect.left--; rect.top++;
-		font->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x - 1; y
+		font->GetFont()->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, outline_color);//x - 1; y
 		rect.left++;
 	}
 
-	font->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, color);
+	font->GetFont()->DrawTextA(NULL, buf, size, &rect, DT_NOCLIP, color);
 }
 
 void cRender::DrawLine(int16_t x1, int16_t y1, int16_t x2, int16_t y2, color_t color)
@@ -192,11 +154,6 @@ void cRender::DrawBox(int16_t x, int16_t y, int16_t width, int16_t height, color
 	m_pDevice->DrawPrimitiveUP(D3DPT_LINESTRIP, 4, pVertex, sizeof(Vertex_t));
 }
 
-void cRender::DrawGradientBox(int16_t x, int16_t y, int16_t width, int16_t height, color_t color1, color_t color2, bool vertical)
-{
-	DrawGradientBox(x, y, width, height, color1, vertical ? color1 : color2, vertical ? color2 : color1, color2);
-}
-
 void cRender::DrawGradientBox(int16_t x, int16_t y, int16_t width, int16_t height, color_t color1, color_t color2, color_t color3, color_t color4)
 {
 	Vertex_t pVertex[4];
@@ -215,16 +172,22 @@ void cRender::DrawCircle(int16_t x, int16_t y, int16_t radius, uint16_t points,
 
 	Vertex_t* verticles = new Vertex_t[points + gradient + 1];
 
-#if _USE_DYNAMIC_SIN_COS != 1
-	SinCos_t* pSinCos = GetSinCos(points);
-#endif // !_USE_DYNAMIC_SIN_COS
+	SinCos_t* pSinCos = m_bUseDynamicSinCos ? nullptr : GetSinCos(points);
 
 	if (gradient)
 		verticles[0] = Vertex_t(x, y, color2);
 
 	for (uint16_t i = gradient; i < points + gradient; i++)
 	{
-		verticles[i] = Vertex_t(x + pSinCos[i - gradient].flCos * radius, y + pSinCos[i - gradient].flSin * radius, color1);
+		if (m_bUseDynamicSinCos)
+		{
+			const float angle = (2 * D3DX_PI) / points * (i - gradient);
+			verticles[i] = Vertex_t(x + cos(angle) *radius, y + sin(angle) * radius, color1);
+		}
+		else
+		{
+			verticles[i] = Vertex_t(x + pSinCos[i - gradient].flCos * radius, y + pSinCos[i - gradient].flSin * radius, color1);
+		}
 
 		if (filled)
 		{
@@ -276,24 +239,37 @@ void cRender::DrawRing(int16_t x, int16_t y, int16_t radius1, int16_t radius2, u
 
 	if (flags & RenderDrawType_Outlined)
 	{
-		DrawCircle(x, y, radius1, points, RenderDrawType_Outlined, color1);
-		DrawCircle(x, y, radius2, points, RenderDrawType_Outlined, color2);
+		DrawCircle(x, y, radius1, points, RenderDrawType_Outlined, color1, 0);
+		DrawCircle(x, y, radius2, points, RenderDrawType_Outlined, color2, 0);
 		return;
 	}
 
 	constexpr uint8_t modifier = 4;
 	Vertex_t* verticles = new Vertex_t[points * modifier];
 
-	SinCos_t* pSinCos = GetSinCos(points);
+	SinCos_t* pSinCos = m_bUseDynamicSinCos ? nullptr : GetSinCos(points);
 
 	for (uint16_t i = 0; i < points; i++)
 	{
 		uint16_t it = i * modifier;
+		
+		if (m_bUseDynamicSinCos)
+		{
+			const float angle1 = (2 * D3DX_PI) / points * i;
+			const float angle2 = (2 * D3DX_PI) / points * (i + 1);
 
-		verticles[it] =		Vertex_t(x + pSinCos[i].flCos * radius1, y + pSinCos[i].flSin * radius1, color1);
-		verticles[it + 1] = Vertex_t(x + pSinCos[i].flCos * radius2, y + pSinCos[i].flSin * radius2, color2);
-		verticles[it + 2] = Vertex_t(x + pSinCos[i + 1].flCos * radius1, y + pSinCos[i + 1].flSin * radius1, color1);
-		verticles[it + 3] = Vertex_t(x + pSinCos[i + 1].flCos * radius2, y + pSinCos[i + 1].flSin * radius2, color2);
+			verticles[it] = Vertex_t(x + cos(angle1) * radius1, y + sin(angle1) * radius1, color1);
+			verticles[it + 1] = Vertex_t(x + cos(angle1) * radius2, y + sin(angle1) * radius2, color2);
+			verticles[it + 2] = Vertex_t(x + cos(angle2) * radius1, y + sin(angle2) * radius1, color1);
+			verticles[it + 3] = Vertex_t(x + cos(angle2) * radius2, y + sin(angle2) * radius2, color2);
+		}
+		else
+		{
+			verticles[it] = Vertex_t(x + pSinCos[i].flCos * radius1, y + pSinCos[i].flSin * radius1, color1);
+			verticles[it + 1] = Vertex_t(x + pSinCos[i].flCos * radius2, y + pSinCos[i].flSin * radius2, color2);
+			verticles[it + 2] = Vertex_t(x + pSinCos[i + 1].flCos * radius1, y + pSinCos[i + 1].flSin * radius1, color1);
+			verticles[it + 3] = Vertex_t(x + pSinCos[i + 1].flCos * radius2, y + pSinCos[i + 1].flSin * radius2, color2);
+		}
 
 		for (uint8_t a = 0; a < modifier; a++)
 		{