diff --git a/assets/In-game/Default/doors_left_overlay.png b/assets/In-game/Default/doors_left_overlay.png deleted file mode 100644 index 6d2cc7f10b..0000000000 Binary files a/assets/In-game/Default/doors_left_overlay.png and /dev/null differ diff --git a/assets/In-game/Default/doors_right_overlay.png b/assets/In-game/Default/doors_right_overlay.png deleted file mode 100644 index cfb4e0d915..0000000000 Binary files a/assets/In-game/Default/doors_right_overlay.png and /dev/null differ diff --git a/assets/In-game/Default/handle_overlay.png b/assets/In-game/Default/handle_overlay.png deleted file mode 100644 index 4488a61dc2..0000000000 Binary files a/assets/In-game/Default/handle_overlay.png and /dev/null differ diff --git a/assets/In-game/Default/indicator_top_overlay.png b/assets/In-game/Default/indicator_top_overlay.png deleted file mode 100644 index 3823ff9232..0000000000 Binary files a/assets/In-game/Default/indicator_top_overlay.png and /dev/null differ diff --git a/assets/In-game/Default/interface.cfg b/assets/In-game/Default/interface.cfg index 06b236c26f..55666fca52 100644 --- a/assets/In-game/Default/interface.cfg +++ b/assets/In-game/Default/interface.cfg @@ -35,10 +35,10 @@ value = 0, 20 subject = score position = 0, -1 alignment = 0, -1 -centermiddle = indicator_top_back.png, indicator_top_overlay.png +centermiddle = indicator_top_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 0, -1 textalignment = 0, 0 textsize = 1 @@ -53,10 +53,10 @@ textshadow = 1 subject = reverser position = -8, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 14, -1 textalignment = -1, 0 textsize = 0 @@ -66,10 +66,10 @@ textshadow = 0 subject = power position = 33, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 13, -1 textalignment = -1, 0 textsize = 0 @@ -79,10 +79,10 @@ textshadow = 0 subject = brake position = 74, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 13, -1 textalignment = -1, 0 textsize = 0 @@ -92,10 +92,10 @@ textshadow = 0 subject = locobrake position = 115, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 13, -1 textalignment = -1, 0 textsize = 0 @@ -105,10 +105,10 @@ textshadow = 0 subject = single position = 33, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 13, -1 textalignment = -1, 0 textsize = 0 @@ -123,10 +123,10 @@ textshadow = 0 subject = doorsleft position = -16, 1 alignment = 0, 1 -centermiddle = doors_left_back.png, doors_left_overlay.png +centermiddle = doors_left_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = -5, -1 textalignment = 1, 0 textsize = 0 @@ -138,10 +138,10 @@ transitionvector = 0, 16 subject = doorsright position = 16, 1 alignment = 0, 1 -centermiddle = doors_right_back.png, doors_right_overlay.png +centermiddle = doors_right_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 2, -1 textalignment = -1, 0 textsize = 0 @@ -313,7 +313,7 @@ bottomleft = ats_center_left_back.png, ats_center_left_overlay.png bottommiddle = ats_center_middle_back.png, ats_center_middle_overlay.png backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = -8, -1 textalignment = 1, 0 textsize = 0 diff --git a/assets/In-game/Default/message_middle_overlay.png b/assets/In-game/Default/message_middle_overlay.png deleted file mode 100644 index 59801b21af..0000000000 Binary files a/assets/In-game/Default/message_middle_overlay.png and /dev/null differ diff --git a/assets/In-game/Default/message_right_overlay.png b/assets/In-game/Default/message_right_overlay.png deleted file mode 100644 index 373b30b809..0000000000 Binary files a/assets/In-game/Default/message_right_overlay.png and /dev/null differ diff --git a/assets/In-game/Large/doors_left_back.png b/assets/In-game/Large/doors_left_back.png index 5acfc24934..e55b1fed53 100644 Binary files a/assets/In-game/Large/doors_left_back.png and b/assets/In-game/Large/doors_left_back.png differ diff --git a/assets/In-game/Large/doors_left_overlay.png b/assets/In-game/Large/doors_left_overlay.png deleted file mode 100644 index 9cefbd4592..0000000000 Binary files a/assets/In-game/Large/doors_left_overlay.png and /dev/null differ diff --git a/assets/In-game/Large/doors_right_back.png b/assets/In-game/Large/doors_right_back.png index bcc3c2929c..992f2eb8d2 100644 Binary files a/assets/In-game/Large/doors_right_back.png and b/assets/In-game/Large/doors_right_back.png differ diff --git a/assets/In-game/Large/doors_right_overlay.png b/assets/In-game/Large/doors_right_overlay.png deleted file mode 100644 index fc6bdf6023..0000000000 Binary files a/assets/In-game/Large/doors_right_overlay.png and /dev/null differ diff --git a/assets/In-game/Large/handle_back.png b/assets/In-game/Large/handle_back.png index 2b7efd661f..300841511f 100644 Binary files a/assets/In-game/Large/handle_back.png and b/assets/In-game/Large/handle_back.png differ diff --git a/assets/In-game/Large/handle_overlay.png b/assets/In-game/Large/handle_overlay.png deleted file mode 100644 index d6e290ee1f..0000000000 Binary files a/assets/In-game/Large/handle_overlay.png and /dev/null differ diff --git a/assets/In-game/Large/indicator_top_back.png b/assets/In-game/Large/indicator_top_back.png index e7bad44bd6..7854f917a0 100644 Binary files a/assets/In-game/Large/indicator_top_back.png and b/assets/In-game/Large/indicator_top_back.png differ diff --git a/assets/In-game/Large/indicator_top_overlay.png b/assets/In-game/Large/indicator_top_overlay.png deleted file mode 100644 index d3abd37b9a..0000000000 Binary files a/assets/In-game/Large/indicator_top_overlay.png and /dev/null differ diff --git a/assets/In-game/Large/interface.cfg b/assets/In-game/Large/interface.cfg index cdcbcffd75..e805e7b882 100644 --- a/assets/In-game/Large/interface.cfg +++ b/assets/In-game/Large/interface.cfg @@ -4,14 +4,14 @@ [element] subject = messages -position = 8, 18 +position = 12, 18 alignment = -1, -1 textcolor = 0, 0, 0, 255 textsize = 4 ;0 textshadow = 1 ;0 transition = 3 ;2 transitionvector = 0, -40 -value = 0, 20 +value = 0, 26 ; ----- @@ -20,7 +20,7 @@ value = 0, 20 [element] subject = scoremessages -position = 0, 80 +position = -64, 80 alignment = 0, -1 textcolor = 0, 0, 0, 255 textposition = 2, -1 @@ -29,16 +29,16 @@ textsize = 4 textshadow = 1 transition = 3 transitionvector = 0, -96 -value = 0, 20 +value = 0, 30 [element] subject = score position = 0, -1 alignment = 0, -1 -centermiddle = indicator_top_back.png, indicator_top_overlay.png +centermiddle = indicator_top_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 0, -1 textalignment = 0, 0 textsize = 3 @@ -51,68 +51,68 @@ textshadow = 1 [element] subject = reverser -position = -8, 1 +position = -16, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 -textposition = 24, 2 +textcolor = 255, 255, 255, 255 +textposition = 24, 0 textalignment = -1, 0 textsize = 2 -textshadow = 0 +textshadow = 1 [element] subject = power -position = 74, 1 +position = 66, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 -textposition = 23, 2 +textcolor = 255, 255, 255, 255 +textposition = 23, 0 textalignment = -1, 0 textsize = 2 -textshadow = 0 +textshadow = 1 [element] subject = brake -position = 156, 1 +position = 148, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 -textposition = 23, 2 +textcolor = 255, 255, 255, 255 +textposition = 23, 0 textalignment = -1, 0 textsize = 2 -textshadow = 0 +textshadow = 1 [element] subject = locobrake -position = 238, 1 +position = 230, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 -textposition = 23, 2 +textcolor = 255, 255, 255, 255 +textposition = 23, 0 textalignment = -1, 0 textsize = 2 -textshadow = 0 +textshadow = 1 [element] subject = single -position = 74, 1 +position = 66, 1 alignment = -1, 1 -centermiddle = handle_back.png, handle_overlay.png +centermiddle = handle_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 -textposition = 23, 2 +textcolor = 255, 255, 255, 255 +textposition = 23, 0 textalignment = -1, 0 textsize = 2 -textshadow = 0 +textshadow = 1 ; --------------- @@ -123,14 +123,14 @@ textshadow = 0 subject = doorsleft position = -32, 0 alignment = 0, 1 -centermiddle = doors_left_back.png, doors_left_overlay.png +centermiddle = doors_left_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = -18, -1 textalignment = 1, 0 textsize = 2 -textshadow = 0 +textshadow = 1 transition = 1 transitionvector = 0, 31 @@ -138,14 +138,14 @@ transitionvector = 0, 31 subject = doorsright position = 32, 0 alignment = 0, 1 -centermiddle = doors_right_back.png, doors_right_overlay.png +centermiddle = doors_right_back.png, NULL backcolor = 0, 0, 0, 144 overlaycolor = 255, 255, 255, 64 -textcolor = 255, 255, 255, 192 +textcolor = 255, 255, 255, 255 textposition = 17, -1 textalignment = -1, 0 textsize = 2 -textshadow = 0 +textshadow = 1 transition = 1 transitionvector = 0, 31 @@ -236,7 +236,7 @@ value = 128 ; vertical radius [element] subject = ai -position = 8, -26 +position = 12, -52 alignment = -1, 1 textcolor = 255, 255, 255, 255 textsize = 3 @@ -245,7 +245,7 @@ transition = 2 [element] subject = clock -position = 8, -42 +position = 12, -78 alignment = -1, 1 textcolor = 255, 255, 255, 255 textsize = 3 @@ -254,7 +254,7 @@ transition = 2 [element] subject = speed -position = 8, -58 +position = 12, -104 alignment = -1, 1 textcolor = 255, 255, 255, 255 textsize = 3 @@ -263,7 +263,7 @@ transition = 2 [element] subject = gradient -position = 8, -74 +position = 12, -130 alignment = -1, 1 textcolor = 255, 255, 255, 255 textsize = 3 @@ -272,7 +272,25 @@ transition = 2 [element] subject = fps -position = 8, -90 +position = 12, -156 +alignment = -1, 1 +textcolor = 255, 255, 255, 255 +textsize = 3 +textshadow = 1 +transition = 2 + +[element] +subject = distnextstation2 +position = 12, -182 +alignment = -1, 1 +textcolor = 255, 255, 255, 255 +textsize = 3 +textshadow = 1 +transition = 2 + +[element] +subject = distnextstation +position = 12, -208 alignment = -1, 1 textcolor = 255, 255, 255, 255 textsize = 3 diff --git a/assets/In-game/Slim/interface.cfg b/assets/In-game/Slim/interface.cfg index d9161d9aa9..e1681e9fe8 100644 --- a/assets/In-game/Slim/interface.cfg +++ b/assets/In-game/Slim/interface.cfg @@ -61,6 +61,15 @@ alignment = -1, 1 textsize = 1 textshadow = 1 +[element] +subject = locobrake +position = 115, 1 +alignment = -1, 1 +textposition = 13, -1 +textalignment = -1, 0 +textsize = 0 +textshadow = 0 + [element] subject = single position = 46, -10 @@ -199,7 +208,7 @@ textshadow = 1 transition = 2 [element] -subject = fps +subject = gradient position = 8, -74 alignment = -1, 1 textcolor = 255, 255, 255, 255 @@ -207,6 +216,33 @@ textsize = 1 textshadow = 1 transition = 2 +[element] +subject = fps +position = 8, -90 +alignment = -1, 1 +textcolor = 255, 255, 255, 255 +textsize = 1 +textshadow = 1 +transition = 2 + +[element] +subject = distnextstation2 +position = 8, -116 +alignment = -1, 1 +textcolor = 255, 255, 255, 255 +textsize = 1 +textshadow = 1 +transition = 2 + +[element] +subject = distnextstation +position = 8, -132 +alignment = -1, 1 +textcolor = 255, 255, 255, 255 +textsize = 1 +textshadow = 1 +transition = 2 + ; ------------- ; ats/atc lamps diff --git a/source/OpenBVE/Graphics/Renderers/Overlays.HUD.cs b/source/OpenBVE/Graphics/Renderers/Overlays.HUD.cs index 7bfb45c287..78c5b61f51 100644 --- a/source/OpenBVE/Graphics/Renderers/Overlays.HUD.cs +++ b/source/OpenBVE/Graphics/Renderers/Overlays.HUD.cs @@ -657,7 +657,7 @@ private void RenderHUDElement(HUD.Element Element, double TimeElapsed) if (Program.CurrentHost.LoadTexture(ref Element.CenterMiddle.OverlayTexture, OpenGlTextureWrapMode.ClampClamp)) { Color128 c = Element.OverlayColor.CreateBackColor(sc, alpha); - renderer.Rectangle.Draw(Element.CenterMiddle.BackgroundTexture, new Vector2(x, y), new Vector2(w, h), c); + renderer.Rectangle.Draw(Element.CenterMiddle.OverlayTexture, new Vector2(x, y), new Vector2(w, h), c); } } }