From 137d74d98f0906f9f6622a35c935bb7452786864 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Sun, 10 Jun 2012 22:49:22 -0400
Subject: [PATCH] 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++
---
modules/gfx/src/gfx_prim.hh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/gfx/src/gfx_prim.hh b/modules/gfx/src/gfx_prim.hh
index d3b97cec8..cb5454254 100644
--- a/modules/gfx/src/gfx_prim.hh
+++ b/modules/gfx/src/gfx_prim.hh
@@ -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()
{
--
GitLab