Fix grid fade, start fade at 2M, max at 0.5

This commit is contained in:
BabbleBones 2023-09-26 19:18:29 -04:00
parent 319120bfaf
commit a4378d7d94
5 changed files with 112 additions and 110 deletions

View file

@ -1 +1 @@
a trigger

View file

@ -1 +1 @@
[0.45,0.69,0.79,0.5] [0.45,0.69,0.79,0]

View file

@ -1 +1 @@
[0.45,0.69,0.79,0.25] [0.45,0.69,0.79,0]

View file

@ -1 +1 @@
4.0 0.5

214
main.lua
View file

@ -66,41 +66,59 @@ function readFile(fileName)
return content return content
end end
function getDistanceBetweenPoints3D(x1,y1,z1,x2,y2,z2) function getDistanceBetweenPoints3D(x1, y1, z1, x2, y2, z2)
return (((x2-x1)*(x2-x1)) + ((y2-y1)*(y2-y1)) + ((z2-z1)*(z2-z1))) / 2 return math.sqrt((x2 - x1)^2 + (z2 - z1)^2)
end end
-- This could be optimized by using a proper algorithm or determining which point of the line is closer to x,y,z first function getLineDistance(x, _, z, point1, point2) -- Notice the underscore for y
function getLineDistance(x,y,z,point1,point2) -- Vector from point1 to point2
local lx1 = point1[1] local dx = point2[1] - point1[1]
local ly1 = 0 local dz = point2[2] - point1[2]
local lz1 = point1[2]
local lx2 = point2[1] -- Vector from point1 to the given point (x, y, z)
local ly2 = 0 local px = x - point1[1]
local lz2 = point2[2] local pz = z - point1[2]
local d = getDistanceBetweenPoints3D(lx1,ly1,lz1,lx2,ly2,lz2) -- Dot product
local dx = (lx2 - lx1) / d local dot = px * dx + pz * dz
local dy = (ly2 - ly1) / d local len_sq = dx * dx + dz * dz
local dz = (lz2 - lz1) / d local param = -1
local cx1 = lx1 if len_sq ~= 0 then -- in case of 0 length line
local cy1 = ly1 param = dot / len_sq
local cz1 = lz1 end
local lowestDist = 9999
local xx, zz
while cx1 < lx1 do
local dist = getDistanceBetweenPoints3D(x,y,z,cx1,cy1,cz1) if param < 0 then
if dist < lowestDist then xx = point1[1]
lowestDist = dist zz = point1[2]
else elseif param > 1 then
return lowestDist xx = point2[1]
end zz = point2[2]
cx1 = cx1 + (dx * settings.check_density) else
cy1 = cy1 + (dy * settings.check_density) xx = point1[1] + param * dx
cz1 = cz1 + (dz * settings.check_density) zz = point1[2] + param * dz
end end
return lowestDist local dx_ = x - xx
local dz_ = z - zz
return math.sqrt(dx_ * dx_ + dz_ * dz_)
end
function getClosestDistanceToPerimeter(x, y, z, points)
local lowestDist = 9999
local length = #points
for i = 1, length do
local point1 = points[i]
local point2 = points[(i % length) + 1]
local dist = getLineDistance(x, y, z, point1, point2)
if dist < lowestDist then
lowestDist = dist
end
end
return lowestDist
end end
function getButton(method,button,devices) function getButton(method,button,devices)
@ -115,47 +133,45 @@ function isTracked(device)
return true return true
end end
function drawSinglePointGrid(pass,point1,point2,cornerColor,miscColor) function drawSinglePointGrid(pass, point1, point2, cornerColor, miscColor)
local _,hy,_ = lovr.headset.getPosition("head") local _, hy, _ = lovr.headset.getPosition("head")
local lx1 = point1[1] local lx1 = point1[1]
local ly1 = hy local ly1 = hy
local lz1 = point1[2] local lz1 = point1[2]
local lx2 = point2[1] local lx2 = point2[1]
local ly2 = hy local ly2 = hy
local lz2 = point2[2] local lz2 = point2[2]
local d = getDistanceBetweenPoints3D(lx1,ly1,lz1,lx2,ly2,lz2) -- For the grid lines
local dx = (lx2 - lx1) / d pass:setColor(unpack(miscColor))
local dy = (ly2 - ly1) / d local drawY = settings.grid_top
local dz = (lz2 - lz1) / d while drawY >= settings.grid_bottom do
pass:line({
pass:setColor(unpack(miscColor)) lx1, drawY, lz1,
local drawY = settings.grid_top lx2, drawY, lz2
while drawY >= settings.grid_bottom do })
pass:line({ drawY = drawY - settings.grid_density
lx1,drawY,lz1, end
lx2,drawY,lz2
}) -- For the perimeter lines
drawY = drawY - settings.grid_density pass:setColor(unpack(cornerColor))
end pass:line({
lx1, settings.grid_bottom, lz1,
pass:setColor(unpack(cornerColor)) lx1, settings.grid_top, lz1
pass:line({ })
lx1,settings.grid_bottom,lz1,
lx1,settings.grid_top,lz1 pass:line({
}) lx1, settings.grid_bottom, lz1,
lx2, settings.grid_bottom, lz2
pass:line({ })
lx1,settings.grid_bottom,lz1,
lx2,settings.grid_bottom,lz2 pass:line({
}) lx1, settings.grid_top, lz1,
lx2, settings.grid_top, lz2
pass:line({ })
lx1,settings.grid_top,lz1,
lx2,settings.grid_top,lz2
})
end end
function drawPointGrid(pass,points,cornerColor,miscColor) function drawPointGrid(pass,points,cornerColor,miscColor)
local index = 2 local index = 2
local length = #points local length = #points
@ -280,40 +296,26 @@ function modeConfigure(pass)
end end
function modeDraw(pass) function modeDraw(pass)
local x,y,z = lovr.headset.getPosition("head") local x, y, z = lovr.headset.getPosition("head")
local lowestDist = 9999 local closestDist = getClosestDistanceToPerimeter(x, y, z, settings.points)
local index = 2
local length = #settings.points -- Update the fade logic based on the closest distance
if length < 1 then return end closestDist = (closestDist - settings.fade_stop) / (settings.fade_start - settings.fade_stop)
while index <= length do closestDist = math.max(0, math.min(1, closestDist))
local dist = getLineDistance(x,y,z,settings.points[index - 1],settings.points[index])
if dist < lowestDist then lowestDist = dist end local function interpolateColor(startColor, endColor)
index = index + 1 return {
end startColor[1] + (endColor[1] - startColor[1]) * closestDist,
startColor[2] + (endColor[2] - startColor[2]) * closestDist,
lowestDist = (lowestDist - settings.fade_stop) / (settings.fade_start - settings.fade_stop) startColor[3] + (endColor[3] - startColor[3]) * closestDist,
if lowestDist < 0 then lowestDist = 0 end startColor[4] + (endColor[4] - startColor[4]) * closestDist
if lowestDist > 1 then lowestDist = 1 end }
end
local cdr=settings.color_close_corners[1] - settings.color_far_corners[1]
cdr = settings.color_far_corners[1] + (cdr * lowestDist) local cornerColor = interpolateColor(settings.color_far_corners, settings.color_close_corners)
local cdg=settings.color_close_corners[2] - settings.color_far_corners[2] local gridColor = interpolateColor(settings.color_far_grid, settings.color_close_grid)
cdg = settings.color_far_corners[2] + (cdg * lowestDist)
local cdb=settings.color_close_corners[3] - settings.color_far_corners[3] drawPointGrid(pass, settings.points, cornerColor, gridColor)
cdb = settings.color_far_corners[3] + (cdb * lowestDist)
local cda=settings.color_close_corners[4] - settings.color_far_corners[4]
cda = settings.color_far_corners[4] + (cda * lowestDist)
local gdr=settings.color_close_grid[1] - settings.color_far_grid[1]
gdr = settings.color_far_grid[1] + (gdr * lowestDist)
local gdg=settings.color_close_grid[2] - settings.color_far_grid[2]
gdg = settings.color_far_grid[2] + (gdg * lowestDist)
local gdb=settings.color_close_grid[3] - settings.color_far_grid[3]
gdb = settings.color_far_grid[3] + (gdb * lowestDist)
local gda=settings.color_close_grid[4] - settings.color_far_grid[4]
gda = settings.color_far_grid[4] + (gda * lowestDist)
drawPointGrid(pass,settings.points,{cdr,cdg,cdb,cda},{gdr,gdg,gdb,gda})
end end
function lovr.draw(pass) function lovr.draw(pass)