Commit 4af9ca7740e0e4499aaed122b47031b2294e3bfc - qb

switch to playhead+radius instead of min/max haldean 1 year, 1 month ago

3 changed file(s) with 15 addition(s) and 14 deletion(s). Raw diff Collapse all Expand all

-3

nodeui.cpp less more

44	44	const context *c = node->ctx();
45	45	const int rad = 100;
46	46	const double rsamplerate = node->rsamplerate();
47		const size_t s0 = floor(rsamplerate * c->vismin);
48		const size_t s1 = ceil(rsamplerate * c->vismax);
	47	const int64_t s0 = (long) floor(rsamplerate * (c->playhead - c->visrad));
	48	const int64_t s1 = (long) ceil(rsamplerate * (c->playhead + c->visrad));
49	49
50	50	ImGui::InvisibleButton("##empty", ImVec2(-1, 2 * rad));
51	51	const ImVec2 origin = ImVec2(0, ImGui::GetItemRectMin().y);

55	55	const double scale = width / (s1 - s0);
56	56
57	57	ImDrawList *drawlist = ImGui::GetWindowDrawList();
58		for (size_t s = s0 + 1; s <= s1 && s < r.size(); s++) {
	58	for (int64_t s = std::max(int64_t(1), s0 + 1);
	59	s <= s1 && s < (int64_t) r.size(); s++) {
59	60	const ImVec2 a(origin.x + scale * (s - 1 - s0),
60	61	origin.y + rad * (1.0 - r[s - 1]));
61	62	const ImVec2 b(origin.x + scale * (s - s0),

-9

qb.cpp less more

21	21	ImGui::Begin("MainWindow", nullptr, ImGuiWindowFlags_NoDecoration);
22	22
23	23	if (ImGui::IsKeyPressed(SAPP_KEYCODE_L)) {
24		int delta = (int) ceil((vismax - vismin) * 0.02);
25		vismin += delta;
26		vismax += delta;
	24	int delta = (int) ceil(visrad * 0.02);
	25	playhead += delta;
27	26	} else if (ImGui::IsKeyPressed(SAPP_KEYCODE_H)) {
28		int delta = (int) ceil((vismax - vismin) * 0.02);
29		delta = std::min(vismin, delta);
30		vismin -= delta;
31		vismax -= delta;
	27	int delta = (int) ceil(visrad * 0.02);
	28	playhead -= delta;
32	29	}
33	30
	31	/*
34	32	int minframe = 0, maxframe = 0;
35	33	for (const auto &n : _nodes) {
36	34	minframe = std::min(minframe, n->minframe());
37	35	maxframe = std::max(maxframe, n->maxframe());
38	36	}
39	37	ImGui::DragIntRange2("visible", &vismin, &vismax, 1.0, minframe, maxframe);
	38	*/
40	39
41	40	for (const auto &n : _nodes) {
42	41	draw_node(n);

63	62	static constexpr int hires_frame_limit = 1000;
64	63
65	64	const std::vector<float>& audio_node::rendered() const {
66		int visframes = _c->vismax - _c->vismin;
	65	int visframes = 2 * _c->visrad;
67	66	return visframes > hires_frame_limit ? _rlo : _rhi;
68	67	}
69	68
70	69	double audio_node::rsamplerate() const {
71		int visframes = _c->vismax - _c->vismin;
	70	int visframes = 2 * _c->visrad;
72	71	return (visframes > hires_frame_limit ? render_rate_lo : render_rate_hi);
73	72	}
74	73

-2

qb.hpp less more

99	99	void frame(int width, int height);
100	100	void shutdown();
101	101
102		int vismin = 0;
103		int vismax = 240;
	102	int playhead = 0;
	103	int visrad = 240;
104	104
	105	// for ui animations
105	106	uint32_t spinstep = 0;
106	107
107	108	private: