OPTM-01: Carry optimizations and improvements into main scene.

Author: Maaack

Scenes/Main.gd

@@ -41,7 +41,7 @@ func _apply_rotated_color():
 func _ready():
 	var velocity_texture = $ViscosityViewport.get_texture()
 	$VelocityViewport/Sprite.texture = velocity_texture
-	$VelocityViewport/Sprite.material.set_shader_param("velocity", $GradientSubtractionViewport.get_texture())
+	$VelocityViewport/Sprite.material.set_shader_param("velocity", $BorderAndGradientSubtractionViewport.get_texture())
 	var dye_texture = $BackBufferViewport.get_texture()
 	$DyeViewport/Sprite.texture = dye_texture
 	$DyeViewport/Sprite.material.set_shader_param("brushColor", $UIControl/ColorPickerButton.color)
@@ -145,13 +145,13 @@ func _on_FinalViewButton_item_selected(index):
 		Options.VELOCITY:
 			$TextureRect.texture = $VelocityViewport.get_texture()
 		Options.VISCOSITY:
-			$TextureRect.texture = $VelocityBorderViewport.get_texture()
+			$TextureRect.texture = $ViscosityViewport.get_texture()
 		Options.DIVERGENCE:
 			$TextureRect.texture = $DivergenceViewport.get_texture()
 		Options.PRESSURE:
-			$TextureRect.texture = $PressureBorderViewport.get_texture()
+			$TextureRect.texture = $PressureViewport.get_texture()
 		Options.PRESSURE_FORCE:
-			$TextureRect.texture = $GradientSubtractionViewport.get_texture()
+			$TextureRect.texture = $BorderAndGradientSubtractionViewport.get_texture()
 	if index == Options.DYE:
 		$UIControl/RefreshClearButton.show()
 	else:

Scenes/Main.tscn

@@ -1,20 +1,18 @@
-[gd_scene load_steps=33 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://Scenes/Main.gd" type="Script" id=1]
 [ext_resource path="res://Scenes/UITheme.tres" type="Theme" id=2]
-[ext_resource path="res://Shaders/GradientSubtractionShader.tres" type="Shader" id=3]
 [ext_resource path="res://Shaders/PressureShader.tres" type="Shader" id=4]
-[ext_resource path="res://Assets/Images/baseTexture.png" type="Texture" id=5]
+[ext_resource path="res://Shaders/BorderAndGradientSubtractionShader.tres" type="Shader" id=5]
 [ext_resource path="res://Scenes/PressureViewport.gd" type="Script" id=6]
 [ext_resource path="res://Shaders/DivergenceShaderMaterial.tres" type="Material" id=7]
 [ext_resource path="res://Shaders/ViscosityShaderMaterial.tres" type="Material" id=8]
 [ext_resource path="res://Assets/Brushes/SoftBrush.png" type="Texture" id=9]
 [ext_resource path="res://Scenes/NestedViewportControl.tscn" type="PackedScene" id=10]
 [ext_resource path="res://Shaders/ShowNegativeColorShaderMaterial.tres" type="Material" id=11]
-[ext_resource path="res://Shaders/BorderConditionShader.tres" type="Shader" id=12]
-[ext_resource path="res://Shaders/VelocityForcesShaderMaterial.tres" type="Material" id=13]
 [ext_resource path="res://Scenes/MouseControl.tscn" type="PackedScene" id=14]
 [ext_resource path="res://Shaders/AdvectPaintShader.tres" type="Shader" id=15]
+[ext_resource path="res://Shaders/VelocityForcesAndBorderShader.tres" type="Shader" id=16]
 
 [sub_resource type="ShaderMaterial" id=55]
 shader = ExtResource( 15 )
@@ -28,20 +26,18 @@ shader_param/brushTexture = ExtResource( 9 )
 [sub_resource type="ViewportTexture" id=18]
 viewport_path = NodePath("VelocityViewport")
 
-[sub_resource type="ViewportTexture" id=67]
-viewport_path = NodePath("ViscosityViewport")
-
-[sub_resource type="ShaderMaterial" id=59]
-shader = ExtResource( 12 )
+[sub_resource type="ShaderMaterial" id=81]
+shader = ExtResource( 16 )
+shader_param/vorticityScale = 4.0
 shader_param/borderScaleFactor = -1.0
-shader_param/borderWidth = 2.0
+shader_param/borderWidth = 1.0
 shader_param/borderActive = true
 
-[sub_resource type="ViewportTexture" id=68]
-viewport_path = NodePath("VelocityForcesViewport")
+[sub_resource type="ViewportTexture" id=82]
+viewport_path = NodePath("ViscosityViewport")
 
-[sub_resource type="ViewportTexture" id=63]
-viewport_path = NodePath("VelocityBorderViewport")
+[sub_resource type="ViewportTexture" id=86]
+viewport_path = NodePath("VelocityForcesAndBorderViewport")
 
 [sub_resource type="ViewportTexture" id=49]
 viewport_path = NodePath("DivergenceViewport")
@@ -51,28 +47,22 @@ resource_local_to_scene = true
 shader = ExtResource( 4 )
 shader_param/divergence = SubResource( 49 )
 
-[sub_resource type="ShaderMaterial" id=61]
-shader = ExtResource( 12 )
-shader_param/borderScaleFactor = 1.0
-shader_param/borderWidth = 2.0
-shader_param/borderActive = true
-
-[sub_resource type="ViewportTexture" id=73]
-viewport_path = NodePath("PressureViewport")
-
 [sub_resource type="ViewportTexture" id=75]
-viewport_path = NodePath("VelocityBorderViewport")
+viewport_path = NodePath("VelocityForcesAndBorderViewport")
 
-[sub_resource type="ShaderMaterial" id=30]
+[sub_resource type="ShaderMaterial" id=84]
 resource_local_to_scene = true
-shader = ExtResource( 3 )
+shader = ExtResource( 5 )
+shader_param/borderScaleFactor = 1.0
+shader_param/borderWidth = 1.0
+shader_param/borderActive = true
 shader_param/velocity = SubResource( 75 )
 
-[sub_resource type="ViewportTexture" id=74]
-viewport_path = NodePath("PressureBorderViewport")
+[sub_resource type="ViewportTexture" id=85]
+viewport_path = NodePath("PressureViewport")
 
 [sub_resource type="ViewportTexture" id=76]
-viewport_path = NodePath("GradientSubtractionViewport")
+viewport_path = NodePath("BorderAndGradientSubtractionViewport")
 
 [sub_resource type="ShaderMaterial" id=77]
 resource_local_to_scene = true
@@ -110,28 +100,18 @@ centered = false
 [node name="ViscosityViewport" parent="." instance=ExtResource( 10 )]
 size = Vector2( 1280, 720 )
 render_target_v_flip = true
-levels = 4
+levels = 8
 shader_material = ExtResource( 8 )
 texture = SubResource( 18 )
 
-[node name="VelocityForcesViewport" type="Viewport" parent="."]
+[node name="VelocityForcesAndBorderViewport" type="Viewport" parent="."]
 size = Vector2( 1280, 720 )
 render_target_v_flip = true
 render_target_update_mode = 3
 
-[node name="Sprite" type="Sprite" parent="VelocityForcesViewport"]
-material = ExtResource( 13 )
-texture = SubResource( 67 )
-centered = false
-
-[node name="VelocityBorderViewport" type="Viewport" parent="."]
-size = Vector2( 1280, 720 )
-render_target_v_flip = true
-render_target_update_mode = 3
-
-[node name="Sprite" type="Sprite" parent="VelocityBorderViewport"]
-material = SubResource( 59 )
-texture = SubResource( 68 )
+[node name="Sprite" type="Sprite" parent="VelocityForcesAndBorderViewport"]
+material = SubResource( 81 )
+texture = SubResource( 82 )
 centered = false
 
 [node name="DivergenceViewport" type="Viewport" parent="."]
@@ -141,7 +121,7 @@ render_target_update_mode = 3
 
 [node name="Sprite" type="Sprite" parent="DivergenceViewport"]
 material = ExtResource( 7 )
-texture = SubResource( 63 )
+texture = SubResource( 86 )
 centered = false
 
 [node name="PressureViewport" parent="." instance=ExtResource( 10 )]
@@ -151,24 +131,14 @@ script = ExtResource( 6 )
 levels = 16
 shader_material = SubResource( 27 )
 
-[node name="PressureBorderViewport" type="Viewport" parent="."]
-size = Vector2( 1280, 720 )
-render_target_v_flip = true
-render_target_update_mode = 3
-
-[node name="Sprite" type="Sprite" parent="PressureBorderViewport"]
-material = SubResource( 61 )
-texture = SubResource( 73 )
-centered = false
-
-[node name="GradientSubtractionViewport" type="Viewport" parent="."]
+[node name="BorderAndGradientSubtractionViewport" type="Viewport" parent="."]
 size = Vector2( 1280, 720 )
 render_target_v_flip = true
 render_target_update_mode = 3
 
-[node name="Sprite" type="Sprite" parent="GradientSubtractionViewport"]
-material = SubResource( 30 )
-texture = SubResource( 74 )
+[node name="Sprite" type="Sprite" parent="BorderAndGradientSubtractionViewport"]
+material = SubResource( 84 )
+texture = SubResource( 85 )
 centered = false
 
 [node name="DyeViewport" type="Viewport" parent="."]
@@ -180,11 +150,6 @@ render_target_update_mode = 3
 material = SubResource( 77 )
 centered = false
 
-[node name="Sprite2" type="Sprite" parent="DyeViewport"]
-visible = false
-texture = ExtResource( 5 )
-centered = false
-
 [node name="BackBufferViewport" type="Viewport" parent="."]
 size = Vector2( 1280, 720 )
 handle_input_locally = false

Scenes/MultiPass.tscn

@@ -48,7 +48,7 @@ resource_local_to_scene = true
 shader = ExtResource( 4 )
 shader_param/divergence = SubResource( 49 )
 
-[sub_resource type="ViewportTexture" id=75]
+[sub_resource type="ViewportTexture" id=79]
 viewport_path = NodePath("VelocityForcesAndBorderViewport")
 
 [sub_resource type="ShaderMaterial" id=30]
@@ -57,7 +57,7 @@ shader = ExtResource( 3 )
 shader_param/borderScaleFactor = 1.0
 shader_param/borderWidth = 1.0
 shader_param/borderActive = true
-shader_param/velocity = SubResource( 75 )
+shader_param/velocity = SubResource( 79 )
 
 [sub_resource type="ViewportTexture" id=74]
 viewport_path = NodePath("PressureViewport")