Apply suggestions from code review

Co-authored-by: A Thousand Ships <[email protected]>

Author: beicause

rendering/mesh_texture_rd/README.md

@@ -1,6 +1,6 @@
 # Rasterize Mesh Texture
 
-This is a demo showing how to setup a basic render pipeline to draw mesh to texture using RenderingDevice.
+This is a demo showing how to set up a basic render pipeline to draw mesh to texture using RenderingDevice.
 
 Language: GDScript
 

rendering/mesh_texture_rd/mesh_texture_rd.gd

@@ -33,6 +33,7 @@ var is_2d_mesh := false
 		size = value
 		_queue_update_pipeline()
 
+
 @export var clear_color := Color.TRANSPARENT:
 	get: return clear_color
 	set(value):
@@ -42,18 +43,22 @@ var is_2d_mesh := false
 @export var mesh: Mesh:
 	get: return mesh
 	set(value):
-		if mesh != null: mesh.changed.disconnect(_queue_update_mesh)
+		if mesh != null:
+			mesh.changed.disconnect(_queue_update_mesh)
 		mesh = value
 		_queue_update_mesh()
-		if mesh != null: mesh.changed.connect(_queue_update_mesh)
+		if mesh != null:
+			mesh.changed.connect(_queue_update_mesh)
 
 @export var base_texture: Texture2D:
 	get: return base_texture
 	set(value):
-		if (base_texture != null): base_texture.changed.disconnect(_queue_update_uniform_set)
+		if base_texture != null:
+			base_texture.changed.disconnect(_queue_update_uniform_set)
 		base_texture = value
 		_queue_update_uniform_set()
-		if (base_texture != null): base_texture.changed.connect(_queue_update_uniform_set)
+		if base_texture != null:
+			base_texture.changed.connect(_queue_update_uniform_set)
 
 
 @export var projection: Projection = Projection.IDENTITY:
@@ -65,10 +70,12 @@ var is_2d_mesh := false
 @export var glsl_file: RDShaderFile = preload("res://base_texture.glsl"):
 	get: return glsl_file
 	set(value):
-		if (glsl_file != null): glsl_file.changed.disconnect(_queue_update_shader)
+		if glsl_file != null:
+			glsl_file.changed.disconnect(_queue_update_shader)
 		glsl_file = value
 		_queue_update_shader()
-		if (glsl_file != null): glsl_file.changed.connect(_queue_update_shader)
+		if glsl_file != null:
+			glsl_file.changed.connect(_queue_update_shader)
 
 var _update_queued := false
 
@@ -93,14 +100,21 @@ func _init() -> void:
 		glsl_file.changed.connect(_queue_update_shader)
 		_queue_update_shader()
 
+
 func _notification(what: int) -> void:
 	if what == NOTIFICATION_PREDELETE:
-		if framebuffer_texture_rid.is_valid(): rd.free_rid(framebuffer_texture_rid)
-		if shader_rid.is_valid(): rd.free_rid(shader_rid)
-		if sampler_rid.is_valid(): rd.free_rid(sampler_rid)
-		if index_buffer_rid.is_valid(): rd.free_rid(index_buffer_rid)
-		if vertex_buffer_pos_rid.is_valid(): rd.free_rid(vertex_buffer_pos_rid)
-		if vertex_buffer_uv_rid.is_valid(): rd.free_rid(vertex_buffer_uv_rid)
+		if framebuffer_texture_rid.is_valid():
+			rd.free_rid(framebuffer_texture_rid)
+		if shader_rid.is_valid():
+			rd.free_rid(shader_rid)
+		if sampler_rid.is_valid():
+			rd.free_rid(sampler_rid)
+		if index_buffer_rid.is_valid():
+			rd.free_rid(index_buffer_rid)
+		if vertex_buffer_pos_rid.is_valid():
+			rd.free_rid(vertex_buffer_pos_rid)
+		if vertex_buffer_uv_rid.is_valid():
+			rd.free_rid(vertex_buffer_uv_rid)
 		RenderingServer.free_rid(texture_rd)
 
 func update(force: bool = false) -> void:
@@ -157,6 +171,7 @@ func _queue_update_mesh() -> void:
 func _reset_vertex() -> void:
 	if mesh == null or mesh.get_surface_count() == 0:
 		return
+
 	var surface_array := mesh.surface_get_arrays(0)
 	var vertex_array: Variant = surface_array[Mesh.ARRAY_VERTEX]
 	var indices: PackedInt32Array = surface_array[Mesh.ARRAY_INDEX]
@@ -170,14 +185,16 @@ func _reset_vertex() -> void:
 			var v: Vector2 = vertex_array[i]
 			# 2D Mesh needs to be downscaled to be visible in normal projection.
 			vertex_array_vec3[i] = Vector3(v.x, v.y, 0) / 100
+
 		vertex_array = vertex_array_vec3
 
 	var points_bytes: PackedByteArray = vertex_array.to_byte_array()
 
 	if indices.size() > 0:
 		var indices_bytes := indices.to_byte_array()
 
-		if index_buffer_rid.is_valid(): rd.free_rid(index_buffer_rid)
+		if index_buffer_rid.is_valid():
+			rd.free_rid(index_buffer_rid)
 		index_buffer_rid = rd.index_buffer_create(indices.size(), RenderingDevice.INDEX_BUFFER_FORMAT_UINT32, indices_bytes)
 
 		index_array_rid = rd.index_array_create(index_buffer_rid, 0, indices.size())
@@ -199,11 +216,13 @@ func _reset_shader() -> void:
 		rd.free_rid(shader_rid)
 		pipeline_rid = RID()
 		uniform_set_rid = RID()
+
 	shader_rid = rd.shader_create_from_spirv(shader_spirv)
 
 func _reset_pipeline() -> void:
 	if glsl_file == null:
 		return
+
 	var tex_format := RDTextureFormat.new()
 	var tex_view := RDTextureView.new()
 	tex_format.texture_type = RenderingDevice.TEXTURE_TYPE_2D
@@ -219,6 +238,7 @@ func _reset_pipeline() -> void:
 	RenderingServer.texture_replace(texture_rd, RenderingServer.texture_rd_create(tex_rid) if tex_rid.is_valid() else RenderingServer.texture_2d_placeholder_create())
 	if framebuffer_texture_rid.is_valid():
 		rd.free_rid(framebuffer_texture_rid)
+
 	framebuffer_texture_rid = tex_rid
 
 	var blend := RDPipelineColorBlendState.new()
@@ -231,15 +251,15 @@ func _reset_pipeline() -> void:
 	rs.cull_mode = RenderingDevice.POLYGON_CULL_DISABLED
 
 	pipeline_rid = rd.render_pipeline_create(
-				   shader_rid,
-				   rd.framebuffer_get_format(framebuffer_rid),
-				   vertex_format,
-				   RenderingDevice.RENDER_PRIMITIVE_TRIANGLES,
-				   rs,
-				   RDPipelineMultisampleState.new(),
-				   RDPipelineDepthStencilState.new(),
-				   blend
-			   )
+			shader_rid,
+			rd.framebuffer_get_format(framebuffer_rid),
+			vertex_format,
+			RenderingDevice.RENDER_PRIMITIVE_TRIANGLES,
+			rs,
+			RDPipelineMultisampleState.new(),
+			RDPipelineDepthStencilState.new(),
+			blend
+		)
 
 func _reset_uniform() -> void:
 	if not sampler_rid.is_valid() or base_texture == null or not base_texture.get_rid().is_valid() or not shader_rid.is_valid():