aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmath/llvolume.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llmath/llvolume.cpp
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llmath/llvolume.cpp')
-rw-r--r--linden/indra/llmath/llvolume.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index e42413a..bb3b24d 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -3,6 +3,7 @@
3 * 3 *
4 * Copyright (c) 2002-2007, Linden Research, Inc. 4 * Copyright (c) 2002-2007, Linden Research, Inc.
5 * 5 *
6 * Second Life Viewer Source Code
6 * The source code in this file ("Source Code") is provided by Linden Lab 7 * The source code in this file ("Source Code") is provided by Linden Lab
7 * to you under the terms of the GNU General Public License, version 2.0 8 * to you under the terms of the GNU General Public License, version 2.0
8 * ("GPL"), unless you have obtained a separate licensing agreement 9 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -215,7 +216,7 @@ void LLProfile::genNGon(S32 sides, F32 offset, F32 bevel, F32 ang_scale, S32 spl
215 t_fraction = (begin - t_first)*sides; 216 t_fraction = (begin - t_first)*sides;
216 217
217 // Only use if it's not almost exactly on an edge. 218 // Only use if it's not almost exactly on an edge.
218 if (t_fraction < 0.99f) 219 if (t_fraction < 0.9999f)
219 { 220 {
220 LLVector3 new_pt = lerp(pt1, pt2, t_fraction); 221 LLVector3 new_pt = lerp(pt1, pt2, t_fraction);
221 F32 pt_x = new_pt.mV[VX]; 222 F32 pt_x = new_pt.mV[VX];
@@ -266,7 +267,7 @@ void LLProfile::genNGon(S32 sides, F32 offset, F32 bevel, F32 ang_scale, S32 spl
266 267
267 // Find the fraction that we need to add to the end point. 268 // Find the fraction that we need to add to the end point.
268 t_fraction = (end - (t - t_step))*sides; 269 t_fraction = (end - (t - t_step))*sides;
269 if (t_fraction > 0.01f) 270 if (t_fraction > 0.0001f)
270 { 271 {
271 LLVector3 new_pt = lerp(pt1, pt2, t_fraction); 272 LLVector3 new_pt = lerp(pt1, pt2, t_fraction);
272 F32 pt_x = new_pt.mV[VX]; 273 F32 pt_x = new_pt.mV[VX];