diff options
| author | Alvin Penner <penner@vaxxine.com> | 2009-12-28 11:12:43 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-28 11:12:43 +0000 |
| commit | 2d44e9ab35cb44184b022965f724264dd7e4fdbd (patch) | |
| tree | ed83f035e7f0b9f4023bb92281ec614f65418b2a | |
| parent | inkscape.pot and French translation update (diff) | |
| download | inkscape-2d44e9ab35cb44184b022965f724264dd7e4fdbd.tar.gz inkscape-2d44e9ab35cb44184b022965f724264dd7e4fdbd.zip | |
patches for LP bug 461964, latitude hiding formula and comment 13.
(bzr r8921)
| -rw-r--r-- | share/extensions/wireframe_sphere.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/share/extensions/wireframe_sphere.py b/share/extensions/wireframe_sphere.py index ec7e9ea33..8fbd4d3f1 100644 --- a/share/extensions/wireframe_sphere.py +++ b/share/extensions/wireframe_sphere.py @@ -147,10 +147,13 @@ class Wireframe_Sphere(inkex.Effect): for i in range(0,so.NUM_LONG/2): long_angle = so.ROT_OFFSET + (i*delta_long)*(pi/180.0); #The longitude of this particular line in radians + if long_angle > pi: + long_angle -= 2*pi width = so.RADIUS * cos(long_angle) height = so.RADIUS * sin(long_angle) * sin(so.TILT) #the rise is scaled by the sine of the tilt - length = sqrt(width*width+height*height) #by pythagorean theorem - inverse = sin(acos(length/so.RADIUS)) + # length = sqrt(width*width+height*height) #by pythagorean theorem + # inverse = sin(acos(length/so.RADIUS)) + inverse = abs(sin(long_angle)) * cos(so.TILT) minorRad = so.RADIUS * inverse minorRad=minorRad + EPSILON @@ -200,9 +203,7 @@ class Wireframe_Sphere(inkex.Effect): if lat_angle > pi-so.TILT: #this LoLat is fully visible draw_SVG_ellipse((majorRad, minorRad), (cx,cy), grp_lat) else: #this LoLat is partially visible - - proportion = -(acos( (lat_angle - pi/2)/(pi/2 - so.TILT)) )/pi + 1 #this is a dirty hacky approximation - #FIXME: if you can work out the right way to do this, please do it + proportion = -(acos( tan(lat_angle - pi/2)/tan(pi/2 - so.TILT)) )/pi + 1 start_end = ( pi/2 - proportion*pi, pi/2 + proportion*pi ) #make the start and end angles (mirror image around pi/2) draw_SVG_ellipse((majorRad, minorRad), (cx,cy), grp_lat, start_end) |