riyyi/inferno
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused parameter

Browse Source
This commit is contained in:
Riyyi
2021-01-14 03:07:02 +01:00
parent 6fb114cbd4
commit eea20285e4
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inferno/src/inferno/application.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ namespace Inferno {
Renderer2D::the().drawQuad(quad2.get<TransformComponent>(), { 0.5f, 0.6f, 0.8f, 1.0f }, m_texture); Renderer2D::the().drawQuad(quad2.get<TransformComponent>(), { 0.5f, 0.6f, 0.8f, 1.0f }, m_texture);
Renderer2D::the().drawQuad(quad3.get<TransformComponent>(), { 1.0f, 1.0f, 1.0f, 1.0f }, m_texture2); Renderer2D::the().drawQuad(quad3.get<TransformComponent>(), { 1.0f, 1.0f, 1.0f, 1.0f }, m_texture2);
RendererCharacter::the().drawCharacter(character, {1,1,1,1}, f->texture()); RendererCharacter::the().drawCharacter(character, f->texture());
Renderer2D::the().endScene(); Renderer2D::the().endScene();
RendererCharacter::the().endScene(); RendererCharacter::the().endScene();
inferno/src/inferno/render/renderer.cpp
+1 -6
View File
@@ -349,12 +349,7 @@ namespace Inferno {
nextBatch(); nextBatch();
} }
void RendererCharacter::drawCharacter(std::array<CharacterVertex, vertexPerQuad>& characterQuad, glm::vec4 color, std::shared_ptr<Texture> texture) void RendererCharacter::drawCharacter(std::array<CharacterVertex, vertexPerQuad>& characterQuad, std::shared_ptr<Texture> texture)
{
drawCharacter(characterQuad, glm::mat4 { color, color, color, color }, texture);
}
void RendererCharacter::drawCharacter(std::array<CharacterVertex, vertexPerQuad>& characterQuad, glm::mat4 color, std::shared_ptr<Texture> texture)
{ {
// Create a new batch if the quad limit has been reached // Create a new batch if the quad limit has been reached
if (m_quadIndex >= quadCount) { if (m_quadIndex >= quadCount) {
inferno/src/inferno/render/renderer.h
+1 -2
View File
@@ -134,8 +134,7 @@ namespace Inferno {
void beginScene(); void beginScene();
void endScene(); void endScene();
void drawCharacter(std::array<CharacterVertex, vertexPerQuad>& characterQuad, glm::vec4 color, std::shared_ptr<Texture> texture); void drawCharacter(std::array<CharacterVertex, vertexPerQuad>& characterQuad, std::shared_ptr<Texture> texture);
void drawCharacter(std::array<CharacterVertex, vertexPerQuad>& characterQuad, glm::mat4 color, std::shared_ptr<Texture> texture);
static inline RendererCharacter& the() { return *s_instance; } static inline RendererCharacter& the() { return *s_instance; }