kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions Packages Projects 9 Releases 2 Wiki Activity

Removed redundant float casts

Browse Source 
fix cast promotions
This commit is contained in:
mos
2023-12-11 14:31:19 +01:00
committed by Yorik van Havre
parent bd0126812d
commit 243acce4e6
3 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/App/MaterialPyImp.cpp
View File

@@ -110,11 +110,11 @@ Py::Tuple MaterialPy::getAmbientColor() const
void MaterialPy::setAmbientColor(Py::Tuple arg)
{
Color c;
c.r = (float)Py::Float(arg.getItem(0));
c.g = (float)Py::Float(arg.getItem(1));
c.b = (float)Py::Float(arg.getItem(2));
c.r = Py::Float(arg.getItem(0));
c.g = Py::Float(arg.getItem(1));
c.b = Py::Float(arg.getItem(2));
if (arg.size() == 4)
c.a = (float)Py::Float(arg.getItem(3));
c.a = Py::Float(arg.getItem(3));
getMaterialPtr()->ambientColor = c;
}
@@ -131,11 +131,11 @@ Py::Tuple MaterialPy::getDiffuseColor() const
void MaterialPy::setDiffuseColor(Py::Tuple arg)
{
Color c;
c.r = (float)Py::Float(arg.getItem(0));
c.g = (float)Py::Float(arg.getItem(1));
c.b = (float)Py::Float(arg.getItem(2));
c.r = Py::Float(arg.getItem(0));
c.g = Py::Float(arg.getItem(1));
c.b = Py::Float(arg.getItem(2));
if (arg.size() == 4)
c.a = (float)Py::Float(arg.getItem(3));
c.a = Py::Float(arg.getItem(3));
getMaterialPtr()->diffuseColor = c;
}
@@ -152,11 +152,11 @@ Py::Tuple MaterialPy::getEmissiveColor() const
void MaterialPy::setEmissiveColor(Py::Tuple arg)
{
Color c;
c.r = (float)Py::Float(arg.getItem(0));
c.g = (float)Py::Float(arg.getItem(1));
c.b = (float)Py::Float(arg.getItem(2));
c.r = Py::Float(arg.getItem(0));
c.g = Py::Float(arg.getItem(1));
c.b = Py::Float(arg.getItem(2));
if (arg.size() == 4)
c.a = (float)Py::Float(arg.getItem(3));
c.a = Py::Float(arg.getItem(3));
getMaterialPtr()->emissiveColor = c;
}
@@ -173,11 +173,11 @@ Py::Tuple MaterialPy::getSpecularColor() const
void MaterialPy::setSpecularColor(Py::Tuple arg)
{
Color c;
c.r = (float)Py::Float(arg.getItem(0));
c.g = (float)Py::Float(arg.getItem(1));
c.b = (float)Py::Float(arg.getItem(2));
c.r = Py::Float(arg.getItem(0));
c.g = Py::Float(arg.getItem(1));
c.b = Py::Float(arg.getItem(2));
if (arg.size() == 4)
c.a = (float)Py::Float(arg.getItem(3));
c.a = Py::Float(arg.getItem(3));
getMaterialPtr()->specularColor = c;
}
@@ -188,7 +188,7 @@ Py::Float MaterialPy::getShininess() const
void MaterialPy::setShininess(Py::Float arg)
{
getMaterialPtr()->shininess = (float)arg;
getMaterialPtr()->shininess = arg;
}
Py::Float MaterialPy::getTransparency() const
@@ -198,7 +198,7 @@ Py::Float MaterialPy::getTransparency() const
void MaterialPy::setTransparency(Py::Float arg)
{
getMaterialPtr()->transparency = (float)arg;
getMaterialPtr()->transparency = arg;
}
PyObject *MaterialPy::getCustomAttributes(const char* /*attr*/) const