Fixed asset transparency when embedding.

This commit is contained in:
Scott Duensing 2023-11-15 21:26:16 -06:00
parent cbff5c1418
commit 5272605211
3 changed files with 25 additions and 5 deletions

View file

@ -31,6 +31,7 @@ function buildAll() {
local ARCH=$2 local ARCH=$2
local COMMON= local COMMON=
# Activate toolchain for this platform.
source <(../toolchains/toolchains.sh use ${ARCH} ${OS}) source <(../toolchains/toolchains.sh use ${ARCH} ${OS})
G_TARGET=${G_BUILDROOT}/${G_BUILDDIR}/${OS}/${ARCH} G_TARGET=${G_BUILDROOT}/${G_BUILDDIR}/${OS}/${ARCH}
@ -222,6 +223,7 @@ if [[ 0 == 1 ]]; then
--build=x86_64-linux --build=x86_64-linux
make install-libLTLIBRARIES # This weird target prevents building the command line tools. make install-libLTLIBRARIES # This weird target prevents building the command line tools.
popd popd
fi
# === Known FFMPEG Types === # === Known FFMPEG Types ===
createExtensionHeader ffmpeg > ${G_GENERATED}/extensions.h createExtensionHeader ffmpeg > ${G_GENERATED}/extensions.h
@ -265,7 +267,6 @@ if [[ 0 == 1 ]]; then
ffmpeg -f concat -safe 0 -i <(echo -e "file ${G_TARGET}/temp1.mkv\nfile ${G_TARGET}/temp2.mkv\n") -c copy ${G_TARGET}/menuBackground.mkv ffmpeg -f concat -safe 0 -i <(echo -e "file ${G_TARGET}/temp1.mkv\nfile ${G_TARGET}/temp2.mkv\n") -c copy ${G_TARGET}/menuBackground.mkv
createEmbeddedBinary ${G_TARGET}/menuBackground.mkv ${G_GENERATED}/menuBackground_mkv.h MENUBACKGROUND_MKV_H createEmbeddedBinary ${G_TARGET}/menuBackground.mkv ${G_GENERATED}/menuBackground_mkv.h MENUBACKGROUND_MKV_H
rm ${G_TARGET}/temp1.mkv ${G_TARGET}/temp2.mkv ${G_TARGET}/menuBackground.mkv rm ${G_TARGET}/temp1.mkv ${G_TARGET}/temp2.mkv ${G_TARGET}/menuBackground.mkv
fi
:<<UNUSED :<<UNUSED
# === Singe Manual === # === Singe Manual ===
@ -318,7 +319,7 @@ function createEmbeddedImage() {
local BASENAME=$1 local BASENAME=$1
pushd assets pushd assets
convert -flatten ${BASENAME}.xcf ${G_GENERATED}/${BASENAME}.png convert -flatten -background rgba\(0,0,0,0\) ${BASENAME}.xcf ${G_GENERATED}/${BASENAME}.png
createEmbeddedBinary ${G_GENERATED}/${BASENAME}.png ${G_GENERATED}/${BASENAME}.h ${BASENAME^^}_H createEmbeddedBinary ${G_GENERATED}/${BASENAME}.png ${G_GENERATED}/${BASENAME}.h ${BASENAME^^}_H
rm ${G_GENERATED}/${BASENAME}.png rm ${G_GENERATED}/${BASENAME}.png
popd popd

View file

@ -750,9 +750,9 @@ void showHeader(void) {
// 00000000011111111112222222222333333333344444444445555555555666666666677777777778 // 00000000011111111112222222222333333333344444444445555555555666666666677777777778
// 12345678901234567890123456789012345678901234567890123456789012345678901234567890 // 12345678901234567890123456789012345678901234567890123456789012345678901234567890
utilSay(" ___ ___ _ _ ___ ___"); utilSay(" ___ ___ _ _ ___ ___");
utilSay("/ __|_ _| \\| |/ __| __| Somewhat Interactive Nostalgic Game Engine %s", VERSION_STRING); utilSay("/ __|_ _| \\| |/ __| __| Somewhat Interactive Nostalgic Game Engine %s Beta 1", VERSION_STRING);
utilSay("\\__ \\| || .` | (_ | _| Copyright (c) 2006-%s Scott C. Duensing", COPYRIGHT_END_YEAR); utilSay("\\__ \\| || .` | (_ | _| Copyright (c) 2006-%s Scott C. Duensing", COPYRIGHT_END_YEAR);
utilSay("|___/___|_|\\_|\\___|___| https://kangaroopunch.com"); utilSay("|___/___|_|\\_|\\___|___| https://KangarooPunch.com https://SingeEngine.com");
utilSay(""); utilSay("");
shown = true; shown = true;
} }
@ -880,7 +880,7 @@ void unpackGames(void) {
if (utilStricmp(utilGetFileExtension(de->d_name), "game") == 0) { if (utilStricmp(utilGetFileExtension(de->d_name), "game") == 0) {
showHeader(); showHeader();
count++; count++;
utilSay("Unpacking game: %s", de->d_name); utilSay(">>> Unpacking Game: %s", de->d_name);
// https://github.com/libarchive/libarchive/wiki/Examples#user-content-A_Complete_Extractor // https://github.com/libarchive/libarchive/wiki/Examples#user-content-A_Complete_Extractor
ok = true; ok = true;

View file

@ -4405,6 +4405,25 @@ void startLuaContext(lua_State *L) {
luaPreload(L, "socket.unix", luaopen_socket_unix); luaPreload(L, "socket.unix", luaopen_socket_unix);
luaPreload(L, "socket.serial", luaopen_socket_serial); luaPreload(L, "socket.serial", luaopen_socket_serial);
#endif #endif
/*
***TODO*** Load these Lua modules:
Lua Socket:
ftp.lua
headers.lua
http.lua
ltn12.lua
mbox.lua
mime.lua
smtp.lua
socket.lua
tp.lua
url.lua
librs232:
rs232.lua
*/
} }