From 2dc3518d60d952cc0efd73c3dc86e99dbc6aed9d Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Sun, 30 Oct 2016 18:59:02 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=D1=84=D0=B8=D0=BA=D1=81=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BB=D0=B8=D1=82=D1=80=D1=8B=20=D0=B8=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B9=D0=B2=D0=BE=D0=BB=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                        | Bin 18436 -> 18436 bytes
 Applications.txt                 |   4 +-
 Applications/.DS_Store           | Bin 67588 -> 67588 bytes
 Applications/RayWalk/RayWalk.lua |  62 ++++++++++++++++++++++++++-----
 lib/palette.lua                  |  15 +++++---
 5 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 130c2cf3e638f8e2290b806ab36d52dcb56d4da3..4bb447e615747506d93dda424eb2a5f51877835b 100644
GIT binary patch
delta 1199
zcmcJONlX(_7{}*dQQy-sycR`TYQ$38)HKL$0f{VH5O6PU2)59{6rm_Z<A%84g3(BP
zxW!$gQHhFH<9bj}CZ0?h55|Kh4<;HDgWE;l%#aWwSLZOv`@VVa&HtC**VTir9`w&<
zNaTeq%B!c(=!{WcIMAZR;+fGTn=Q$dJs@j>fp%p<YcSLpQi58?Vzx{rq(-fmwkhJR
zmt~v9PFaBXBB5=AM>u5{WfAII9|{j{b<1gl1!;A2pk8U#Ps@<A2&<$kHY-cpBB9o>
zUd@#~#0WQC+0fe3qJ-Ncdbz+-NZ2b<r(Rwah_o--poE8htC)~gYNt3DRDvY6NGalr
z9h14iWN&yUeULs$1JZZtm-Jiu0|JWikYR=msjwp*dC13X6ru!`sKP=lf)BN*gC7B`
z!v<_b1nt;?eb|p~90JE#oWliN#2q}sV?5#Arj=u@<?}1zWiOw@F7fV!CjQ#u=u8qQ
zWt(iLM#LzSV(QxJw7Q7E%M995c3aa_cx;s3)u03^8?AQ*4HYDd)4K(-pioKK7=2k}
zEm5H`qJQkPdMRPh@=N03K1TxYo0wgbj$9PMi!xM*j0><FE3g_hB4wjU7(x@8u?d^8
z1zWKlT_WiL9MqEb;sj3OG%n)`uHqW5<1X&uJ|5s9p5p~xM)N1#kV#IS$DNXymBp*_
z%edWXj#k=g4WkmgGB1uR<x>+p+%bJ7|H{%jKT{erF=PD5mZ_Z)EYmg&vrMZDvrOAM
z+%l~+WSJ^ic38XJ@~>su$0J+D-x!k&+%J?WX?QEWmp)2gq;Eo~AJR_%2E<`BOh|?m
zQ{X}-vXCQy7ho>t3FPI2z*h<6{z2F+0{2dIVh{G>Fpdkzrvzjb?o&MD1CAzGqkiW&
zXci@#ElJaCvdknSRDA#4qVbdnhqzyLNJ{0)9UflhN?hi`Off5Sgh{0$npe!p5-};&
z!ltz%SUnn`AdFTqFKuF8Iz+%-*sTRTf}`lcF`N;Tb6!l&CEP?GZsB&c-_^^KGCeu&
d6i;4<J7s%DdTyROWma}>M+bWzU6X%(!e3-39oql^

delta 1179
zcmcJOS!_&U7>3VV${7y*XR6wsM#hYqQARg|nxZY$mbM7fs<i0nIc2JyE;IIJEVUGo
z@>dXqirDu_aU&6K+zK}?T)AwDkR~FreE(^KN?ke^C;7kcU%vOv^R~95wH^0nGsN;a
zEW*nsriOhc)9V;!wj?B~N|ojd>7|XDzt*p7tV{0ej7wD2O3|6$qSIfKW#fR&t}5Q3
zf1A#H{Tm%lMe%O%2Q(J!zjTUAQOoLmYxR1jnfi{UXDI55O?pev-xy%Urp0~L=`$3y
zqNcH-K@Wt2X1Mw{d$Lt^wRpP37Yr?F(gQTsi~jd>Xsnf@m#1lBD0xC|=ptY0i04t3
z<eInAJE=$NmA*>fr0>!X$cRHc5|9WxQjvyq%)(scA`kOWjHOtH<?vz^YM`SQ>(GQP
z*oN)cf&Dm!<2V71bGV7yxP!ZRjAwYx+bk8stwjqL#VGkahjsF{*g9^Dc7(~wB%57P
zm}G{qSF9aQtCdBOr?Rn};<74ih~b>*k||aeZFnS><c7kA8ZL^ZC!4y%$gIAzIk|L|
zZ1^C$`A)hDvdPdd(Z{`xSblSiyD}AS(pZ2ZQdojgl%oQbs3MiMSdThvKs`2MGqxH^
zTX6t~(1ydL^dwH<G|u1>F5?QW;u`KFf-XG7BRmz_Bc8bHitNtJaE+hl&WLo|o<t29
zTcGf~q4T*lHj6tZrtyz#a=6Fj4fq=L*A`}up<xFhOmqezOq2%_CMp976P3RR6Qw^0
z%Mysm#_NL+CN}?rF#gh<5Y@4paGF>1N_s;uy_Y^npQO*y7XYKdV1@-raAFctkcpXu
zlLy(z$HHG`S79~Qpc;NOBZv@Ly$c7)-Xl0l2LCqp0V2HDQ3q?J+BpISK}m^ff?`*a
zO=k3%nDn0s8c75h{B-OV{74gcxg(1gri@+g#8i@&Ln+C}0wQS%B}L?<oP_x(D;lLG
zKv`)q1nxu_d$1S#NZ>KF8>u;q^SFSE=)?`&64{B|OX*;;d&YFv_{>@9yxUe7;hyGE
FKLLxV8Pfm&

diff --git a/Applications.txt b/Applications.txt
index eb244833..f305c00d 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -679,7 +679,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic",
     createShortcut="desktop",
-    version=1.53,
+    version=1.54,
     resources={
       {
         name="Localization/Russian.lang",
@@ -810,7 +810,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/Palette/Icon.pic",
     createShortcut="desktop",
-    version=1.01,
+    version=1.02,
   },
   {
     name="MineOS/Applications/Stargate",
diff --git a/Applications/.DS_Store b/Applications/.DS_Store
index 8ccc2e134fe613fa928f7fbb48dc69399b90ab88..884894cea9d0f742ff5a03cfa4e3edc79f7740cc 100644
GIT binary patch
delta 27
jcmZpfz|t~-Wy8^Z9Hy2QItoU{#*=>rxNjEO|G@(Qksb=y

delta 18
acmZpfz|t~-Wy8^ZlZAi!Zx-4A!2<wMy$KKi

diff --git a/Applications/RayWalk/RayWalk.lua b/Applications/RayWalk/RayWalk.lua
index 6f9a2d08..a624a66d 100755
--- a/Applications/RayWalk/RayWalk.lua
+++ b/Applications/RayWalk/RayWalk.lua
@@ -1,5 +1,5 @@
 
-package.loaded.doubleHeight, package.loaded.rayEngine, package.loaded.GUI, package.loaded.windows, _G.doubleHeight, _G.rayEngine, _G.GUI, _G.windows = nil, nil, nil, nil, nil, nil, nil, nil
+package.loaded.rayEngine, package.loaded.GUI, package.loaded.windows, _G.rayEngine, _G.GUI, _G.windows = nil, nil, nil, nil, nil, nil, nil, nil
 
 local libraries = {
 	component = "component",
@@ -19,7 +19,7 @@ for library in pairs(libraries) do if not _G[library] then _G[library] = require
 local applicationResourcesDirectory = MineOSCore.getCurrentApplicationResourcesDirectory()
 local localization = MineOSCore.getLocalization(applicationResourcesDirectory .. "Localization/")
 local worldsPath = applicationResourcesDirectory .. "Worlds/"
-local rayWalkVersion = "RayWalk Tech Demo v3.3"
+local rayWalkVersion = "RayWalk Tech Demo v3.4"
 
 ----------------------------------------------------------------------------------------------------------------------------------
 
@@ -47,17 +47,61 @@ local function settings()
 	resolutionTextBoxWidth.onInputFinished = onAnyResolutionTextBoxInputFinished
 	resolutionTextBoxHeight.onInputFinished = onAnyResolutionTextBoxInputFinished
 
-	window:addHorizontalSlider("drawDistanceSlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 100, 5000, rayEngine.properties.drawDistance, true, localization.drawDistance).onValueChanged = function(object) rayEngine.properties.drawDistance = object.value; window:draw(); buffer:draw() end; y = y + 4
-	window:addHorizontalSlider("shadingDistanceSlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 100, 3000, rayEngine.properties.shadingDistance, true, localization.shadingDistance).onValueChanged = function(object) rayEngine.properties.shadingDistance = object.value; window:draw(); buffer:draw(); window:draw(); buffer:draw() end; y = y + 4
-	window:addHorizontalSlider("shadingCascadesSlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 2, 48, rayEngine.properties.shadingCascades, true, localization.shadingCascades).onValueChanged = function(object) rayEngine.properties.shadingCascades = object.value; window:draw(); buffer:draw() end; y = y + 4
-	window:addHorizontalSlider("raycastQualitySlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 0.5, 32, rayEngine.properties.raycastQuality, true, localization.raycastQuality).onValueChanged = function(object) rayEngine.properties.raycastQuality = object.value; window:draw(); buffer:draw() end; y = y + 4
-	window:addHorizontalSlider("currentTimeSlider", x, y, sliderWidth, rayEngine.world.colors.sky.current, 0x000000, rayEngine.world.colors.sky.current, 0xDDDDDD, 0, rayEngine.world.dayNightCycle.length, rayEngine.world.dayNightCycle.currentTime, true, localization.dayNightCycle, localization.seconds).onValueChanged = function(object) rayEngine.world.dayNightCycle.currentTime = object.value; rayEngine.refreshTimeDependentColors(); object.colors.active = rayEngine.world.colors.sky.current; object.colors.pipe = rayEngine.world.colors.sky.current; window:draw(); buffer:draw() end; y = y + 4
+	local drawDistanceSlider = window:addHorizontalSlider("drawDistanceSlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 100, 5000, rayEngine.properties.drawDistance, true, localization.drawDistance)
+	drawDistanceSlider.onValueChanged = function()
+		rayEngine.properties.drawDistance = drawDistanceSlider.value
+		window:draw()
+		buffer:draw()
+	end; y = y + 4
+	
+	local shadingDistanceSlider = window:addHorizontalSlider("shadingDistanceSlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 100, 3000, rayEngine.properties.shadingDistance, true, localization.shadingDistance)
+	shadingDistanceSlider.onValueChanged = function()
+		rayEngine.properties.shadingDistance = shadingDistanceSlider.value
+		window:draw()
+		buffer:draw()
+	end; y = y + 4
+	
+	local shadingCascadesSlider = window:addHorizontalSlider("shadingCascadesSlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 2, 48, rayEngine.properties.shadingCascades, true, localization.shadingCascades)
+	shadingCascadesSlider.onValueChanged = function()
+		rayEngine.properties.shadingCascades = shadingCascadesSlider.value
+		window:draw()
+		buffer:draw()
+	end; y = y + 4
+
+	local raycastQualitySlider = window:addHorizontalSlider("raycastQualitySlider", x, y, sliderWidth, 0xFFDB80, 0x000000, 0xFFDB40, 0xDDDDDD, 0.5, 32, rayEngine.properties.raycastQuality, true, localization.raycastQuality)
+	raycastQualitySlider.onValueChanged = function()
+		rayEngine.properties.raycastQuality = raycastQualitySlider.value
+		window:draw()
+		buffer:draw()
+	end; y = y + 4
+
+	local currentTimeSlider = window:addHorizontalSlider("currentTimeSlider", x, y, sliderWidth, rayEngine.world.colors.sky.current, 0x000000, rayEngine.world.colors.sky.current, 0xDDDDDD, 0, rayEngine.world.dayNightCycle.length, rayEngine.world.dayNightCycle.currentTime, true, localization.dayNightCycle, localization.seconds)
+	currentTimeSlider.onValueChanged = function()
+		rayEngine.world.dayNightCycle.currentTime = currentTimeSlider.value
+		rayEngine.refreshTimeDependentColors()
+		currentTimeSlider.colors.active = rayEngine.world.colors.sky.current
+		currentTimeSlider.colors.pipe = rayEngine.world.colors.sky.current
+		window:draw()
+		buffer:draw()
+	end; y = y + 4
 
 	window:addLabel("graphonLabel", x, y, sliderWidth, 1, 0xDDDDDD, localization.enableSemipixelRenderer)
-	window:addSwitch("graphonSwitch", x + sliderWidth - 8, y, 8, 0xFFDB40, 0xAAAAAA, 0xFFFFFF, not rayEngine.properties.useSimpleRenderer).onStateChanged = function(object) rayEngine.properties.useSimpleRenderer = not object.state; window:draw(); buffer:draw() end; y = y + 3
+	
+	local graphonSwitch = window:addSwitch("graphonSwitch", x + sliderWidth - 8, y, 8, 0xFFDB40, 0xAAAAAA, 0xFFFFFF, not rayEngine.properties.useSimpleRenderer)
+	graphonSwitch.onStateChanged = function()
+		rayEngine.properties.useSimpleRenderer = not graphonSwith.state
+		window:draw()
+		buffer:draw()
+	end; y = y + 3
 
 	window:addLabel("lockTimeLabel", x, y, sliderWidth, 1, 0xDDDDDD, localization.enableDayNightCycle)
-	window:addSwitch("lockTimeSwitch", x + sliderWidth - 8, y, 8, 0xFFDB40, 0xAAAAAA, 0xFFFFFF, rayEngine.world.dayNightCycle.enabled).onStateChanged = function(object) rayEngine.world.dayNightCycle.enabled = object.state; window:draw(); buffer:draw() end; y = y + 3
+	
+	local lockTimeSwitch = window:addSwitch("lockTimeSwitch", x + sliderWidth - 8, y, 8, 0xFFDB40, 0xAAAAAA, 0xFFFFFF, rayEngine.world.dayNightCycle.enabled)
+	lockTimeSwitch.onStateChanged = function()
+		rayEngine.world.dayNightCycle.enabled = lockTimeSwitch.state
+		window:draw()
+		buffer:draw()
+	end; y = y + 3
 
 	window:addButton("resumeButton", x, y, sliderWidth, 3, 0xEEEEEE, 0x262626, 0xBBBBBB, 0x262626, localization.continue).onTouch = function() window:close(); table.toFile(applicationResourcesDirectory .. "RayEngine.cfg", rayEngine.properties, true) end
 
diff --git a/lib/palette.lua b/lib/palette.lua
index 36dde348..2c970ef1 100755
--- a/lib/palette.lua
+++ b/lib/palette.lua
@@ -185,8 +185,15 @@ local function createInputs(x, y)
 end
 
 local function createFavourites()
-	local function onFavouriteClicked(button) switchColorFromHex(button.colors.default.background); refreshRainbows(); createCrestsCoordinates(); drawAll() end
-	for i = 1, #favourites do favouritesContainer:addButton("favourite" .. i, i * 2 - 1, 1, 2, 1, favourites[i], 0x0, 0x0, 0x0, " ").onTouch = onFavouriteClicked end
+	for i = 1, #favourites do
+		local button = favouritesContainer:addButton("favourite" .. i, i * 2 - 1, 1, 2, 1, favourites[i], 0x0, 0x0, 0x0, " ")
+		button.onTouch = function()
+			switchColorFromHex(button.colors.default.background)
+			refreshRainbows()
+			createCrestsCoordinates()
+			drawAll()
+		end
+	end
 end
 
 local function createWindow(x, y)
@@ -267,10 +274,6 @@ function palette.show(x, y, startColor)
 	createWindow(x, y)
 	createCrestsCoordinates()
 
-	--Поддержка внебуферных систем
-	buffer.square(window.x, window.y, window.width, window.height, 0xEEEEEE)
-	buffer.draw()
-
 	refreshRainbows()
 	window.drawShadow = true
 	drawAll()