Skip to content
Snippets Groups Projects
Commit 137d74d9 authored by Andreas Schenk's avatar Andreas Schenk
Browse files

renamed rad1 and rad2 to radius_1 and radius_2 in gfx_prim.hh, because rad1

and rad2 are already defined as constants in vc++
parent abfa8a35
Branches
Tags
No related merge requests found
......@@ -74,18 +74,18 @@ struct CylinderPrim {
calc_rotmat();
}
CylinderPrim(const geom::Vec3& st, const geom::Vec3& en, float rad1, float rad2, const Color& col):
CylinderPrim(const geom::Vec3& st, const geom::Vec3& en, float radius_1, float radius_2, const Color& col):
start(st), end(en),
radius1(rad1), radius2(rad2),
radius1(radius_1), radius2(radius_2),
color1(col), color2(col),
length(geom::Length(end-start)), rotmat(), rotmat_t()
{
calc_rotmat();
}
CylinderPrim(const geom::Vec3& st, const geom::Vec3& en, float rad1, float rad2, const Color& col1, const Color& col2):
CylinderPrim(const geom::Vec3& st, const geom::Vec3& en, float radius_1, float radius_2, const Color& col1, const Color& col2):
start(st), end(en),
radius1(rad1), radius2(rad2),
radius1(radius_1), radius2(radius_2),
color1(col1), color2(col2),
length(geom::Length(end-start)), rotmat(), rotmat_t()
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment