mirror of
https://github.com/IgorTimofeev/MineOS.git
synced 2026-01-08 20:22:38 +01:00
Хуй!
This commit is contained in:
Igor Timofeev
parent
63063fcb44
commit
0ce10eba6e
@ -249,7 +249,7 @@
|
||||
name="lib/GUI.lua",
|
||||
url="IgorTimofeev/OpenComputers/master/lib/GUI.lua",
|
||||
type="Library",
|
||||
version=1.1,
|
||||
version=1.11,
|
||||
},
|
||||
{
|
||||
name="lib/serialization.lua",
|
||||
@ -273,7 +273,7 @@
|
||||
name="lib/rayEngine.lua",
|
||||
url="IgorTimofeev/OpenComputers/master/lib/rayEngine.lua",
|
||||
type="Library",
|
||||
version=1.23,
|
||||
version=1.24,
|
||||
},
|
||||
{
|
||||
name="lib/doubleHeight.lua",
|
||||
@ -546,53 +546,45 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
-- {
|
||||
-- name="MineOS/Applications/RayWalk",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayWalk.lua",
|
||||
-- about="IgorTimofeev/OpenComputers/master/Applications/RayWalk/About/",
|
||||
-- type="Application",
|
||||
-- icon="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic",
|
||||
-- createShortcut="desktop",
|
||||
-- version=1.43,
|
||||
-- resources={
|
||||
-- {
|
||||
-- name="Worlds/ExampleWorld/Map.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/ExampleWorld/Player.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/ExampleWorld/World.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/World.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/ForeverDay/Map.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ForeverDay/Map.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/ForeverDay/Player.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ForeverDay/Player.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/ForeverDay/World.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ForeverDay/World.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/SundownBeams/Map.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Map.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/SundownBeams/Player.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Player.cfg",
|
||||
-- },
|
||||
-- {
|
||||
-- name="Worlds/SundownBeams/World.cfg",
|
||||
-- url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/World.cfg",
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
{
|
||||
name="MineOS/Applications/RayWalk",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayWalk.lua",
|
||||
about="IgorTimofeev/OpenComputers/master/Applications/RayWalk/About/",
|
||||
type="Application",
|
||||
icon="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic",
|
||||
createShortcut="desktop",
|
||||
version=1.44,
|
||||
resources={
|
||||
{
|
||||
name="RayEngine.cfg",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayEngine.cfg",
|
||||
},
|
||||
{
|
||||
name="Worlds/ExampleWorld/Map.cfg",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg",
|
||||
},
|
||||
{
|
||||
name="Worlds/ExampleWorld/Player.cfg",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg",
|
||||
},
|
||||
{
|
||||
name="Worlds/ExampleWorld/World.cfg",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/World.cfg",
|
||||
},
|
||||
{
|
||||
name="Worlds/SundownBeams/Map.cfg",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Map.cfg",
|
||||
},
|
||||
{
|
||||
name="Worlds/SundownBeams/Player.cfg",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Player.cfg",
|
||||
},
|
||||
{
|
||||
name="Worlds/SundownBeams/World.cfg",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/World.cfg",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name="MineOS/Applications/GuessWord",
|
||||
url="IgorTimofeev/OpenComputers/master/Applications/GuessWord/GuessWord.lua",
|
||||
|
||||
5
Applications/RayWalk/RayEngine.cfg
Normal file
5
Applications/RayWalk/RayEngine.cfg
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
tileWidth = 32,
|
||||
drawDistance = 1000,
|
||||
raycastQuality = 0.2,
|
||||
}
|
||||
@ -5,42 +5,53 @@ local libraries = {
|
||||
buffer = "doubleBuffering",
|
||||
rayEngine = "rayEngine",
|
||||
GUI = "GUI",
|
||||
ecs = "ECSAPI",
|
||||
unicode = "unicode",
|
||||
event = "event",
|
||||
}
|
||||
|
||||
for library in pairs(libraries) do if not _G[library] then _G[library] = require(libraries[library]) end end; libraries = nil
|
||||
local worldsPath = "MineOS/Applications/RayWalk.app/Resources/Worlds/"
|
||||
local applicationPath = "MineOS/Applications/RayWalk.app/Resources/"
|
||||
local worldsPath = applicationPath .. "Worlds/"
|
||||
local rayWalkVersion = "RayWalk v3.2 closed beta"
|
||||
|
||||
----------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
local function menu()
|
||||
local buttonWidth = 50
|
||||
local buttons = {}
|
||||
for file in fs.list(worldsPath) do table.insert(buttons, unicode.sub(file, 1, -2)) end
|
||||
local x, y = math.floor(buffer.screen.width / 2 - buttonWidth / 2), math.floor(buffer.screen.height / 2 - ((#buttons + 1) * 4) / 2)
|
||||
local buttonData = {}; for i = 1, #buttons do table.insert(buttonData, {GUI.buttonTypes.default, buttonWidth, 3, 0xDDDDDD, 0x555555, 0xBBBBBB, 0x262626, buttons[i]}) end
|
||||
table.insert(buttonData, {GUI.buttonTypes.default, buttonWidth, 3, 0xBBBBBB, 0x262626, 0x999999, 0x262626, "Выход"})
|
||||
local buttonWidth, buttonHeight = 50, 3
|
||||
local selectWorldButtons, buttons = {}, {}
|
||||
for file in fs.list(worldsPath) do table.insert(selectWorldButtons, unicode.sub(file, 1, -2)) end
|
||||
local x, y = math.floor(buffer.screen.width / 2 - buttonWidth / 2), math.floor(buffer.screen.height / 2 - ((#selectWorldButtons + 3) * (buttonHeight + 1)) / 2)
|
||||
local buttonData = {}; for i = 1, #selectWorldButtons do table.insert(buttonData, {GUI.buttonTypes.default, buttonWidth, buttonHeight, 0xEEEEEE, 0x262626, 0xBBBBBB, 0x262626, selectWorldButtons[i]}) end
|
||||
|
||||
rayEngine.drawWorld()
|
||||
buffer.clear(0x000000, 50)
|
||||
buttons = GUI.buttons(x, y, GUI.directions.vertical, 1, table.unpack(buttonData))
|
||||
|
||||
GUI.centeredText(GUI.alignment.verticalCenter, y, 0xFFFFFF, rayWalkVersion); y = y + 2
|
||||
buttons.resume = GUI.button(x, y, buttonWidth, buttonHeight, 0xEEEEEE, 0x262626, 0xBBBBBB, 0x262626, "Продолжить"); y = y + buttonHeight + 1
|
||||
buttons.quit = GUI.button(x, y, buttonWidth, buttonHeight, 0xEEEEEE, 0x262626, 0x999999, 0x262626, "Выход"); y = y + buttonHeight + 1
|
||||
GUI.centeredText(GUI.alignment.verticalCenter, y, 0xFFFFFF, "Загрузить мир"); y = y + 2
|
||||
selectWorldButtons = GUI.buttons(x, y, GUI.directions.vertical, 1, table.unpack(buttonData))
|
||||
|
||||
buffer.draw()
|
||||
|
||||
while true do
|
||||
local e = {event.pull("touch")}
|
||||
for _, button in pairs(buttons) do
|
||||
for _, button in pairs(selectWorldButtons) do
|
||||
if button:isClicked(e[3], e[4]) then
|
||||
button:press()
|
||||
if button.text == "Выход" then
|
||||
os.exit()
|
||||
else
|
||||
rayEngine.loadWorld(worldsPath .. button.text)
|
||||
return
|
||||
end
|
||||
break
|
||||
rayEngine.loadWorld(worldsPath .. button.text)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
if buttons.resume:isClicked(e[3], e[4]) then
|
||||
buttons.resume:press()
|
||||
return
|
||||
elseif buttons.quit:isClicked(e[3], e[4]) then
|
||||
buttons.quit:press()
|
||||
os.exit()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -71,6 +82,7 @@ local controls = {
|
||||
|
||||
buffer.start()
|
||||
-- rayEngine.intro()
|
||||
rayEngine.init(applicationPath .. "RayEngine.cfg")
|
||||
rayEngine.loadWorld(worldsPath .. "ExampleWorld")
|
||||
menu()
|
||||
rayEngine.update()
|
||||
|
||||
72
lib/GUI.lua
72
lib/GUI.lua
@ -1,7 +1,6 @@
|
||||
|
||||
local libraries = {
|
||||
buffer = "doubleBuffering",
|
||||
ecs = "ECSAPI",
|
||||
unicode = "unicode",
|
||||
event = "event",
|
||||
}
|
||||
@ -11,6 +10,12 @@ local GUI = {}
|
||||
|
||||
---------------------------------------------------- Универсальные методы --------------------------------------------------------
|
||||
|
||||
GUI.alignment = {
|
||||
verticalCenter = 0,
|
||||
horizontalCenter = 1,
|
||||
horizontalAndVerticalCenter = 3,
|
||||
}
|
||||
|
||||
GUI.directions = {
|
||||
horizontal = 0,
|
||||
vertical = 1,
|
||||
@ -253,10 +258,10 @@ function GUI.error(text, errorWindowParameters)
|
||||
--Ебемся с текстом, делаем его пиздатым во всех смыслах
|
||||
if type(text) ~= "table" then
|
||||
text = tostring(text)
|
||||
text = (errorWindowParameters and errorWindowParameters.truncate) and ecs.stringLimit("end", text, errorWindowParameters.truncate) or text
|
||||
text = (errorWindowParameters and errorWindowParameters.truncate) and unicode.sub(text, 1, errorWindowParameters.truncate) or text
|
||||
text = { text }
|
||||
end
|
||||
text = ecs.stringWrap(text, widthOfText)
|
||||
text = GUI.stringWrap(text, widthOfText)
|
||||
|
||||
|
||||
--Ебашим высоту правильнуюe
|
||||
@ -475,6 +480,67 @@ end
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
--Функция по переносу слов на новую строку в зависимости от ограничения по ширине
|
||||
function GUI.stringWrap(strings, limit)
|
||||
local currentString = 1
|
||||
while currentString <= #strings do
|
||||
local words = {}; for word in string.gmatch(tostring(strings[currentString]), "[^%s]+") do table.insert(words, word) end
|
||||
|
||||
local newStringThatFormedFromWords, oldStringThatFormedFromWords = "", ""
|
||||
local word = 1
|
||||
local overflow = false
|
||||
while word <= #words do
|
||||
oldStringThatFormedFromWords = oldStringThatFormedFromWords .. (word > 1 and " " or "") .. words[word]
|
||||
if unicode.len(oldStringThatFormedFromWords) > limit then
|
||||
--ЕБЛО
|
||||
if unicode.len(words[word]) > limit then
|
||||
local left = unicode.sub(oldStringThatFormedFromWords, 1, limit)
|
||||
local right = unicode.sub(strings[currentString], unicode.len(left) + 1, -1)
|
||||
overflow = true
|
||||
strings[currentString] = left
|
||||
if strings[currentString + 1] then
|
||||
strings[currentString + 1] = right .. " " .. strings[currentString + 1]
|
||||
else
|
||||
strings[currentString + 1] = right
|
||||
end
|
||||
end
|
||||
break
|
||||
else
|
||||
newStringThatFormedFromWords = oldStringThatFormedFromWords
|
||||
end
|
||||
word = word + 1
|
||||
end
|
||||
|
||||
if word <= #words and not overflow then
|
||||
local fuckToAdd = table.concat(words, " ", word, #words)
|
||||
if strings[currentString + 1] then
|
||||
strings[currentString + 1] = fuckToAdd .. " " .. strings[currentString + 1]
|
||||
else
|
||||
strings[currentString + 1] = fuckToAdd
|
||||
end
|
||||
strings[currentString] = newStringThatFormedFromWords
|
||||
end
|
||||
|
||||
currentString = currentString + 1
|
||||
end
|
||||
|
||||
return strings
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
function GUI.centeredText(centrationENUM, coordinate, color, text)
|
||||
local textLength, x, y = unicode.len(text)
|
||||
if centrationENUM == GUI.alignment.verticalCenter then
|
||||
x, y = math.floor(buffer.screen.width / 2 - textLength / 2), coordinate
|
||||
elseif centrationENUM == GUI.alignment.horizontalCenter then
|
||||
x, y = coordinate, math.floor(buffer.screen.height / 2)
|
||||
else
|
||||
x, y = math.floor(buffer.screen.width / 2 - textLength / 2), math.floor(buffer.screen.height / 2)
|
||||
end
|
||||
|
||||
buffer.text(x, y, color, text)
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -14,7 +14,6 @@ local rayEngine = {}
|
||||
|
||||
---------------------------------------------------- Константы ------------------------------------------------------------------
|
||||
|
||||
rayEngine.tileWidth = 32
|
||||
rayEngine.wallsPosition = 0
|
||||
rayEngine.horizonPosition = math.floor(buffer.screen.height / 2)
|
||||
rayEngine.minimapEnabled = true
|
||||
@ -36,14 +35,6 @@ local function round(num)
|
||||
end
|
||||
end
|
||||
|
||||
local function convertRadiansToDegrees(rad)
|
||||
return rad * (180 / 3.14)
|
||||
end
|
||||
|
||||
local function convertDegreesToRadians(ang)
|
||||
return ang * (3.14 / 180)
|
||||
end
|
||||
|
||||
local function constrainAngle(value)
|
||||
if ( value < 0 ) then
|
||||
value = value + 360
|
||||
@ -90,18 +81,24 @@ local function correctDouble(number)
|
||||
end
|
||||
|
||||
local function convertWorldCoordsToMapCoords(x, y)
|
||||
return round(x / rayEngine.tileWidth), round(y / rayEngine.tileWidth)
|
||||
return round(x / rayEngine.properties.tileWidth), round(y / rayEngine.properties.tileWidth)
|
||||
end
|
||||
|
||||
local function getBlockCoordsByLook(distance)
|
||||
local radRotation = math.rad(rayEngine.player.rotation + 90)
|
||||
return convertWorldCoordsToMapCoords(rayEngine.player.position.x + distance * math.sin(radRotation) * rayEngine.tileWidth, rayEngine.player.position.y + distance * math.cos(radRotation) * rayEngine.tileWidth)
|
||||
local radRotation = math.rad(rayEngine.player.rotation)
|
||||
return convertWorldCoordsToMapCoords(rayEngine.player.position.x + distance * math.sin(radRotation) * rayEngine.properties.tileWidth, rayEngine.player.position.y + distance * math.cos(radRotation) * rayEngine.properties.tileWidth)
|
||||
end
|
||||
|
||||
---------------------------------------------------- Работа с файлами ------------------------------------------------------------------
|
||||
|
||||
--Грузим базовый конфиг движка
|
||||
function rayEngine.init(pathToRayEnginePropertiesFile)
|
||||
rayEngine.properties = files.loadTableFromFile(pathToRayEnginePropertiesFile)
|
||||
rayEngine.properties.raycastQuality = rayEngine.properties.raycastQuality * rayEngine.properties.tileWidth
|
||||
end
|
||||
|
||||
--Загружаем все конфиг-файлы мира
|
||||
function rayEngine.loadWorld(pathToWorldFolder)
|
||||
--Загружаем все конфиг-файлы мира
|
||||
rayEngine.world = files.loadTableFromFile(pathToWorldFolder .. "/World.cfg")
|
||||
rayEngine.map = files.loadTableFromFile(pathToWorldFolder .. "/Map.cfg")
|
||||
rayEngine.player = files.loadTableFromFile(pathToWorldFolder .. "/Player.cfg")
|
||||
@ -109,22 +106,24 @@ function rayEngine.loadWorld(pathToWorldFolder)
|
||||
rayEngine.map.width = #rayEngine.map[1]
|
||||
rayEngine.map.height = #rayEngine.map
|
||||
--Ебашим правильную позицию игрока, основанную на этой ХУЙНЕ, которую ГЛЕБ так ЛЮБИТ
|
||||
rayEngine.player.position.x = rayEngine.tileWidth * rayEngine.player.position.x - rayEngine.tileWidth / 2
|
||||
rayEngine.player.position.y = rayEngine.tileWidth * rayEngine.player.position.y - rayEngine.tileWidth / 2
|
||||
rayEngine.player.position.x = rayEngine.properties.tileWidth * rayEngine.player.position.x - rayEngine.properties.tileWidth / 2
|
||||
rayEngine.player.position.y = rayEngine.properties.tileWidth * rayEngine.player.position.y - rayEngine.properties.tileWidth / 2
|
||||
--Рассчитываем стартовые цвета, зависимые от времени - небо, землю, стены
|
||||
getTimeDependentColors()
|
||||
--Обнуляем текущее время, если превышен лимит
|
||||
rayEngine.world.dayNightCycle.currentTime = rayEngine.world.dayNightCycle.currentTime > rayEngine.world.dayNightCycle.length and 0 or rayEngine.world.dayNightCycle.currentTime
|
||||
--Осуществляем базовое получение аптайма пекарни
|
||||
rayEngine.world.dayNightCycle.lastComputerUptime = computer.uptime()
|
||||
rayEngine.distanceToProjectionPlane = (buffer.screen.width / 2) / math.tan(convertDegreesToRadians(rayEngine.player.fieldOfView / 2))
|
||||
rayEngine.distanceToProjectionPlane = (buffer.screen.width / 2) / math.tan(math.rad((rayEngine.player.fieldOfView / 2)))
|
||||
--Шаг, с которым будет изменяться угол рейкаста
|
||||
rayEngine.properties.raycastStep = rayEngine.player.fieldOfView / buffer.screen.width
|
||||
end
|
||||
|
||||
---------------------------------------------------- Функции, связанные с игроком ------------------------------------------------------------------
|
||||
|
||||
function rayEngine.move(distanceForward, distanceRight)
|
||||
local forwardRotation = math.rad(rayEngine.player.rotation + 90)
|
||||
local rightRotation = math.rad(rayEngine.player.rotation + 180)
|
||||
local forwardRotation = math.rad(rayEngine.player.rotation)
|
||||
local rightRotation = math.rad(rayEngine.player.rotation + 90)
|
||||
local xNew = rayEngine.player.position.x + distanceForward * math.sin(forwardRotation) + distanceRight * math.sin(rightRotation)
|
||||
local yNew = rayEngine.player.position.y + distanceForward * math.cos(forwardRotation) + distanceRight * math.cos(rightRotation)
|
||||
|
||||
@ -374,86 +373,43 @@ end
|
||||
|
||||
---------------------------------------------------- Функции отрисовки мира ------------------------------------------------------------------
|
||||
|
||||
local function hRaycast(player, angle)
|
||||
local rayInTop = math.sin( angle ) > 0
|
||||
local function raycast(angle)
|
||||
angle = math.rad(angle)
|
||||
local angleSinDistance, angleCosDistance, currentDistance, xWorld, yWorld, xMap, yMap, tile = math.sin(angle) * rayEngine.properties.raycastQuality, math.cos(angle) * rayEngine.properties.raycastQuality, 0, rayEngine.player.position.x, rayEngine.player.position.y
|
||||
|
||||
local tanAng = math.tan( angle )
|
||||
while true do
|
||||
if currentDistance <= rayEngine.properties.drawDistance then
|
||||
xMap, yMap = math.floor(xWorld / rayEngine.properties.tileWidth), math.floor(yWorld / rayEngine.properties.tileWidth)
|
||||
if rayEngine.map[yMap] and rayEngine.map[yMap][xMap] then
|
||||
return currentDistance, rayEngine.map[yMap][xMap]
|
||||
end
|
||||
|
||||
local Ay = math.floor(rayEngine.player.position.y / rayEngine.tileWidth) * rayEngine.tileWidth; Ay = Ay + ( (rayInTop) and -1 or rayEngine.tileWidth )
|
||||
local Ax = rayEngine.player.position.x + (rayEngine.player.position.y - Ay) / tanAng
|
||||
|
||||
local Ya = (rayInTop) and -rayEngine.tileWidth or rayEngine.tileWidth
|
||||
local Xa = rayEngine.tileWidth / tanAng; Xa = Xa * ( (rayInTop) and 1 or -1 )
|
||||
|
||||
local x, y = math.floor(Ax / rayEngine.tileWidth), math.floor(Ay / rayEngine.tileWidth)
|
||||
|
||||
while (rayEngine.map[y + 1] and not rayEngine.map[y + 1][x + 1]) do
|
||||
Ax = Ax + Xa; Ay = Ay + Ya
|
||||
|
||||
if (Ax < 0 or Ax > rayEngine.tileWidth * rayEngine.map.width or Ay < 0 or Ay > rayEngine.tileWidth * rayEngine.map.height) then
|
||||
break
|
||||
xWorld, yWorld = xWorld + angleSinDistance, yWorld + angleCosDistance
|
||||
currentDistance = currentDistance + rayEngine.properties.raycastQuality
|
||||
else
|
||||
return nil
|
||||
end
|
||||
|
||||
x, y = math.floor(Ax / rayEngine.tileWidth), math.floor(Ay / rayEngine.tileWidth)
|
||||
end
|
||||
|
||||
return math.abs(rayEngine.player.position.x - Ax) / math.abs(math.cos( angle ))
|
||||
end
|
||||
|
||||
local function vRaycast(player, angle)
|
||||
local rayInRight = math.cos( angle ) > 0
|
||||
|
||||
local tanAng = math.tan( angle )
|
||||
|
||||
local Bx = math.floor(rayEngine.player.position.x / rayEngine.tileWidth) * rayEngine.tileWidth; Bx = Bx + ( (rayInRight) and rayEngine.tileWidth or -1 )
|
||||
local By = rayEngine.player.position.y + (rayEngine.player.position.x - Bx) * tanAng
|
||||
|
||||
local Xa = (rayInRight) and rayEngine.tileWidth or -rayEngine.tileWidth
|
||||
local Ya = rayEngine.tileWidth * tanAng; Ya = Ya * ( (rayInRight) and -1 or 1 )
|
||||
|
||||
local x, y = math.floor(Bx / rayEngine.tileWidth), math.floor(By / rayEngine.tileWidth)
|
||||
|
||||
while (rayEngine.map[y + 1] and not rayEngine.map[y + 1][x + 1]) do
|
||||
Bx = Bx + Xa; By = By + Ya
|
||||
|
||||
if (Bx < 0 or Bx > rayEngine.tileWidth * rayEngine.map.width or By < 0 or By > rayEngine.tileWidth * rayEngine.map.height) then
|
||||
break
|
||||
end
|
||||
|
||||
x, y = math.floor(Bx / rayEngine.tileWidth), math.floor(By / rayEngine.tileWidth)
|
||||
end
|
||||
|
||||
return math.abs(rayEngine.player.position.y - By) / math.abs(math.sin( angle ))
|
||||
end
|
||||
|
||||
function rayEngine.drawWorld()
|
||||
--Земля
|
||||
buffer.clear(rayEngine.world.colors.groundByTime)
|
||||
--Небо
|
||||
buffer.square(1, 1, buffer.screen.width, rayEngine.horizonPosition, rayEngine.world.colors.sky.current)
|
||||
--Сцена
|
||||
local startAngle, endAngle, startX, distanceLimit, distanceToTile, tile, height, startY, tileColor = rayEngine.player.rotation - rayEngine.player.fieldOfView / 2, rayEngine.player.rotation + rayEngine.player.fieldOfView / 2, 1, buffer.screen.height * 0.85
|
||||
for angle = startAngle, endAngle, rayEngine.properties.raycastStep do
|
||||
distanceToTile, tile = raycast(angle)
|
||||
if distanceToTile then
|
||||
height = rayEngine.properties.tileWidth / distanceToTile * rayEngine.distanceToProjectionPlane
|
||||
startY = buffer.screen.height / 2 - height / 2 + rayEngine.wallsPosition + 1
|
||||
|
||||
local startColumn = rayEngine.player.rotation - (rayEngine.player.fieldOfView / 2)
|
||||
local endColumn = rayEngine.player.rotation + (rayEngine.player.fieldOfView / 2)
|
||||
local step = rayEngine.player.fieldOfView / buffer.screen.width
|
||||
|
||||
local startX = 1
|
||||
local distanceLimit = buffer.screen.height * 0.85
|
||||
local hDist, vDist, dist, height, startY, tileColor
|
||||
for angle = startColumn, endColumn, step do
|
||||
hDist = hRaycast(player, convertDegreesToRadians(angle) )
|
||||
vDist = vRaycast(player, convertDegreesToRadians(angle) )
|
||||
|
||||
-- local dist = math.min( hDist, vDist ) * math.cos( convertDegreesToRadians(angle) )
|
||||
dist = math.min( hDist, vDist )
|
||||
height = rayEngine.tileWidth / dist * rayEngine.distanceToProjectionPlane
|
||||
startY = buffer.screen.height / 2 - height / 2 + 1 + rayEngine.wallsPosition
|
||||
|
||||
--Рисуем сценку
|
||||
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, height, tileColor, 0x000000, " ")
|
||||
-- buffer.square(math.floor(startX), math.floor(startY), 1, height, 0x000000, 0x000000, " ")
|
||||
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
|
||||
end
|
||||
|
||||
doDayNightCycle()
|
||||
end
|
||||
|
||||
function rayEngine.update()
|
||||
@ -464,6 +420,7 @@ function rayEngine.update()
|
||||
if rayEngine.watchEnabled then rayEngine.watch(xTools, yTools) end
|
||||
--rayEngine.drawWeapon()
|
||||
if rayEngine.chatEnabled then rayEngine.chat() end
|
||||
doDayNightCycle()
|
||||
buffer.draw()
|
||||
end
|
||||
|
||||
|
||||
472
lib/rayEngineBackup.lua
Normal file
472
lib/rayEngineBackup.lua
Normal file
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user