src/fragment_store/message_fragment_store.cpp

@@ -33,12 +33,9 @@ namespace Message::Components {
 	struct ContactFragments final {
 		// kept up-to-date by events
 		entt::dense_set<FragmentID> frags;
-
-		// add 2 sorted contact lists for both range begin and end
 	};
 
 	// all LOADED message fragments
-	// TODO: merge into ContactFragments (and pull in openfrags)
 	struct LoadedContactFragments final {
 		// kept up-to-date by events
 		entt::dense_set<FragmentID> frags;
@@ -484,10 +481,9 @@ float MessageFragmentStore::tick(float time_delta) {
 	// load needed fragments here
 
 	// last check event frags
-	// only checks if it collides with ranges, not adjacent
+	// only checks if it collides with ranges, not adjacency ???
 	// bc ~range~ msgreg will be marked dirty and checked next tick
 	if (!_event_check_queue.empty()) {
-		std::cout << "MFS: event check\n";
 		auto fh = _fs.fragmentHandle(_event_check_queue.front().fid);
 		auto c = _event_check_queue.front().c;
 		_event_check_queue.pop();
@@ -513,12 +509,10 @@ float MessageFragmentStore::tick(float time_delta) {
 			_potentially_dirty_contacts.emplace(c);
 		}
 
-		std::cout << "MFS: event check none\n";
 		return 0.05f; // only one but soon again
 	}
 
 	if (!_potentially_dirty_contacts.empty()) {
-		std::cout << "MFS: pdc\n";
 		// here we check if any view of said contact needs frag loading
 		// only once per tick tho
 
@@ -543,14 +537,12 @@ float MessageFragmentStore::tick(float time_delta) {
 				auto fh = _fs.fragmentHandle(fid);
 
 				if (!static_cast<bool>(fh)) {
-					std::cerr << "MFS error: frag is invalid\n";
 					// WHAT
 					msg_reg->ctx().get<Message::Components::ContactFragments>().frags.erase(fid);
 					return 0.05f;
 				}
 
 				if (!fh.all_of<FragComp::MessagesTSRange>()) {
-					std::cerr << "MFS error: frag has no range\n";
 					// ????
 					msg_reg->ctx().get<Message::Components::ContactFragments>().frags.erase(fid);
 					return 0.05f;
@@ -560,13 +552,11 @@ float MessageFragmentStore::tick(float time_delta) {
 				const auto& [range_begin, range_end] = fh.get<FragComp::MessagesTSRange>();
 
 				if (rangeVisible(range_begin, range_end, *msg_reg)) {
-					std::cout << "MFS: frag hit by vis range\n";
 					loadFragment(*msg_reg, fh);
 					return 0.05f;
 				}
 			}
 			// no new visible fragment
-			std::cout << "MFS: no new frag directly visible\n";
 
 			// now, finally, check for adjecent fragments that need to be loaded
 			// we do this by finding the outermost fragment in a rage, and extend it by one
@@ -602,7 +592,7 @@ float MessageFragmentStore::tick(float time_delta) {
 						continue;
 					}
 
-					if (ts_begin_comp.ts > range_begin) {
+					if (ts_begin_comp.ts < range_begin) {
 						// begin curser does not hit the frag, but end might still hit/contain it
 						// if has curser end, check that
 						if (!msg_reg->valid(vcb.curser_end) || !msg_reg->all_of<Message::Components::ViewCurserEnd, Message::Components::Timestamp>(vcb.curser_end)) {
@@ -615,7 +605,6 @@ float MessageFragmentStore::tick(float time_delta) {
 							continue;
 						}
 					}
-					//std::cout << "------------ hit\n";
 
 					// save hit
 					if (!_fs._reg.valid(frag_newest)) {

src/main_screen.cpp

@@ -400,8 +400,8 @@ Screen* MainScreen::tick(float time_delta, bool& quit) {
 
 	tdch.tick(time_delta); // compute
 
-	const float mfs_interval = mfs.tick(time_delta);
-	mts.iterate(); // compute (after mfs)
+	mts.iterate(); // compute
+	mfs.tick(time_delta); // TODO: use delta
 
 	_min_tick_interval = std::min<float>(
 		// HACK: pow by 1.6 to increase 50 -> ~500 (~522)
@@ -413,10 +413,6 @@ Screen* MainScreen::tick(float time_delta, bool& quit) {
 		_min_tick_interval,
 		fo_interval
 	);
-	_min_tick_interval = std::min<float>(
-		_min_tick_interval,
-		mfs_interval
-	);
 
 	//std::cout << "MS: min tick interval: " << _min_tick_interval << "\n";