Show internal GAMEID in the title of the window when loading a game.

Changed port changing to show a temporary number on the bottom left corner rather than changing the title of the application.
Backported notification library from GUI branch to show if loading clones.lua from %APPDATA%/m-overlay is successful or not.

Author: bkacjios

README.md

@@ -8,6 +8,12 @@ Latest downloads can be found in ![releases](https://github.com/bkacjios/m-overl
 
 ### Usage
 
+**You can change which controller port is displayed by using the scrollwheel.**
+
+Extra game clones can be defined in "%APPDATA%/m-overlay/clones.lua"
+If you are running from source via *run64*, it will load from "%APPDATA%/LOVE/m-overlay/clones.lua" instead..
+To see an example of the clones.lua file format, please ![click here.](https://github.com/bkacjios/m-overlay/blob/master/source/modules/games/clones.lua)
+
 This program hooks into Dolphin and reads from memory to show a players inputs. This could be an alternative to Nintendo-Spy for those who don't have the technical prowess of setting up an Arduino.
 
 Currently this program will work on Melee (NTSC v1.02, PAL), 20XX, UnclePunch Training Mode, Brawl, Project M/P+, Need for Speed Underground 1/2, and The Legend of Zelda: The Wind Waker.
@@ -17,8 +23,6 @@ More games can be supported upon request!
 To use with OBS, add a "Game Capture" source and use "capture specific window" select "[M'Overlay.exe]"
 and be sure to check "Allow Transparency"
 
-You can change display ports by using the scrollwheel.
-
 ### Why?
 
 This is the start of a bigger project to make a fully customizable stream overlay. I plan on making a overlay system to show different elements of the game, like percents, stocks, game time, an off camera minimap (like Smash Ultimate), APM meters, controller inputs, and much more. The plan is to have a plugin system for people to script their own overlay elements.

source/fonts/melee-bold.otf

@@ -5,10 +5,13 @@ require("util.love2d")
 
 local watcher = require("memory")
 local perspective = require("perspective")
+local notification = require("notification")
 
 local graphics = love.graphics
 local newImage = graphics.newImage
 
+local portChangeFont = graphics.newFont("fonts/melee-bold.otf", 42)
+
 function love.load()
 	love.window.setTitle("M'Overlay - Waiting for Dolphin...")
 	graphics.setBackgroundColor(0, 0, 0, 0) -- Transparent background for OBS
@@ -31,6 +34,7 @@ local BUTTONS = {
 
 function love.update(dt)
 	watcher.update("Dolphin.exe") -- Look for Dolphin.exe
+	notification.update(8, 0)
 end
 
 local DC_CON = newImage("textures/buttons/disconnected.png")
@@ -147,6 +151,7 @@ local BUTTON_TEXTURES = {
 
 local MAX_PORTS = 4
 local PORT = 0
+local CONTROLLER_PORT_DISPLAY = 0
 
 function love.wheelmoved(x, y)
 	if not watcher.isReady() then return end
@@ -157,7 +162,8 @@ function love.wheelmoved(x, y)
 		PORT = PORT + 1
 	end
 	PORT = PORT % MAX_PORTS
-	love.window.setTitle(string.format("M'Overlay - Port %d", PORT + 1))
+
+	CONTROLLER_PORT_DISPLAY = love.timer.getTime() + 1.5
 end
 
 local vertices = {
@@ -212,6 +218,21 @@ local function transformVertices(vertices, x, y, angle, ox, oy)
 end
 
 function love.draw()
+	love.drawControllerOverlay()
+
+	-- Draw a temporary number to show that the user changed controller port
+	if CONTROLLER_PORT_DISPLAY >= love.timer.getTime() then
+		graphics.setFont(portChangeFont)
+		graphics.setColor(0, 0, 0, 255)
+		graphics.textOutline(PORT + 1, 3, 16, 256 - 42 - 16)
+		graphics.setColor(255, 255, 255, 255)
+		graphics.print(PORT + 1, 16, 256 - 42 - 16)
+	end
+
+	notification.draw()
+end
+
+function love.drawControllerOverlay()
 	if not watcher.initialized or not watcher.game then return end
 
 	local controller = watcher.controller[PORT + 1]

source/main.lua

@@ -2,6 +2,7 @@ local bit = require("bit")
 local log = require("log")
 local memory = require("memory." .. jit.os:lower())
 local clones = require("games.clones")
+local notification = require("notification")
 local filesystem = love.filesystem
 
 local configdir = filesystem.getSaveDirectory()
@@ -19,6 +20,7 @@ if filesystem.getInfo(clones_file, "file") then
 	if not status then
 		-- Failed loading chunk, chunk is an error string
 		log.error(chunk)
+		notification.error(chunk)
 	elseif chunk then
 		-- Create a sandboxed lua environment
 		local env = {}
@@ -31,13 +33,15 @@ if filesystem.getInfo(clones_file, "file") then
 		if not status then
 			-- Failed calling the chunk, custom_clones is an error string
 			log.error(custom_clones)
+			notification.error(custom_clones)
 		else
 			local num_clones = 0
 			for clone_id, info in pairs(custom_clones) do
 				num_clones = num_clones + 1
 				clones[clone_id] = info
 			end
 			log.info("Loaded %d clones from %s", num_clones, clones_file)
+			notification.coloredMessage(("Loaded %d clones from %s"):format(num_clones, clones_file))
 		end
 	end
 end
@@ -272,6 +276,7 @@ function watcher.checkmemoryvalues()
 
 		if gid ~= "\0\0\0\0\0\0" then
 			log.debug("GAMEID: %q (Version %d)", gid, version)
+			love.window.setTitle(("M'Overlay - Dolphin hooked (%s-%d)"):format(gid, version))
 
 			-- See if this GameID is a clone of another
 			local clone = clones[gid]
@@ -292,6 +297,7 @@ function watcher.checkmemoryvalues()
 				log.error(game)
 			end
 		else
+			love.window.setTitle("M'Overlay - Dolphin hooked")
 			log.info("Game closed..")
 		end
 	end

source/modules/memory/init.lua

@@ -0,0 +1,109 @@
+local graphics = love.graphics
+local newImage = graphics.newImage
+local newFont = graphics.newFont
+local timer = love.timer
+
+local log = require("log")
+
+local notification = {
+	messages = {},
+	font = newFont("fonts/melee-bold.otf", 12),
+	padding = 8,
+}
+
+local dummy = function(height, fade) end
+
+function notification.add(height, length, fade, draw)
+	height = height or 16
+	length = length or 3
+	fade = fade or 0.75
+
+	local now = timer.getTime()
+
+	table.insert(notification.messages, {
+		time = now,
+		length = length,
+		fade = fade,
+		finish = now + length + fade,
+
+		height = height,
+
+		draw = draw or dummy,
+
+		lerp = {},
+	})
+end
+
+function notification.update(x, y)
+	local now = timer.getTime()
+
+	local prevh = 0
+
+	for k, message in pairs(notification.messages) do
+		if (message.finish >= now) then
+			x = x * 0.5 + (message.lerp.x or x) * 0.5
+			y = y * 0.5 + (message.lerp.y or y) * 0.5
+			y = y + prevh/2 + notification.padding/2
+
+			message.lerp.x = x
+			message.lerp.y = y
+
+			prevh = message.height
+		end
+	end
+	
+	for k, message in pairs(notification.messages) do
+		if (message.finish >= now) then
+			return
+		end
+	end
+	
+	notification.messages = {}
+end
+
+function notification.draw()
+	local now = timer.getTime()
+	for k, message in pairs(notification.messages) do
+
+		local fade = 1
+
+		if now >= message.time + message.length then
+			fade = 1-((now - message.time - message.length)/message.fade)
+		end
+
+		local x, y = message.lerp.x, message.lerp.y
+
+		if x and y then
+			graphics.push("transform")
+			graphics.translate(x, y)
+			graphics.setFont(notification.font)
+			graphics.setColor(255, 255, 255, 255 * fade)
+			local succ, ret = xpcall(message.draw, debug.traceback, message.height, fade)
+			if not succ then
+				log.error("notification error: %s", ret)
+			end
+			graphics.pop()
+		end
+	end
+end
+
+function notification.error(text)
+	notification.add(14, 10, 0.75, function(height, fade)
+		graphics.setColor(0, 0, 0, 255 * fade)
+		graphics.textOutline(text, 1, 1, 1)
+		graphics.setColor(205, 16, 26, 255 * fade)
+		graphics.print(text, 0, 0)
+	end)
+end
+
+function notification.coloredMessage(...)
+	local args = {...}
+	notification.add(14, 5, 0.75, function(height, fade)
+		graphics.setColor(0, 0, 0, 255 * fade)
+		graphics.textOutline(args, 1, 1, 1)
+		graphics.setColor(255, 255, 255, 255 * fade)
+		graphics.print(args, 0, 0)
+	end)
+end
+
+return notification

source/modules/notification.lua

@@ -28,4 +28,26 @@ function love.graphics.easyDraw(obj, x, y, rotation, width, height, originX, ori
 	local scaledW = width / objW
 	local scaledH = height / objH
 	love.graphics.draw(obj, x, y, rotation, scaledW, scaledH, objW * originX, objH * originY, ...)
+end
+
+function love.graphics.textOutlinef(text, width, x, y, ...)
+	local steps = width * 2 / 3
+	if steps < 1 then steps = 1 end
+
+	for _x = -width, width, steps do
+		for _y = -width, width, steps do
+			love.graphics.printf(text, x + _x, y + _y, ...)
+		end
+	end
+end
+
+function love.graphics.textOutline(text, width, x, y, ...)
+	local steps = width * 2 / 3
+	if steps < 1 then steps = 1 end
+
+	for _x = -width, width, steps do
+		for _y = -width, width, steps do
+			love.graphics.print(text, x + _x, y + _y, ...)
+		end
+	end
 end