lua demo

Author: coltonoscopy

lua_demo.lua

@@ -0,0 +1,73 @@
+--
+-- Variables
+--
+
+-- global (accessible from other Lua modules)
+hello = 'hello'
+
+-- local (accessible only in this scope)
+local world = ' world!'
+
+--
+-- Functions
+--
+
+-- declaring our function
+function say(text)
+    print(text)
+end
+
+-- calling our function (note the .. operator to concatenate strings!)
+say(hello .. world)
+
+--
+-- If statements
+--
+if world == 'world' then
+    print('world!')
+else
+    print('hello!')
+end
+
+--
+-- Loops
+--
+
+-- while loop with counter
+local i = 10
+while i > 0 do
+    -- note the lack of -= and +=
+    i = i - 1
+    print(i)
+end
+
+-- for loop, decrements from 10 to 1
+for j = 10, 1, -1 do
+    print(j)
+end
+
+-- repeat (do-while) loop
+i = 10
+repeat
+    i = i - 1
+    print(i)
+until i == 0
+
+--
+-- Tables
+--
+
+-- sort of like structs or hash tables in C, and like Python dictionaries
+local person = {}
+person.name = 'Colton Ogden'
+person.age = 26
+person.height = 69.5
+
+-- bracket and dot syntax to access table fields
+print(person['name'])
+print(person.name)
+
+-- iterate through table's key-value pairs and print both of each
+for key, value in pairs(person) do
+    print(key, value)
+end

pong-final/main.lua

@@ -85,7 +85,8 @@ function love.load()
     push:setupScreen(VIRTUAL_WIDTH, VIRTUAL_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, {
         fullscreen = false,
         resizable = true,
-        vsync = true
+        vsync = true,
+        canvas = false
     })
 
     -- initialize our player paddles; make them global so that they can be
@@ -300,7 +301,7 @@ end
 ]]
 function love.draw()
     -- begin drawing with push, in our virtual resolution
-    push:apply('start')
+    push:start()
 
     love.graphics.clear(40, 45, 52, 255)
 
@@ -338,7 +339,7 @@ function love.draw()
     displayFPS()
 
     -- end our drawing to push
-    push:apply('end')
+    push:finish()
 end
 
 --[[
@@ -361,4 +362,5 @@ function displayFPS()
     love.graphics.setFont(smallFont)
     love.graphics.setColor(0, 255, 0, 255)
     love.graphics.print('FPS: ' .. tostring(love.timer.getFPS()), 10, 10)
+    love.graphics.setColor(255, 255, 255, 255)
 end

pong-final/push.lua

@@ -1,10 +1,13 @@
--- push.lua v0.2
+-- push.lua v0.3
 
--- Copyright (c) 2017 Ulysse Ramage
+-- Copyright (c) 2018 Ulysse Ramage
 -- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 -- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 -- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+local love11 = love.getVersion() == 11
+local getDPI = love11 and love.window.getDPIScale or love.window.getPixelScale
+
 local push = {
 
   defaults = {
@@ -18,9 +21,6 @@ local push = {
 }
 setmetatable(push, push)
 
---TODO: rendering resolution?
---TODO: clean up code
-
 function push:applySettings(settings)
   for k, v in pairs(settings) do
     self["_" .. k] = v
@@ -39,11 +39,11 @@ function push:setupScreen(WWIDTH, WHEIGHT, RWIDTH, RHEIGHT, settings)
   self:applySettings(self.defaults) --set defaults first
   self:applySettings(settings) --then fill with custom settings
 
-  love.window.setMode( self._RWIDTH, self._RHEIGHT, {
+  love.window.setMode(self._RWIDTH, self._RHEIGHT, {
     fullscreen = self._fullscreen,
     resizable = self._resizable,
     highdpi = self._highdpi
-  } )
+  })
 
   self:initValues()
 
@@ -62,25 +62,29 @@ function push:setupScreen(WWIDTH, WHEIGHT, RWIDTH, RHEIGHT, settings)
 end
 
 function push:setupCanvas(canvases)
-  table.insert(canvases, { name = "_render" }) --final render
+  table.insert(canvases, { name = "_render", private = true }) --final render
 
   self._canvas = true
   self.canvases = {}
 
   for i = 1, #canvases do
-    self.canvases[i] = {
-      name = canvases[i].name,
-      shader = canvases[i].shader,
-      canvas = love.graphics.newCanvas(self._WWIDTH, self._WHEIGHT)
-    }
+    push:addCanvas(canvases[i])
   end
 
   return self
 end
+function push:addCanvas(params)
+  table.insert(self.canvases, {
+    name = params.name,
+    private = params.private,
+    shader = params.shader,
+    canvas = love.graphics.newCanvas(self._WWIDTH, self._WHEIGHT)
+  })
+end
 
 function push:setCanvas(name)
   if not self._canvas then return true end
-  return love.graphics.setCanvas( self:getCanvasTable(name).canvas )
+  return love.graphics.setCanvas(self:getCanvasTable(name).canvas)
 end
 function push:getCanvasTable(name)
   for i = 1, #self.canvases do
@@ -98,7 +102,7 @@ function push:setShader(name, shader)
 end
 
 function push:initValues()
-  self._PSCALE = self._highdpi and love.window.getPixelScale() or 1
+  self._PSCALE = (not love11 and self._highdpi) and getDPI() or 1
 
   self._SCALE = {
     x = self._RWIDTH/self._WWIDTH * self._PSCALE,
@@ -119,13 +123,8 @@ function push:initValues()
   self._GHEIGHT = self._RHEIGHT * self._PSCALE - self._OFFSET.y * 2
 end
 
---[[ DEPRECATED ]]--
 function push:apply(operation, shader)
-  if operation == "start" then
-    self:start()
-  elseif operation == "finish" or operation == "end" then
-    self:finish(shader)
-  end
+  self._drawFunctions[operation](self, shader)
 end
 
 function push:start()
@@ -140,32 +139,73 @@ function push:start()
   end
 end
 
+function push:applyShaders(canvas, shaders)
+  local _shader = love.graphics.getShader()
+  if #shaders <= 1 then
+    love.graphics.setShader(shaders[1])
+    love.graphics.draw(canvas)
+  else
+    local _canvas = love.graphics.getCanvas()
+
+    local _tmp = self:getCanvasTable("_tmp")
+    if not _tmp then --create temp canvas only if needed
+      self:addCanvas({ name = "_tmp", private = true, shader = nil })
+      _tmp = self:getCanvasTable("_tmp")
+    end
+
+    love.graphics.push()
+    love.graphics.origin()
+    local outputCanvas
+    for i = 1, #shaders do
+      local inputCanvas = i % 2 == 1 and canvas or _tmp.canvas
+      outputCanvas = i % 2 == 0 and canvas or _tmp.canvas
+      love.graphics.setCanvas(outputCanvas)
+      love.graphics.clear()
+      love.graphics.setShader(shaders[i])
+      love.graphics.draw(inputCanvas)
+      love.graphics.setCanvas(inputCanvas)
+    end
+    love.graphics.pop()
+
+    love.graphics.setCanvas(_canvas)
+    love.graphics.draw(outputCanvas)
+  end
+  love.graphics.setShader(_shader)
+end
+
 function push:finish(shader)
   love.graphics.setBackgroundColor(unpack(self._borderColor))
   if self._canvas then
     local _render = self:getCanvasTable("_render")
 
     love.graphics.pop()
 
-    love.graphics.setColor(255, 255, 255)
+    local white = love11 and 1 or 255
+    love.graphics.setColor(white, white, white)
 
     --draw canvas
     love.graphics.setCanvas(_render.canvas)
-    for i = 1, #self.canvases - 1 do --do not draw _render yet
+    for i = 1, #self.canvases do --do not draw _render yet
       local _table = self.canvases[i]
-      love.graphics.setShader(_table.shader)
-      love.graphics.draw(_table.canvas)
+      if not _table.private then
+        local _canvas = _table.canvas
+        local _shader = _table.shader
+        self:applyShaders(_canvas, type(_shader) == "table" and _shader or { _shader })
+      end
     end
     love.graphics.setCanvas()
-
+    
     --draw render
     love.graphics.translate(self._OFFSET.x, self._OFFSET.y)
-    love.graphics.setShader(shader or self:getCanvasTable("_render").shader)
-    love.graphics.draw(self:getCanvasTable("_render").canvas, 0, 0, 0, self._SCALE.x, self._SCALE.y)
+    local shader = shader or _render.shader
+    love.graphics.push()
+    love.graphics.scale(self._SCALE.x, self._SCALE.y)
+    self:applyShaders(_render.canvas, type(shader) == "table" and shader or { shader })
+    love.graphics.pop()
 
     --clear canvas
     for i = 1, #self.canvases do
-      love.graphics.setCanvas( self.canvases[i].canvas )
+      love.graphics.setCanvas(self.canvases[i].canvas)
       love.graphics.clear()
     end
 
@@ -193,7 +233,7 @@ end
 
 --doesn't work - TODO
 function push:toReal(x, y)
-  return x+self._OFFSET.x, y+self._OFFSET.y
+  return x + self._OFFSET.x, y + self._OFFSET.y
 end
 
 function push:switchFullscreen(winw, winh)
@@ -218,8 +258,7 @@ function push:switchFullscreen(winw, winh)
 end
 
 function push:resize(w, h)
-  local pixelScale = love.window.getPixelScale()
-  if self._highdpi then w, h = w / pixelScale, h / pixelScale end
+  if self._highdpi then w, h = w / self._PSCALE, h / self._PSCALE end
   self._RWIDTH = w
   self._RHEIGHT = h
   self:initValues()