additional new face stuff

This commit is contained in:
max
2026-02-08 21:45:11 +01:00
parent 3d5b5704f5
commit e3b553696c
6 changed files with 567 additions and 735 deletions
+121
View File
@@ -0,0 +1,121 @@
:root{
--bg:#06070b;
--card:#0f1422;
--text:#e8f0ff;
--muted:#a8b6d8;
--border: rgba(255,255,255,.10);
--accent: rgba(120,220,255,1);
--shadow: 0 12px 40px rgba(0,0,0,.55);
--r: 18px;
}
html,body{ height:100%; margin:0; background:var(--bg); color:var(--text);
font-family:system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial; }
.page{ max-width: 880px; margin:0 auto; padding: 18px; }
.top{ display:flex; align-items:flex-start; justify-content:space-between; gap:16px; flex-wrap:wrap; }
h1{ margin:0; font-size:22px; }
h2{ margin:0 0 12px 0; font-size:16px; }
.card{
background: rgba(255,255,255,.04);
border: 1px solid var(--border);
border-radius: var(--r);
padding: 14px;
margin-top: 14px;
box-shadow: var(--shadow);
}
.row{ display:flex; gap:10px; align-items:center; flex-wrap:wrap; }
.pill{
font-size: 12px;
color: var(--muted);
border:1px solid var(--border);
border-radius: 999px;
padding: 8px 10px;
background: rgba(255,255,255,.03);
}
.grid{
display:grid;
grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
gap: 10px;
}
.emobtn{
border:1px solid var(--border);
background: rgba(255,255,255,.05);
border-radius: 14px;
padding: 12px;
color: var(--text);
cursor:pointer;
display:flex;
align-items:center;
gap:10px;
justify-content:flex-start;
}
.emobtn.active{ outline: 2px solid rgba(120,220,255,.55); }
.icon{
width:34px; height:34px;
border-radius: 10px;
display:grid; place-items:center;
background: rgba(120,220,255,.12);
border: 1px solid rgba(120,220,255,.25);
color: var(--accent);
font-size: 18px;
}
.controls{ display:grid; gap: 12px; }
.toggle{ display:flex; gap:10px; align-items:center; color:var(--text); }
.toggle input{ transform: scale(1.2); }
.slider{ display:grid; grid-template-columns: 110px 1fr 60px; gap:10px; align-items:center; }
.slider output{ text-align:right; color: var(--muted); }
.lookpad{
width:min(520px, 92vw);
aspect-ratio: 1 / 1;
margin-top: 10px;
border-radius: 20px;
border:1px solid var(--border);
background: rgba(0,0,0,.35);
position:relative;
overflow:hidden;
touch-action: none;
}
.cross::before, .cross::after{
content:"";
position:absolute;
left:50%; top:0; bottom:0;
width:1px;
background: rgba(255,255,255,.08);
}
.cross::after{
left:0; right:0; top:50%; bottom:auto;
height:1px; width:auto;
}
.dot{
width:18px; height:18px;
border-radius: 99px;
background: rgba(120,220,255,.95);
box-shadow: 0 0 0 6px rgba(120,220,255,.18);
position:absolute;
left:50%; top:50%;
transform: translate(-50%,-50%);
}
.btn{
border:1px solid var(--border);
background: rgba(255,255,255,.06);
color: var(--text);
border-radius: 14px;
padding: 10px 12px;
cursor:pointer;
}
.btn:active{ transform: translateY(1px); }
.muted{ margin: 0; color: var(--muted); font-size: 13px; }
.foot{ margin-top: 18px; display:flex; justify-content:space-between; }
.link{ color: rgba(120,220,255,.95); text-decoration:none; }
+229
View File
@@ -0,0 +1,229 @@
// Control UI -> POST /api/state
// Also subscribes to /events to show current state/connection.
(() => {
const EMOTIONS = [
{ id: "neutral", label: "Neutral", icon: "•" },
{ id: "happy", label: "Happy", icon: "😊" },
{ id: "sad", label: "Sad", icon: "☹️" },
{ id: "angry", label: "Angry", icon: "😠" },
{ id: "sleepy", label: "Sleepy", icon: "😴" },
{ id: "surprised", label: "Surprised", icon: "😲" },
{ id: "excited", label: "Excited", icon: "⚡" },
];
const clamp = (n,a,b) => Math.max(a, Math.min(b, n));
const clamp01 = (v) => clamp(Number(v) || 0, 0, 1);
const ui = {
grid: document.getElementById("emotionGrid"),
conn: document.getElementById("conn"),
current: document.getElementById("current"),
speaking: document.getElementById("speaking"),
eyesMoving: document.getElementById("eyesMoving"),
intensity: document.getElementById("intensity"),
intensityVal: document.getElementById("intensityVal"),
lookpad: document.getElementById("lookpad"),
lookdot: document.getElementById("lookdot"),
center: document.getElementById("center"),
stareOff: document.getElementById("stareOff"),
};
const state = {
emotion: "neutral",
intensity: 0.85,
speaking: false,
eyesMoving: true,
look: { x: 0, y: 0 },
// stare/lock is represented by sending/omitting look.
stare: false,
};
function renderEmotionButtons() {
ui.grid.innerHTML = "";
for (const e of EMOTIONS) {
const b = document.createElement("button");
b.className = "emobtn";
b.dataset.emotion = e.id;
b.innerHTML = `
<div class="icon">${e.icon}</div>
<div>
<div style="font-weight:700">${e.label}</div>
<div style="opacity:.6;font-size:12px">${e.id}</div>
</div>
`;
b.addEventListener("click", () => {
state.emotion = e.id;
setActiveEmotion();
sendState({ emotion: state.emotion });
});
ui.grid.appendChild(b);
}
setActiveEmotion();
}
function setActiveEmotion() {
for (const btn of ui.grid.querySelectorAll(".emobtn")) {
btn.classList.toggle("active", btn.dataset.emotion === state.emotion);
}
ui.current.textContent = state.emotion;
}
async function sendState(partial) {
// Build payload. If stare=false -> do NOT send look (so face can drift).
const payload = {
emotion: state.emotion,
intensity: state.intensity,
speaking: state.speaking,
eyesMoving: state.eyesMoving,
...partial,
};
if (state.stare) payload.look = { x: state.look.x, y: state.look.y };
else delete payload.look;
try {
await fetch("/api/state", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(payload),
});
} catch (_) {
// ignore; SSE status will show disconnected
}
}
// intensity
ui.intensity.addEventListener("input", () => {
state.intensity = clamp01(ui.intensity.value);
ui.intensityVal.textContent = state.intensity.toFixed(2);
sendState({ intensity: state.intensity });
});
// toggles
ui.speaking.addEventListener("change", () => {
state.speaking = !!ui.speaking.checked;
sendState({ speaking: state.speaking });
});
ui.eyesMoving.addEventListener("change", () => {
state.eyesMoving = !!ui.eyesMoving.checked;
sendState({ eyesMoving: state.eyesMoving });
});
// Look pad (touch/mouse)
function setDotFromLook() {
const r = ui.lookpad.getBoundingClientRect();
const px = (state.look.x + 1) / 2 * r.width;
const py = (state.look.y + 1) / 2 * r.height;
ui.lookdot.style.left = `${px}px`;
ui.lookdot.style.top = `${py}px`;
ui.lookdot.style.transform = "translate(-50%,-50%)";
}
function setLookFromEvent(ev) {
const r = ui.lookpad.getBoundingClientRect();
const x = clamp((ev.clientX - r.left) / r.width, 0, 1);
const y = clamp((ev.clientY - r.top) / r.height, 0, 1);
state.look.x = (x * 2) - 1;
state.look.y = (y * 2) - 1;
state.stare = true; // touching pad implies stare
setDotFromLook();
sendState({}); // will include look because stare=true
}
let pointerDown = false;
ui.lookpad.addEventListener("pointerdown", (ev) => {
pointerDown = true;
ui.lookpad.setPointerCapture(ev.pointerId);
setLookFromEvent(ev);
});
ui.lookpad.addEventListener("pointermove", (ev) => {
if (!pointerDown) return;
setLookFromEvent(ev);
});
ui.lookpad.addEventListener("pointerup", () => { pointerDown = false; });
// dblclick / double tap center
let lastTap = 0;
ui.lookpad.addEventListener("pointerdown", () => {
const now = Date.now();
if (now - lastTap < 280) {
state.look = { x: 0, y: 0 };
state.stare = true;
setDotFromLook();
sendState({});
}
lastTap = now;
});
ui.center.addEventListener("click", () => {
state.look = { x: 0, y: 0 };
state.stare = true;
setDotFromLook();
sendState({});
});
ui.stareOff.addEventListener("click", () => {
state.stare = false; // omit look in next send
sendState({});
});
// SSE subscribe to reflect current state + connection
(function connectSSE(){
let es;
function open(){
ui.conn.textContent = "connecting…";
es = new EventSource("/events");
es.onopen = () => ui.conn.textContent = "online";
const apply = (msg) => {
if (!msg || typeof msg !== "object") return;
if (typeof msg.emotion === "string") state.emotion = msg.emotion;
if (msg.intensity !== undefined) state.intensity = clamp01(msg.intensity);
if (typeof msg.speaking === "boolean") state.speaking = msg.speaking;
if (typeof msg.eyesMoving === "boolean") state.eyesMoving = msg.eyesMoving;
if (msg.look && typeof msg.look === "object") {
state.look = {
x: clamp(Number(msg.look.x ?? 0), -1, 1),
y: clamp(Number(msg.look.y ?? 0), -1, 1),
};
state.stare = true;
}
ui.intensity.value = String(state.intensity);
ui.intensityVal.textContent = state.intensity.toFixed(2);
ui.speaking.checked = state.speaking;
ui.eyesMoving.checked = state.eyesMoving;
setActiveEmotion();
setDotFromLook();
};
es.addEventListener("state", (ev) => {
try { apply(JSON.parse(ev.data)); } catch (_) {}
});
es.onmessage = (ev) => {
try { apply(JSON.parse(ev.data)); } catch (_) {}
};
es.onerror = () => {
ui.conn.textContent = "offline";
try { es.close(); } catch (_) {}
setTimeout(open, 1200);
};
}
open();
})();
// init
renderEmotionButtons();
ui.intensityVal.textContent = state.intensity.toFixed(2);
setDotFromLook();
})();
+51 -374
View File
@@ -2,390 +2,67 @@
<html lang="de">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>Robot Face Control</title>
<style>
:root { color-scheme: dark; }
body {
margin: 0;
font-family: system-ui, -apple-system, Segoe UI, Roboto, sans-serif;
background: #0b0f14;
color: #d7e3f2;
}
.wrap {
max-width: 720px;
margin: 0 auto;
padding: 16px;
display: grid;
gap: 14px;
}
.card {
background: rgba(18, 25, 37, 0.85);
border: 1px solid rgba(255,255,255,0.08);
border-radius: 18px;
padding: 14px;
box-shadow: 0 10px 30px rgba(0,0,0,0.25);
}
h1 { font-size: 18px; margin: 0 0 10px 0; opacity: 0.95; }
h2 { font-size: 14px; margin: 0 0 10px 0; opacity: 0.85; }
.grid {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: 10px;
}
button {
background: #121925;
color: #d7e3f2;
border: 1px solid rgba(255,255,255,0.10);
padding: 12px 10px;
border-radius: 14px;
cursor: pointer;
font-size: 14px;
transition: transform 120ms ease, border-color 120ms ease;
user-select: none;
touch-action: manipulation;
}
button:active { transform: scale(0.98); }
button.primary { border-color: rgba(0,255,180,0.35); }
.row {
display: grid;
grid-template-columns: 1fr auto;
align-items: center;
gap: 10px;
margin-top: 10px;
}
.row3 {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
gap: 10px;
margin-top: 10px;
}
input[type="range"] {
width: 100%;
accent-color: #6ee7ff;
}
.value {
font-variant-numeric: tabular-nums;
opacity: 0.85;
min-width: 72px;
text-align: right;
}
.toggle {
display: grid;
grid-template-columns: auto 1fr;
gap: 10px;
align-items: center;
}
.pill {
display: inline-flex;
align-items: center;
gap: 8px;
padding: 10px 12px;
border-radius: 999px;
border: 1px solid rgba(255,255,255,0.10);
background: #121925;
}
.dot {
width: 10px; height: 10px; border-radius: 999px;
background: rgba(255,255,255,0.35);
}
.dot.ok { background: rgba(0,255,180,0.75); }
.dot.bad { background: rgba(255,70,70,0.75); }
.small { font-size: 12px; opacity: 0.75; }
.footer {
display: flex;
gap: 10px;
flex-wrap: wrap;
margin-top: 10px;
}
</style>
<meta name="viewport" content="width=device-width,initial-scale=1,viewport-fit=cover" />
<title>Face Control</title>
<link rel="stylesheet" href="/control/control.css" />
</head>
<body>
<div class="wrap">
<div class="card">
<h1>Robot Face Control</h1>
<div class="toggle">
<span class="pill"><span id="connDot" class="dot"></span><span id="connTxt">offline</span></span>
<div class="small" id="stateTxt">–</div>
<main class="page">
<header class="top">
<h1>Face Control</h1>
<div class="row">
<span class="pill">Status: <strong id="conn">?</strong></span>
<span class="pill">Aktuell: <strong id="current">neutral</strong></span>
</div>
</div>
</header>
<div class="card">
<section class="card">
<h2>Emotion</h2>
<div class="grid">
<button data-emotion="neutral" class="primary">neutral</button>
<button data-emotion="happy">happy</button>
<button data-emotion="sad">sad</button>
<button data-emotion="angry">angry</button>
<button data-emotion="surprised">surprised</button>
<button data-emotion="sleepy">sleepy</button>
</div>
<div class="grid" id="emotionGrid"></div>
</section>
<section class="card">
<h2>Parameter</h2>
<div class="controls">
<label class="toggle">
<input id="speaking" type="checkbox" />
<span>🗣️ Sprechen</span>
</label>
<label class="toggle">
<input id="eyesMoving" type="checkbox" checked />
<span>👀 Augen bewegen</span>
</label>
<label class="slider">
<span>Intensity</span>
<input id="intensity" type="range" min="0" max="1" step="0.01" value="0.85" />
<output id="intensityVal">0.85</output>
</label>
</div>
</section>
<section class="card">
<h2>Look</h2>
<p class="muted">Zieh im Feld: links/rechts/oben/unten. Doppeltipp = zentrieren.</p>
<div class="lookpad" id="lookpad">
<div class="cross"></div>
<div class="dot" id="lookdot"></div>
</div>
<div class="row">
<label for="intensity">Intensität</label>
<div class="value" id="intensityVal">0.70</div>
<button class="btn" id="center">Center</button>
<button class="btn" id="stareOff">Stare OFF</button>
</div>
<input id="intensity" type="range" min="0" max="1" step="0.01" value="0.70" />
<div class="footer">
<button id="blinkBtn">Blinzeln</button>
<button id="wanderBtn" class="primary">Blick: wander</button>
</div>
</div>
</section>
<div class="card">
<h2>Blick (fix)</h2>
<div class="row">
<label for="lookX">X (links ↔ rechts)</label>
<div class="value" id="lookXVal">0.00</div>
</div>
<input id="lookX" type="range" min="-1" max="1" step="0.01" value="0" />
<footer class="foot">
<a class="link" href="/">← Face</a>
<a class="link" href="/drive">Drive →</a>
</footer>
</main>
<div class="row">
<label for="lookY">Y (oben ↕ unten)</label>
<div class="value" id="lookYVal">0.00</div>
</div>
<input id="lookY" type="range" min="-1" max="1" step="0.01" value="0" />
<div class="footer">
<button id="applyLookBtn">Blick anwenden</button>
<button id="centerLookBtn">Zentrieren</button>
</div>
</div>
<div class="card">
<h2>Sprechen</h2>
<div class="footer">
<button id="speakBtn">Speak (700ms)</button>
<button id="talkToggleBtn" class="primary">Talk: OFF</button>
</div>
<div class="row">
<label for="talkRate">Rate (Hz)</label>
<div class="value" id="talkRateVal">3.20</div>
</div>
<input id="talkRate" type="range" min="0.5" max="10" step="0.1" value="3.2" />
<div class="row">
<label for="talkAmount">Mund-Öffnung</label>
<div class="value" id="talkAmountVal">0.90</div>
</div>
<input id="talkAmount" type="range" min="0" max="1" step="0.01" value="0.9" />
<div class="row">
<label for="talkJitter">Jitter</label>
<div class="value" id="talkJitterVal">0.25</div>
</div>
<input id="talkJitter" type="range" min="0" max="1" step="0.01" value="0.25" />
</div>
<div class="card small">
Tipp: URL am Handy öffnen: <b>/control/</b> (z. B. http://raspy/control/)
</div>
</div>
<script>
const $ = (id) => document.getElementById(id);
const connDot = $("connDot");
const connTxt = $("connTxt");
const stateTxt = $("stateTxt");
const intensity = $("intensity");
const intensityVal = $("intensityVal");
const lookX = $("lookX"), lookXVal = $("lookXVal");
const lookY = $("lookY"), lookYVal = $("lookYVal");
const talkToggleBtn = $("talkToggleBtn");
const talkRate = $("talkRate"), talkRateVal = $("talkRateVal");
const talkAmount = $("talkAmount"), talkAmountVal = $("talkAmountVal");
const talkJitter = $("talkJitter"), talkJitterVal = $("talkJitterVal");
let talkEnabled = false;
let wander = true;
let lastState = null;
function fmt(n, d=2){ return Number(n).toFixed(d); }
async function postState(patch) {
const res = await fetch("/api/state", {
method: "POST",
headers: {"Content-Type":"application/json"},
body: JSON.stringify(patch),
});
if (!res.ok) throw new Error("POST failed: " + res.status);
return res.json();
}
function setConn(ok) {
connDot.classList.toggle("ok", ok);
connDot.classList.toggle("bad", !ok);
connTxt.textContent = ok ? "online" : "offline";
}
function updateStateText(s) {
if (!s) { stateTxt.textContent = "–"; return; }
const e = s.emotion ?? "?";
const i = s.intensity ?? "?";
const t = s.talk?.enabled ? "talk" : "silent";
const lk = (s.look === null || s.look === undefined) ? "wander" : `look(${fmt(s.look.x)},${fmt(s.look.y)})`;
stateTxt.textContent = `${e} | intensity ${fmt(i)} | ${t} | ${lk}`;
}
// Emotion buttons
document.querySelectorAll("button[data-emotion]").forEach(btn => {
btn.addEventListener("click", async () => {
try {
await postState({ emotion: btn.dataset.emotion });
} catch(e) { console.error(e); }
});
});
// Intensity slider
intensity.addEventListener("input", () => intensityVal.textContent = fmt(intensity.value));
intensity.addEventListener("change", async () => {
try { await postState({ intensity: Number(intensity.value) }); } catch(e){ console.error(e); }
});
// Blink + Wander toggle
$("blinkBtn").addEventListener("click", async () => {
try { await postState({ blink: true }); } catch(e){ console.error(e); }
});
$("wanderBtn").addEventListener("click", async (ev) => {
wander = !wander;
ev.target.textContent = "Blick: " + (wander ? "wander" : "fix");
ev.target.classList.toggle("primary", wander);
try {
await postState({ look: wander ? null : { x: Number(lookX.value), y: Number(lookY.value) } });
} catch(e){ console.error(e); }
});
// Look sliders
function updateLookLabels(){
lookXVal.textContent = fmt(lookX.value);
lookYVal.textContent = fmt(lookY.value);
}
lookX.addEventListener("input", updateLookLabels);
lookY.addEventListener("input", updateLookLabels);
updateLookLabels();
$("applyLookBtn").addEventListener("click", async () => {
try {
wander = false;
$("wanderBtn").textContent = "Blick: fix";
$("wanderBtn").classList.remove("primary");
await postState({ look: { x: Number(lookX.value), y: Number(lookY.value) } });
} catch(e){ console.error(e); }
});
$("centerLookBtn").addEventListener("click", async () => {
lookX.value = 0; lookY.value = 0; updateLookLabels();
try {
wander = false;
$("wanderBtn").textContent = "Blick: fix";
$("wanderBtn").classList.remove("primary");
await postState({ look: { x: 0, y: 0 } });
} catch(e){ console.error(e); }
});
// Speak (one-shot)
$("speakBtn").addEventListener("click", async () => {
try {
await postState({ mouth: { open: true, amount: Number(talkAmount.value), duration_ms: 700 } });
} catch(e){ console.error(e); }
});
// Talk controls
function updateTalkLabels(){
talkRateVal.textContent = fmt(talkRate.value);
talkAmountVal.textContent = fmt(talkAmount.value);
talkJitterVal.textContent = fmt(talkJitter.value);
}
talkRate.addEventListener("input", updateTalkLabels);
talkAmount.addEventListener("input", updateTalkLabels);
talkJitter.addEventListener("input", updateTalkLabels);
updateTalkLabels();
async function pushTalk() {
try {
await postState({
talk: {
enabled: talkEnabled,
rate_hz: Number(talkRate.value),
amount: Number(talkAmount.value),
jitter: Number(talkJitter.value),
}
});
} catch(e){ console.error(e); }
}
talkToggleBtn.addEventListener("click", async () => {
talkEnabled = !talkEnabled;
talkToggleBtn.textContent = "Talk: " + (talkEnabled ? "ON" : "OFF");
talkToggleBtn.classList.toggle("primary", !talkEnabled); // OFF = primary (wie vorher)
await pushTalk();
});
[talkRate, talkAmount, talkJitter].forEach(el => {
el.addEventListener("change", async () => {
if (talkEnabled) await pushTalk();
});
});
// Live state via SSE (optional, aber nice)
function connectSSE() {
try {
const es = new EventSource("/events");
es.addEventListener("state", (e) => {
setConn(true);
try {
lastState = JSON.parse(e.data);
updateStateText(lastState);
// sync some UI hints
if (typeof lastState?.intensity === "number") {
intensity.value = lastState.intensity;
intensityVal.textContent = fmt(intensity.value);
}
if (lastState?.look === null) {
wander = true;
$("wanderBtn").textContent = "Blick: wander";
$("wanderBtn").classList.add("primary");
} else if (lastState?.look) {
wander = false;
$("wanderBtn").textContent = "Blick: fix";
$("wanderBtn").classList.remove("primary");
lookX.value = lastState.look.x ?? 0;
lookY.value = lastState.look.y ?? 0;
updateLookLabels();
}
if (lastState?.talk) {
talkEnabled = !!lastState.talk.enabled;
talkToggleBtn.textContent = "Talk: " + (talkEnabled ? "ON" : "OFF");
talkToggleBtn.classList.toggle("primary", !talkEnabled);
if (typeof lastState.talk.rate_hz === "number") talkRate.value = lastState.talk.rate_hz;
if (typeof lastState.talk.amount === "number") talkAmount.value = lastState.talk.amount;
if (typeof lastState.talk.jitter === "number") talkJitter.value = lastState.talk.jitter;
updateTalkLabels();
}
} catch {}
});
es.onerror = () => { setConn(false); es.close(); setTimeout(connectSSE, 1200); };
} catch {
setConn(false);
}
}
connectSSE();
// Initial ping
fetch("/api/state").then(r => r.json()).then(j => {
setConn(true);
lastState = j.state;
updateStateText(lastState);
}).catch(() => setConn(false));
</script>
<script src="/control/control.js"></script>
</body>
</html>