Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-01-15 02:01:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix division by zero error in shape.gd.

Browse Source
This commit is contained in:
Relintai 2021-10-09 19:07:50 +02:00
parent a0a2a81acf
commit babee4f93a
2 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
game/addons/mat_maker_gd/new_resource.tres
View File

@ -1,4 +1,4 @@
[gd_resource type="Resource" load_steps=15 format=2] [gd_resource type="Resource" load_steps=19 format=2]
[ext_resource path="res://addons/mat_maker_gd/nodes/mm_material.gd" type="Script" id=1] [ext_resource path="res://addons/mat_maker_gd/nodes/mm_material.gd" type="Script" id=1]
[ext_resource path="res://addons/mat_maker_gd/nodes/noise/perlin.gd" type="Script" id=2] [ext_resource path="res://addons/mat_maker_gd/nodes/noise/perlin.gd" type="Script" id=2]
@ -25,7 +25,7 @@ refresh = false
script = ExtResource( 5 ) script = ExtResource( 5 )
default_type = 1 default_type = 1
default_int = 0 default_int = 0
default_float = 0.5 default_float = 0.75
default_vector2 = Vector2( 0, 0 ) default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 ) default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 ) default_color = Color( 0, 0, 0, 1 )
@ -43,21 +43,21 @@ default_color = Color( 0, 0, 0, 1 )
script = ExtResource( 5 ) script = ExtResource( 5 )
default_type = 1 default_type = 1
default_int = 0 default_int = 0
default_float = 0.55 default_float = 0.65
default_vector2 = Vector2( 0, 0 ) default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 ) default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 ) default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=5] [sub_resource type="Resource" id=5]
script = ExtResource( 4 ) script = ExtResource( 4 )
graph_position = Vector2( -360, -340 ) graph_position = Vector2( -340, -340 )
image = SubResource( 7 ) image = SubResource( 7 )
shape_type = 2 shape_type = 4
sides = 6 sides = 11
radius = SubResource( 4 ) radius = SubResource( 4 )
edge = SubResource( 3 ) edge = SubResource( 3 )
[sub_resource type="Resource" id=8] [sub_resource type="Resource" id=13]
script = ExtResource( 5 ) script = ExtResource( 5 )
default_type = 5 default_type = 5
default_int = 0 default_int = 0
@ -65,15 +65,50 @@ default_float = 0.0
default_vector2 = Vector2( 0, 0 ) default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 ) default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 ) default_color = Color( 0, 0, 0, 1 )
input_property = SubResource( 7 )
[sub_resource type="Resource" id=6] [sub_resource type="Resource" id=6]
script = ExtResource( 6 ) script = ExtResource( 6 )
graph_position = Vector2( -20, -340 ) graph_position = Vector2( -20, -340 )
image = SubResource( 8 ) image = SubResource( 13 )
postfix = "-test" postfix = "-test"
[sub_resource type="Resource" id=9]
script = ExtResource( 5 )
default_type = 1
default_int = 0
default_float = 0.2
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=10]
script = ExtResource( 5 )
default_type = 5
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=11]
script = ExtResource( 5 )
default_type = 1
default_int = 0
default_float = 0.34375
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=12]
script = ExtResource( 4 )
graph_position = Vector2( -720, -60 )
image = SubResource( 10 )
shape_type = 3
sides = 6
radius = SubResource( 11 )
edge = SubResource( 9 )
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
image_size = Vector2( 128, 128 ) image_size = Vector2( 128, 128 )
nodes = [ SubResource( 1 ), SubResource( 2 ), SubResource( 5 ), SubResource( 6 ) ] nodes = [ SubResource( 1 ), SubResource( 2 ), SubResource( 5 ), SubResource( 6 ), SubResource( 12 ) ]

19
game/addons/mat_maker_gd/nodes/simple/shape.gd
View File

@ -62,16 +62,25 @@ func _render(material) -> void:
func get_value_for(uv : Vector2, pseed : int) -> Color: func get_value_for(uv : Vector2, pseed : int) -> Color:
var c : float = 0 var c : float = 0
var rad : float = radius.get_value(uv)
var edg : float = edge.get_value(uv)
if rad == 0:
rad = 0.0000001
if edg == 0:
edg = 0.0000001
if shape_type == ShapeType.SHAPE_TYPE_CIRCLE: if shape_type == ShapeType.SHAPE_TYPE_CIRCLE:
c = Shapes.shape_circle(uv, sides, radius.get_value(uv) * 1.0, edge.get_value(uv) * 1.0) c = Shapes.shape_circle(uv, sides, rad, edg)
elif shape_type == ShapeType.SHAPE_TYPE_POLYGON: elif shape_type == ShapeType.SHAPE_TYPE_POLYGON:
c = Shapes.shape_polygon(uv, sides, radius.get_value(uv) * 1.0, edge.get_value(uv) * 1.0) c = Shapes.shape_polygon(uv, sides, rad, edg)
elif shape_type == ShapeType.SHAPE_TYPE_STAR: elif shape_type == ShapeType.SHAPE_TYPE_STAR:
c = Shapes.shape_star(uv, sides, radius.get_value(uv) * 1.0, edge.get_value(uv) * 1.0) c = Shapes.shape_star(uv, sides, rad, edg)
elif shape_type == ShapeType.SHAPE_TYPE_CURVED_STAR: elif shape_type == ShapeType.SHAPE_TYPE_CURVED_STAR:
c = Shapes.shape_curved_star(uv, sides, radius.get_value(uv) * 1.0, edge.get_value(uv) * 1.0) c = Shapes.shape_curved_star(uv, sides, rad, edg)
elif shape_type == ShapeType.SHAPE_TYPE_RAYS: elif shape_type == ShapeType.SHAPE_TYPE_RAYS:
c = Shapes.shape_rays(uv, sides, radius.get_value(uv) * 1.0, edge.get_value(uv) * 1.0) c = Shapes.shape_rays(uv, sides, rad, edg)
return Color(c, c, c, 1) return Color(c, c, c, 1)