make texture cache scale down images on load to the requested size

slightly wip

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14...3.24 FATAL_ERROR)
 
 # cmake setup begin
 project(tomato
-	VERSION 0.3.2
+	VERSION 0.3.3
 	HOMEPAGE_URL https://github.com/Green-Sky/tomato
 )
 

src/bitset_image_loader.cpp

@@ -65,7 +65,7 @@ std::optional<TextureEntry> BitsetImageLoader::haveToTexture(TextureUploaderI& t
 BitsetImageLoader::BitsetImageLoader(void) {
 }
 
-TextureLoaderResult BitsetImageLoader::load(TextureUploaderI& tu, ObjectHandle o) {
+TextureLoaderResult BitsetImageLoader::load(TextureUploaderI& tu, ObjectHandle o, uint32_t w, uint32_t h) {
 	if (!static_cast<bool>(o)) {
 		std::cerr << "BIL error: trying to load invalid object\n";
 		return {};

src/bitset_image_loader.hpp

@@ -34,7 +34,7 @@ class BitsetImageLoader {
 
 	public:
 		BitsetImageLoader(void);
-		TextureLoaderResult load(TextureUploaderI& tu, ObjectHandle o);
+		TextureLoaderResult load(TextureUploaderI& tu, ObjectHandle o, uint32_t w, uint32_t h);
 		std::optional<TextureEntry> load(TextureUploaderI& tu, ObjectContactSub ocs);
 };
 

src/chat_gui/contact_list.cpp

@@ -41,8 +41,12 @@ void renderAvatar(
 			}
 		}
 
+		// TODO: per display?
+		// TODO: do we really need this? test dpi scaling
+		const auto [g_scale_x, g_scyle_y] = ImGui::GetIO().DisplayFramebufferScale;
+
 		// avatar
-		const auto [id, width, height] = contact_tc.get(c);
+		const auto [id, width, height] = contact_tc.get(c, box.x*g_scale_x, box.y*g_scyle_y);
 		ImGui::Image(
 			id,
 			box,

src/chat_gui/image_viewer_popup.cpp

@@ -14,6 +14,8 @@ void ImageViewerPopup::view(Message3Handle m) {
 	}
 
 	_m = m;
+	_width = 0;
+	_height = 0;
 
 	_open_popup = true;
 }
@@ -35,10 +37,13 @@ void ImageViewerPopup::render(float) {
 
 	ImGui::SliderFloat("scale", &_scale, 0.05f, 2.f);
 
-	auto [id, img_width, img_height] = _mtc.get(_m);
+	auto [id, img_width, img_height] = _mtc.get(_m, _width, _height);
 
-	img_width = std::max<int32_t>(5, _scale * img_width);
-	img_height = std::max<int32_t>(5, _scale * img_height);
+	img_width = std::max<uint32_t>(5, _scale * img_width);
+	img_height = std::max<uint32_t>(5, _scale * img_height);
+
+	_width = img_width;
+	_height = img_height;
 
 	ImGui::Image(
 		id,

src/chat_gui/image_viewer_popup.hpp

@@ -12,6 +12,9 @@ struct ImageViewerPopup {
 
 	Message3Handle _m{};
 	float _scale {1.f};
+	// keep track of full size from last frame
+	uint32_t _width {0};
+	uint32_t _height {0};
 
 	bool _open_popup {false};
 

src/chat_gui/send_image_popup.cpp

@@ -15,6 +15,7 @@
 
 #include <cstdint>
 #include <cmath>
+#include <iostream>
 
 SendImagePopup::SendImagePopup(TextureUploaderI& tu) : _tu(tu) {
 	_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());
@@ -460,7 +461,6 @@ void SendImagePopup::render(float time_delta) {
 	if (ImGui::Button("reset##scale")) {
 		scale_x = 1.f;
 		scale_y = 1.f;
-		compress = false; // feels nice
 	}
 	ImGui::SameLine();
 	ImGui::SetNextItemWidth(TEXT_BASE_HEIGHT*3);
@@ -570,8 +570,6 @@ void SendImagePopup::render(float time_delta) {
 					(int)std::ceil(crop_rect.w*scale_x),
 					(int)std::ceil(crop_rect.h*scale_y)
 				);
-			} else {
-				tmp_img = original_image;
 			}
 
 			std::vector<uint8_t> new_data;

src/chat_gui4.cpp

@@ -27,9 +27,7 @@
 
 #include "./chat_gui/contact_list.hpp"
 
-#include "./media_meta_info_loader.hpp"
 #include "./sdl_clipboard_utils.hpp"
-#include "os_comps.hpp"
 
 #include "./string_formatter_utils.hpp"
 
@@ -42,7 +40,7 @@
 #include <iomanip>
 #include <sstream>
 #include <string>
-#include <variant>
+#include <iostream>
 
 // TODO: split into msg and c
 namespace Components {
@@ -1074,7 +1072,7 @@ void ChatGui4::renderChatLog(Contact4 c, bool window_focused, const std::vector<
 		ImGui::EndTable();
 	}
 
-	if (ImGui::Shortcut(ImGuiKey_End, ImGuiInputFlags_RouteGlobal)) {
+	if (ImGui::Shortcut(ImGuiKey_G | ImGuiMod_Shift, ImGuiInputFlags_RouteGlobal) || ImGui::Shortcut(ImGuiKey_End, ImGuiInputFlags_RouteGlobal)) {
 		ImGui::SetScrollHereY(1.f);
 		manually_scrolled = true;
 	}
@@ -1420,7 +1418,7 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
 		if (ImGui::IsItemVisible() && o.all_of<ObjComp::F::TagLocalHaveAll, ObjComp::F::SingleInfo, ObjComp::Ephemeral::BackendFile2>()) {
 			ImGui::SetCursorPos(orig_curser_pos); // reset for actual img
 
-			auto [id, img_width, img_height] = _msg_tc.get(Message3Handle{reg, e});
+			auto [id, img_width, img_height] = _msg_tc.get(Message3Handle{reg, e}, width, height);
 
 			// if cache gives 0s, fall back to frame dims (eg if pic not loaded yet)
 			//if (img_width == 0 || img_height == 0) {

src/message_image_loader.cpp

@@ -8,9 +8,8 @@
 
 #include <solanaceae/message3/components.hpp>
 
-#include "./os_comps.hpp"
-
 #include <solanaceae/object_store/object_store.hpp>
+#include <solanaceae/object_store/meta_components_file.hpp>
 
 #include <solanaceae/file/file2.hpp>
 
@@ -25,7 +24,7 @@ MessageImageLoader::MessageImageLoader(void) {
 	_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
 }
 
-TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handle m) {
+TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handle m, uint32_t w, uint32_t h) {
 	if (!static_cast<bool>(m)) {
 		return {std::nullopt};
 	}
@@ -101,6 +100,17 @@ TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handl
 		TextureEntry new_entry;
 		new_entry.timestamp_last_rendered = getTimeMS();
 		new_entry.current_texture = 0;
+
+		new_entry.src_width = res.width;
+		new_entry.src_height = res.height;
+
+		if (w != 0 && h != 0 && w < res.width && h < res.height) {
+			res = res.scale(w, h);
+		}
+
+		new_entry.width = res.width;
+		new_entry.height = res.height;
+
 		for (const auto& [ms, data] : res.frames) {
 			const auto n_t = tu.upload(data.data(), res.width, res.height);
 			if (n_t == 0) {
@@ -114,9 +124,6 @@ TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handl
 			continue;
 		}
 
-		new_entry.width = res.width;
-		new_entry.height = res.height;
-
 		std::cout << "MIL: loaded image file o:" << /*file_path*/ entt::to_integral(o.entity()) << "\n";
 
 		return {new_entry};

src/message_image_loader.hpp

@@ -5,13 +5,11 @@
 #include "./image_loader.hpp"
 #include "./texture_cache.hpp"
 
-#include <optional>
-
 class MessageImageLoader {
 	std::vector<std::unique_ptr<ImageLoaderI>> _image_loaders;
 
 	public:
 		MessageImageLoader(void);
-		TextureLoaderResult load(TextureUploaderI& tu, Message3Handle m);
+		TextureLoaderResult load(TextureUploaderI& tu, Message3Handle m, uint32_t w, uint32_t h);
 };
 

src/texture_cache.cpp

@@ -51,8 +51,11 @@ TextureEntry generateTestAnim(TextureUploaderI& tu) {
 		new_entry.textures.emplace_back(n_t);
 		new_entry.frame_duration.emplace_back(250);
 	}
+	// TODO: 2x2?
 	new_entry.width = 0;
 	new_entry.height = 0;
+	new_entry.src_width = 0;
+	new_entry.src_height = 0;
 	return new_entry;
 }
 

src/texture_cache.hpp

@@ -16,6 +16,10 @@
 struct TextureEntry {
 	uint32_t width {0};
 	uint32_t height {0};
+
+	uint32_t src_width {0};
+	uint32_t src_height {0};
+
 	std::vector<uint64_t> textures;
 	std::vector<uint32_t> frame_duration; // ms
 	size_t current_texture {0};
@@ -28,6 +32,8 @@ struct TextureEntry {
 	TextureEntry(const TextureEntry& other) :
 		width(other.width),
 		height(other.height),
+		src_width(other.src_width),
+		src_height(other.src_height),
 		textures(other.textures),
 		frame_duration(other.frame_duration),
 		current_texture(other.current_texture),
@@ -39,6 +45,8 @@ struct TextureEntry {
 	TextureEntry& operator=(const TextureEntry& other) {
 		width = other.width;
 		height = other.height;
+		src_width = other.src_width;
+		src_height = other.src_height;
 		textures = other.textures;
 		frame_duration = other.frame_duration;
 		current_texture = other.current_texture;
@@ -97,7 +105,11 @@ struct TextureCache {
 	TextureEntry _default_texture;
 
 	entt::dense_map<KeyType, TextureEntry> _cache;
-	entt::dense_set<KeyType> _to_load;
+	struct LoadDims {
+		uint32_t w{0};
+		uint32_t h{0};
+	};
+	entt::dense_map<KeyType, LoadDims> _to_load;
 	// to_reload // to_update? _marked_stale?
 
 	const uint64_t ms_before_purge {60 * 1000ull};
@@ -126,21 +138,37 @@ struct TextureCache {
 		uint32_t width;
 		uint32_t height;
 	};
-	GetInfo get(const KeyType& key) {
+	GetInfo get(const KeyType& key, uint32_t width = 0, uint32_t height = 0) {
 		auto it = _cache.find(key);
 
 		if (it != _cache.end()) {
+			// if scaled down AND smaller than requested, reload larger
+			if (
+				(width != 0 && height != 0) &&
+				(
+					(it->second.width < width && it->second.width < it->second.src_width) ||
+					(it->second.height < height && it->second.height < it->second.src_height)
+				)
+			) {
+				// TODO: only overwrite smaller dims (or combine max)
+				_to_load.insert({key, LoadDims{width, height}});
+			}
+
+			// return current texture either way
 			return {
 				it->second.template getID<TextureType>(),
-				it->second.width,
-				it->second.height
+				it->second.src_width,
+				it->second.src_height
 			};
 		} else {
-			_to_load.insert(key);
+			// TODO: only overwrite smaller dims (or combine max)
+			_to_load.insert({key, LoadDims{width, height}});
+
+			// return fallback
 			return {
 				_default_texture.getID<TextureType>(),
-				_default_texture.width,
-				_default_texture.height
+				_default_texture.src_width,
+				_default_texture.src_height
 			};
 		}
 	}
@@ -153,7 +181,7 @@ struct TextureCache {
 		if (it == _cache.end()) {
 			return false;
 		}
-		_to_load.insert(key);
+		_to_load.insert({key, {it->second.width, it->second.height}});
 		return true;
 	}
 
@@ -202,17 +230,18 @@ struct TextureCache {
 	bool workLoadQueue(void) {
 		auto it = _to_load.cbegin();
 		for (; it != _to_load.cend(); it++) {
-			auto new_entry_opt = _l.load(_tu, *it);
-			if (_cache.count(*it)) {
+			const auto& load_key = it->first;
+			auto new_entry_opt = _l.load(_tu, load_key, it->second.w, it->second.h);
+			if (_cache.count(load_key)) {
 				if (new_entry_opt.texture.has_value()) {
-					auto old_entry = _cache.at(*it); // copy
+					auto old_entry = _cache.at(load_key); // copy
 					assert(!old_entry.textures.empty());
 					for (const auto& tex_id : old_entry.textures) {
 						_tu.destroy(tex_id);
 					}
 
-					_cache.erase(*it);
-					auto& new_entry = _cache[*it] = new_entry_opt.texture.value();
+					_cache.erase(load_key);
+					auto& new_entry = _cache[load_key] = new_entry_opt.texture.value();
 					// TODO: make update interface and let loader handle this
 					//new_entry.current_texture = old_entry.current_texture; // ??
 					new_entry.rendered_this_frame = old_entry.rendered_this_frame;
@@ -228,8 +257,8 @@ struct TextureCache {
 				}
 			} else {
 				if (new_entry_opt.texture.has_value()) {
-					_cache.emplace(*it, new_entry_opt.texture.value());
-					_cache.at(*it).rendered_this_frame = true; // ?
+					_cache.emplace(load_key, new_entry_opt.texture.value());
+					_cache.at(load_key).rendered_this_frame = true; // ?
 					it = _to_load.erase(it);
 
 					// TODO: not a good idea?

src/tox_avatar_loader.cpp

@@ -195,7 +195,7 @@ static std::vector<uint8_t> generateToxIdenticon(const ToxKey& key) {
 	return pixels;
 }
 
-TextureLoaderResult ToxAvatarLoader::load(TextureUploaderI& tu, Contact4 c) {
+TextureLoaderResult ToxAvatarLoader::load(TextureUploaderI& tu, Contact4 c, uint32_t w, uint32_t h) {
 	const auto& cr = _cs.registry();
 	if (!cr.valid(c)) {
 		return {std::nullopt};
@@ -234,14 +234,23 @@ TextureLoaderResult ToxAvatarLoader::load(TextureUploaderI& tu, Contact4 c) {
 				TextureEntry new_entry;
 				new_entry.timestamp_last_rendered = getTimeMS();
 				new_entry.current_texture = 0;
+
+				new_entry.src_width = res.width;
+				new_entry.src_height = res.height;
+
+				if (w != 0 && h != 0 && w < res.width && h < res.height) {
+					res = res.scale(w, h);
+				}
+
+				new_entry.width = res.width;
+				new_entry.height = res.height;
+
 				for (const auto& [ms, data] : res.frames) {
 					const auto n_t = tu.upload(data.data(), res.width, res.height);
 					new_entry.textures.push_back(n_t);
 					new_entry.frame_duration.push_back(ms);
 				}
 
-				new_entry.width = res.width;
-				new_entry.height = res.height;
 
 				if (cr.all_of<Contact::Components::AvatarFile>(c)) {
 					std::cout << "TAL: loaded image file " << cr.get<Contact::Components::AvatarFile>(c).file_path << "\n";

src/tox_avatar_loader.hpp

@@ -8,8 +8,6 @@
 #include "./image_loader.hpp"
 #include "./texture_cache.hpp"
 
-#include <optional>
-
 class ToxAvatarLoader {
 	ContactStore4I& _cs;
 	ObjectStore2& _os;
@@ -21,6 +19,6 @@ class ToxAvatarLoader {
 
 	public:
 		ToxAvatarLoader(ContactStore4I& cs, ObjectStore2& os);
-		TextureLoaderResult load(TextureUploaderI& tu, Contact4 c);
+		TextureLoaderResult load(TextureUploaderI& tu, Contact4 c, uint32_t w, uint32_t h);
 };
 

src/tox_ui_utils.cpp

@@ -79,18 +79,48 @@ void ToxUIUtils::render(void) {
 						_tc.runBootstrap();
 					}
 
+					if (ImGui::MenuItem("connect node", nullptr, _show_dht_connect_node)) {
+						_show_dht_connect_node = !_show_dht_connect_node;
+					}
+
+					{ // self node info
+						bool either = false;
+						{
+							auto [port_opt, port_err] = _tc.toxSelfGetUDPPort();
+							if (port_opt.has_value()) {
+								either = true;
+								ImGui::TextDisabled("udp online; port: %d", port_opt.value());
+							} else {
+								ImGui::TextDisabled("udp disabled");
+							}
+						}
+						{
+							auto [port_opt, port_err] = _tc.toxSelfGetTCPPort();
+							if (port_opt.has_value()) {
+								either = true;
+								ImGui::TextDisabled("tcp relay server online; port: %d", port_opt.value());
+							} else {
+								ImGui::TextDisabled("tcp relay server disabled");
+							}
+						}
+
+						if (either && ImGui::MenuItem("copy own DHT id/pubkey")) {
+							ImGui::SetClipboardText(bin2hex(_tc.toxSelfGetDHTID()).c_str());
+						}
+					}
+
 					ImGui::EndMenu();
 				}
 
 				switch (_tc.toxSelfGetConnectionStatus()) {
 					case TOX_CONNECTION_NONE:
-						ImGui::TextColored({1.0,0.5,0.5,0.8}, "Offline");
+						ImGui::TextColored({1.0,0.5,0.5,0.8}, "Disconnected");
 						break;
 					case TOX_CONNECTION_TCP:
-						ImGui::TextColored({0.0,1.0,0.8,0.8}, "Online-TCP");
+						ImGui::TextColored({0.0,1.0,0.8,0.8}, "Connected-TCP");
 						break;
 					case TOX_CONNECTION_UDP:
-						ImGui::TextColored({0.3,1.0,0.0,0.8}, "Online-UDP");
+						ImGui::TextColored({0.3,1.0,0.0,0.8}, "Connected-UDP");
 						break;
 				}
 
@@ -236,5 +266,81 @@ void ToxUIUtils::render(void) {
 		}
 		ImGui::End();
 	}
+
+	if (_show_dht_connect_node) {
+		if (ImGui::Begin("Tox connect DHT node", &_show_dht_connect_node)) {
+			ImGui::BeginDisabled();
+			ImGui::TextWrapped(
+				"Here you can manually connect to a DHT node (or/and tcp-relay) by address and id/pubkey.\n"
+				"This is equivalent to what 'DHT Bootstrapping' does, but not with hardcoded nodes.\n"
+				"Keep in mind that your own DHT id/pubkey changes everytime you start the program, unlike dedicated bootstrap nodes.\n"
+				"If DNS querries where not disabled at launch, domain names can be used too."
+				"A public list can be found at: nodes.tox.chat\n"
+			);
+			ImGui::EndDisabled();
+
+			static std::string addr;
+			static uint16_t port {33445};
+			static char pubkey[TOX_PUBLIC_KEY_SIZE*2 + 1]; // 1 for null terminator
+
+			if (ImGui::BeginTable("node", 2, ImGuiTableFlags_SizingFixedFit)) {
+				ImGui::TableSetupColumn(nullptr, ImGuiTableColumnFlags_WidthFixed);
+				ImGui::TableSetupColumn(nullptr, ImGuiTableColumnFlags_WidthStretch);
+
+				ImGui::TableNextColumn();
+				ImGui::TextUnformatted("address");
+				ImGui::TableNextColumn();
+				ImGui::SetNextItemWidth(-1);
+				ImGui::InputText("##address", &addr);
+
+				ImGui::TableNextColumn();
+				ImGui::TextUnformatted("port");
+				ImGui::TableNextColumn();
+				ImGui::SetNextItemWidth(-1);
+				ImGui::InputScalar("##port", ImGuiDataType_U16, &port);
+
+				ImGui::TableNextColumn();
+				ImGui::TextUnformatted("pubkey");
+				ImGui::TableNextColumn();
+				ImGui::SetNextItemWidth(-1);
+				ImGui::InputText("##pubkey", pubkey, TOX_PUBLIC_KEY_SIZE*2+1);
+
+				// add as
+				// - udp dht node (default)
+				// - udp dht node + tcp relay
+				// - tcp relay
+
+				ImGui::EndTable();
+			}
+
+			static std::string last_error;
+
+			bool valid_input = !addr.empty() && port != 0;
+			if (!valid_input) ImGui::BeginDisabled();
+			if (ImGui::Button("connect")) {
+				std::vector<uint8_t> bin_pubkey = hex2bin(std::string_view{pubkey, TOX_PUBLIC_KEY_SIZE*2});
+
+				last_error.clear();
+
+				{
+					Tox_Err_Bootstrap err = _tc.toxBootstrap(addr, port, bin_pubkey);
+					if (err != Tox_Err_Bootstrap::TOX_ERR_BOOTSTRAP_OK) {
+						last_error += "add udp node failed with " + std::to_string(err) + "\n";
+					}
+				}
+				{
+					Tox_Err_Bootstrap err = _tc.toxAddTcpRelay(addr, port, bin_pubkey);
+					if (err != Tox_Err_Bootstrap::TOX_ERR_BOOTSTRAP_OK) {
+						last_error += "add tcp relay failed with " + std::to_string(err) + "\n";
+					}
+				}
+			}
+			if (!valid_input) ImGui::EndDisabled();
+			if (!last_error.empty()) {
+				ImGui::TextUnformatted(last_error.c_str());
+			}
+		}
+		ImGui::End();
+	}
 }
 

src/tox_ui_utils.hpp

@@ -11,6 +11,7 @@ class ToxUIUtils {
 	bool _show_add_friend_window {false};
 	bool _show_add_group_window {false};
 	bool _show_new_group_window {false};
+	bool _show_dht_connect_node {false};
 
 	ToxClient& _tc;
 	ToxContactModel2& _tcm;