From 788a42b5296ff9ce1d409011587efb533fe10ab2 Mon Sep 17 00:00:00 2001 From: K3v1njk <117534841+K3v1njk@users.noreply.github.com> Date: Fri, 10 Apr 2026 12:09:02 -0400 Subject: [PATCH] Implement delete layer - keyboard and right-click context menu --- server/input-conway.yaml | 28 +------ server/input-image-test.yaml | 106 ++++++++++++++++++++++-- server/input-rainbow.yaml | 8 +- server/input-rotated-element-test.yaml | 55 ++++++++---- server/input-rtmp-test-two-streams.yaml | 20 +---- server/input-rtmp-test.yaml | 13 +-- server/input-text.yaml | 20 +---- server/input-webcam.yaml | 20 +++-- server/input.yaml | 37 +-------- 9 files changed, 165 insertions(+), 142 deletions(-) diff --git a/server/input-conway.yaml b/server/input-conway.yaml index f3a3179..5be7994 100644 --- a/server/input-conway.yaml +++ b/server/input-conway.yaml @@ -1,27 +1,3 @@ settings: - gamma: 1.00 -elements: - "elem1": - id: 1 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [0, 0] - "elem2": - id: 2 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [0, 32] - "elem3": - id: 3 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [32, 0] - "elem4": - id: 4 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [32, 32] \ No newline at end of file + gamma: 1 +elements: \ No newline at end of file diff --git a/server/input-image-test.yaml b/server/input-image-test.yaml index 090450a..a216bad 100644 --- a/server/input-image-test.yaml +++ b/server/input-image-test.yaml @@ -1,21 +1,111 @@ settings: gamma: 1.05 elements: - "elem1": + "bjlkjbkb (1)": id: 1 + type: "carousel" + filepaths: + framerate: 1 + location: [10,2] + "bjlkjbkb": + id: 2 + type: "carousel" + filepaths: + framerate: 1 + location: [10,2] + "khbkjb": + id: 3 + type: "webcam" + camera-number: 0 + framerate: 30 + location: [20,2] + "bjbkjb": + id: 4 + type: "rtmp" + stream-name: "" + framerate: 30 + location: [23,0] + "efwefw": + id: 5 + type: "webcam" + camera-number: 0 + framerate: 30 + location: [22,4] + "qdewqecw": + id: 6 + type: "video" + filepath: "" + framerate: 30 + location: [13,17] + "fwfwecw": + id: 7 + type: "webcam" + camera-number: 0 + framerate: 30 + location: [20,17] + "ewfew": + id: 8 + type: "video" + filepath: "" + framerate: 30 + location: [5,14] + "eewew": + id: 9 + type: "video" + filepath: "" + framerate: 30 + location: [13,11] + "seres": + id: 10 + type: "carousel" + filepaths: + framerate: 1 + location: [45,0] + "skdkd": + id: 12 + type: "webcam" + camera-number: 0 + framerate: 30 + location: [17,13] + "ssss": + id: 14 + type: "video" + filepath: "" + framerate: 30 + location: [32,11] + "sss": + id: 15 + type: "rtmp" + stream-name: "" + framerate: 30 + location: [12,17] + "ss": + id: 16 + type: "carousel" + filepaths: + framerate: 1 + location: [29,16] + "elem2 (1)": + id: 17 + type: "image" + filepath: "images/img.jpg" + location: [4,9] + scale: 0.025 + "elem1": + id: 18 type: "image" filepath: "images/apple.png" - location: [18, 54] + location: [18,54] scale: 1 "elem2": - id: 2 + id: 19 type: "image" filepath: "images/img.jpg" - location: [4, 0] + location: [20,0] scale: 0.025 "elem3": - id: 3 + id: 20 type: "image" - filepath: "images/Alan_32x32_Transparent.png" - location: [5, 20] - scale: 1 + filepath: "images/rainbow.png" + location: [5,20] + scale: 1 \ No newline at end of file diff --git a/server/input-rainbow.yaml b/server/input-rainbow.yaml index 5bb7401..d4197f4 100644 --- a/server/input-rainbow.yaml +++ b/server/input-rainbow.yaml @@ -1,9 +1,3 @@ settings: gamma: 1.05 -elements: - "elem1": - id: 1 - type: "image" - filepath: "images/rainbow.png" - location: [0, 0] - scale: 0.5 +elements: \ No newline at end of file diff --git a/server/input-rotated-element-test.yaml b/server/input-rotated-element-test.yaml index 0f3106b..38fb7e5 100644 --- a/server/input-rotated-element-test.yaml +++ b/server/input-rotated-element-test.yaml @@ -1,41 +1,68 @@ settings: gamma: 1.05 elements: + "ddddd": + id: 2 + type: "rtmp" + stream-name: "" + framerate: 30 + location: [21,23] + "nono": + id: 4 + type: "video" + filepath: "" + framerate: 30 + location: [10,24] + "dddd": + id: 5 + type: "rtmp" + stream-name: "" + framerate: 30 + location: [15,9] + "ssss": + id: 6 + type: "webcam" + camera-number: 0 + framerate: 30 + location: [21,9] + "xxxx": + id: 7 + type: "video" + filepath: "" + framerate: 30 + location: [0,9] "elem1": - id: 1 + id: 8 type: "video" filepath: "images/alan/alan_ca_4_64x64.mp4" - location: [0, 0] framerate: 30 - rotation: 180 + location: [10,6] "elem2": - id: 2 + id: 9 type: "carousel" - filepaths: ["images/creeper.png", "images/hello-rainbow.png"] - location: [12, -12] + filepaths: + - "images/creeper.png" + - "images/hello-rainbow.png" framerate: 2 - rotation: 90 + location: [12,-12] "elem3": - id: 3 + id: 10 type: "image" filepath: "images/img.jpg" location: [40,10] scale: 0.015 - rotation: 30.0 "elem4": - id: 4 + id: 11 type: "rtmp" stream-name: "test" framerate: 60 location: [0,44] size: [20,20] - rotation: -45 "elem5": - id: 5 + id: 12 type: "text" content: "Hello" size: 24 color: "#0025ff" font_path: "ttf/Lobster-Regular.ttf" - location: [5,30] - rotation: -15.0 \ No newline at end of file + location: [5,30] \ No newline at end of file diff --git a/server/input-rtmp-test-two-streams.yaml b/server/input-rtmp-test-two-streams.yaml index 73bb20a..5be7994 100644 --- a/server/input-rtmp-test-two-streams.yaml +++ b/server/input-rtmp-test-two-streams.yaml @@ -1,17 +1,3 @@ -settings: - gamma: 1.0 -elements: - "rtmp-elem1": - id: 1 - type: "rtmp" - stream-name: "test" - framerate: 60 - location: [0,0] - size: [32, 32] - "rtmp-elem2": - id: 2 - type: "rtmp" - stream-name: "test2" - framerate: 60 - location: [32, 0] - size: [32, 32] +settings: + gamma: 1 +elements: \ No newline at end of file diff --git a/server/input-rtmp-test.yaml b/server/input-rtmp-test.yaml index e9c62e8..5be7994 100644 --- a/server/input-rtmp-test.yaml +++ b/server/input-rtmp-test.yaml @@ -1,10 +1,3 @@ -settings: - gamma: 1.0 -elements: - "rtmp-elem1": - id: 1 - type: "rtmp" - stream-name: "test" - framerate: 60 - location: [0,0] - size: [64, 64] +settings: + gamma: 1 +elements: \ No newline at end of file diff --git a/server/input-text.yaml b/server/input-text.yaml index 3650aea..5be7994 100644 --- a/server/input-text.yaml +++ b/server/input-text.yaml @@ -1,19 +1,3 @@ -#Beyond just the id, the id is also a weight to determine which images have layering priority -#As of right now, we only support "image" and "text" -- "video" is planned. settings: - gamma: 1.0 -elements: - "elem1": - id: 1 - type: "image" - filepath: "images/rainbow.png" - location: [0, 0] - scale: 0.5 - "elem2": - id: 2 - type: "text" - content: "WHATS UP GUYS!!1" - size: 24 - color: "#0025ff" - font_path: "ttf/Lobster-Regular.ttf" - location: [5,0] \ No newline at end of file + gamma: 1 +elements: \ No newline at end of file diff --git a/server/input-webcam.yaml b/server/input-webcam.yaml index b85c6d6..feb4a15 100644 --- a/server/input-webcam.yaml +++ b/server/input-webcam.yaml @@ -1,9 +1,17 @@ settings: - gamma: 2.0 + gamma: 2 elements: - "elem1": + "aaa": id: 1 - type: "webcam" - camera-number: 2 - framerate: 10 - location: [0, 0] \ No newline at end of file + type: "carousel" + filepaths: + framerate: 1 + location: [0,0] + "sss": + id: 2 + type: "text" + content: "ss" + size: 24 + color: "#0025ff" + font_path: "ttf/Roboto-Regular.ttf" + location: [38,0] \ No newline at end of file diff --git a/server/input.yaml b/server/input.yaml index 0d20aba..16a896c 100644 --- a/server/input.yaml +++ b/server/input.yaml @@ -1,38 +1,3 @@ -#Beyond just the id, the id is also a weight to determine which images have layering priority - - -#Gamma - Less than 1 -> lighter, More than 1 -> Darker - settings: gamma: 1.25 -elements: - "elem1": - id: 1 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [0, 0] - "elem2": - id: 2 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [0, 32] - "elem3": - id: 3 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [32, 0] - "elem4": - id: 4 - type: "video" - filepath: "images/conway_pulsar.mp4" - framerate: 1 - location: [32, 32] - "elem5": - id: 5 - type: "video" - filepath: "images/cat64.mp4" - framerate: 30 - location: [0, 0] \ No newline at end of file +elements: \ No newline at end of file