This commit is contained in:
igor 2017-11-29 10:05:14 +03:00
parent 48a704209c
commit ceca3e61f9
4 changed files with 10 additions and 6 deletions

View File

@ -4,7 +4,7 @@
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/OS.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/OS.lua",
type="Script", type="Script",
forceDownload=true, forceDownload=true,
version=4.10, version=4.11,
}, },
{ {
path="/MineOS/Pictures/MoonTouch.pic", path="/MineOS/Pictures/MoonTouch.pic",
@ -227,7 +227,7 @@
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
type="Library", type="Library",
preloadFile=true, preloadFile=true,
version=2.01, version=2.02,
}, },
{ {
path="/lib/MineOSNetwork.lua", path="/lib/MineOSNetwork.lua",

8
OS.lua
View File

@ -251,9 +251,13 @@ local function changeWallpaper()
MineOSInterface.mainContainer.background.wallpaperPosition.y = math.floor(1 + MineOSInterface.mainContainer.height / 2 - image.getHeight(MineOSInterface.mainContainer.background.wallpaper) / 2) MineOSInterface.mainContainer.background.wallpaperPosition.y = math.floor(1 + MineOSInterface.mainContainer.height / 2 - image.getHeight(MineOSInterface.mainContainer.background.wallpaper) / 2)
end end
local r, g, b
for i = 3, #MineOSInterface.mainContainer.background.wallpaper, 4 do for i = 3, #MineOSInterface.mainContainer.background.wallpaper, 4 do
MineOSInterface.mainContainer.background.wallpaper[i] = color.blend(MineOSInterface.mainContainer.background.wallpaper[i], 0x0, MineOSCore.properties.wallpaperBrightness) r, g, b = color.HEXToRGB(MineOSInterface.mainContainer.background.wallpaper[i])
MineOSInterface.mainContainer.background.wallpaper[i + 1] = color.blend(MineOSInterface.mainContainer.background.wallpaper[i + 1], 0x0, MineOSCore.properties.wallpaperBrightness) MineOSInterface.mainContainer.background.wallpaper[i] = color.RGBToHEX(math.floor(r * MineOSCore.properties.wallpaperBrightness), math.floor(g * MineOSCore.properties.wallpaperBrightness), math.floor(b * MineOSCore.properties.wallpaperBrightness))
r, g, b = color.HEXToRGB(MineOSInterface.mainContainer.background.wallpaper[i + 1])
MineOSInterface.mainContainer.background.wallpaper[i + 1] = color.RGBToHEX(math.floor(r * MineOSCore.properties.wallpaperBrightness), math.floor(g * MineOSCore.properties.wallpaperBrightness), math.floor(b * MineOSCore.properties.wallpaperBrightness))
end end
end end
end end

BIN
Wallpapers/Tatu.pic Normal file

Binary file not shown.

View File

@ -77,9 +77,9 @@ function MineOSCore.loadPropeties()
iconWidth = 12, iconWidth = 12,
iconHeight = 6, iconHeight = 6,
showExtension = false, showExtension = false,
wallpaper = MineOSPaths.pictures .. "Girl.pic", wallpaper = MineOSPaths.pictures .. "Tatu.pic",
wallpaperMode = 2, wallpaperMode = 2,
wallpaperBrightness = 0.6, wallpaperBrightness = 1.0,
screensaver = "Matrix", screensaver = "Matrix",
screensaverDelay = 20, screensaverDelay = 20,
timezone = 3, timezone = 3,