TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-03-25 09:12:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Багфикс палитры и рейволка

Browse Source
This commit is contained in:
Igor Timofeev
2016-10-30 18:59:02 +03:00
parent 99a035fbb9
commit 2dc3518d60
5 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
Applications.txt
View File

@@ -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",

BIN
Applications/.DS_Store vendored
View File

Binary file not shown.

62
Applications/RayWalk/RayWalk.lua
View File

@@ -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

15
lib/palette.lua
View File

@@ -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()