Deploy 2897: [77ad22b] Merge pull request #622 from baaahs/merge-brc-…

…2024 Merge changes from BRC 2024
baaahs · Sep 25, 2024 · 4e9185b · 4e9185b
1 parent 897a847
commit 4e9185b
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 10 deletions.
diff --git a/BUILT.txt b/BUILT.txt
@@ -1 +1 @@
-Build 2890 at Sun 22 Sep 2024 01:16:10 AM UTC.
+Build 2897 at Wed 25 Sep 2024 07:42:59 PM UTC.
diff --git a/_RESOURCE_FILES_ b/_RESOURCE_FILES_
@@ -25,6 +25,7 @@ fonts/roboto/v30/KFOmCnqEu92Fr1Mu7GxKKTU1Kvnz.woff2
 index.html
 lib/long-press-event/src/long-press-event.js
 loading.gif
+midi/index.html
 monitor/index.html
 patch-editor.html
 react-mosaic-component.css

diff --git a/midi/index.html b/midi/index.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, user-scalable=no" />
+  <title>Admin | sparklemotion</title>
+  <link rel="icon" href="../favicon.png"/>
+  <link rel="stylesheet" href="../styles.css"/>
+  <link rel="stylesheet" href="../fontawesome-free/css/all.min.css"/>
+</head>
+<body class="sparklemotion-admin">
+<div id="content">
+  <div style="
+    background: white;
+    color: black;
+    font-family: 'Press Start 2P', monospace;
+    border: 2px solid black;
+    display: flex;
+    margin: auto;
+    padding: 1em;
+    height: 150px;
+    align-items: center;
+  ">
+    <img style="transform: scale(.5);" src="../loading.gif" alt=""/>
+    <div id="_patience_" style="padding-right: 5em;">Patience...</div>
+  </div>
+</div>
+
+<script type="application/javascript">
+  document.resourcesBase = "..";
+  document.sparklemotionMode = "MIDIUi";
+
+  (function () {
+    function loadJs(path) {
+      let el = document.createElement("script");
+      el.setAttribute("src", path);
+      document.head.appendChild(el);
+    }
+
+    setTimeout(function () {
+      loadJs("../sparklemotion.js");
+    });
+  })();
+</script>
+</body>
+</html>
diff --git a/shader-libraries/built-in/shaders/BAAAHS_Eclipse.glsl b/shader-libraries/built-in/shaders/BAAAHS_Eclipse.glsl
@@ -16,6 +16,12 @@ struct SoundAnalysis {
 };
 uniform SoundAnalysis soundAnalysis; // @@baaahs.SoundAnalysis:SoundAnalysis
 
+struct Midi {
+	int sustainPedalCount;
+	int noteCount;
+};
+uniform Midi midi; // @@baaahs.Midi:Midi
+
 struct BeatInfo {
 	float beat;
 	float bpm;

diff --git a/sparklemotion.js b/sparklemotion.js
diff --git a/sparklemotion.js.map b/sparklemotion.js.map
diff --git a/templates/shows/BRC 2024.sparkle b/templates/shows/BRC 2024.sparkle
@@ -2991,6 +2991,8 @@
             "type": "baaahs.Core:Slider",
             "title": "Brightness",
             "initialValue": 0.3,
+            "minValue": 0.0,
+            "maxValue": 0.75,
             "controlledFeedId": "brightnessSlider"
         },
         "saturation": {
@@ -3078,7 +3080,7 @@
         "brightnessSlider": {
             "type": "baaahs.Core:Slider",
             "title": "Brightness",
-            "initialValue": 0.15,
+            "initialValue": 0.3,
             "minValue": 0.0,
             "maxValue": 0.75
         },

diff --git a/templates/shows/Eve Rafters.sparkle b/templates/shows/Eve Rafters.sparkle
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Build 2890 at Sun 22 Sep 2024 01:16:10 AM UTC.
		Build 2897 at Wed 25 Sep 2024 07:42:59 PM UTC.