New version (1.2.1)

Camera/CameraControl.gd

@@ -5,8 +5,10 @@ class_name CameraControl
 var movement_enabled : bool = true
 var zoom_enabled : bool = true
 var currently_zooming : bool = false
+var target_zoom : Vector2 = Vector2(1.0, 1.0)
 
 func _ready() -> void:
+	target_zoom = zoom
 	CameraSignals.disable_camera_movement.connect(_disable_camera_movement)
 	CameraSignals.enable_camera_movement.connect(_enable_camera_movement)
 	CameraSignals.enable_camera_zoom.connect(_enable_camera_zoom)
@@ -18,8 +20,11 @@ func _process(delta : float):
 		var inputmovementVector : Vector2 = handle_movement_input()
 		moveCamera(inputmovementVector, delta)
 	if zoom_enabled:
-		var inputZoomVector : Vector2 = handle_zoom_input(false)
-		zoom_camera(inputZoomVector)
+		var keyZoomVector : Vector2 = handle_zoom_input(false)
+		if keyZoomVector != Vector2.ZERO:
+			set_target_zoom(keyZoomVector * delta)
+
+		zoom = zoom.lerp(target_zoom, 15.0 * delta)
 
 #Movement functions -----------------------------------------------------------
 var current_velocity : Vector2 = Vector2(0, 0)
@@ -71,7 +76,8 @@ func _unhandled_input(event: InputEvent) -> void:
 		handle_mouse_movement(event)
 	if zoom_enabled:
 		var inputZoomVector : Vector2 = handle_zoom_input(true)
-		zoom_camera(inputZoomVector)
+		if inputZoomVector != Vector2.ZERO:
+			set_target_zoom(inputZoomVector)
 
 func handle_mouse_movement(event : InputEventMouseMotion) -> void:
 	translate(-event.relative / zoom)
@@ -91,8 +97,8 @@ func handle_zoom_input(using_mouse : bool):
 			input_vector += Vector2(-CameraConfig.Zoom.ZOOM_SCROLL_SPEED, -CameraConfig.Zoom.ZOOM_SCROLL_SPEED)
 	return input_vector
 
-func zoom_camera(input_vector: Vector2):
-	zoom = clamp(lerp(zoom, zoom + input_vector, 0.01), Vector2(CameraConfig.Zoom.MAX_ZOOM_OUT_SCALE, CameraConfig.Zoom.MAX_ZOOM_OUT_SCALE), Vector2(CameraConfig.Zoom.MAX_ZOOM_IN_SCALE, CameraConfig.Zoom.MAX_ZOOM_IN_SCALE))
+func set_target_zoom(input_vector: Vector2):
+	target_zoom = clamp(target_zoom + input_vector, Vector2(CameraConfig.Zoom.MAX_ZOOM_OUT_SCALE, CameraConfig.Zoom.MAX_ZOOM_OUT_SCALE), Vector2(CameraConfig.Zoom.MAX_ZOOM_IN_SCALE, CameraConfig.Zoom.MAX_ZOOM_IN_SCALE))
 
 #Signal handling ---------------------------------------------------------------
 func _disable_camera_movement() -> void:
@@ -114,7 +120,7 @@ func _zoom_to_fit(target_rect: Rect2):
 
 	# Use the smaller scale to ensure the whole target fits
 	var zoom_factor = min(scale_x, scale_y)
-	zoom = Vector2(zoom_factor, zoom_factor)
+	target_zoom = Vector2(zoom_factor, zoom_factor)
 
 	# Center the camera on the target
 	position = target_rect.position + target_rect.size * 0.5

Config/CameraConfig.gd

@@ -10,5 +10,5 @@ class Movement:
 class Zoom:
 	const MAX_ZOOM_IN_SCALE : float = 2
 	const MAX_ZOOM_OUT_SCALE : float = 0.3
-	const ZOOM_KEY_SPEED : float = 1
-	const ZOOM_SCROLL_SPEED : float = 5
+	const ZOOM_KEY_SPEED : float = 1.5
+	const ZOOM_SCROLL_SPEED : float = 0.2

Config/FusekiConfig.gd

@@ -28,6 +28,7 @@ class JsonHead:
 	const C8 = "c8"
 	const C9 = "c9"
 	const C12 = "c12"
+	const C13 = "c13"
 	const C14 = "c14"
 	const C15 = "c15"
 	const C16 = "c16"

Config/LegendsConfig.gd

@@ -1,11 +1,17 @@
 extends Node
 
 const LEGENDS : Dictionary = {
-	"Realtime relationship" : RT_LEGENDS
+	"Realtime Relationships" : RT_LEGENDS,
+	"Component Evolution" : BG_LEGENDS
 }
 
 const RT_LEGENDS : Dictionary = {
-	"Slower than realtime" : StyleConfig.RTBorder.SLOWER_THAN_RT_COLOR,
-	"Realtime" : StyleConfig.RTBorder.RT_COLOR,
-	"Faster than realtime" : StyleConfig.RTBorder.FASTER_THAN_RT_COLOR
+	"Slower than realtime" : StyleConfig.Timescale.SLOWER_THAN_REALTIME,
+	"Realtime" : StyleConfig.Timescale.REALTIME,
+	"Faster than realtime" : StyleConfig.Timescale.FASTER_THAN_REALTIME,
+}
+
+const BG_LEGENDS : Dictionary = {
+	"Implemented": StyleConfig.DTElement.DIMMED_COLOR,
+	"Planned": StyleConfig.DTElement.PLANNED_COLOR
 }

Config/StyleConfig.gd

@@ -1,33 +1,63 @@
 extends Node
 
-#Realtime relationship style
-class RTBorder:
-	const BORDER_WIDTH : int = 5
+# Deployment relationship style
+class Deployment:
+	const ON_DEVICE : Color = Color(0.2, 0.6, 0.2)
+	const EDGE : Color = Color(0.2, 0.4, 0.8)
+	const FOG : Color = Color.LIGHT_STEEL_BLUE
+	const CLOUD : Color = Color.AQUA
+
+	const MAP : Dictionary = {
+		"ON_DEVICE": ON_DEVICE,
+		"EDGE": EDGE,
+		"FOG": FOG,
+		"CLOUD": CLOUD
+	}
+
+# Implementation relationship style
+class Implementation:
+	const PLANNED : Color = Color.YELLOW
+	const ACTIVE : Color = Color.ORANGE
+	const IMPLEMENTED : Color = Color.GREEN
+
+	const MAP : Dictionary = {
+		"PLANNED": PLANNED,
+		"ACTIVE": ACTIVE,
+		"IMPLEMENTED": IMPLEMENTED
+	}
 
-	const SLOWER_THAN_RT_COLOR : Color = Color.BLUE_VIOLET
-	const RT_COLOR : Color = Color.AQUAMARINE
-	const FASTER_THAN_RT_COLOR : Color = Color.GOLD
+# Timescale relationship style
+class Timescale:
+	const SLOWER_THAN_REALTIME : Color = Color.BLUE_VIOLET
+	const REALTIME : Color = Color.AQUAMARINE
+	const FASTER_THAN_REALTIME : Color = Color.GOLD
+
+	const MAP : Dictionary = {
+		"SLOWER_THAN_REALTIME": SLOWER_THAN_REALTIME,
+		"REALTIME": REALTIME,
+		"FASTER_THAN_REALTIME": FASTER_THAN_REALTIME
+	}
 
 #DT/RT displayed element style
 class DTElement:
+	const BORDER_WIDTH : int = 5
+	const BORDER_COLOR : Color = Color("454545")
+
 	const DIMMED_COLOR : Color = Color.GRAY
 	const HIGHLIGHT_COLOR : Color = Color.DIM_GRAY
 	const TEXT_HIGHLIGHT_COLOR : Color = Color.WHITE_SMOKE
+	const PLANNED_COLOR : Color = Color(Color.WHITE, 0.6)
 
 #Visual link style
 class Link:
 	const WIDTH : int = 5
 
-	const MEAN_OUTER_LINK_DISTANCE : int = 30 * WIDTH
+	const MEAN_OUTER_LINK_DISTANCE : int = 15 * WIDTH
 
 	const DIMMED_COLOR : Color = Color.GRAY
 	const HIGHLIGHT_COLOR : Color = Color.DIM_GRAY
 
 #Legends style
 class Legends:
-	const GO_AWAY_TEXT : String = "Hide legend"
-	const COME_IN_TEXT : String = "Show legend"
-
-	const RETRACT_BUTTON_COLOR : Color = Color.DARK_ORANGE
-	const PANEL_COLOR : Color = Color.GRAY
-	const CATEGORY_ANNONCE_COLOR : Color = Color.DIM_GRAY
+	const PANEL_COLOR : Color = Color.DARK_GRAY
+	const CATEGORY_ANNONCE_COLOR : Color = Color(0.3, 0.3, 0.3)