diff --git a/distribute.sh b/distribute.sh new file mode 100755 index 0000000..50fe7d9 --- /dev/null +++ b/distribute.sh @@ -0,0 +1,5 @@ +cd src +zip -9 -r "../ᐊᑯᓕᕕᒃ.love" . +cd .. +#windows +cat "/home/frc/Bureau/frc/dev/love/love-11.5-win64/love.exe" "ᐊᑯᓕᕕᒃ.love" > ᐊᑯᓕᕕᒃ.exe \ No newline at end of file diff --git a/licence.txt b/licence.txt new file mode 100644 index 0000000..7b03af4 --- /dev/null +++ b/licence.txt @@ -0,0 +1,3 @@ +Assets: +Johann Wilhelm Weis-Cuiller, photo par Ji-Elle sur Wikipedia: https://commons.wikimedia.org/wiki/File:Johann_Wilhelm_Weis-Cuiller.jpg licenced under CC-BY-SA 4.0: https://creativecommons.org/licenses/by-sa/4.0/ +Coffee spoon MET 17847.jpg, CC0 https://commons.wikimedia.org/wiki/File:Coffee_spoon_MET_17847.jpg \ No newline at end of file diff --git a/conf.lua b/src/conf.lua similarity index 100% rename from conf.lua rename to src/conf.lua diff --git a/fonts/bjcrus.ttf b/src/fonts/bjcrus.ttf similarity index 100% rename from fonts/bjcrus.ttf rename to src/fonts/bjcrus.ttf diff --git a/gpu.lua b/src/gpu.lua similarity index 100% rename from gpu.lua rename to src/gpu.lua diff --git a/i18n.lua b/src/i18n.lua similarity index 100% rename from i18n.lua rename to src/i18n.lua diff --git a/i18n/en.lua b/src/i18n/en.lua similarity index 100% rename from i18n/en.lua rename to src/i18n/en.lua diff --git a/i18n/test.lua b/src/i18n/test.lua similarity index 100% rename from i18n/test.lua rename to src/i18n/test.lua diff --git a/instance.lua b/src/instance.lua similarity index 100% rename from instance.lua rename to src/instance.lua diff --git a/models/terrain.lua b/src/level/terrain.lua similarity index 80% rename from models/terrain.lua rename to src/level/terrain.lua index 6573bb0..94f483c 100644 --- a/models/terrain.lua +++ b/src/level/terrain.lua @@ -1,8 +1,7 @@ local lg = assert( love.graphics ) local mesh = lg.newMesh( {--attributes - {"VertexPosition", "float", 3}, - {"VertexColor", "float", 3}, + {"VertexPosition", "float", 2}, {"VertexTexCoord", "float", 2}, }, {--vertices diff --git a/main.lua b/src/main.lua similarity index 100% rename from main.lua rename to src/main.lua diff --git a/mat4.lua b/src/mat4.lua similarity index 100% rename from mat4.lua rename to src/mat4.lua diff --git a/models/bell.lua b/src/models/bell.lua similarity index 100% rename from models/bell.lua rename to src/models/bell.lua diff --git a/models/building.lua b/src/models/building.lua similarity index 100% rename from models/building.lua rename to src/models/building.lua diff --git a/models/plane.lua b/src/models/plane.lua similarity index 100% rename from models/plane.lua rename to src/models/plane.lua diff --git a/models/sky.lua b/src/models/sky.lua similarity index 100% rename from models/sky.lua rename to src/models/sky.lua diff --git a/models/spike.lua b/src/models/spike.lua similarity index 100% rename from models/spike.lua rename to src/models/spike.lua diff --git a/player.lua b/src/player.lua similarity index 100% rename from player.lua rename to src/player.lua diff --git a/renderer.lua b/src/renderer.lua similarity index 89% rename from renderer.lua rename to src/renderer.lua index 2510b4e..cc55e3a 100644 --- a/renderer.lua +++ b/src/renderer.lua @@ -38,6 +38,7 @@ function t.draw( view, proj ) love.graphics.setCanvas( canvas ) love.graphics.clear() love.graphics.setDepthMode( "less", true ) + love.graphics.replaceTransform( tf ) for name, shader in pairs( shaders ) do love.graphics.setShader( shader ) @@ -46,16 +47,17 @@ function t.draw( view, proj ) for mesh in pairs( drawLists[ name ] ) do local modelMatrix = meshes[ mesh ] - tf:setMatrix( "column", modelMatrix ) + shader:send( "mdl", "column", modelMatrix ) love.graphics.draw( mesh ) end end + love.graphics.pop() love.graphics.setCanvas() love.graphics.setDepthMode( "always", false ) love.graphics.setShader() + love.graphics.origin() love.graphics.draw( canvas[1] ) - love.graphics.pop() if isDebugging then isDebugging = false diff --git a/scene.lua b/src/scene.lua similarity index 100% rename from scene.lua rename to src/scene.lua diff --git a/scenes/main.lua b/src/scenes/main.lua similarity index 93% rename from scenes/main.lua rename to src/scenes/main.lua index 52d64e6..6769c26 100644 --- a/scenes/main.lua +++ b/src/scenes/main.lua @@ -16,10 +16,6 @@ function t.play() player:setTurnRate( settings.mouseSensitivity.val ) player:setFOV( settings.FOV.val ) renderer.start() ---[[ local terrain = require( "models/terrain" ) - terrain:setTexture( rockTexture ) - renderer.add( terrain ) - renderer.update( terrain, {{1, 0, 0, 0}, {0,1,0,0},{0,0,1,0},{0,0,-3,1}})]] local plane = require( "models/plane" ) plane:setTexture( rockTexture ) @@ -89,6 +85,9 @@ function t.keypressed( key, code, isrepeat ) if code == settings.keyUse.val then end + if code == "q" then + renderer.debug() + end end function t.keyreleased( key, code ) diff --git a/scenes/settings.lua b/src/scenes/settings.lua similarity index 91% rename from scenes/settings.lua rename to src/scenes/settings.lua index 76b7a2e..44511c1 100644 --- a/scenes/settings.lua +++ b/src/scenes/settings.lua @@ -24,7 +24,7 @@ local function restoreCachedSetting() if settings[currentSetting].set then settings[currentSetting]:set(cachedSettingVal) else - settings[currentSetting].val = cachedSettingVal + settings[currentSetting].val = cachedSettingVal end cachedSettingVal = nil end @@ -114,17 +114,17 @@ function t.update( dt ) end end +do + local tex = love.graphics.newImage( "tex/terrain.png" ) + tex:setFilter( "nearest", "nearest" ) + tex:setWrap( "repeat", "repeat" ) + terrain:setTexture( tex ) +end + function t.draw() love.graphics.setScissor( 0, 0, 400, love.graphics.getHeight() ) - if not terrain:getTexture() then - local tex = love.graphics.newImage( "tex/terrain.png" ) - tex:setFilter( "nearest", "nearest" ) - tex:setWrap( "repeat", "repeat" ) - terrain:setTexture( tex ) - end - love.graphics.draw( terrain, 0, 0, 0, 400, love.graphics.getHeight() ) love.graphics.setScissor( 400, 0, love.graphics.getWidth() - 400, love.graphics.getHeight() ) diff --git a/scenes/slideshow.lua b/src/scenes/slideshow.lua similarity index 100% rename from scenes/slideshow.lua rename to src/scenes/slideshow.lua diff --git a/scenes/world.lua b/src/scenes/world.lua similarity index 100% rename from scenes/world.lua rename to src/scenes/world.lua diff --git a/scratch.lua b/src/scratch.lua similarity index 100% rename from scratch.lua rename to src/scratch.lua diff --git a/settings.lua b/src/settings.lua similarity index 100% rename from settings.lua rename to src/settings.lua diff --git a/shaders/matte.lua b/src/shaders/matte.lua similarity index 87% rename from shaders/matte.lua rename to src/shaders/matte.lua index 63eae3e..d66c74c 100644 --- a/shaders/matte.lua +++ b/src/shaders/matte.lua @@ -4,9 +4,10 @@ return love.graphics.newShader[[ varying float depth; varying float height; #ifdef VERTEX + uniform mat4 mdl; uniform mat4 view; uniform mat4 proj; - vec4 position( mat4 mdl, vec4 pos ){ + vec4 position( mat4 _, vec4 pos ){ vec4 world = mdl * pos; height = world.y; vec4 eye = view * world; diff --git a/shaders/sky.lua b/src/shaders/sky.lua similarity index 100% rename from shaders/sky.lua rename to src/shaders/sky.lua diff --git a/src/tex/bell-height.png b/src/tex/bell-height.png new file mode 100644 index 0000000..7266d48 Binary files /dev/null and b/src/tex/bell-height.png differ diff --git a/src/tex/bell-normal.png b/src/tex/bell-normal.png new file mode 100644 index 0000000..7f5f2e2 Binary files /dev/null and b/src/tex/bell-normal.png differ diff --git a/src/tex/bell.png b/src/tex/bell.png new file mode 100644 index 0000000..452257d Binary files /dev/null and b/src/tex/bell.png differ diff --git a/tex/favicon.png b/src/tex/favicon.png similarity index 100% rename from tex/favicon.png rename to src/tex/favicon.png diff --git a/tex/rock.png b/src/tex/rock.png similarity index 100% rename from tex/rock.png rename to src/tex/rock.png diff --git a/tex/terrain.png b/src/tex/terrain.png similarity index 100% rename from tex/terrain.png rename to src/tex/terrain.png diff --git a/view.lua b/src/view.lua similarity index 100% rename from view.lua rename to src/view.lua