mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2025-07-18 19:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

various small C++ warning fixes

Browse Source
This commit is contained in:
Noel Berry
2021-05-06 21:48:06 -07:00
parent fb91b77900
commit 04f6257b75
20 changed files with 87 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/graphics/batch.cpp
View File

@ -140,11 +140,11 @@ namespace
}
#define MAKE_VERTEX(vert, mat, px, py, tx, ty, c, m, w, f) \
(vert)->pos.x = ((px) * mat.m11) + ((py) * mat.m21) + mat.m31; \
(vert)->pos.y = ((px) * mat.m12) + ((py) * mat.m22) + mat.m32; \
(vert)->pos.x = ((px) * (mat).m11) + ((py) * (mat).m21) + (mat).m31; \
(vert)->pos.y = ((px) * (mat).m12) + ((py) * (mat).m22) + (mat).m32; \
(vert)->tex.x = tx; \
if (m_batch.flip_vertically) \
(vert)->tex.y = 1.0f - ty; \
(vert)->tex.y = 1.0f - (ty); \
else \
(vert)->tex.y = ty; \
(vert)->col = c; \
@ -194,7 +194,7 @@ do { \
// Compares a Batcher variable, and starts a new batch if it has changed
#define SET_BATCH_VAR(variable) \
if (m_batch.elements > 0 && variable != m_batch.variable) \
if (m_batch.elements > 0 && (variable) != m_batch.variable) \
INSERT_BATCH(); \
m_batch.variable = variable;
@ -757,7 +757,7 @@ void Batch::rect_rounded_line(const Rect& r, float rtl, int rtl_steps, float rtr
}
}
void Batch::semi_circle(Vec2 center, float start_radians, float end_radians, float radius, int steps, Color centerColor, Color edgeColor)
void Batch::semi_circle(const Vec2& center, float start_radians, float end_radians, float radius, int steps, Color centerColor, Color edgeColor)
{
Vec2 last = Vec2::from_angle(start_radians, radius);
float add = Calc::angle_diff(start_radians, end_radians);
@ -770,12 +770,12 @@ void Batch::semi_circle(Vec2 center, float start_radians, float end_radians, flo
}
}
void Batch::semi_circle(Vec2 center, float start_radians, float end_radians, float radius, int steps, Color color)
void Batch::semi_circle(const Vec2& center, float start_radians, float end_radians, float radius, int steps, Color color)
{
semi_circle(center, start_radians, end_radians, radius, steps, color, color);
}
void Batch::semi_circle_line(Vec2 center, float start_radians, float end_radians, float radius, int steps, float t, Color color)
void Batch::semi_circle_line(const Vec2& center, float start_radians, float end_radians, float radius, int steps, float t, Color color)
{
if (t >= radius)
{
@ -801,12 +801,12 @@ void Batch::semi_circle_line(Vec2 center, float start_radians, float end_radians
}
}
void Batch::circle(const Vec2 center, float radius, int steps, Color color)
void Batch::circle(const Vec2& center, float radius, int steps, Color color)
{
circle(center, radius, steps, color, color);
}
void Batch::circle(const Vec2 center, float radius, int steps, Color center_color, Color outer_color)
void Batch::circle(const Vec2& center, float radius, int steps, Color center_color, Color outer_color)
{
Vec2 last = Vec2(center.x + radius, center.y);
@ -821,7 +821,7 @@ void Batch::circle(const Vec2 center, float radius, int steps, Color center_colo
}
}
void Batch::circle_line(const Vec2 center, float radius, float t, int steps, Color color)
void Batch::circle_line(const Vec2& center, float radius, float t, int steps, Color color)
{
if (t >= radius)
{

2
src/graphics/material.cpp
View File

@ -70,7 +70,7 @@ Material::Material(const ShaderRef& shader)
m_data.expand(float_size);
}
const ShaderRef Material::shader() const
ShaderRef Material::shader() const
{
return m_shader;
}