diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 18:59:58 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 19:12:29 +0300 |
commit | d7d3233715503ecc15b8dd1973f7e73257e2cbda (patch) | |
tree | f9f9ab24b89fe574b3f972e45c8337bcd791a9b1 /add_mesh_extra_objects | |
parent | 84b817117328b3193533324846ec389b1f5fe5c4 (diff) |
Spelling fixes in comments and descriptions, patch by luzpaz.
Differential Revision: https://developer.blender.org/D3746
Diffstat (limited to 'add_mesh_extra_objects')
-rw-r--r-- | add_mesh_extra_objects/Blocks.py | 26 | ||||
-rw-r--r-- | add_mesh_extra_objects/Wallfactory.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_beam_builder.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_gears.py | 2 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_round_brilliant.py | 18 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_solid.py | 6 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_teapot.py | 4 | ||||
-rw-r--r-- | add_mesh_extra_objects/add_mesh_triangles.py | 10 | ||||
-rw-r--r-- | add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py | 6 | ||||
-rw-r--r-- | add_mesh_extra_objects/geodesic_domes/vefm_271.py | 12 | ||||
-rw-r--r-- | add_mesh_extra_objects/mesh_discombobulator.py | 2 |
11 files changed, 45 insertions, 45 deletions
diff --git a/add_mesh_extra_objects/Blocks.py b/add_mesh_extra_objects/Blocks.py index bade30d0..31db7807 100644 --- a/add_mesh_extra_objects/Blocks.py +++ b/add_mesh_extra_objects/Blocks.py @@ -11,7 +11,7 @@ # note above. # if opening width == indent*2 the edge blocks fail (row of blocks cross opening). # if openings overlap fills inverse with blocks - see h/v slots. -# Negative grout width creates a pair of phantom blocks, seperated by grout +# Negative grout width creates a pair of phantom blocks, separated by grout # width, inside the edges. # if block width variance is 0, and edging is on, right edge blocks create a "vertical seam" @@ -401,7 +401,7 @@ def MakeAKeystone(xpos, width, zpos, ztop, zbtm, thick, bevel, vll=0, FaceExclud faces.append([5, 4, 0, 1]) faces.append([6, 5, 1, 2]) faces.append([7, 6, 2, 3]) - # Offset the vertex numbers by the number of verticies already in the list + # Offset the vertex numbers by the number of vertices already in the list for i in range(len(faces)): for j in range(len(faces[i])): faces[i][j] += vll @@ -415,7 +415,7 @@ def circ(offs=0., r=1.): __doc__ = """\ offs is the distance perpendicular to the line to the center of the circle r is the radius of the circle - circ returns the distance paralell to the line to the center of the circle at the intercept. + circ returns the distance parallel to the line to the center of the circle at the intercept. """ offs = abs(offs) if offs > r: @@ -769,7 +769,7 @@ class rowOb: self.h = float(rowheight) self.EdgeOffset = float(edgeoffset) - # THIS INITILIZATION IS IMPORTANT! OTHERWISE ALL OBJECTS WILL HAVE THE SAME LISTS! + # THIS INITIALIZATION IS IMPORTANT! OTHERWISE ALL OBJECTS WILL HAVE THE SAME LISTS! self.BlocksEdge = [] self.RowSegments = [] self.BlocksNorm = [] @@ -904,7 +904,7 @@ def sketch(): x['v'], x['t'], x['vl'], x['tl'], x['b'])) else: boundlist.append(opening(x['x'], x['z'], x['w'], x['h'], x['v'], x['t'], x['vl'], x['tl'], x['b'])) - # check for overlaping edges? + # check for overlapping edges? return boundlist @@ -946,7 +946,7 @@ def wedgeBlocks(row, opening, leftPos, rightPos, edgeBinary, r1): # Wedges are on btm = blank, off, blank, off ThisBlockOffsets = [[0, 0, LeftVertOffset]] * 2 + [[0] * 3] * 2 + [[0, 0, RightVertOffset]] * 2 - # Instert or append "blank" for top or bottom wedges. + # Insert or append "blank" for top or bottom wedges. if edgeBinary == 1: ThisBlockOffsets = ThisBlockOffsets + [[0] * 3] * 2 else: @@ -1086,7 +1086,7 @@ def rowProcessing(row, Thesketch, WallBoundaries): LDiff = LBtm - LTop RDiff = RTop - RBtm - # which is furthur out on each side, top or bottom? + # which is further out on each side, top or bottom? if LDiff > 0: LNerEdge = LBtm # the nearer edge left LEB = 1 # Left Edge Boolean, set to 1 if furthest edge is top, -1 if it is bottom @@ -1180,7 +1180,7 @@ def rowProcessing(row, Thesketch, WallBoundaries): # this row is just two blocks! Left block, then right block # div is the x position of the dividing point between the two bricks div = InnerMid + (rndd() * settings['wv']) / r1 - # set the grout distance, since we need grout seperation between the blocks + # set the grout distance, since we need grout separation between the blocks grt = (settings['g'] + rndc() * settings['gv']) / r1 # set the x position and width for the left block x = (div + LNerEdge) / 2 - grt / 4 @@ -1330,7 +1330,7 @@ def archGeneration(hole, vlist, flist, sideSign): example, Upper arch: archGeneration(hole, vlist, flist, 1) hole is the opening object that the arch is for - add the verticies to vlist + add the vertices to vlist add the faces to flist sideSign is + or - 1, for the top or bottom arch. Other values may cause errors. """ @@ -1410,7 +1410,7 @@ def archGeneration(hole, vlist, flist, sideSign): BtmHt = - (hole.btm() - MidZ) - Grout TopHt = nearCorner - # set the amout to bevel the keystone + # set the amount to bevel the keystone keystoneBevel = (bevHt - v) * sideSign if Wdth >= settings['hm']: avlist, aflist = MakeAKeystone(x, Wdth, MidZ, TopHt, BtmHt, Dpth, keystoneBevel, len(vlist)) @@ -1572,7 +1572,7 @@ def build(Aplan): else: r1 = 1 - Tollerance = settings['g'] / r1 + Tolerance = settings['g'] / r1 idxThis = len(rows[rowidx].BlocksNorm[:]) - 1 idxThat = len(rows[rowidx + 1].BlocksNorm[:]) - 1 @@ -1588,7 +1588,7 @@ def build(Aplan): cx, cz, cw, ch, cd = blockThis[:5] ox, oz, ow, oh, od = blockThat[:5] - if (abs(cw - ow) < Tollerance) and (abs(cx - ox) < Tollerance): + if (abs(cw - ow) < Tolerance) and (abs(cx - ox) < Tolerance): if cw > ow: BlockW = ow else: @@ -1781,7 +1781,7 @@ def build(Aplan): def createWall(radial, curve, openings, mergeBlox, shelf, shelfSide, steps, stepDir, stepBare, stepSide): __doc__ = """\ - Call all the funcitons you need to make a wall, return the verts and faces. + Call all the functions you need to make a wall, return the verts and faces. """ global radialized global slope diff --git a/add_mesh_extra_objects/Wallfactory.py b/add_mesh_extra_objects/Wallfactory.py index 41957b22..16215fbf 100644 --- a/add_mesh_extra_objects/Wallfactory.py +++ b/add_mesh_extra_objects/Wallfactory.py @@ -61,7 +61,7 @@ class add_mesh_wallb(Operator): bl_description = "Create a block (masonry) wall mesh" bl_options = {'REGISTER', 'UNDO'} - # UI items - API for properties - User accessable variables... + # UI items - API for properties - User accessible variables... # not all options are via UI, and some operations just don't work yet # only create object when True diff --git a/add_mesh_extra_objects/add_mesh_beam_builder.py b/add_mesh_extra_objects/add_mesh_beam_builder.py index cacde06a..ba8ae6fc 100644 --- a/add_mesh_extra_objects/add_mesh_beam_builder.py +++ b/add_mesh_extra_objects/add_mesh_beam_builder.py @@ -186,7 +186,7 @@ def create_beam(sRef): def beamSlant(sRef, outV, inV): bTaper = 100 - sRef.edgeA - # calcuate variance & adjust vertex + # calculate variance & adjust vertex deltaV = ((inV - outV) / 100) adVert = outV + (deltaV * bTaper) diff --git a/add_mesh_extra_objects/add_mesh_gears.py b/add_mesh_extra_objects/add_mesh_gears.py index 7eede285..b042a6d5 100644 --- a/add_mesh_extra_objects/add_mesh_gears.py +++ b/add_mesh_extra_objects/add_mesh_gears.py @@ -461,7 +461,7 @@ def add_spokes(teethNum, radius, De, base, width=1, conangle=0, rack=0, # crown ... Inward pointing extend of crown teeth # # @todo: Fix teethNum. Some numbers are not possible yet -# @todo: Create start & end geoemtry (closing faces) +# @todo: Create start & end geometry (closing faces) def add_worm(teethNum, rowNum, radius, Ad, De, p_angle, width=1, skew=radians(11.25), crown=0.0): diff --git a/add_mesh_extra_objects/add_mesh_round_brilliant.py b/add_mesh_extra_objects/add_mesh_round_brilliant.py index 850421d8..d8310c42 100644 --- a/add_mesh_extra_objects/add_mesh_round_brilliant.py +++ b/add_mesh_extra_objects/add_mesh_round_brilliant.py @@ -27,9 +27,9 @@ def addBrilliant(context, s, table_w, crown_h, girdle_t, pavi_d, bezel_f, # table_w # table width default: 0.530 # crown_h # crown height default: 0.162 # girdle_t # girdle thickness default: 0.017 - # pavi_d # pavillion depth default: 0.431 + # pavi_d # pavilion depth default: 0.431 # bezel_f # bezel factor default: 0.250 - # pavi_f # pavillion factor default: 0.400 + # pavi_f # pavilion factor default: 0.400 # culet # culet size default: 0.000 # girdle_real # type of girdle flat/real default: True # g_real_smooth # smooth or flat shading default: False @@ -197,7 +197,7 @@ def addBrilliant(context, s, table_w, crown_h, girdle_t, pavi_d, bezel_f, else: va(culet / ca, pavi_d * (-2), 2 * ang, ang, int(s / 2)) - # make pavillion facet face + # make pavilion facet face l5 = len(Verts) # 4*s / 10*s //if !culet: 3.5*s+1 / 9.5*s+1 for i in range(l5): if i > 0 and i < s - 1 and i % 2 == 0: @@ -266,7 +266,7 @@ def addBrilliant(context, s, table_w, crown_h, girdle_t, pavi_d, bezel_f, for i, p in enumerate(dp): pls.extend(p.vertices) # list all verts of girdle - for i, e in enumerate(obj.data.edges): # select egdes to mark sharp + for i, e in enumerate(obj.data.edges): # select edges to mark sharp if e.vertices[0] in pls and e.vertices[1] in pls and abs( ov[e.vertices[0]].co.x - ov[e.vertices[1]].co.x): obj.data.edges[i].select = True @@ -301,7 +301,7 @@ def addBrilliant(context, s, table_w, crown_h, girdle_t, pavi_d, bezel_f, class MESH_OT_primitive_brilliant_add(Operator): bl_idname = "mesh.primitive_brilliant_add" bl_label = "Custom Brilliant" - bl_description = "Contruct a custom brilliant mesh" + bl_description = "Construct a custom brilliant mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} # set user options @@ -324,7 +324,7 @@ class MESH_OT_primitive_brilliant_add(Operator): ) crown_h = FloatProperty( name="Crown height", - description="Heigth of crown", + description="Height of crown", min=0.0, max=1.0, default=0.162, @@ -350,7 +350,7 @@ class MESH_OT_primitive_brilliant_add(Operator): ) pavi_d = FloatProperty( name="Pavilion depth", - description="Height of pavillion", + description="Height of pavilion", min=0.0, max=1.0, default=0.431, @@ -366,7 +366,7 @@ class MESH_OT_primitive_brilliant_add(Operator): ) pavi_f = FloatProperty( name="Lower facet factor", - description="Determines the form of pavillion and lower girdle facets", + description="Determines the form of pavilion and lower girdle facets", min=0.001, max=1.0, default=0.400, @@ -382,7 +382,7 @@ class MESH_OT_primitive_brilliant_add(Operator): ) keep_lga = BoolProperty( name="Retain lower angle", - description="If culet > 0, retains angle of pavillion facets", + description="If culet > 0, retains angle of pavilion facets", default=False ) diff --git a/add_mesh_extra_objects/add_mesh_solid.py b/add_mesh_extra_objects/add_mesh_solid.py index 3fb058c9..74c173e4 100644 --- a/add_mesh_extra_objects/add_mesh_solid.py +++ b/add_mesh_extra_objects/add_mesh_solid.py @@ -246,7 +246,7 @@ def createSolid(plato, vtrunc, etrunc, dual, snub): fvOutput[vData[x][2][j]][index - 1]]) feOutput.append([fvOutput[x][j - 1], fvOutput[vData[x][2][j]][index], fvOutput[vData[x][2][j]][index - 1]]) - # special rules fro birectified mesh (v1 todo: done) + # special rules for birectified mesh (v1 todo: done) elif vtrunc == 0.5: for j in range(len(i) - 1): if x < vData[x][2][j]: # use current vert, since other one has not passed yet @@ -348,7 +348,7 @@ class Solids(bpy.types.Operator): ) vTrunc = FloatProperty( name="Vertex Truncation", - description="Ammount of vertex truncation", + description="Amount of vertex truncation", min=0.0, soft_min=0.0, max=2.0, @@ -359,7 +359,7 @@ class Solids(bpy.types.Operator): ) eTrunc = FloatProperty( name="Edge Truncation", - description="Ammount of edge truncation", + description="Amount of edge truncation", min=0.0, soft_min=0.0, max=1.0, diff --git a/add_mesh_extra_objects/add_mesh_teapot.py b/add_mesh_extra_objects/add_mesh_teapot.py index 23dd084f..3f117d72 100644 --- a/add_mesh_extra_objects/add_mesh_teapot.py +++ b/add_mesh_extra_objects/add_mesh_teapot.py @@ -199,8 +199,8 @@ def transpose(rowsbycols): def make_teapot(enumname, resolution): filenames = [None, teapot, teaspoon] try: - indexs = int(enumname) - filename = filenames[indexs] + indexes = int(enumname) + filename = filenames[indexes] except: print("Add Teapot Error: EnumProperty could not be set") filename = filenames[1] diff --git a/add_mesh_extra_objects/add_mesh_triangles.py b/add_mesh_extra_objects/add_mesh_triangles.py index f5768c0a..2cccd0fb 100644 --- a/add_mesh_extra_objects/add_mesh_triangles.py +++ b/add_mesh_extra_objects/add_mesh_triangles.py @@ -68,9 +68,9 @@ class MakeTriangle(Operator): ] triangleFaceList = [ ('DEFAULT', "Normal", "1 Tri(angle) face", 0), - ('TRIANGLES', "3 Tri faces", "4 Verticies & 3 Tri(angle) faces", 1), - ('QUADS', "3 Quad faces", "7 Verticies & 3 Quad faces", 2), - ('SAFEQUADS', "6 Quad faces", "12 Verticies & 6 Quad faces", 3) + ('TRIANGLES', "3 Tri faces", "4 Vertices & 3 Tri(angle) faces", 1), + ('QUADS', "3 Quad faces", "7 Vertices & 3 Quad faces", 2), + ('SAFEQUADS', "6 Quad faces", "12 Vertices & 6 Quad faces", 3) ] # add definitions for some manipulation buttons @@ -255,7 +255,7 @@ class MakeTriangle(Operator): # a triangle consists of 3 points: A, B, C # a 'safer' subdividable triangle consists of 4 points: A, B, C, D # a subdivide friendly triangle consists of 7 points: A, B, C, D, AB, AC, BC - # a truely subdivide friendly triangle consists of (3 x 4 = )12 points: + # a truly subdivide friendly triangle consists of (3 x 4 = )12 points: # A, B, C, D, E, BC, AAB, AAC, BBA, BBC, BCC, CCA BasicShapeCreated = False @@ -263,7 +263,7 @@ class MakeTriangle(Operator): go = 0 # - # call the functions for creating the triangles and test if successfull + # call the functions for creating the triangles and test if successful # BasicShapeCreated = self.drawBasicTriangleShape() if (BasicShapeCreated): diff --git a/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py b/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py index 720628d6..ab3b0e9b 100644 --- a/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py +++ b/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py @@ -1117,7 +1117,7 @@ class GenerateGeodesicDome(Operator): basegeodesic.makegeodesic() basegeodesic.connectivity() mesh = vefm_271.mesh() - vefm_271.finalfill(basegeodesic, mesh) # always! for hexifiy etc. necessarry!!! + vefm_271.finalfill(basegeodesic, mesh) # always! for hexifiy etc. necessary!!! vefm_271.vefm_add_object(mesh) last_generated_object = context.active_object last_generated_object.location = (0, 0, 0) @@ -1319,7 +1319,7 @@ class GenerateGeodesicDome(Operator): message = "***OK***\nParameters saved in\n" + filename print(message) except: - message = "***ERRROR***\n" + "Writing " + filename + "\nis not possible" + message = "***ERROR***\n" + "Writing " + filename + "\nis not possible" # bpy.context.scene.instant_filenames = filenames except: @@ -1348,7 +1348,7 @@ class GenerateGeodesicDome(Operator): message = "***OK***\nparameters read from\n" + filename print(message) except: - message = "***ERRROR***\n" + "Writing " + filename + "\nnot possible" + message = "***ERROR***\n" + "Writing " + filename + "\nnot possible" # bpy.context.scene.instant_filenames = filenames except: message = "***ERROR***\n Contakt PKHG,\nsomething went wrong reading params happened" diff --git a/add_mesh_extra_objects/geodesic_domes/vefm_271.py b/add_mesh_extra_objects/geodesic_domes/vefm_271.py index cac2b74d..8c87c22a 100644 --- a/add_mesh_extra_objects/geodesic_domes/vefm_271.py +++ b/add_mesh_extra_objects/geodesic_domes/vefm_271.py @@ -72,7 +72,7 @@ class vertex: self.normal = average(target).centroid() self.normal.findlength() if self.length == 0: - print("******ERROR*** lenght zero in findnormal, j = (0,1,0) replcaced") + print("******ERROR*** length zero in findnormal, j = (0,1,0) replaced") self.normal = vertex((0, 1, 0)) self.normal.normalize() @@ -706,7 +706,7 @@ class mesh: class facetype(mesh): def __init__(self, basegeodesic, parameters, width, height, relative): mesh.__init__(self) - self.detatch = parameters[0] + self.detach = parameters[0] self.endtype = parameters[1] self.coords = parameters[2] self.base = basegeodesic @@ -750,7 +750,7 @@ class facetype(mesh): return length def createfaces(self): - if not self.detatch: + if not self.detach: for point in self.base.verts: self.verts.append(point) if self.endtype == 4: @@ -768,7 +768,7 @@ class facetype(mesh): grid = [] candidate.dospokes() - if not self.detatch: + if not self.detach: line = [] for vert in candidate.vertices: line.append(vert) @@ -1100,10 +1100,10 @@ class hub(mesh): # ???PKHG TODO Nmesh used yet wrong! def finalfill(source, target): - if source == target: # PKHG: otherewise >infinite< loop + if source == target: # PKHG: otherwise >infinite< loop print("\n***WARNING*** vefm_271.finalfill L1104 source == target empty mesh used") target = mesh() - # PKHG_??? maybe renumverting and checkkin faces wiht >=4 5 vertices? + # PKHG_??? maybe renumverting and checking faces with >=4 5 vertices? count = 0 for point in source.verts: diff --git a/add_mesh_extra_objects/mesh_discombobulator.py b/add_mesh_extra_objects/mesh_discombobulator.py index b677fc6c..bc0bfe67 100644 --- a/add_mesh_extra_objects/mesh_discombobulator.py +++ b/add_mesh_extra_objects/mesh_discombobulator.py @@ -461,7 +461,7 @@ def discombobulate(minHeight, maxHeight, minTaper, maxTaper, sf1, sf2, sf3, sf4, to_scale = bpy.context.active_object.scale to_rotate = bpy.context.active_object.rotation_euler - # First, we collect all the informations we will need from the previous mesh + # First, we collect all the information we will need from the previous mesh obverts = bpy.context.active_object.data.vertices obpolygons = bpy.context.active_object.data.polygons verts = [] |