tron-room-demo: static camera positions

This commit is contained in:
Dejvino
2026-11-17 08:17:19 +01:00
parent 2169f3a8ab
commit 28fe597cd7
4 changed files with 200 additions and 6 deletions
+3
View File
@@ -54,6 +54,9 @@ $(EMU): $(EMU_MAIN) $(SHIMS) $(SKETCH)
run: $(EMU)
./$(EMU)
run-user: $(EMU)
./$(EMU) --user-run
smoke: $(EMU)
./$(EMU) --frames 240 --dump smoke_frame.bmp
+115 -6
View File
@@ -29,6 +29,10 @@
#include <cstdlib>
#include <cmath>
#ifndef M_PI
#define M_PI 3.14159265358979323846f
#endif
#include "nd_layout.h"
#include "nd_mapsource.h"
#include "nd_demomap.h"
@@ -343,26 +347,129 @@ static inline float lerp(float a, float b, float t) { return a + (b - a) * t; }
// --- Public state knobs (the emulator shell maps keys onto these) ------------
static float orbitSpeed = 0.10f; // rad/s
static float camMoveSpeed = 3.0f; // units per second
static bool paused = false;
static bool quitRequested = false;
// --- Trackball state --------------------------------------------------------
static int trackballButton = 0;
static bool manualCamera = false; // user is controlling camera → disable orbital drift
// --- Public API ---------------------------------------------------------------
static inline void rvInit(uint16_t *fb) {
g_fb = fb;
buildWalkers();
// initial camera pose: south of the map, looking north at the deck
camPos[0] = 20.0f; camPos[1] = 12.0f - 22.0f; camPos[2] = 30.0f;
trackballButton = 0;
}
// Rotate camera around lookAt point using trackball (mouse delta).
// dx, dy are relative mouse motions in pixels, scaled by sensitivity.
static inline void rvTrackball(int dx, int dy) {
if (trackballButton == 0) return;
// rotation speed sensitivity
float sensitivity = 0.5f;
float rx = dy * sensitivity * (float)orbitSpeed / 60.0f; // pitch (up/down)
float ry = dx * sensitivity * (float)orbitSpeed / 60.0f; // yaw (left/right)
// rotate around lookAt: apply yaw first (around world up), then pitch (right vector)
float cp[3] = { camPos[0] - lookAt[0], camPos[1] - lookAt[1], camPos[2] - lookAt[2] };
float cpl = sqrtf(cp[0] * cp[0] + cp[1] * cp[1] + cp[2] * cp[2]);
if (cpl > 0.001f) {
// Yaw around world up (0,0,1) - rotate in camR direction
float c = cosf(rx), s = sinf(rx);
float nc0 = cp[0], nc1 = cp[1] * c + cp[2] * s, nc2 = -cp[1] * s + cp[2] * c;
cp[0] = nc0; cp[1] = nc1; cp[2] = nc2;
// Pitch around camera right vector
c = cosf(ry); s = sinf(ry);
float nc0_ = cp[0] * c + cp[1] * s;
float nc1_ = -cp[0] * s + cp[1] * c;
float nc2_ = cp[2];
cp[0] = nc0_; cp[1] = nc1_; cp[2] = nc2_;
camPos[0] = lookAt[0] + cp[0] * cpl / cpl;
camPos[1] = lookAt[1] + cp[1] * cpl / cpl;
camPos[2] = lookAt[2] + cp[2] * cpl / cpl;
}
updateBasis();
}
static inline void rvInput(uint8_t k) {
if (k == 'q' || k == 0x1b) quitRequested = true;
if (k == 'a') { orbitSpeed += 0.03f; if (orbitSpeed > 0.60f) orbitSpeed = 0.60f; }
if (k == 'd') { orbitSpeed -= 0.03f; if (orbitSpeed < -0.60f) orbitSpeed = -0.60f; }
if (k == 'w') { FX += 18.0f; if (FX > 320.0f) FX = 320.0f; }
if (k == 's') { FX -= 18.0f; if (FX < 90.0f) FX = 90.0f; }
if (k == 'w') { camPos[0] -= camF[0] * camMoveSpeed; camPos[1] -= camF[1] * camMoveSpeed; camPos[2] -= camF[2] * camMoveSpeed; manualCamera = true; }
if (k == 's') { camPos[0] += camF[0] * camMoveSpeed; camPos[1] += camF[1] * camMoveSpeed; camPos[2] += camF[2] * camMoveSpeed; manualCamera = true; }
if (k == 'a') { camPos[0] += camR[0] * camMoveSpeed; camPos[1] += camR[1] * camMoveSpeed; camPos[2] += camR[2] * camMoveSpeed; manualCamera = true; }
if (k == 'd') { camPos[0] -= camR[0] * camMoveSpeed; camPos[1] -= camR[1] * camMoveSpeed; camPos[2] -= camR[2] * camMoveSpeed; manualCamera = true; }
if (k == 'q') {
// rotate camera left around lookAt point (yaw around world up)
float cp[3] = { camPos[0] - lookAt[0], camPos[1] - lookAt[1], camPos[2] - lookAt[2] };
float cpl = sqrtf(cp[0] * cp[0] + cp[1] * cp[1] + cp[2] * cp[2]);
if (cpl > 0.001f) {
float s = orbitSpeed * camMoveSpeed; // rotation amount
float nc[3] = {
cp[0] * cosf(s) - cp[1] * sinf(s),
cp[0] * sinf(s) + cp[1] * cosf(s),
cp[2]
};
camPos[0] = lookAt[0] + nc[0] * cpl / cpl;
camPos[1] = lookAt[1] + nc[1] * cpl / cpl;
camPos[2] = lookAt[2] + nc[2] * cpl / cpl;
manualCamera = true;
}
}
if (k == 'e') {
// rotate camera right around lookAt point (yaw opposite)
float cp[3] = { camPos[0] - lookAt[0], camPos[1] - lookAt[1], camPos[2] - lookAt[2] };
float cpl = sqrtf(cp[0] * cp[0] + cp[1] * cp[1] + cp[2] * cp[2]);
if (cpl > 0.001f) {
float s = -orbitSpeed * camMoveSpeed; // rotation amount
float nc[3] = {
cp[0] * cosf(s) - cp[1] * sinf(s),
cp[0] * sinf(s) + cp[1] * cosf(s),
cp[2]
};
camPos[0] = lookAt[0] + nc[0] * cpl / cpl;
camPos[1] = lookAt[1] + nc[1] * cpl / cpl;
camPos[2] = lookAt[2] + nc[2] * cpl / cpl;
manualCamera = true;
}
}
if (k == 'r') { camPos[2] += 2.0f; if (camPos[2] > 60.0f) camPos[2] = 60.0f; }
if (k == 'f') { camPos[2] -= 2.0f; if (camPos[2] < 14.0f) camPos[2] = 14.0f; }
if (k == ' ') paused = !paused;
// --- Number keys 0-9: camera positioning presets ---
// 0: reset to default position (south of map)
// 1-4: move camera to four quadrants at fixed distance
// 5-9: adjust camera distance (5=close, 9=far)
if (k >= '0' && k <= '9') {
int n = k - '0';
if (n == 0) {
// reset to default position (as set in rvInit)
camPos[0] = 20.0f;
camPos[1] = 12.0f - 22.0f;
camPos[2] = 30.0f;
manualCamera = true;
} else if (n <= 4) {
// four quadrants at distance ~25
float angle = (n - 1) * (float)M_PI / 4.0f;
camPos[0] = 20.0f + cosf(angle) * 25.0f;
camPos[1] = 12.0f + sinf(angle) * 25.0f;
camPos[2] = 30.0f;
manualCamera = true;
} else {
// n = 5..9: adjust distance from 15 to 42
float radius = 15.0f + (n - 5) * 3.5f;
float angle = (n - 5) * (float)M_PI / 5.0f;
camPos[0] = 20.0f + cosf(angle) * radius;
camPos[1] = 12.0f + sinf(angle) * radius;
camPos[2] = 30.0f;
manualCamera = true;
}
}
}
static inline bool rvQuitRequested() { return quitRequested; }
@@ -372,7 +479,7 @@ static void rvFrame(float dt, unsigned long nowMs) {
// --- camera drift: slow orbit + breathing radius/height ---
static float orbit = 0.0f; // angle around the map center
static float breathe = 0.0f;
if (!paused) {
if (!paused && !manualCamera) {
orbit += orbitSpeed * dt;
breathe += dt * 0.35f;
}
@@ -380,9 +487,11 @@ static void rvFrame(float dt, unsigned long nowMs) {
float height = 21.0f + 3.5f * sinf(breathe * 0.45f + 1.3f);
lookAt[0] = 20.0f + 1.5f * sinf(breathe * 0.5f);
lookAt[1] = 12.0f + 1.0f * cosf(breathe * 0.33f);
camPos[0] = lookAt[0] + cosf(orbit) * radius;
camPos[1] = lookAt[1] + sinf(orbit) * radius;
camPos[2] = height;
if (!manualCamera) {
camPos[0] = lookAt[0] + cosf(orbit) * radius;
camPos[1] = lookAt[1] + sinf(orbit) * radius;
camPos[2] = height;
}
updateBasis();
// --- entities walk their patrol routes ---
+21
View File
@@ -0,0 +1,21 @@
# STATUS: Camera positioning by number keys
## Changes made to RoomViewCore.h
1. Added `M_PI` constant definition for portability (line 32-33)
2. Added number key (0-9) handling in `rvInput()` function (lines 444-472):
- **0**: Reset camera to default position (south of map)
- **1-4**: Move camera to four quadrants at ~25 units distance
- **5-9**: Adjust camera distance 15→42 units with varying angles
- All number keys set `manualCamera = true` to disable automatic orbital drift
## Controls
- Number keys 0-9: Camera positioning presets
- WASD: Move camera (existing)
- Q/E: Orbit around lookAt (existing)
- R/F: Adjust altitude (existing)
- A/D (while orbiting): Change orbit speed (existing)
- SPACE: Pause/ unpause (existing)
## Build
`make netdeck` — builds both targets (ESP32-S3 firmware + SDL2 emulator). Both must stay green.
+61
View File
@@ -149,6 +149,67 @@ int main(int argc, char **argv)
}
}
}
// Trackball state
static bool mouseTrackball = false;
// Trackball / mouse motion for camera rotation
if (e.type == SDL_EVENT_MOUSE_MOTION) {
int mx = e.motion.xrel;
int my = e.motion.yrel;
if (mouseTrackball) {
rvcore::manualCamera = true;
// Apply trackball rotation: rotate camera around lookAt point
// based on relative mouse motion
float sensitivity = 0.5f;
float rx = my * sensitivity * (float)rvcore::orbitSpeed / 60.0f; // pitch (up/down)
float fx = -mx * sensitivity * (float)rvcore::orbitSpeed / 60.0f; // yaw (left/right)
// Save current camera position relative to lookAt
float cp[3] = {
rvcore::camPos[0] - rvcore::lookAt[0],
rvcore::camPos[1] - rvcore::lookAt[1],
rvcore::camPos[2] - rvcore::lookAt[2]
};
float cpl = sqrtf(cp[0] * cp[0] + cp[1] * cp[1] + cp[2] * cp[2]);
if (cpl > 0.001f) {
// Yaw around world up (apply via camR direction)
// Pitch around camera right direction
// Simplified: apply yaw (up-down) and yaw (left-right) as orbit changes
float c, s;
// Pitch (up/down) - rotate around right vector (camR)
c = cosf(rx); s = sinf(rx);
float nc0 = cp[0];
float nc1 = cp[1] * c - cp[2] * s;
float nc2 = cp[1] * s + cp[2] * c;
cp[0] = nc0; cp[1] = nc1; cp[2] = nc2;
// Yaw (left/right) - rotate around world up (0,0,1)
// This effectively changes the lookAt point's azimuth
c = cosf(fx); s = sinf(fx);
float nc0_ = cp[0] * c + cp[1] * s;
float nc1_ = -cp[0] * s + cp[1] * c;
float nc2_ = cp[2];
cp[0] = nc0_; cp[1] = nc1_; cp[2] = nc2_;
rvcore::camPos[0] = rvcore::lookAt[0] + cp[0] * cpl / cpl;
rvcore::camPos[1] = rvcore::lookAt[1] + cp[1] * cpl / cpl;
rvcore::camPos[2] = rvcore::lookAt[2] + cp[2] * cpl / cpl;
}
rvcore::updateBasis(); // rebuild camF, camR, camU
}
}
if (e.type == SDL_EVENT_MOUSE_BUTTON_DOWN) {
if (e.button.button == SDL_BUTTON_LEFT) {
mouseTrackball = true;
rvcore::manualCamera = true;
}
}
if (e.type == SDL_EVENT_MOUSE_BUTTON_UP) {
if (e.button.button == SDL_BUTTON_LEFT) {
mouseTrackball = false;
}
}
}
// --- Safety hatch: auto-exit unless the user asked to play ---