Compare commits

..

No commits in common. "2426302dd82f95d8b35acef5de8a3483f85e09a4" and "d36ec336ab89b3ad3479e703a2b2b704bdf1a1e2" have entirely different histories.

View file

@ -1,6 +1,7 @@
-- Bootstrap -- Bootstrap
appName = "lovr-playspace" appName = "lovr-playspace"
-- Function to get the current time
function getCurrentTime() function getCurrentTime()
local time = os.time() local time = os.time()
local date = os.date("*t", time) local date = os.date("*t", time)
@ -176,7 +177,6 @@ function lovr.load()
color_close_grid = {0.45, 0.69, 0.79, 0.5}, color_close_grid = {0.45, 0.69, 0.79, 0.5},
color_far_corners = {0.45, 0.69, 0.79, 0}, color_far_corners = {0.45, 0.69, 0.79, 0},
color_far_grid = {0.45, 0.69, 0.79, 0}, color_far_grid = {0.45, 0.69, 0.79, 0},
show_time = 0,
points = {} points = {}
} }
@ -223,7 +223,6 @@ function lovr.load()
color_close_grid = loadSetting("color_close_grid.json", defaults.color_close_grid, json.decode), color_close_grid = loadSetting("color_close_grid.json", defaults.color_close_grid, json.decode),
color_far_corners = loadSetting("color_far_corners.json", defaults.color_far_corners, json.decode), color_far_corners = loadSetting("color_far_corners.json", defaults.color_far_corners, json.decode),
color_far_grid = loadSetting("color_far_grid.json", defaults.color_far_grid, json.decode), color_far_grid = loadSetting("color_far_grid.json", defaults.color_far_grid, json.decode),
show_time = loadSetting("show_time.json", defaults.show_time, json.decode),
points = {}, points = {},
transformed = false transformed = false
} }
@ -393,7 +392,6 @@ end
function lovr.draw(pass) function lovr.draw(pass)
mode(pass) mode(pass)
if settings.show_time == 1 then
local hx, hy, hz = lovr.headset.getPosition("head") local hx, hy, hz = lovr.headset.getPosition("head")
local hangle, hax, hay, haz = lovr.headset.getOrientation("head") local hangle, hax, hay, haz = lovr.headset.getOrientation("head")
local currentTime = getCurrentTime() local currentTime = getCurrentTime()
@ -406,4 +404,3 @@ function lovr.draw(pass)
transform:scale(0.1, 0.1, 0.1) transform:scale(0.1, 0.1, 0.1)
pass:text(currentTime, transform) pass:text(currentTime, transform)
end end
end