From 1aef8ad49ddba6f120ad3e2e3d7b4a4410b21f3f Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sun, 14 Apr 2019 19:24:10 +0200 Subject: [PATCH] core: add a special file for callbacks --- README.md | 16 ---------------- gamecore/callbacks.lua | 38 ++++++++++++++++++++++++++++++++++++++ gamecore/init.lua | 2 ++ main.lua | 16 ---------------- 4 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 gamecore/callbacks.lua diff --git a/README.md b/README.md index 3b0904d..8e482c4 100644 --- a/README.md +++ b/README.md @@ -15,22 +15,6 @@ function love.load() core = Core() end -function love.update(dt) - core:update(dt) - game:update(dt) -end - -function love.draw() - core:draw() -end - -function love.mousemoved(x, y, dx, dy) - core:mousemoved(x, y, dx, dy) -end - -function love.mousepressed( x, y, button, istouch ) - core:mousepressed(x, y, button, istouch) -end ```` Then you have to create some scene object, diff --git a/gamecore/callbacks.lua b/gamecore/callbacks.lua new file mode 100644 index 0000000..9ff576d --- /dev/null +++ b/gamecore/callbacks.lua @@ -0,0 +1,38 @@ +-- callbacks.lua :: load the callbacks from love2D + +--[[ + Copyright © 2019 Kazhnuz + + 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. +]] + +function love.update(dt) + core:update(dt) +end + +function love.draw() + core:draw() +end + +function love.mousemoved(x, y, dx, dy) + core:mousemoved(x, y, dx, dy) +end + +function love.mousepressed( x, y, button, istouch ) + core:mousepressed(x, y, button, istouch) +end diff --git a/gamecore/init.lua b/gamecore/init.lua index 41f4255..f0eeb40 100644 --- a/gamecore/init.lua +++ b/gamecore/init.lua @@ -42,6 +42,8 @@ local Screen = require(cwd .. "screen") local Lang = require(cwd .. "lang") local SceneManager = require(cwd .. "scenemanager") +require(cwd .. "callbacks") + -- INIT FUNCTIONS -- Initialize and configure the core object diff --git a/main.lua b/main.lua index d29f16d..9484294 100644 --- a/main.lua +++ b/main.lua @@ -29,19 +29,3 @@ function love.load() examples.MainMenu() end - -function love.update(dt) - core:update(dt) -end - -function love.draw() - core:draw() -end - -function love.mousemoved(x, y, dx, dy) - core:mousemoved(x, y, dx, dy) -end - -function love.mousepressed( x, y, button, istouch ) - core:mousepressed(x, y, button, istouch) -end