From 596b58d3427f9d06bede042900035cc8a07572ca Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sat, 18 Jun 2016 20:04:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B5=D0=B9=D1=88=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.txt | 2 +- lib/rayEngine.lua | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Applications.txt b/Applications.txt index e86742eb..b78e360f 100644 --- a/Applications.txt +++ b/Applications.txt @@ -273,7 +273,7 @@ name="lib/rayEngine.lua", url="IgorTimofeev/OpenComputers/master/lib/rayEngine.lua", type="Library", - version=1.24, + version=1.25, }, { name="lib/doubleHeight.lua", diff --git a/lib/rayEngine.lua b/lib/rayEngine.lua index cbd39bb8..77f18ad8 100644 --- a/lib/rayEngine.lua +++ b/lib/rayEngine.lua @@ -14,7 +14,6 @@ local rayEngine = {} ---------------------------------------------------- Константы ------------------------------------------------------------------ -rayEngine.wallsPosition = 0 rayEngine.horizonPosition = math.floor(buffer.screen.height / 2) rayEngine.minimapEnabled = true rayEngine.compassEnabled = false @@ -165,12 +164,12 @@ function rayEngine.jump() if not rayEngine.player.jumpTimer then local function onJumpFinished() rayEngine.horizonPosition = rayEngine.horizonPosition - rayEngine.player.jumpHeight; - rayEngine.wallsPosition = rayEngine.wallsPosition - rayEngine.player.jumpHeight; + rayEngine.horizonPosition = rayEngine.horizonPosition - rayEngine.player.jumpHeight; rayEngine.player.jumpTimer = nil end rayEngine.player.jumpTimer = event.timer(1, onJumpFinished) - rayEngine.wallsPosition = rayEngine.wallsPosition + rayEngine.player.jumpHeight + rayEngine.horizonPosition = rayEngine.horizonPosition + rayEngine.player.jumpHeight rayEngine.horizonPosition = rayEngine.horizonPosition + rayEngine.player.jumpHeight end end @@ -178,7 +177,7 @@ end function rayEngine.crouch() rayEngine.player.isCrouched = not rayEngine.player.isCrouched local heightAdder = rayEngine.player.isCrouched and -rayEngine.player.crouchHeight or rayEngine.player.crouchHeight - rayEngine.wallsPosition = rayEngine.wallsPosition + heightAdder + rayEngine.horizonPosition = rayEngine.horizonPosition + heightAdder rayEngine.horizonPosition = rayEngine.horizonPosition + heightAdder end @@ -403,9 +402,10 @@ function rayEngine.drawWorld() distanceToTile, tile = raycast(angle) if distanceToTile then height = rayEngine.properties.tileWidth / distanceToTile * rayEngine.distanceToProjectionPlane - startY = buffer.screen.height / 2 - height / 2 + rayEngine.wallsPosition + 1 + startY = rayEngine.horizonPosition - height / 2 + 1 tileColor = height > distanceLimit and rayEngine.world.colors.tile.byTime[#rayEngine.world.colors.tile.byTime] or rayEngine.world.colors.tile.byTime[math.floor(#rayEngine.world.colors.tile.byTime * height / distanceLimit)] + --Кусочек стенки buffer.square(math.floor(startX), math.floor(startY), 1, math.floor(height), tileColor, 0x000000, " ") end startX = startX + 1