Skip to content

Commit 734d05a

Browse files
author
Lawrence D'Oliveiro
committed
Update for fix to misnamed keyword arguments in Blender 3.0.
Unfortunately this is not backward-compatible with pre-3.0 Blender.
1 parent fba9cf6 commit 734d05a

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
{
33
"name" : "Spaceship Generator",
44
"author" : "Michael Davies, Lawrence D'Oliveiro",
5-
"version" : (1, 6, 2),
6-
"blender" : (2, 82, 0),
5+
"version" : (1, 6, 3),
6+
"blender" : (3, 0, 0),
77
"location" : "View3D > Add > Mesh",
88
"description" : "Procedurally generate 3D spaceships from a random seed.",
99
"wiki_url" : "https://github.com/a1studmuffin/SpaceshipGenerator/blob/master/README.md",

‎spaceship_generator.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,8 @@ def add_cylinders_to_face(bm, face) :
750750
cap_ends = True,
751751
cap_tris = False,
752752
segments = num_segments,
753-
diameter1 = cylinder_size,
754-
diameter2 = cylinder_size,
753+
radius1 = cylinder_size,
754+
radius2 = cylinder_size,
755755
depth = cylinder_depth,
756756
matrix = cylinder_matrix
757757
)
@@ -807,8 +807,8 @@ def add_weapons_to_face(bm, face) :
807807
cap_ends = True,
808808
cap_tris = False,
809809
segments = num_segments,
810-
diameter1 = weapon_size * 0.9,
811-
diameter2 = weapon_size,
810+
radius1 = weapon_size * 0.9,
811+
radius2 = weapon_size,
812812
depth = weapon_depth,
813813
matrix = face_matrix
814814
)
@@ -819,8 +819,8 @@ def add_weapons_to_face(bm, face) :
819819
cap_ends = True,
820820
cap_tris = False,
821821
segments = num_segments,
822-
diameter1 = weapon_size * 0.6,
823-
diameter2 = weapon_size * 0.5,
822+
radius1 = weapon_size * 0.6,
823+
radius2 = weapon_size * 0.5,
824824
depth = weapon_depth * 2,
825825
matrix =
826826
face_matrix
@@ -836,8 +836,8 @@ def add_weapons_to_face(bm, face) :
836836
cap_ends = True,
837837
cap_tris = False,
838838
segments = num_segments,
839-
diameter1 = weapon_size * 0.5,
840-
diameter2 = weapon_size * 0.6,
839+
radius1 = weapon_size * 0.5,
840+
radius2 = weapon_size * 0.6,
841841
depth = weapon_depth * 2,
842842
matrix =
843843
face_matrix
@@ -862,8 +862,8 @@ def add_weapons_to_face(bm, face) :
862862
cap_ends = True,
863863
cap_tris = False,
864864
segments = 8,
865-
diameter1 = weapon_size * 0.4,
866-
diameter2 = weapon_size * 0.4,
865+
radius1 = weapon_size * 0.4,
866+
radius2 = weapon_size * 0.4,
867867
depth = weapon_depth * 5,
868868
matrix = turret_house_mat
869869
)
@@ -874,8 +874,8 @@ def add_weapons_to_face(bm, face) :
874874
cap_ends = True,
875875
cap_tris = False,
876876
segments = 8,
877-
diameter1 = weapon_size * 0.1,
878-
diameter2 = weapon_size * 0.1,
877+
radius1 = weapon_size * 0.1,
878+
radius2 = weapon_size * 0.1,
879879
depth = weapon_depth * 6,
880880
matrix =
881881
turret_house_mat
@@ -888,8 +888,8 @@ def add_weapons_to_face(bm, face) :
888888
cap_ends = True,
889889
cap_tris = False,
890890
segments = 8,
891-
diameter1 = weapon_size * 0.1,
892-
diameter2 = weapon_size * 0.1,
891+
radius1 = weapon_size * 0.1,
892+
radius2 = weapon_size * 0.1,
893893
depth = weapon_depth * 6,
894894
matrix =
895895
turret_house_mat
@@ -916,7 +916,7 @@ def add_sphere_to_face(bm, face) :
916916
(
917917
bm,
918918
subdivisions = 3,
919-
diameter = sphere_size,
919+
radius = sphere_size,
920920
matrix = sphere_matrix
921921
)
922922
for vert in result["verts"] :
@@ -950,7 +950,7 @@ def add_surface_antenna_to_face(bm, face) :
950950
face_size = math.sqrt(face.calc_area())
951951
depth = geom_random.uniform(0.1, 1.5) * face_size
952952
depth_short = depth * geom_random.uniform(0.02, 0.15)
953-
base_diameter = geom_random.uniform(0.005, 0.05)
953+
base_radius = geom_random.uniform(0.005, 0.05)
954954
material_index = MATERIAL.HULL_METALLIC
955955

956956
# Spire
@@ -961,8 +961,8 @@ def add_surface_antenna_to_face(bm, face) :
961961
cap_ends = False,
962962
cap_tris = False,
963963
segments = num_segments,
964-
diameter1 = 0,
965-
diameter2 = base_diameter,
964+
radius1 = 0,
965+
radius2 = base_radius,
966966
depth = depth,
967967
matrix = get_face_matrix(face, pos + face.normal * depth * 0.5)
968968
)
@@ -979,8 +979,8 @@ def add_surface_antenna_to_face(bm, face) :
979979
cap_ends = True,
980980
cap_tris = False,
981981
segments = num_segments,
982-
diameter1 = base_diameter * geom_random.uniform(1, 1.5),
983-
diameter2 = base_diameter * geom_random.uniform(1.5, 2),
982+
radius1 = base_radius * geom_random.uniform(1, 1.5),
983+
radius2 = base_radius * geom_random.uniform(1.5, 2),
984984
depth = depth_short,
985985
matrix = get_face_matrix(face, pos + face.normal * depth_short * 0.45)
986986
)
@@ -1007,8 +1007,8 @@ def add_disc_to_face(bm, face) :
10071007
cap_ends = True,
10081008
cap_tris = False,
10091009
segments = 32,
1010-
diameter1 = depth * 3,
1011-
diameter2 = depth * 4,
1010+
radius1 = depth * 3,
1011+
radius2 = depth * 4,
10121012
depth=depth,
10131013
matrix = get_face_matrix(face, face.calc_center_bounds() + face.normal * depth * 0.5)
10141014
)
@@ -1018,8 +1018,8 @@ def add_disc_to_face(bm, face) :
10181018
cap_ends = False,
10191019
cap_tris = False,
10201020
segments = 32,
1021-
diameter1 = depth * 1.25,
1022-
diameter2 = depth * 2.25,
1021+
radius1 = depth * 1.25,
1022+
radius2 = depth * 2.25,
10231023
depth = 0.0,
10241024
matrix = get_face_matrix(face, face.calc_center_bounds() + face.normal * depth * 1.05)
10251025
)

0 commit comments

Comments
 (0)