From ef648d556db6f9b078aa2b427605963851ad88f2 Mon Sep 17 00:00:00 2001 From: bizcochito Date: Mon, 15 Mar 2021 19:54:32 +0100 Subject: [PATCH] did pause menu, personal seed, and seed info in screen --- main.lua | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/main.lua b/main.lua index 9cf56b4..07a9584 100644 --- a/main.lua +++ b/main.lua @@ -1,7 +1,12 @@ g3d = require "g3d" +require "suppfunc" function love.load() - math.randomseed(os.time()) + -- Personal seed generation + personalseed = love.data.encode("string", "hex", love.data.hash("sha256", os.getenv("PATH"))) + notsorandomseed = tonumber(personalseed, 16) + math.randomseed(notsorandomseed) + -- GRAPHICS -- GOOD PIXEL love.graphics.setDefaultFilter("nearest") @@ -21,20 +26,33 @@ function love.load() end function love.mousemoved(x,y, dx,dy) - g3d.camera.firstPersonLook(dx,dy) + if not pause then + g3d.camera.firstPersonLook(dx,dy) + end end function love.update(dt) - g3d.camera.firstPersonMovement(dt,5) - + if not pause then + g3d.camera.firstPersonMovement(dt,5) + end end function love.keypressed(key) if key == "z" then obj_list = {} - math.randomseed(os.time()) + notsorandomseed = os.time() + math.randomseed(notsorandomseed ) generate_museum(0,0,0) end + if key == "escape" then + if pause then + pause = false + love.mouse.setRelativeMode(true) + else + pause = true + love.mouse.setRelativeMode(false) + end + end end function love.draw() @@ -42,12 +60,26 @@ function love.draw() for _, obj in pairs(obj_list) do obj:draw() end - - -- print coords + + -- print "Press [z] to generate a new museum" love.graphics.print("Press [z] to generate a new museum", 20, 20) -- print coords love.graphics.print("x: "..math.floor(g3d.camera.position[1])..", y: "..math.floor(g3d.camera.position[2])..", z: "..math.floor(g3d.camera.position[3]), 20, 40) + + -- print seed + if notsorandomseed == tonumber(personalseed, 16) then + love.graphics.setColor(hexrgb("#FFD700")) + love.graphics.print("Seed: "..personalseed, 20, 60) + love.graphics.setColor(hexrgb("#ffffff")) + else + love.graphics.print("Seed: "..notsorandomseed, 20, 60) + end + + + if pause then + love.graphics.rectangle("fill", 20, 20, love.graphics.getWidth()-40, love.graphics.getHeight()-40) + end end function generate_museum(x,y,z)