Update Godot version to 3.5.beta

* Change the defaults of some shader params in attenuated circle shader.
* Change the defaults of some variables exported.
* Move the changing of radius and strength from TerrainTool to TerrainToolUI.
* Make chunk size snap to powers of 2
* Update the radius and strength changes on shader.
* Improve transforming of vertices for better placement in the terrain chunk mesh.

Author: sairam4123

AttenuatedCircle.shader

@@ -2,8 +2,8 @@ shader_type spatial;
 // by Sairam
 uniform float radius = 3.0;
 uniform float attenuated_radius = 0.01;
-uniform float attenuation_strength = 1.0;
-uniform float attenuated_size_multiplier = 1.0;
+uniform float attenuation_strength : hint_range(0.0, 1.0) = 1.0;
+uniform float attenuated_size_multiplier : hint_range(0.0, 5.0) = 1.0;
 uniform float max_power = 1;
 uniform float min_power = 0;
 

AttenuatedCircle.tres

@@ -5,9 +5,9 @@
 [resource]
 shader = ExtResource( 1 )
 shader_param/radius = 3.0
-shader_param/attenuated_radius = 0.01
-shader_param/attenuation_strength = 1.164
-shader_param/attenuated_size_multiplier = 1.778
+shader_param/attenuated_radius = 0.0
+shader_param/attenuation_strength = 1.0
+shader_param/attenuated_size_multiplier = 1.0
 shader_param/max_power = 1.0
 shader_param/min_power = 0.0
 shader_param/color = Color( 0, 1, 1, 0.498039 )

CircleAttenuation.gd

@@ -39,10 +39,13 @@ func _update_attentuation_size():
 
 func get_power_at_position(position: Vector3, sharp = false) -> float:
 	var _translation = global_transform.origin
+#	prints(position, translation)
 	var _distance_squared = _translation.distance_squared_to(position)
 	if _distance_squared >= radius_squared:
+#		prints(position, _translation, "_distance_squared >= radius_squared")
 		return min_power
 	if _distance_squared <= attentuation_radius_squared:
+#		prints(position, "_distance_squared <= attentuation_radius_squared")
 		return max_power
 
 	# thanks to JestemStefan and QbieShay

FPSDebug.gd

@@ -4,7 +4,7 @@ extends Control
 func _process(_delta):
 	$Label.text = "FPS: %d\n" % Engine.get_frames_per_second()
 	$Label.text += "Memory: %d\n" % OS.get_static_memory_usage()
-#	$Label.text += "Position: %s\n" % $"../Tools/TerrainTool".translation
+	$Label.text += "Position: %s\n" % $"../Tools/TerrainTool".translation
 #	var aabb = $"../Tools/TerrainTool".get_transformed_aabb()
 #	aabb.position.y -= 50
 #	aabb.size.y += 100

GUI.tscn

@@ -74,13 +74,14 @@ margin_bottom = 16.0
 size_flags_horizontal = 3
 max_value = 1.0
 step = 0.01
+value = 1.0
 
 [node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/Strength"]
 margin_left = 609.0
 margin_top = 1.0
 margin_right = 633.0
 margin_bottom = 15.0
-text = "000"
+text = "001"
 
 [node name="RotationDegrees" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
 margin_top = 52.0

Game.tscn

@@ -13,9 +13,9 @@
 
 [sub_resource type="PlaneMesh" id=1]
 material = ExtResource( 5 )
-size = Vector2( 16, 16 )
-subdivide_width = 32
-subdivide_depth = 32
+size = Vector2( 8, 8 )
+subdivide_width = 16
+subdivide_depth = 16
 
 [sub_resource type="BoxShape" id=2]
 extents = Vector3( 8, 0.25, 8 )

PanelContainer.gd

@@ -5,6 +5,9 @@ signal radius_changed(radius)
 signal strength_changed(strength)
 signal rotation_changed(rotation)
 
+var strength = 1
+var radius = 3
+
 func _ready():
 	$VBoxContainer/Radius/Label2.text = "%04d" % $VBoxContainer/Radius/Radius.value
 	$VBoxContainer/Strength/Label2.text = "%.2f" % $VBoxContainer/Strength/Strength.value
@@ -16,13 +19,24 @@ func _on_Button_pressed(state):
 
 func _on_HSlider_value_changed(value):
 	emit_signal("radius_changed", value)
+	radius = value
 	$VBoxContainer/Radius/Label2.text = "%03d" % value
 
 
 func _on_Strength_value_changed(value):
 	emit_signal("strength_changed", value)
+	strength = value
 	$VBoxContainer/Strength/Label2.text = "%.2f" % value
 
 func _on_RotationDegrees_value_changed(value):
 	emit_signal("rotation_changed", value)
 	$VBoxContainer/RotationDegrees/Label2.text = "%03d" % value
+
+func _unhandled_input(event):
+	if event is InputEventMouseMotion:
+		if event.shift and Input.is_action_pressed("left_button"):
+			$VBoxContainer/Radius/Radius.value = radius+event.relative.x*0.5
+			get_tree().set_input_as_handled()
+		elif event.control and Input.is_action_pressed("left_button"):
+			$VBoxContainer/Strength/Strength.value = strength+event.relative.x*0.01
+			get_tree().set_input_as_handled()

TerrainChunked.gd

@@ -31,7 +31,7 @@ static func previous_power_of_two(x: int) -> int:
 
 
 var _size: int = 64
-export var chunk_size = 16
+var _chunk_size: int = 16
 var chunks = {}
 var height_map: Image = Image.new()
 var quad_tree = QuadTreeNode.new()
@@ -45,6 +45,7 @@ func _ready():
 	if Engine.editor_hint:
 		return
 	quad_tree.extents = Vector3(_size/2, 2, _size/2)
+	$QuadTreeNode.extents = Vector3(_size/2, 2, _size/2)
 	quad_tree.capacity = 4
 	quad_tree.max_levels = 6
 	height_map.create(_size, _size, false, Image.FORMAT_RGBA8)
@@ -54,12 +55,12 @@ func _ready():
 	if get_node_or_null(terrain_tool_node):
 		terrain_tool = get_node(terrain_tool_node)
 #	print(range(-_size/2-8, 64-/2+8, 16))
-	var r = range((-_size+chunk_size)/2, (_size+chunk_size)/2, chunk_size)
-	# var r = range((-2*chunk_size+chunk_size)/2, (2*chunk_size+chunk_size)/2, chunk_size)
+	var r = range((-_size+_chunk_size)/2, (_size+_chunk_size)/2, _chunk_size)
+	# var r = range((-2*_chunk_size+_chunk_size)/2, (2*_chunk_size+_chunk_size)/2, _chunk_size)
 	for i in r:
 		for j in r:
 			var image_offset: Vector2 = Vector2(range_lerp(i, -_size/2, _size/2, 0, _size), range_lerp(j, -_size/2, _size/2, 0, _size))
-			var chunk = Chunk.new(Vector3(i, 0, j), chunk_size, 0, height_map, image_offset)
+			var chunk = Chunk.new(Vector3(i, 0, j), _chunk_size, 1, height_map, image_offset)
 			add_child(chunk)
 			chunks[Vector3(i, 0, j)] = chunk
 			chunk.translation = Vector3(i, 0, j)
@@ -108,8 +109,9 @@ func _process(delta):
 				var new_aabb = aabb
 				var old_aabb = (chunk.global_transform as Transform).xform_inv(new_aabb)
 				# print("chunk: ", chunk, " (", chunk.get_transformed_aabb(), "), aabb: ", aabb, ", new: ", new_aabb, ", old: ", old_aabb)
-				old_aabb.position.y -= 50
-				old_aabb.size.y += 100
+#				old_aabb.position.y -= 50
+#				old_aabb.size.y += 100
+#				print(old_aabb)
 				(chunk as Chunk)._process_chunk(delta, terrain_tool, old_aabb)
 
 	terrain_tool.reset_values()
@@ -130,17 +132,27 @@ func _get_property_list():
 		"hint": PROPERTY_HINT_RANGE,
 		"hint_string": "16,8192"
 	})
+	properties.append({
+		"name": "chunk_size",
+		"type": TYPE_INT,
+		"hint": PROPERTY_HINT_RANGE,
+		"hint_string": "8,64"
+	})
 	return properties
 
 func _get(property):
 	match property:
 		"size":
 			return _size
+		"chunk_size": 
+			return _chunk_size
 
 func _set(property, value):
 	match property:
 		"size":
 			_size = snap_to_nearest_power_of_two(_size, value)
-			
+			return true
+		"chunk_size":
+			_chunk_size = snap_to_nearest_power_of_two(_chunk_size, value)
 			return true
 

TerrainTool.gd

@@ -25,27 +25,28 @@ func _unhandled_input(event):
 	if event is InputEventMouseMotion:
 		mouse_pointer = event.position
 		if Input.is_action_pressed("left_button") and (!event.control and !event.shift):
+#			print("is being clicked?")
 			clicked = true
 			strength = Input.get_action_strength("left_button") * strength_factor * 2
 			attenuated_circle.attentuation_strength = strength
 			position = translation
 			if mesh is CylinderMesh:
 				radius = mesh.bottom_radius
 				attenuated_circle.radius = radius
-		elif event.control and Input.is_action_pressed("left_button"):
-			set_strength_value(strength_factor+event.relative.x*0.02)
-		elif event.shift and Input.is_action_pressed("left_button"):
-			print("shift")
-			set_radius_value(radius+event.relative.x*0.02)
+#		elif event.control and Input.is_action_pressed("left_button"):
+#			set_strength_value(strength_factor+event.relative.x*0.01)
+#		elif event.shift and Input.is_action_pressed("left_button"):
+##			print("shift")
+#			set_radius_value(radius+event.relative.x*0.02)
 
-		
-	if Input.is_action_just_pressed("left_button"):
+
+	if Input.is_action_just_pressed("left_button") and !Input.is_key_pressed(KEY_SHIFT) and !Input.is_key_pressed(KEY_CONTROL):
 		position = translation
 		for audio in sound_dict.values():
 			audio.stop()
 		sound_dict[current_state].play()
 
-	if Input.is_action_just_released("left_button"):
+	if Input.is_action_just_released("left_button") and !Input.is_key_pressed(KEY_SHIFT) and !Input.is_key_pressed(KEY_CONTROL):
 		for audio in sound_dict.values():
 			audio.stop()
 		clicked = false
@@ -59,16 +60,20 @@ func _physics_process(_delta):
 		if not ray.empty():
 			show()
 			translation = ray.get("position", translation)
+#			print(translation)
 		else:
 			hide()
 
-	if clicked and Input.is_action_pressed("left_button"):
+	if clicked and Input.is_action_pressed("left_button") and (!Input.is_key_pressed(KEY_CONTROL) and !Input.is_key_pressed(KEY_SHIFT)):
+#		print("running?")
 		strength = Input.get_action_strength("left_button") * strength_factor * 2
 		attenuated_circle.attentuation_strength = strength
+		mesh.surface_get_material(0).set_shader_param("attenuation_strength", strength_factor)
 		position = translation
 		if mesh is CylinderMesh:
 			radius = mesh.bottom_radius
 			attenuated_circle.radius = radius
+			mesh.surface_get_material(0).set_shader_param("radius", float(radius))
 
 func reset_values():
 	position = null
@@ -77,14 +82,16 @@ func set_state(state):
 	current_state = state
 
 func set_strength_value(value):
-	strength_factor = value
+	strength_factor = clamp(value, 0, 1)
+	mesh.surface_get_material(0).set_shader_param("attenuation_strength", strength_factor)
 
 func set_radius_value(value):
 	if mesh is CylinderMesh:
 		mesh.bottom_radius = value
 		mesh.top_radius = value
 		radius = value
 		attenuated_circle.radius = radius
+		mesh.surface_get_material(0).set_shader_param("radius", float(radius))
 
 func get_strength_at_position(_position, sharp_edges):
 	return attenuated_circle.get_power_at_position(_position, sharp_edges)

World.tscn

@@ -11,62 +11,16 @@
 [ext_resource path="res://Materials/Terrain.material" type="Material" id=9]
 [ext_resource path="res://GUI.tscn" type="PackedScene" id=10]
 [ext_resource path="res://Materials/Drawing.material" type="Material" id=11]
+[ext_resource path="res://AttenuatedCircle.tres" type="Material" id=12]
+[ext_resource path="res://addons/sairam.quadtree/QuadTreeNode.gd" type="Script" id=13]
 
-[sub_resource type="Shader" id=4]
-code = "shader_type spatial;
-// by Sairam
-uniform float radius = 3.0;
-uniform float attenuated_radius = 0.01;
-uniform float attenuation_strength = 1.0;
-uniform float attenuated_size_multiplier = 1.0;
-uniform float max_power = 1;
-uniform float min_power = 0;
-
-uniform vec4 color : hint_color = vec4(0.0, 1.0, 1.0, 0.5);
-
-varying vec3 vertex_1;
-
-float get_power_at_position(vec3 point) {
-	vec3 origin = vec3(0.0, 0.0, 0.0);
-	float dist = pow(distance(origin, point), 2.0);
-	
-	if (dist >= radius*radius) {
-		return min_power;
-	}
-	if (dist <= attenuated_radius*attenuated_radius) {
-		return max_power;
-	}
-
-	float ratio = 1.0 - ((dist - attenuated_radius*attenuated_radius) / (radius*radius - attenuated_radius*attenuated_radius));
-	return mix(min_power, max_power, ratio) * attenuation_strength*attenuated_size_multiplier;
-}
-
-void vertex() {
-	vertex_1 = VERTEX;
-}
-
-void fragment() {
-	ALBEDO = color.xyz;
-	ALPHA = get_power_at_position(vertex_1) * color.a;
-}"
-
-[sub_resource type="ShaderMaterial" id=5]
-shader = SubResource( 4 )
-shader_param/radius = 3.0
-shader_param/attenuated_radius = 0.01
-shader_param/attenuation_strength = 1.164
-shader_param/attenuated_size_multiplier = 1.778
-shader_param/max_power = 1.0
-shader_param/min_power = 0.0
-shader_param/color = Color( 0, 1, 1, 0.498039 )
-
-[sub_resource type="CylinderMesh" id=6]
-material = SubResource( 5 )
+[sub_resource type="CylinderMesh" id=1]
+material = ExtResource( 12 )
 top_radius = 4.0
 bottom_radius = 4.0
 height = 0.01
 
-[sub_resource type="SpatialMaterial" id=7]
+[sub_resource type="SpatialMaterial" id=2]
 flags_unshaded = true
 params_line_width = 24.8
 albedo_color = Color( 0, 0, 0, 1 )
@@ -78,10 +32,13 @@ script = ExtResource( 8 )
 
 [node name="Terrain" type="Spatial" parent="."]
 script = ExtResource( 1 )
-chunk_size = 8
 terrain_tool_node = NodePath("../Tools/TerrainTool")
 terrain_material = ExtResource( 9 )
-size = 128
+size = 64
+chunk_size = 8
+
+[node name="QuadTreeNode" type="Spatial" parent="Terrain"]
+script = ExtResource( 13 )
 
 [node name="Camera" parent="." instance=ExtResource( 2 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0 )
@@ -92,16 +49,15 @@ zooming/max_distance = 300.0
 [node name="Tools" type="Spatial" parent="."]
 
 [node name="TerrainTool" type="MeshInstance" parent="Tools"]
-mesh = SubResource( 6 )
+mesh = SubResource( 1 )
 material/0 = null
 script = ExtResource( 7 )
 
 [node name="AttenuatedCircle" type="Spatial" parent="Tools/TerrainTool"]
 script = ExtResource( 6 )
 radius = 3.0
-attentuation_radius = 0.01
-attentuation_size_multiplier = 0.5
-min_power = 0.01
+attentuation_radius = 0.0
+attentuation_size_multiplier = 1.0
 
 [node name="Raise" type="AudioStreamPlayer" parent="Tools/TerrainTool"]
 stream = ExtResource( 4 )
@@ -113,13 +69,11 @@ volume_db = -3.098
 
 [node name="ImmediateGeometry" type="ImmediateGeometry" parent="Tools"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0 )
-visible = false
 material_override = ExtResource( 11 )
 
 [node name="ImmediateGeometry2" type="ImmediateGeometry" parent="Tools"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0 )
-visible = false
-material_override = SubResource( 7 )
+material_override = SubResource( 2 )
 
 [node name="Control2" parent="." instance=ExtResource( 10 )]
 mouse_filter = 2