ShibaGit/khaotic-engine-Reborn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Minor Update - Suppression de text

Browse Source
This commit is contained in:
CatChow0 2024-04-08 15:33:46 +02:00
parent 695aae93e9
commit 1112fd6040
3 changed files with 1 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
enginecustom/applicationclass.cpp
View File

@ -17,9 +17,6 @@ ApplicationClass::ApplicationClass()
m_MouseStrings = 0; m_MouseStrings = 0;
m_FontShader = 0; m_FontShader = 0;
m_Font = 0; m_Font = 0;
m_TextString1 = 0;
m_TextString2 = 0;
m_TextString3 = 0;
m_Fps = 0; m_Fps = 0;
m_FpsString = 0; m_FpsString = 0;
m_NormalMapShader = 0; m_NormalMapShader = 0;
@ -122,38 +119,6 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
return false; return false;
} }
// Set the strings we want to display.
strcpy_s(testString1, "Yo");
strcpy_s(testString2, "Les");
strcpy_s(testString3, "Noobs !");
// Create and initialize the first text object.
m_TextString1 = new TextClass;
result = m_TextString1->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, 32, m_Font, testString1, 25, screenHeight / 2 - m_Font->GetFontHeight(), 1.0f, 1.0f, 1.0f);
if (!result)
{
return false;
}
// Create and initialize the second text object.
m_TextString2 = new TextClass;
result = m_TextString2->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, 32, m_Font, testString2, 250, screenHeight / 2 - m_Font->GetFontHeight(), 0.0f, 1.0f, 1.0f);
if (!result)
{
return false;
}
// Create and initialize the second text object.
m_TextString3 = new TextClass;
result = m_TextString3->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), screenWidth, screenHeight, 32, m_Font, testString3, screenWidth / 2 - m_Font->GetSentencePixelLength(testString3), screenHeight / 2 - m_Font->GetFontHeight(), 1.0f, 1.0f, 0.0f);
if (!result)
{
return false;
}
// Create and initialize the texture shader object. // Create and initialize the texture shader object.
m_TextureShader = new TextureShaderClass; m_TextureShader = new TextureShaderClass;
@ -462,28 +427,6 @@ void ApplicationClass::Shutdown()
m_Fps = 0; m_Fps = 0;
} }
// Release the text string objects.
if (m_TextString3)
{
m_TextString3->Shutdown();
delete m_TextString3;
m_TextString3 = 0;
}
if (m_TextString2)
{
m_TextString2->Shutdown();
delete m_TextString2;
m_TextString2 = 0;
}
if (m_TextString1)
{
m_TextString1->Shutdown();
delete m_TextString1;
m_TextString1 = 0;
}
// Release the font object. // Release the font object.
if (m_Font) if (m_Font)
{ {
@ -920,36 +863,6 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z)
return false; return false;
} }
// Render the first text string using the font shader.
m_TextString1->Render(m_Direct3D->GetDeviceContext());
result = m_FontShader->Render(m_Direct3D->GetDeviceContext(), m_TextString1->GetIndexCount(), worldMatrix, m_baseViewMatrix, orthoMatrix,
m_Font->GetTexture(), m_TextString1->GetPixelColor());
if (!result)
{
return false;
}
// Render the second text string using the font shader.
m_TextString2->Render(m_Direct3D->GetDeviceContext());
result = m_FontShader->Render(m_Direct3D->GetDeviceContext(), m_TextString2->GetIndexCount(), worldMatrix, m_baseViewMatrix, orthoMatrix,
m_Font->GetTexture(), m_TextString2->GetPixelColor());
if (!result)
{
return false;
}
// Render the second text string using the font shader.
m_TextString3->Render(m_Direct3D->GetDeviceContext());
result = m_FontShader->Render(m_Direct3D->GetDeviceContext(), m_TextString3->GetIndexCount(), worldMatrix, m_baseViewMatrix, orthoMatrix,
m_Font->GetTexture(), m_TextString3->GetPixelColor());
if (!result)
{
return false;
}
// Render the mouse text strings using the font shader. // Render the mouse text strings using the font shader.
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {

1
enginecustom/applicationclass.h
View File

@ -162,7 +162,6 @@ private :
TextClass* m_MouseStrings; TextClass* m_MouseStrings;
TextClass* m_RenderCountString; TextClass* m_RenderCountString;
FontClass* m_Font; FontClass* m_Font;
TextClass* m_TextString1, * m_TextString2, * m_TextString3;
FpsClass* m_Fps; FpsClass* m_Fps;
TextClass* m_FpsString; TextClass* m_FpsString;
int m_previousFps; int m_previousFps;

2
enginecustom/imgui.ini
View File

@ -3,7 +3,7 @@ Pos=60,60
Size=400,400 Size=400,400
[Window][Khaotic Engine] [Window][Khaotic Engine]
Pos=172,20 Pos=260,25
Size=694,210 Size=694,210
[Window][Objects] [Window][Objects]