From dabc054abc9a184afb36770d7f7fe70974fd1689 Mon Sep 17 00:00:00 2001 From: Michael Freno Date: Fri, 31 Oct 2025 21:19:44 -0400 Subject: [PATCH] renamed module directory --- FlexLove.lua | 34 +++++++++++------------ README.md | 2 +- {flexlove => modules}/Animation.lua | 0 {flexlove => modules}/Blur.lua | 0 {flexlove => modules}/Color.lua | 0 {flexlove => modules}/Element.lua | 0 {flexlove => modules}/Grid.lua | 0 {flexlove => modules}/GuiState.lua | 0 {flexlove => modules}/ImageCache.lua | 0 {flexlove => modules}/ImageDataReader.lua | 0 {flexlove => modules}/ImageRenderer.lua | 0 {flexlove => modules}/ImageScaler.lua | 0 {flexlove => modules}/InputEvent.lua | 0 {flexlove => modules}/NinePatchParser.lua | 0 {flexlove => modules}/NineSlice.lua | 0 {flexlove => modules}/RoundedRect.lua | 0 {flexlove => modules}/Theme.lua | 8 ++++-- {flexlove => modules}/Units.lua | 0 {flexlove => modules}/utils.lua | 2 +- 19 files changed, 24 insertions(+), 22 deletions(-) rename {flexlove => modules}/Animation.lua (100%) rename {flexlove => modules}/Blur.lua (100%) rename {flexlove => modules}/Color.lua (100%) rename {flexlove => modules}/Element.lua (100%) rename {flexlove => modules}/Grid.lua (100%) rename {flexlove => modules}/GuiState.lua (100%) rename {flexlove => modules}/ImageCache.lua (100%) rename {flexlove => modules}/ImageDataReader.lua (100%) rename {flexlove => modules}/ImageRenderer.lua (100%) rename {flexlove => modules}/ImageScaler.lua (100%) rename {flexlove => modules}/InputEvent.lua (100%) rename {flexlove => modules}/NinePatchParser.lua (100%) rename {flexlove => modules}/NineSlice.lua (100%) rename {flexlove => modules}/RoundedRect.lua (100%) rename {flexlove => modules}/Theme.lua (98%) rename {flexlove => modules}/Units.lua (100%) rename {flexlove => modules}/utils.lua (99%) diff --git a/FlexLove.lua b/FlexLove.lua index 8eea435..043e994 100644 --- a/FlexLove.lua +++ b/FlexLove.lua @@ -13,23 +13,23 @@ local function req(name) return require(modulePath .. name) end -local Blur = req("flexlove.Blur") -local Color = req("flexlove.Color") -local ImageDataReader = req("flexlove.ImageDataReader") -local NinePatchParser = req("flexlove.NinePatchParser") -local ImageScaler = req("flexlove.ImageScaler") -local ImageCache = req("flexlove.ImageCache") -local ImageRenderer = req("flexlove.ImageRenderer") -local Theme = req("flexlove.Theme") -local RoundedRect = req("flexlove.RoundedRect") -local NineSlice = req("flexlove.NineSlice") -local utils = req("flexlove.utils") -local Units = req("flexlove.Units") -local Animation = req("flexlove.Animation") -local GuiState = req("flexlove.GuiState") -local Grid = req("flexlove.Grid") -local InputEvent = req("flexlove.InputEvent") -local Element = req("flexlove.Element") +local Blur = req("modules.Blur") +local Color = req("modules.Color") +local ImageDataReader = req("modules.ImageDataReader") +local NinePatchParser = req("modules.NinePatchParser") +local ImageScaler = req("modules.ImageScaler") +local ImageCache = req("modules.ImageCache") +local ImageRenderer = req("modules.ImageRenderer") +local Theme = req("modules.Theme") +local RoundedRect = req("modules.RoundedRect") +local NineSlice = req("modules.NineSlice") +local utils = req("modules.utils") +local Units = req("modules.Units") +local Animation = req("modules.Animation") +local GuiState = req("modules.GuiState") +local Grid = req("modules.Grid") +local InputEvent = req("modules.InputEvent") +local Element = req("modules.Element") -- Extract from utils local enums = utils.enums diff --git a/README.md b/README.md index f041ac3..0ecb800 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This library is under active development. While many features are functional, so ## Installation -Copy the `FlexLove.lua` file into your project and require it: +Add the `modules` directory and `FlexLove.lua` into your project and require it: ```lua local FlexLove = require("FlexLove") diff --git a/flexlove/Animation.lua b/modules/Animation.lua similarity index 100% rename from flexlove/Animation.lua rename to modules/Animation.lua diff --git a/flexlove/Blur.lua b/modules/Blur.lua similarity index 100% rename from flexlove/Blur.lua rename to modules/Blur.lua diff --git a/flexlove/Color.lua b/modules/Color.lua similarity index 100% rename from flexlove/Color.lua rename to modules/Color.lua diff --git a/flexlove/Element.lua b/modules/Element.lua similarity index 100% rename from flexlove/Element.lua rename to modules/Element.lua diff --git a/flexlove/Grid.lua b/modules/Grid.lua similarity index 100% rename from flexlove/Grid.lua rename to modules/Grid.lua diff --git a/flexlove/GuiState.lua b/modules/GuiState.lua similarity index 100% rename from flexlove/GuiState.lua rename to modules/GuiState.lua diff --git a/flexlove/ImageCache.lua b/modules/ImageCache.lua similarity index 100% rename from flexlove/ImageCache.lua rename to modules/ImageCache.lua diff --git a/flexlove/ImageDataReader.lua b/modules/ImageDataReader.lua similarity index 100% rename from flexlove/ImageDataReader.lua rename to modules/ImageDataReader.lua diff --git a/flexlove/ImageRenderer.lua b/modules/ImageRenderer.lua similarity index 100% rename from flexlove/ImageRenderer.lua rename to modules/ImageRenderer.lua diff --git a/flexlove/ImageScaler.lua b/modules/ImageScaler.lua similarity index 100% rename from flexlove/ImageScaler.lua rename to modules/ImageScaler.lua diff --git a/flexlove/InputEvent.lua b/modules/InputEvent.lua similarity index 100% rename from flexlove/InputEvent.lua rename to modules/InputEvent.lua diff --git a/flexlove/NinePatchParser.lua b/modules/NinePatchParser.lua similarity index 100% rename from flexlove/NinePatchParser.lua rename to modules/NinePatchParser.lua diff --git a/flexlove/NineSlice.lua b/modules/NineSlice.lua similarity index 100% rename from flexlove/NineSlice.lua rename to modules/NineSlice.lua diff --git a/flexlove/RoundedRect.lua b/modules/RoundedRect.lua similarity index 100% rename from flexlove/RoundedRect.lua rename to modules/RoundedRect.lua diff --git a/flexlove/Theme.lua b/modules/Theme.lua similarity index 98% rename from flexlove/Theme.lua rename to modules/Theme.lua index b4f56cd..61d7d6e 100644 --- a/flexlove/Theme.lua +++ b/modules/Theme.lua @@ -5,7 +5,9 @@ Supports 9-patch images, component states, and dynamic theme switching. ]] local modulePath = (...):match("(.-)[^%.]+$") -local function req(name) return require(modulePath .. name) end +local function req(name) + return require(modulePath .. name) +end local NinePatchParser = req("NinePatchParser") local ImageScaler = req("ImageScaler") @@ -30,7 +32,7 @@ local function getFlexLoveBasePath() source = source:sub(2) end - -- Extract the directory path (remove Theme.lua and flexlove/) + -- Extract the directory path (remove Theme.lua and modules/) local filesystemPath = source:match("(.*/)") if filesystemPath then -- Store the original filesystem path for loading assets @@ -40,7 +42,7 @@ local function getFlexLoveBasePath() -- Remove trailing / fsPath = fsPath:gsub("/$", "") -- Remove the flexlove subdirectory to get back to base - fsPath = fsPath:gsub("/flexlove$", "") + fsPath = fsPath:gsub("/modules$", "") -- Convert filesystem path to Lua module path local modulePath = fsPath:gsub("/", ".") diff --git a/flexlove/Units.lua b/modules/Units.lua similarity index 100% rename from flexlove/Units.lua rename to modules/Units.lua diff --git a/flexlove/utils.lua b/modules/utils.lua similarity index 99% rename from flexlove/utils.lua rename to modules/utils.lua index fe021c0..0508843 100644 --- a/flexlove/utils.lua +++ b/modules/utils.lua @@ -213,7 +213,7 @@ local function getFlexLoveBasePath() local fsPath = filesystemPath fsPath = fsPath:gsub("^%./", "") fsPath = fsPath:gsub("/$", "") - fsPath = fsPath:gsub("/flexlove$", "") + fsPath = fsPath:gsub("/modules$", "") return fsPath end end