Added color grouping during MultiScreen drawing

Applications/Multiscreen.app/Main.lua

@@ -30,7 +30,7 @@ local function saveConfig()
 	filesystem.writeTable(configPath, config, true)
 end
 
-local workspace, window = system.addWindow(GUI.filledWindow(1, 1, 64, 37, 0x2D2D2D))
+local workspace, window = system.addWindow(GUI.filledWindow(1, 1, 68, 37, 0x2D2D2D))
 
 local layout = window:addChild(GUI.layout(1, 1, window.width, window.height, 1, 1))
 
@@ -84,7 +84,7 @@ local function mainMenu(force)
 		local width, height = #config.map[1], #config.map
 		table.insert(lines, width .. "x" .. height .. " screen blocks")
 		table.insert(lines, width * baseResolutionWidth .. "x" .. height * baseResolutionHeight .. " OpenComputers pixels")
-		table.insert(lines, width * baseResolutionWidth * 2 .. "x" .. height * baseResolutionHeight * 4 .. " pixels using Braille font")
+		-- table.insert(lines, width * baseResolutionWidth * 2 .. "x" .. height * baseResolutionHeight * 4 .. " pixels using Braille font")
 	else
 		table.insert(lines, {color = 0xFF4940, text = "Calibrate your system before starting"})
 	end
@@ -123,42 +123,92 @@ local function mainMenu(force)
 			if signature == "OCIF" then
 				local encodingMethod = file:readBytes(1)
 				if encodingMethod == 5 then
-					local width = file:readBytes(2)
+					local width, height, maxWidth, maxHeight, widthLimit, heightLimit, monitorCornerImageX, monitorCornerImageY, background, foreground, symbol = file:readBytes(2), file:readBytes(2), baseResolutionWidth * #config.map[1],  baseResolutionHeight * #config.map
-					local height = file:readBytes(2)
 
+					local function skipPixels(count)
+						for i = 1, count do
+							file:readString(3)
+							file:readUnicodeChar()
+
+							-- Иначе может впасть в TLWY на тормознутых серваках
+							if i % 1000 == 0 then
+								computer.pullSignal(0)
+							end
+						end
+					end
+
+					-- Чистим дерьмо вилочкой
 					clearScreens()
 
-					local background, foreground, symbol, currentBackground, currentForeground, currentAddress
+					for yMonitor = 1, #config.map do
-					for y = 1, height do
+						for xMonitor = 1, #config.map[yMonitor] do
-						for x = 1, width do
+							GPUProxy.bind(mainScreenAddress, false)
-							background = color.to24Bit(file:readBytes(1))
+							-- GUI.alert("Monitor", xMonitor, yMonitor)
-							foreground = color.to24Bit(file:readBytes(1))
+
-							file:readBytes(1)
+							-- Координаты левого верхнего угла моника в пикселях на пикче
+							monitorCornerImageX, monitorCornerImageY =
+								(xMonitor - 1) * baseResolutionWidth,
+								(yMonitor - 1) * baseResolutionHeight
+
+							-- Если размеры моника вообще дотягивают до рассматриваемого моника
+							if monitorCornerImageX < width and monitorCornerImageY < height then
+								-- Число пикселей, которые мы можем прочесть до окончания пикчи на данном монике (вдруг она заканчивается посередине?)
+								widthLimit, heightLimit =
+									math.min(width - monitorCornerImageX, baseResolutionWidth),
+									math.min(height - monitorCornerImageY, baseResolutionHeight)
+								-- GUI.alert("Limits", xMonitor, yMonitor, maxWidth, maxHeight, widthLimit, heightLimit)
+
+								-- Тута будет храниться сгруппированная по цветам пикча
+								local grouped = {}
+
+								-- Пиздуем на начало файла, т.к. мы в душе не можем ебать, какой там размер юникод-символов далее в пикче
+								file:seek("set", 4 + 1 + 2 + 2)
+								skipPixels(monitorCornerImageY * width + monitorCornerImageX)
+
+								-- Читаем ебучие пиксели
+								local yImageLine = monitorCornerImageY
+								for yImage = 1, heightLimit do
+									for xImage = 1, widthLimit do
+										background, foreground = color.to24Bit(file:readBytes(1)), color.to24Bit(file:readBytes(1))
+										file:readString(1)
 										symbol = file:readUnicodeChar()
 
-							local xMonitor = math.ceil(x / baseResolutionWidth)
+										grouped[background] = grouped[background] or {}
-							local yMonitor = math.ceil(y / baseResolutionHeight)
+										grouped[background][foreground] = grouped[background][foreground] or {}
 
-							if config.map[yMonitor] and config.map[yMonitor][xMonitor] then
+										table.insert(grouped[background][foreground], xImage)
-								if currentAddress ~= config.map[yMonitor][xMonitor] then
+										table.insert(grouped[background][foreground], yImage)
+										table.insert(grouped[background][foreground], symbol)
+									end
+
+									-- Скипаем пиксели вплоть до начала следующего сканлайна на ДАННОМ монике
+									skipPixels(width - widthLimit)
+
+									yImageLine = yImageLine + 1
+								end
+
+								-- Биндим гпуху к выбранному монику и рисуем сгруппированную пикчу
 								GPUProxy.bind(config.map[yMonitor][xMonitor], false)
+
+								local currentForeground
+								for background in pairs(grouped) do
 									GPUProxy.setBackground(background)
-									GPUProxy.setForeground(foreground)
-
-									currentAddress, currentBackground, currentForeground = config.map[yMonitor][xMonitor], background, foreground
-								end
-
-								if currentBackground ~= background then
-									GPUProxy.setBackground(background)
-									currentBackground = background
-								end
 									
+									for foreground in pairs(grouped[background]) do
 										if currentForeground ~= foreground then
 											GPUProxy.setForeground(foreground)
 											currentForeground = foreground
 										end
 
-								GPUProxy.set(x - (xMonitor - 1) * baseResolutionWidth, y - (yMonitor - 1) * baseResolutionHeight, symbol)
+										for i = 1, #grouped[background][foreground], 3 do
+											GPUProxy.set(
+												grouped[background][foreground][i],
+												grouped[background][foreground][i + 1],
+												grouped[background][foreground][i + 2]
+											)
+										end
+									end
+								end
 							end
 						end
 					end
@@ -166,7 +216,6 @@ local function mainMenu(force)
 					file:close()
 					
 					GPUProxy.bind(mainScreenAddress, false)
-					GUI.alert("Done.")
 				else
 					file:close()
 					GUI.alert("Wrong encodingMethod: " .. tostring(encodingMethod))
@@ -246,8 +295,6 @@ local function mainMenu(force)
 
 					workspace:draw()
 
-					clearScreens(0x0)
-
 					config.map = {}
 					local hue, hueStep = 0, 360 / specifiedCount
 					while true do

Libraries/Filesystem.lua

@@ -277,23 +277,29 @@ end
 
 local function seek(self, pizda, cyka)
 	if pizda == "set" then
-		local value = self.proxy.seek(self.stream, "set", -self.position + cyka)
+		local result, reason = self.proxy.seek(self.stream, "set", cyka)
+		if result then
 			self.position = cyka
 			self.buffer = ""
+		end
 
-		return value
+		return result, reason
 	elseif pizda == "cur" then
-		local value = self.proxy.seek(self.stream, "cur", cyka)
+		local result, reason = self.proxy.seek(self.stream, "cur", cyka)
+		if result then
 			self.position = self.position + cyka
 			self.buffer = ""
+		end
 
-		return value
+		return result, reason
 	elseif pizda == "end" then
-		local value = self.proxy.seek(self.stream, "set", self.size - 1)
+		local result, reason = self.proxy.seek(self.stream, "set", self.size - 1)
+		if result then
 			self.position = self.size - 1
 			self.buffer = ""
+		end
 
-		return value
+		return result, reason
 	else
 		error("bad argument #2 ('set', 'cur' or 'end' expected, got " .. tostring(whence) .. ")")
 	end