The-Homebrew-Cloud/launchiine
2
0
Fork 0
mirror of https://github.com/wiiu-env/launchiine.git synced 2024-11-22 01:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from wiiu-env/clang_format

Browse Source 
Format the code via clang-format [no-ci]
This commit is contained in:
Maschell 2022-02-03 17:11:27 +01:00 committed by GitHub
commit 807f7ea68b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 448 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
.clang-format Normal file
View File

@ -0,0 +1,67 @@
# Generated from CLion C/C++ Code Style settings
BasedOnStyle: LLVM
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: Consecutive
AlignConsecutiveMacros: AcrossEmptyLinesAndComments
AlignOperands: Align
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Always
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterReturnType: None
AlwaysBreakTemplateDeclarations: Yes
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: Never
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterUnion: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: true
BreakBeforeBinaryOperators: None
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: BeforeColon
BreakInheritanceList: BeforeColon
ColumnLimit: 0
CompactNamespaces: false
ContinuationIndentWidth: 8
IndentCaseLabels: true
IndentPPDirectives: None
IndentWidth: 4
KeepEmptyLinesAtTheStartOfBlocks: true
MaxEmptyLinesToKeep: 2
NamespaceIndentation: All
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PointerAlignment: Right
ReflowComments: false
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 4
UseTab: Never

8
.github/workflows/ci.yml vendored
View File

@ -6,8 +6,16 @@ on:
- master - master
jobs: jobs:
clang-format:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: clang-format
run: |
docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./src
build-binary: build-binary:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
needs: clang-format
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: build binary - name: build binary

8
.github/workflows/pr.yml vendored
View File

@ -3,8 +3,16 @@ name: CI-PR
on: [pull_request] on: [pull_request]
jobs: jobs:
clang-format:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: clang-format
run: |
docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./src
build-binary: build-binary:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
needs: clang-format
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: build binary - name: build binary

37
src/Application.cpp
View File

@ -14,29 +14,29 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/ ****************************************************************************/
#include "Application.h"
#include "common/common.h"
#include "resources/Resources.h"
#include "utils/AsyncExecutor.h"
#include "utils/logger.h"
#include <coreinit/core.h> #include <coreinit/core.h>
#include <coreinit/foreground.h> #include <coreinit/foreground.h>
#include <coreinit/title.h> #include <coreinit/title.h>
#include <proc_ui/procui.h>
#include <sysapp/launch.h>
#include "Application.h"
#include "common/common.h"
#include <gui/FreeTypeGX.h> #include <gui/FreeTypeGX.h>
#include <gui/VPadController.h> #include <gui/VPadController.h>
#include <gui/WPadController.h> #include <gui/WPadController.h>
#include "resources/Resources.h"
#include <gui/sounds/SoundHandler.hpp>
#include <gui/memory.h> #include <gui/memory.h>
#include "utils/logger.h" #include <gui/sounds/SoundHandler.hpp>
#include "utils/AsyncExecutor.h" #include <proc_ui/procui.h>
#include <sysapp/launch.h>
#include <thread> #include <thread>
Application *Application::applicationInstance = nullptr; Application *Application::applicationInstance = nullptr;
bool Application::exitApplication = false; bool Application::exitApplication = false;
bool Application::quitRequest = false; bool Application::quitRequest = false;
Application::Application() Application::Application()
: CThread(CThread::eAttributeAffCore1 | CThread::eAttributePinnedAff, 0, 0x800000), bgMusic(nullptr), video(nullptr), mainWindow(nullptr), fontSystem(nullptr), exitCode(0) { : CThread(CThread::eAttributeAffCore1 | CThread::eAttributePinnedAff, 0, 0x800000), bgMusic(nullptr), video(nullptr), mainWindow(nullptr), fontSystem(nullptr), exitCode(0) {
controller[0] = new VPadController(GuiTrigger::CHANNEL_1); controller[0] = new VPadController(GuiTrigger::CHANNEL_1);
controller[1] = new WPadController(GuiTrigger::CHANNEL_2); controller[1] = new WPadController(GuiTrigger::CHANNEL_2);
controller[2] = new WPadController(GuiTrigger::CHANNEL_3); controller[2] = new WPadController(GuiTrigger::CHANNEL_3);
@ -62,7 +62,7 @@ Application::~Application() {
DEBUG_FUNCTION_LINE("Destroy controller"); DEBUG_FUNCTION_LINE("Destroy controller");
for (auto &i: controller) { for (auto &i : controller) {
delete i; delete i;
} }
@ -88,15 +88,13 @@ int32_t Application::exec() {
} }
void Application::quit(int32_t code) { void Application::quit(int32_t code) {
exitCode = code; exitCode = code;
exitApplication = true; exitApplication = true;
quitRequest = true; quitRequest = true;
} }
void Application::fadeOut() { void Application::fadeOut() {
GuiImage fadeOut(video->getTvWidth(), video->getTvHeight(), (GX2Color) { GuiImage fadeOut(video->getTvWidth(), video->getTvHeight(), (GX2Color){0, 0, 0, 255});
0, 0, 0, 255
});
for (int32_t i = 0; i < 255; i += 10) { for (int32_t i = 0; i < 255; i += 10) {
if (i > 255) if (i > 255)
@ -138,7 +136,7 @@ bool Application::procUI() {
switch (ProcUIProcessMessages(true)) { switch (ProcUIProcessMessages(true)) {
case PROCUI_STATUS_EXITING: { case PROCUI_STATUS_EXITING: {
DEBUG_FUNCTION_LINE("PROCUI_STATUS_EXITING"); DEBUG_FUNCTION_LINE("PROCUI_STATUS_EXITING");
exitCode = EXIT_SUCCESS; exitCode = EXIT_SUCCESS;
exitApplication = true; exitApplication = true;
break; break;
} }
@ -185,7 +183,6 @@ bool Application::procUI() {
DEBUG_FUNCTION_LINE("Initialize main window"); DEBUG_FUNCTION_LINE("Initialize main window");
mainWindow = new MainWindow(video->getTvWidth(), video->getTvHeight()); mainWindow = new MainWindow(video->getTvWidth(), video->getTvHeight());
} }
} }
executeProcess = true; executeProcess = true;
} }
@ -212,7 +209,7 @@ void Application::executeThread() {
mainWindow->process(); mainWindow->process();
//! Read out inputs //! Read out inputs
for (auto &i: controller) { for (auto &i : controller) {
if (!i->update(video->getTvWidth(), video->getTvHeight())) if (!i->update(video->getTvWidth(), video->getTvHeight()))
continue; continue;

3
src/Application.h
View File

@ -18,8 +18,8 @@
#define _APPLICATION_H #define _APPLICATION_H
#include "menu/MainWindow.h" #include "menu/MainWindow.h"
#include <gui/video/CVideo.h>
#include "system/CThread.h" #include "system/CThread.h"
#include <gui/video/CVideo.h>
// forward declaration // forward declaration
class FreeTypeGX; class FreeTypeGX;
@ -77,7 +77,6 @@ private:
GuiController *controller[5]{}; GuiController *controller[5]{};
int exitCode; int exitCode;
BOOL sFromHBL = FALSE; BOOL sFromHBL = FALSE;
}; };
#endif //_APPLICATION_H #endif //_APPLICATION_H

9
src/common/common.h
View File

@ -1,16 +1,15 @@
#ifndef COMMON_H #ifndef COMMON_H
#define COMMON_H #define COMMON_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define LAUNCHIINE_VERSION "v0.1" #define LAUNCHIINE_VERSION "v0.1"
#define META_PATH "/meta" #define META_PATH "/meta"
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* COMMON_H */ #endif /* COMMON_H */

14
src/entry.cpp
View File

@ -1,18 +1,18 @@
#include "common/common.h"
#include <whb/log_cafe.h>
#include <whb/log_udp.h>
#include <whb/log_module.h>
#include "utils/logger.h"
#include "Application.h" #include "Application.h"
#include "common/common.h"
#include "utils/logger.h"
#include <whb/log_cafe.h>
#include <whb/log_module.h>
#include <whb/log_udp.h>
int32_t main(int32_t argc, char **argv) { int32_t main(int32_t argc, char **argv) {
bool moduleInit; bool moduleInit;
bool cafeInit = false; bool cafeInit = false;
bool udpInit = false; bool udpInit = false;
if (!(moduleInit = WHBLogModuleInit())) { if (!(moduleInit = WHBLogModuleInit())) {
cafeInit = WHBLogCafeInit(); cafeInit = WHBLogCafeInit();
udpInit = WHBLogUdpInit(); udpInit = WHBLogUdpInit();
} }
DEBUG_FUNCTION_LINE("Starting launchiine " LAUNCHIINE_VERSION ""); DEBUG_FUNCTION_LINE("Starting launchiine " LAUNCHIINE_VERSION "");

24
src/fs/CFile.cpp
View File

@ -1,15 +1,15 @@
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <strings.h>
#include <fs/CFile.hpp> #include <fs/CFile.hpp>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <strings.h>
CFile::CFile() { CFile::CFile() {
iFd = -1; iFd = -1;
mem_file = nullptr; mem_file = nullptr;
filesize = 0; filesize = 0;
pos = 0; pos = 0;
} }
CFile::CFile(const std::string &filepath, eOpenTypes mode) { CFile::CFile(const std::string &filepath, eOpenTypes mode) {
@ -35,7 +35,7 @@ int32_t CFile::open(const std::string &filepath, eOpenTypes mode) {
switch (mode) { switch (mode) {
default: default:
case ReadOnly: // file must exist case ReadOnly: // file must exist
openMode = O_RDONLY; openMode = O_RDONLY;
break; break;
case WriteOnly: // file will be created / zerod case WriteOnly: // file will be created / zerod
@ -77,10 +77,10 @@ void CFile::close() {
if (iFd >= 0) if (iFd >= 0)
::close(iFd); ::close(iFd);
iFd = -1; iFd = -1;
mem_file = nullptr; mem_file = nullptr;
filesize = 0; filesize = 0;
pos = 0; pos = 0;
} }
int32_t CFile::read(uint8_t *ptr, size_t size) { int32_t CFile::read(uint8_t *ptr, size_t size) {
@ -127,7 +127,7 @@ int32_t CFile::write(const uint8_t *ptr, size_t size) {
} }
int32_t CFile::seek(long int offset, int32_t origin) { int32_t CFile::seek(long int offset, int32_t origin) {
int32_t ret = 0; int32_t ret = 0;
int64_t newPos = pos; int64_t newPos = pos;
if (origin == SEEK_SET) { if (origin == SEEK_SET) {
@ -158,7 +158,7 @@ int32_t CFile::seek(long int offset, int32_t origin) {
int32_t CFile::fwrite(const char *format, ...) { int32_t CFile::fwrite(const char *format, ...) {
char tmp[512]; char tmp[512];
tmp[0] = 0; tmp[0] = 0;
int32_t result = -1; int32_t result = -1;
va_list va; va_list va;
@ -171,5 +171,3 @@ int32_t CFile::fwrite(const char *format, ...) {
return result; return result;
} }

6
src/fs/CFile.hpp
View File

@ -1,10 +1,10 @@
#ifndef CFILE_HPP_ #ifndef CFILE_HPP_
#define CFILE_HPP_ #define CFILE_HPP_
#include <stdio.h>
#include <string>
#include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <string>
#include <unistd.h> #include <unistd.h>
#include <wut_types.h> #include <wut_types.h>

16
src/fs/DirList.cpp
View File

@ -24,22 +24,22 @@
* DirList Class * DirList Class
* for WiiXplorer 2010 * for WiiXplorer 2010
***************************************************************************/ ***************************************************************************/
#include <algorithm>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <strings.h> #include <strings.h>
#include <algorithm>
#include <sys/stat.h>
#include <sys/dirent.h> #include <sys/dirent.h>
#include <sys/stat.h>
#include <fs/DirList.h> #include <fs/DirList.h>
#include <utils/StringTools.h> #include <utils/StringTools.h>
DirList::DirList() { DirList::DirList() {
Flags = 0; Flags = 0;
Filter = 0; Filter = 0;
Depth = 0; Depth = 0;
} }
DirList::DirList(const std::string &path, const char *filter, uint32_t flags, uint32_t maxDepth) { DirList::DirList(const std::string &path, const char *filter, uint32_t flags, uint32_t maxDepth) {
@ -55,9 +55,9 @@ BOOL DirList::LoadPath(const std::string &folder, const char *filter, uint32_t f
if (folder.empty()) if (folder.empty())
return false; return false;
Flags = flags; Flags = flags;
Filter = filter; Filter = filter;
Depth = maxDepth; Depth = maxDepth;
std::string folderpath(folder); std::string folderpath(folder);
uint32_t length = folderpath.size(); uint32_t length = folderpath.size();
@ -82,14 +82,14 @@ BOOL DirList::InternalLoadPath(std::string &folderpath) {
return false; return false;
struct dirent *dirent = nullptr; struct dirent *dirent = nullptr;
DIR *dir = nullptr; DIR *dir = nullptr;
dir = opendir(folderpath.c_str()); dir = opendir(folderpath.c_str());
if (dir == nullptr) if (dir == nullptr)
return false; return false;
while ((dirent = readdir(dir)) != 0) { while ((dirent = readdir(dir)) != 0) {
BOOL isDir = dirent->d_type & DT_DIR; BOOL isDir = dirent->d_type & DT_DIR;
const char *filename = dirent->d_name; const char *filename = dirent->d_name;
if (isDir) { if (isDir) {

7
src/fs/DirList.h
View File

@ -27,8 +27,8 @@
#ifndef ___DIRLIST_H_ #ifndef ___DIRLIST_H_
#define ___DIRLIST_H_ #define ___DIRLIST_H_
#include <vector>
#include <string> #include <string>
#include <vector>
#include <wut_types.h> #include <wut_types.h>
typedef struct { typedef struct {
@ -93,10 +93,11 @@ public:
//! Enum for search/filter flags //! Enum for search/filter flags
enum { enum {
Files = 0x01, Files = 0x01,
Dirs = 0x02, Dirs = 0x02,
CheckSubfolders = 0x08, CheckSubfolders = 0x08,
}; };
protected: protected:
// Internal parser // Internal parser
BOOL InternalLoadPath(std::string &path); BOOL InternalLoadPath(std::string &path);

15
src/fs/FSUtils.cpp
View File

@ -1,11 +1,11 @@
#include <malloc.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include "fs/FSUtils.h" #include "fs/FSUtils.h"
#include "fs/CFile.hpp" #include "fs/CFile.hpp"
#include "utils/logger.h" #include "utils/logger.h"
#include <fcntl.h>
#include <malloc.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
int32_t FSUtils::LoadFileToMem(const char *filepath, uint8_t **inbuffer, uint32_t *size) { int32_t FSUtils::LoadFileToMem(const char *filepath, uint8_t **inbuffer, uint32_t *size) {
//! always initialze input //! always initialze input
@ -27,8 +27,8 @@ int32_t FSUtils::LoadFileToMem(const char *filepath, uint8_t **inbuffer, uint32_
} }
uint32_t blocksize = 0x4000; uint32_t blocksize = 0x4000;
uint32_t done = 0; uint32_t done = 0;
int32_t readBytes = 0; int32_t readBytes = 0;
while (done < filesize) { while (done < filesize) {
if (done + blocksize > filesize) { if (done + blocksize > filesize) {
@ -139,4 +139,3 @@ int32_t FSUtils::saveBufferToFile(const char *path, void *buffer, uint32_t size)
file.close(); file.close();
return written; return written;
} }

50
src/game/GameList.cpp
View File

@ -1,14 +1,14 @@
#include <algorithm> #include <algorithm>
#include <string> #include <coreinit/cache.h>
#include <string.h>
#include <coreinit/mcp.h> #include <coreinit/mcp.h>
#include <nn/acp/nn_acp_types.h> #include <nn/acp/nn_acp_types.h>
#include <nn/acp/title.h> #include <nn/acp/title.h>
#include <coreinit/cache.h> #include <string.h>
#include <string>
#include "utils/AsyncExecutor.h"
#include "GameList.h" #include "GameList.h"
#include "common/common.h" #include "common/common.h"
#include "utils/AsyncExecutor.h"
#include "fs/FSUtils.h" #include "fs/FSUtils.h"
#include "utils/logger.h" #include "utils/logger.h"
@ -24,7 +24,7 @@ GameList::~GameList() {
void GameList::clear() { void GameList::clear() {
lock(); lock();
for (auto const &x: fullGameList) { for (auto const &x : fullGameList) {
if (x != nullptr) { if (x != nullptr) {
if (x->imageData != nullptr) { if (x->imageData != nullptr) {
AsyncExecutor::pushForDelete(x->imageData); AsyncExecutor::pushForDelete(x->imageData);
@ -55,7 +55,7 @@ gameInfo *GameList::getGameInfo(uint64_t titleId) {
int32_t GameList::readGameList() { int32_t GameList::readGameList() {
// Clear list // Clear list
for (auto const &x: fullGameList) { for (auto const &x : fullGameList) {
delete x; delete x;
} }
@ -92,10 +92,10 @@ int32_t GameList::readGameList() {
MCP_APP_TYPE_ACCOUNT_APPS, MCP_APP_TYPE_ACCOUNT_APPS,
}; };
for (auto appType: menuAppTypes) { for (auto appType : menuAppTypes) {
uint32_t titleCountByType = 0; uint32_t titleCountByType = 0;
MCPError err = MCP_TitleListByAppType(mcp, appType, &titleCountByType, titles.data() + realTitleCount, MCPError err = MCP_TitleListByAppType(mcp, appType, &titleCountByType, titles.data() + realTitleCount,
(titles.size() - realTitleCount) * sizeof(decltype(titles)::value_type)); (titles.size() - realTitleCount) * sizeof(decltype(titles)::value_type));
if (err < 0) { if (err < 0) {
MCP_Close(mcp); MCP_Close(mcp);
return 0; return 0;
@ -106,12 +106,12 @@ int32_t GameList::readGameList() {
titles.resize(realTitleCount); titles.resize(realTitleCount);
} }
for (auto title_candidate: titles) { for (auto title_candidate : titles) {
auto *newGameInfo = new gameInfo; auto *newGameInfo = new gameInfo;
newGameInfo->titleId = title_candidate.titleId; newGameInfo->titleId = title_candidate.titleId;
newGameInfo->appType = title_candidate.appType; newGameInfo->appType = title_candidate.appType;
newGameInfo->gamePath = title_candidate.path; newGameInfo->gamePath = title_candidate.path;
newGameInfo->name = "<unknown>"; newGameInfo->name = "<unknown>";
newGameInfo->imageData = nullptr; newGameInfo->imageData = nullptr;
DCFlushRange(newGameInfo, sizeof(gameInfo)); DCFlushRange(newGameInfo, sizeof(gameInfo));
@ -141,11 +141,11 @@ int32_t GameList::readGameList() {
if (header->imageData == nullptr) { if (header->imageData == nullptr) {
std::string filepath = "fs:" + header->gamePath + META_PATH + "/iconTex.tga"; std::string filepath = "fs:" + header->gamePath + META_PATH + "/iconTex.tga";
uint8_t *buffer = nullptr; uint8_t *buffer = nullptr;
uint32_t bufferSize = 0; uint32_t bufferSize = 0;
int iResult = FSUtils::LoadFileToMem(filepath.c_str(), &buffer, &bufferSize); int iResult = FSUtils::LoadFileToMem(filepath.c_str(), &buffer, &bufferSize);
if (iResult > 0) { if (iResult > 0) {
auto *imageData = new GuiImageData(buffer, bufferSize, GX2_TEX_CLAMP_MODE_MIRROR); auto *imageData = new GuiImageData(buffer, bufferSize, GX2_TEX_CLAMP_MODE_MIRROR);
header->imageData = imageData; header->imageData = imageData;
//! free original image buffer which is converted to texture now and not needed anymore //! free original image buffer which is converted to texture now and not needed anymore
@ -173,7 +173,7 @@ void GameList::updateTitleInfo() {
auto acp = ACPGetTitleMetaXml(newHeader->titleId, meta); auto acp = ACPGetTitleMetaXml(newHeader->titleId, meta);
if (acp >= 0) { if (acp >= 0) {
newHeader->name = meta->shortname_en; newHeader->name = meta->shortname_en;
hasChanged = true; hasChanged = true;
} }
free(meta); free(meta);
} }
@ -181,14 +181,14 @@ void GameList::updateTitleInfo() {
if (newHeader->imageData == nullptr) { if (newHeader->imageData == nullptr) {
std::string filepath = "fs:" + newHeader->gamePath + META_PATH + "/iconTex.tga"; std::string filepath = "fs:" + newHeader->gamePath + META_PATH + "/iconTex.tga";
uint8_t *buffer = nullptr; uint8_t *buffer = nullptr;
uint32_t bufferSize = 0; uint32_t bufferSize = 0;
int iResult = FSUtils::LoadFileToMem(filepath.c_str(), &buffer, &bufferSize); int iResult = FSUtils::LoadFileToMem(filepath.c_str(), &buffer, &bufferSize);
if (iResult > 0) { if (iResult > 0) {
auto *imageData = new GuiImageData(buffer, bufferSize, GX2_TEX_CLAMP_MODE_MIRROR); auto *imageData = new GuiImageData(buffer, bufferSize, GX2_TEX_CLAMP_MODE_MIRROR);
newHeader->imageData = imageData; newHeader->imageData = imageData;
hasChanged = true; hasChanged = true;
//! free original image buffer which is converted to texture now and not needed anymore //! free original image buffer which is converted to texture now and not needed anymore
free(buffer); free(buffer);

10
src/game/GameList.h
View File

@ -1,13 +1,13 @@
#ifndef GAME_LIST_H_ #ifndef GAME_LIST_H_
#define GAME_LIST_H_ #define GAME_LIST_H_
#include <vector> #include <coreinit/cache.h>
#include <coreinit/mcp.h>
#include <gui/GuiImageData.h>
#include <gui/sigslot.h>
#include <mutex> #include <mutex>
#include <stdint.h> #include <stdint.h>
#include <coreinit/mcp.h> #include <vector>
#include <coreinit/cache.h>
#include <gui/sigslot.h>
#include <gui/GuiImageData.h>
typedef struct _gameInfo { typedef struct _gameInfo {
uint64_t titleId; uint64_t titleId;

74
src/gui/GameIcon.cpp
View File

@ -1,42 +1,42 @@
#include "GameIcon.h" #include "GameIcon.h"
#include "GameIconModel.h"
#include "Application.h" #include "Application.h"
#include "GameIconModel.h"
#include "utils/logger.h"
#include "utils/utils.h"
#include <gui/video/CVideo.h> #include <gui/video/CVideo.h>
#include <gui/video/shaders/Shader3D.h> #include <gui/video/shaders/Shader3D.h>
#include <gui/video/shaders/ShaderFractalColor.h> #include <gui/video/shaders/ShaderFractalColor.h>
#include "utils/utils.h"
#include "utils/logger.h"
static const float cfIconMirrorScale = 1.15f; static const float cfIconMirrorScale = 1.15f;
static const float cfIconMirrorAlpha = 0.45f; static const float cfIconMirrorAlpha = 0.45f;
GameIcon::GameIcon(GuiImageData *preloadImage) GameIcon::GameIcon(GuiImageData *preloadImage)
: GuiImage(preloadImage) { : GuiImage(preloadImage) {
bSelected = false; bSelected = false;
bRenderStroke = true; bRenderStroke = true;
bRenderReflection = false; bRenderReflection = false;
bIconLast = false; bIconLast = false;
strokeFractalEnable = 1; strokeFractalEnable = 1;
strokeBlurBorder = 0.0f; strokeBlurBorder = 0.0f;
distanceFadeout = 0.0f; distanceFadeout = 0.0f;
rotationX = 0.0f; rotationX = 0.0f;
reflectionAlpha = 0.4f; reflectionAlpha = 0.4f;
strokeWidth = 2.35f; strokeWidth = 2.35f;
colorIntensity = glm::vec4(1.0f); colorIntensity = glm::vec4(1.0f);
colorIntensityMirror = colorIntensity; colorIntensityMirror = colorIntensity;
alphaFadeOutNorm = glm::vec4(0.0f); alphaFadeOutNorm = glm::vec4(0.0f);
alphaFadeOutRefl = glm::vec4(-1.0f, 0.0f, 0.9f, 1.0f); alphaFadeOutRefl = glm::vec4(-1.0f, 0.0f, 0.9f, 1.0f);
selectionBlurOuterColorIntensity = glm::vec4(0.09411764f * 1.15f, 0.56862745f * 1.15f, 0.96862745098f * 1.15f, 1.0f); selectionBlurOuterColorIntensity = glm::vec4(0.09411764f * 1.15f, 0.56862745f * 1.15f, 0.96862745098f * 1.15f, 1.0f);
selectionBlurOuterSize = 1.65f; selectionBlurOuterSize = 1.65f;
selectionBlurOuterBorderSize = 0.5f; selectionBlurOuterBorderSize = 0.5f;
selectionBlurInnerColorIntensity = glm::vec4(0.46666667f, 0.90588235f, 1.0f, 1.0f); selectionBlurInnerColorIntensity = glm::vec4(0.46666667f, 0.90588235f, 1.0f, 1.0f);
selectionBlurInnerSize = 1.45f; selectionBlurInnerSize = 1.45f;
selectionBlurInnerBorderSize = 0.95f; selectionBlurInnerBorderSize = 0.95f;
vtxCount = sizeof(cfGameIconPosVtxs) / (Shader3D::cuVertexAttrSize); vtxCount = sizeof(cfGameIconPosVtxs) / (Shader3D::cuVertexAttrSize);
//! texture and vertex coordinates //! texture and vertex coordinates
posVtxs = (float *) memalign(GX2_VERTEX_BUFFER_ALIGNMENT, sizeof(cfGameIconPosVtxs)); posVtxs = (float *) memalign(GX2_VERTEX_BUFFER_ALIGNMENT, sizeof(cfGameIconPosVtxs));
texCoords = (float *) memalign(GX2_VERTEX_BUFFER_ALIGNMENT, sizeof(cfGameIconTexCoords)); texCoords = (float *) memalign(GX2_VERTEX_BUFFER_ALIGNMENT, sizeof(cfGameIconTexCoords));
if (posVtxs) { if (posVtxs) {
@ -68,7 +68,7 @@ GameIcon::GameIcon(GuiImageData *preloadImage)
strokeTexCoords = (float *) memalign(GX2_VERTEX_BUFFER_ALIGNMENT, cuGameIconStrokeVtxCount * Shader::cuTexCoordAttrSize); strokeTexCoords = (float *) memalign(GX2_VERTEX_BUFFER_ALIGNMENT, cuGameIconStrokeVtxCount * Shader::cuTexCoordAttrSize);
if (strokeTexCoords) { if (strokeTexCoords) {
for (size_t i = 0, n = 0; i < cuGameIconStrokeVtxCount; n += 2, i += 3) { for (size_t i = 0, n = 0; i < cuGameIconStrokeVtxCount; n += 2, i += 3) {
strokeTexCoords[n] = (1.0f + strokePosVtxs[i]) * 0.5f; strokeTexCoords[n] = (1.0f + strokePosVtxs[i]) * 0.5f;
strokeTexCoords[n + 1] = 1.0f - (1.0f + strokePosVtxs[i + 1]) * 0.5f; strokeTexCoords[n + 1] = 1.0f - (1.0f + strokePosVtxs[i + 1]) * 0.5f;
} }
GX2Invalidate(GX2_INVALIDATE_MODE_CPU_ATTRIBUTE_BUFFER, strokeTexCoords, cuGameIconStrokeVtxCount * Shader::cuTexCoordAttrSize); GX2Invalidate(GX2_INVALIDATE_MODE_CPU_ATTRIBUTE_BUFFER, strokeTexCoords, cuGameIconStrokeVtxCount * Shader::cuTexCoordAttrSize);
@ -118,9 +118,9 @@ bool GameIcon::checkRayIntersection(const glm::vec3 &rayOrigin, const glm::vec3
//! since we always face the camera we can just check the AABB intersection //! since we always face the camera we can just check the AABB intersection
//! otherwise an OOB intersection would be required //! otherwise an OOB intersection would be required
float currPosX = getCenterX() * Application::instance()->getVideo()->getWidthScaleFactor() * 2.0f; float currPosX = getCenterX() * Application::instance()->getVideo()->getWidthScaleFactor() * 2.0f;
float currPosY = getCenterY() * Application::instance()->getVideo()->getHeightScaleFactor() * 2.0f; float currPosY = getCenterY() * Application::instance()->getVideo()->getHeightScaleFactor() * 2.0f;
float currPosZ = getDepth() * Application::instance()->getVideo()->getDepthScaleFactor() * 2.0f; float currPosZ = getDepth() * Application::instance()->getVideo()->getDepthScaleFactor() * 2.0f;
float currScaleX = getScaleX() * (float) getWidth() * Application::instance()->getVideo()->getWidthScaleFactor(); float currScaleX = getScaleX() * (float) getWidth() * Application::instance()->getVideo()->getWidthScaleFactor();
float currScaleY = getScaleY() * (float) getHeight() * Application::instance()->getVideo()->getHeightScaleFactor(); float currScaleY = getScaleY() * (float) getHeight() * Application::instance()->getVideo()->getHeightScaleFactor();
float currScaleZ = getScaleZ() * (float) getWidth() * Application::instance()->getVideo()->getDepthScaleFactor(); float currScaleZ = getScaleZ() * (float) getWidth() * Application::instance()->getVideo()->getDepthScaleFactor();
@ -159,12 +159,12 @@ void GameIcon::draw(CVideo *pVideo, const glm::mat4 &projectionMtx, const glm::m
return; return;
} }
//! first setup 2D GUI positions //! first setup 2D GUI positions
float currPosX = getCenterX() * pVideo->getWidthScaleFactor() * 2.0f; float currPosX = getCenterX() * pVideo->getWidthScaleFactor() * 2.0f;
float currPosY = getCenterY() * pVideo->getHeightScaleFactor() * 2.0f; float currPosY = getCenterY() * pVideo->getHeightScaleFactor() * 2.0f;
float currPosZ = getDepth() * pVideo->getDepthScaleFactor() * 2.0f; float currPosZ = getDepth() * pVideo->getDepthScaleFactor() * 2.0f;
float currScaleX = getScaleX() * (float) getWidth() * pVideo->getWidthScaleFactor(); float currScaleX = getScaleX() * (float) getWidth() * pVideo->getWidthScaleFactor();
float currScaleY = getScaleY() * (float) getHeight() * pVideo->getHeightScaleFactor(); float currScaleY = getScaleY() * (float) getHeight() * pVideo->getHeightScaleFactor();
float currScaleZ = getScaleZ() * (float) getWidth() * pVideo->getDepthScaleFactor(); float currScaleZ = getScaleZ() * (float) getWidth() * pVideo->getDepthScaleFactor();
float strokeScaleX = pVideo->getWidthScaleFactor() * strokeWidth * 0.25f + cfIconMirrorScale; float strokeScaleX = pVideo->getWidthScaleFactor() * strokeWidth * 0.25f + cfIconMirrorScale;
float strokeScaleY = pVideo->getHeightScaleFactor() * strokeWidth * 0.25f + cfIconMirrorScale; float strokeScaleY = pVideo->getHeightScaleFactor() * strokeWidth * 0.25f + cfIconMirrorScale;
@ -182,10 +182,10 @@ void GameIcon::draw(CVideo *pVideo, const glm::mat4 &projectionMtx, const glm::m
m_iconView = glm::rotate(m_iconView, DegToRad(rotationX), glm::vec3(1.0f, 0.0f, 0.0f)); m_iconView = glm::rotate(m_iconView, DegToRad(rotationX), glm::vec3(1.0f, 0.0f, 0.0f));
m_iconView = glm::scale(m_iconView, glm::vec3(currScaleX, -currScaleY, currScaleZ)); m_iconView = glm::scale(m_iconView, glm::vec3(currScaleX, -currScaleY, currScaleZ));
colorIntensity[3] = reflectionAlpha * getAlpha(); colorIntensity[3] = reflectionAlpha * getAlpha();
selectionBlurOuterColorIntensity[3] = colorIntensity[3] * 0.7f; selectionBlurOuterColorIntensity[3] = colorIntensity[3] * 0.7f;
selectionBlurInnerColorIntensity[3] = colorIntensity[3] * 0.7f; selectionBlurInnerColorIntensity[3] = colorIntensity[3] * 0.7f;
alphaFadeOut = &alphaFadeOutRefl; alphaFadeOut = &alphaFadeOutRefl;
GX2SetCullOnlyControl(GX2_FRONT_FACE_CCW, GX2_ENABLE, GX2_DISABLE); GX2SetCullOnlyControl(GX2_FRONT_FACE_CCW, GX2_ENABLE, GX2_DISABLE);
} else { } else {
@ -194,10 +194,10 @@ void GameIcon::draw(CVideo *pVideo, const glm::mat4 &projectionMtx, const glm::m
m_iconView = glm::rotate(m_iconView, DegToRad(rotationX), glm::vec3(1.0f, 0.0f, 0.0f)); m_iconView = glm::rotate(m_iconView, DegToRad(rotationX), glm::vec3(1.0f, 0.0f, 0.0f));
m_iconView = glm::scale(m_iconView, glm::vec3(currScaleX, currScaleY, currScaleZ)); m_iconView = glm::scale(m_iconView, glm::vec3(currScaleX, currScaleY, currScaleZ));
colorIntensity[3] = getAlpha(); colorIntensity[3] = getAlpha();
selectionBlurOuterColorIntensity[3] = colorIntensity[3]; selectionBlurOuterColorIntensity[3] = colorIntensity[3];
selectionBlurInnerColorIntensity[3] = colorIntensity[3]; selectionBlurInnerColorIntensity[3] = colorIntensity[3];
alphaFadeOut = &alphaFadeOutNorm; alphaFadeOut = &alphaFadeOutNorm;
} }
m_mirrorView = glm::scale(m_iconView, glm::vec3(cfIconMirrorScale, cfIconMirrorScale, cfIconMirrorScale)); m_mirrorView = glm::scale(m_iconView, glm::vec3(cfIconMirrorScale, cfIconMirrorScale, cfIconMirrorScale));

4
src/gui/GameIcon.h
View File

@ -15,8 +15,8 @@ public:
} }
void setColorIntensity(const glm::vec4 &color) { void setColorIntensity(const glm::vec4 &color) {
colorIntensity = color; colorIntensity = color;
colorIntensityMirror = colorIntensity; colorIntensityMirror = colorIntensity;
selectionBlurOuterColorIntensity = color * glm::vec4(0.09411764f * 1.15f, 0.56862745f * 1.15f, 0.96862745098f * 1.15f, 1.0f); selectionBlurOuterColorIntensity = color * glm::vec4(0.09411764f * 1.15f, 0.56862745f * 1.15f, 0.96862745098f * 1.15f, 1.0f);
selectionBlurInnerColorIntensity = color * glm::vec4(0.46666667f, 0.90588235f, 1.0f, 1.0f); selectionBlurInnerColorIntensity = color * glm::vec4(0.46666667f, 0.90588235f, 1.0f, 1.0f);
} }

1
src/gui/GameIconModel.h
View File

@ -1,6 +1,7 @@
#ifndef ICON_MODEL_H_ #ifndef ICON_MODEL_H_
#define ICON_MODEL_H_ #define ICON_MODEL_H_
// clang-format off
static const float cfGameIconPosVtxs[] = { static const float cfGameIconPosVtxs[] = {
-0.844501f, -0.861263f, 0.050154f, -0.802664f, -0.8797f, 0.054004f, -0.809968f, -0.828995f, 0.061777f, -0.864233f, -0.822169f, 0.054004f, -0.844501f, -0.861263f, 0.050154f, -0.802664f, -0.8797f, 0.054004f, -0.809968f, -0.828995f, 0.061777f, -0.864233f, -0.822169f, 0.054004f,
-0.802664f, -0.8797f, 0.054004f, -0.726455f, -0.89991f, 0.058224f, -0.730326f, -0.842312f, 0.067487f, -0.809968f, -0.828995f, 0.061777f, -0.802664f, -0.8797f, 0.054004f, -0.726455f, -0.89991f, 0.058224f, -0.730326f, -0.842312f, 0.067487f, -0.809968f, -0.828995f, 0.061777f,

103
src/gui/GuiIconGrid.cpp
View File

@ -14,37 +14,37 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/ ****************************************************************************/
#include <map>
#include <algorithm>
#include <gui/GuiIconGrid.h>
#include <gui/GuiController.h>
#include <coreinit/cache.h>
#include "common/common.h"
#include "Application.h" #include "Application.h"
#include <gui/video/CVideo.h> #include "common/common.h"
#include "utils/logger.h"
#include "gui/GameIcon.h" #include "gui/GameIcon.h"
#include "utils/logger.h"
#include <algorithm>
#include <coreinit/cache.h>
#include <gui/GuiController.h>
#include <gui/GuiIconGrid.h>
#include <gui/video/CVideo.h>
#include <map>
GuiIconGrid::GuiIconGrid(int32_t w, int32_t h, uint64_t GameIndex, bool sortByName) GuiIconGrid::GuiIconGrid(int32_t w, int32_t h, uint64_t GameIndex, bool sortByName)
: GuiTitleBrowser(w, h, GameIndex), : GuiTitleBrowser(w, h, GameIndex),
sortByName(sortByName), sortByName(sortByName),
particleBgImage(w, h, 50, 60.0f, 90.0f, 0.6f, 1.0f), buttonClickSound(Resources::GetSound("button_click.mp3")), gameTitle((char *) nullptr, 52, glm::vec4(1.0f)), particleBgImage(w, h, 50, 60.0f, 90.0f, 0.6f, 1.0f), buttonClickSound(Resources::GetSound("button_click.mp3")), gameTitle((char *) nullptr, 52, glm::vec4(1.0f)),
touchTrigger(GuiTrigger::CHANNEL_1, GuiTrigger::VPAD_TOUCH), touchTrigger(GuiTrigger::CHANNEL_1, GuiTrigger::VPAD_TOUCH),
wpadTouchTrigger(GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5, GuiTrigger::BUTTON_A), wpadTouchTrigger(GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5, GuiTrigger::BUTTON_A),
leftTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_LEFT | GuiTrigger::STICK_L_LEFT, true), leftTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_LEFT | GuiTrigger::STICK_L_LEFT, true),
rightTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_RIGHT | GuiTrigger::STICK_L_RIGHT, true), rightTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_RIGHT | GuiTrigger::STICK_L_RIGHT, true),
downTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_DOWN | GuiTrigger::STICK_L_DOWN, true), upTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_UP | GuiTrigger::STICK_L_UP, true), downTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_DOWN | GuiTrigger::STICK_L_DOWN, true), upTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_UP | GuiTrigger::STICK_L_UP, true),
buttonATrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_A, true), buttonLTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_L, true), buttonATrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_A, true), buttonLTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_L, true),
buttonRTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_R, true), leftButton(w, h), rightButton(w, h), downButton(w, h), upButton(w, h), launchButton(w, h), buttonRTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_R, true), leftButton(w, h), rightButton(w, h), downButton(w, h), upButton(w, h), launchButton(w, h),
arrowRightImageData(Resources::GetImageData("rightArrow.png")), arrowLeftImageData(Resources::GetImageData("leftArrow.png")), arrowRightImage(arrowRightImageData), arrowRightImageData(Resources::GetImageData("rightArrow.png")), arrowLeftImageData(Resources::GetImageData("leftArrow.png")), arrowRightImage(arrowRightImageData),
arrowLeftImage(arrowLeftImageData), arrowRightButton(arrowRightImage.getWidth(), arrowRightImage.getHeight()), arrowLeftButton(arrowLeftImage.getWidth(), arrowLeftImage.getHeight()), arrowLeftImage(arrowLeftImageData), arrowRightButton(arrowRightImage.getWidth(), arrowRightImage.getHeight()), arrowLeftButton(arrowLeftImage.getWidth(), arrowLeftImage.getHeight()),
noIcon(Resources::GetFile("noGameIcon.png"), Resources::GetFileSize("noGameIcon.png"), GX2_TEX_CLAMP_MODE_MIRROR), noIcon(Resources::GetFile("noGameIcon.png"), Resources::GetFileSize("noGameIcon.png"), GX2_TEX_CLAMP_MODE_MIRROR),
emptyIcon(Resources::GetFile("iconEmpty.png"), Resources::GetFileSize("iconEmpty.png"), GX2_TEX_CLAMP_MODE_MIRROR), dragListener(w, h) { emptyIcon(Resources::GetFile("iconEmpty.png"), Resources::GetFileSize("iconEmpty.png"), GX2_TEX_CLAMP_MODE_MIRROR), dragListener(w, h) {
particleBgImage.setParent(this); particleBgImage.setParent(this);
setSelectedGame(GameIndex); setSelectedGame(GameIndex);
listOffset = selectedGame / (MAX_COLS * MAX_ROWS); listOffset = selectedGame / (MAX_COLS * MAX_ROWS);
targetLeftPosition = -listOffset * getWidth(); targetLeftPosition = -listOffset * getWidth();
currentLeftPosition = targetLeftPosition; currentLeftPosition = targetLeftPosition;
leftButton.setTrigger(&leftTrigger); leftButton.setTrigger(&leftTrigger);
@ -126,18 +126,18 @@ GuiIconGrid::GuiIconGrid(int32_t w, int32_t h, uint64_t GameIndex, bool sortByNa
GuiIconGrid::~GuiIconGrid() { GuiIconGrid::~GuiIconGrid() {
containerMutex.lock(); containerMutex.lock();
for (auto const &x: gameInfoContainers) { for (auto const &x : gameInfoContainers) {
remove(x.second->button); remove(x.second->button);
delete x.second; delete x.second;
} }
gameInfoContainers.clear(); gameInfoContainers.clear();
containerMutex.unlock(); containerMutex.unlock();
for (auto const &x: emptyButtons) { for (auto const &x : emptyButtons) {
delete x; delete x;
} }
for (auto const &x: emptyIcons) { for (auto const &x : emptyIcons) {
delete x; delete x;
} }
@ -163,7 +163,7 @@ void GuiIconGrid::setSelectedGame(uint64_t idx) {
containerMutex.lock(); containerMutex.lock();
GameInfoContainer *container = nullptr; GameInfoContainer *container = nullptr;
for (auto const &x: gameInfoContainers) { for (auto const &x : gameInfoContainers) {
container = x.second; container = x.second;
if (x.first == idx) { if (x.first == idx) {
container->image->setSelected(true); container->image->setSelected(true);
@ -178,7 +178,7 @@ void GuiIconGrid::setSelectedGame(uint64_t idx) {
if (offset > 0) { if (offset > 0) {
uint32_t newPage = offset / (MAX_COLS * MAX_ROWS); uint32_t newPage = offset / (MAX_COLS * MAX_ROWS);
if (newPage != (uint32_t) curPage) { if (newPage != (uint32_t) curPage) {
curPage = newPage; curPage = newPage;
bUpdatePositions = true; bUpdatePositions = true;
} }
} }
@ -215,10 +215,10 @@ void GuiIconGrid::OnGameTitleListUpdated(GameList *gameList) {
} }
for (int32_t i = 0; i < gameList->size(); i++) { for (int32_t i = 0; i < gameList->size(); i++) {
gameInfo *info = gameList->at(i); gameInfo *info = gameList->at(i);
GameInfoContainer *container = nullptr; GameInfoContainer *container = nullptr;
for (auto const &x: gameInfoContainers) { for (auto const &x : gameInfoContainers) {
if (info->titleId == x.first) { if (info->titleId == x.first) {
container = x.second; container = x.second;
break; break;
@ -233,9 +233,9 @@ void GuiIconGrid::OnGameTitleListUpdated(GameList *gameList) {
gameList->unlock(); gameList->unlock();
setSelectedGame(0); setSelectedGame(0);
gameSelectionChanged(this, selectedGame); gameSelectionChanged(this, selectedGame);
curPage = 0; curPage = 0;
currentLeftPosition = 0; currentLeftPosition = 0;
bUpdatePositions = true; bUpdatePositions = true;
} }
void GuiIconGrid::OnLeftArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) { void GuiIconGrid::OnLeftArrowClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
@ -268,7 +268,6 @@ void GuiIconGrid::OnLeftClick(GuiButton *button, const GuiController *controller
setSelectedGame(newTitleId); setSelectedGame(newTitleId);
gameSelectionChanged(this, selectedGame); gameSelectionChanged(this, selectedGame);
} }
} }
void GuiIconGrid::OnRightClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) { void GuiIconGrid::OnRightClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
@ -379,7 +378,7 @@ void GuiIconGrid::OnGameButtonHeld(GuiButton *button, const GuiController *contr
if (currentlyHeld == nullptr) { if (currentlyHeld == nullptr) {
bool found = false; bool found = false;
// We don't want to drag empty buttons // We don't want to drag empty buttons
for (auto const &x: emptyButtons) { for (auto const &x : emptyButtons) {
if (x == button) { if (x == button) {
found = true; found = true;
break; break;
@ -395,11 +394,9 @@ void GuiIconGrid::OnGameButtonHeld(GuiButton *button, const GuiController *contr
} }
void GuiIconGrid::OnGameButtonPointedOn(GuiButton *button, const GuiController *controller) { void GuiIconGrid::OnGameButtonPointedOn(GuiButton *button, const GuiController *controller) {
} }
void GuiIconGrid::OnGameButtonPointedOff(GuiButton *button, const GuiController *controller) { void GuiIconGrid::OnGameButtonPointedOff(GuiButton *button, const GuiController *controller) {
} }
void GuiIconGrid::OnDrag(GuiDragListener *element, const GuiController *controller, GuiTrigger *trigger, int32_t dx, int32_t dy) { void GuiIconGrid::OnDrag(GuiDragListener *element, const GuiController *controller, GuiTrigger *trigger, int32_t dx, int32_t dy) {
@ -412,7 +409,7 @@ void GuiIconGrid::OnDrag(GuiDragListener *element, const GuiController *controll
void GuiIconGrid::OnGameButtonClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) { void GuiIconGrid::OnGameButtonClick(GuiButton *button, const GuiController *controller, GuiTrigger *trigger) {
containerMutex.lock(); containerMutex.lock();
for (auto const &x: gameInfoContainers) { for (auto const &x : gameInfoContainers) {
if (x.second->button == button) { if (x.second->button == button) {
if (selectedGame == (x.second->info->titleId)) { if (selectedGame == (x.second->info->titleId)) {
if (gameLaunchTimer < 30) if (gameLaunchTimer < 30)
@ -466,7 +463,7 @@ void GuiIconGrid::OnGameTitleAdded(gameInfo *info) {
bool foundFreePlace = false; bool foundFreePlace = false;
for (uint32_t i = 0; i < position.size(); i++) { for (uint32_t i = 0; i < position.size(); i++) {
if (position[i] == 0) { if (position[i] == 0) {
position[i] = info->titleId; position[i] = info->titleId;
foundFreePlace = true; foundFreePlace = true;
break; break;
} }
@ -483,7 +480,7 @@ void GuiIconGrid::OnGameTitleUpdated(gameInfo *info) {
DEBUG_FUNCTION_LINE("Updating infos of %016llX", info->titleId); DEBUG_FUNCTION_LINE("Updating infos of %016llX", info->titleId);
GameInfoContainer *container = nullptr; GameInfoContainer *container = nullptr;
containerMutex.lock(); containerMutex.lock();
for (auto const &x: gameInfoContainers) { for (auto const &x : gameInfoContainers) {
if (info->titleId == x.first) { if (info->titleId == x.first) {
container = x.second; container = x.second;
break; break;
@ -514,7 +511,7 @@ void GuiIconGrid::process() {
std::copy(gameInfoContainers.begin(), gameInfoContainers.end(), std::back_inserter<std::vector<std::pair<uint64_t, GameInfoContainer *>>>(vec)); std::copy(gameInfoContainers.begin(), gameInfoContainers.end(), std::back_inserter<std::vector<std::pair<uint64_t, GameInfoContainer *>>>(vec));
containerMutex.unlock(); containerMutex.unlock();
uint64_t targetTitleId = 0; uint64_t targetTitleId = 0;
for (auto const &x: vec) { for (auto const &x : vec) {
if (x.second->button == dragTarget) { if (x.second->button == dragTarget) {
targetTitleId = x.first; targetTitleId = x.first;
break; break;
@ -543,11 +540,11 @@ void GuiIconGrid::process() {
} }
} }
positionMutex.unlock(); positionMutex.unlock();
currentlyHeld = nullptr; currentlyHeld = nullptr;
currentlyHeldTitleId = 0; currentlyHeldTitleId = 0;
currentlyHeldPosition = -1; currentlyHeldPosition = -1;
bUpdatePositions = true; bUpdatePositions = true;
} else { } else {
//DEBUG_FUNCTION_LINE("Holding it"); //DEBUG_FUNCTION_LINE("Holding it");
bUpdatePositions = true; bUpdatePositions = true;
@ -602,14 +599,14 @@ void GuiIconGrid::updateButtonPositions() {
containerMutex.unlock(); containerMutex.unlock();
for (auto const &x: vec) { for (auto const &x : vec) {
if (x.second->button == currentlyHeld) { if (x.second->button == currentlyHeld) {
currentlyHeldTitleId = x.first; currentlyHeldTitleId = x.first;
} }
remove(x.second->button); remove(x.second->button);
} }
for (auto const &x: emptyButtons) { for (auto const &x : emptyButtons) {
remove(x); remove(x);
} }
@ -629,12 +626,12 @@ void GuiIconGrid::updateButtonPositions() {
for (uint32_t i = 0; i < position.size(); i++) { for (uint32_t i = 0; i < position.size(); i++) {
if (position[i] == currentlyHeldTitleId) { if (position[i] == currentlyHeldTitleId) {
currentlyHeldPosition = i; currentlyHeldPosition = i;
position[i] = 0; position[i] = 0;
} }
} }
uint32_t elementSize = position.size(); uint32_t elementSize = position.size();
uint32_t pages = (elementSize / (MAX_COLS * MAX_ROWS)) + 1; uint32_t pages = (elementSize / (MAX_COLS * MAX_ROWS)) + 1;
if (elementSize % (MAX_COLS * MAX_ROWS) == 0) { if (elementSize % (MAX_COLS * MAX_ROWS) == 0) {
pages--; pages--;
} }
@ -662,10 +659,10 @@ void GuiIconGrid::updateButtonPositions() {
} }
uint32_t startPage = -(currentLeftPosition / getWidth()); uint32_t startPage = -(currentLeftPosition / getWidth());
uint32_t endPage = startPage; uint32_t endPage = startPage;
if (targetLeftPosition != currentLeftPosition) { if (targetLeftPosition != currentLeftPosition) {
for (auto const &x: vec) { for (auto const &x : vec) {
x.second->button->setHoldable(false); x.second->button->setHoldable(false);
} }
endPage++; endPage++;
@ -673,7 +670,7 @@ void GuiIconGrid::updateButtonPositions() {
endPage = pages; endPage = pages;
} }
} else { } else {
for (auto const &x: vec) { for (auto const &x : vec) {
x.second->button->setHoldable(true); x.second->button->setHoldable(true);
} }
} }
@ -685,10 +682,10 @@ void GuiIconGrid::updateButtonPositions() {
} }
for (uint32_t i = startPage * (MAX_COLS * MAX_ROWS); i < (endPage + 1) * (MAX_COLS * MAX_ROWS); i++) { for (uint32_t i = startPage * (MAX_COLS * MAX_ROWS); i < (endPage + 1) * (MAX_COLS * MAX_ROWS); i++) {
listOff = i / (MAX_COLS * MAX_ROWS); listOff = i / (MAX_COLS * MAX_ROWS);
GuiButton *element = nullptr; GuiButton *element = nullptr;
float posX = currentLeftPosition + listOff * width + (col * (noIcon.getWidth() + noIcon.getWidth() * 0.5f) - (MAX_COLS * 0.5f - 0.5f) * (noIcon.getWidth() + noIcon.getWidth() * 0.5f)); float posX = currentLeftPosition + listOff * width + (col * (noIcon.getWidth() + noIcon.getWidth() * 0.5f) - (MAX_COLS * 0.5f - 0.5f) * (noIcon.getWidth() + noIcon.getWidth() * 0.5f));
float posY = -row * (noIcon.getHeight() + noIcon.getHeight() * 0.5f) + (MAX_ROWS * 0.5f - 0.5f) * (noIcon.getHeight() + noIcon.getHeight() * 0.5f) + 30.0f; float posY = -row * (noIcon.getHeight() + noIcon.getHeight() * 0.5f) + (MAX_ROWS * 0.5f - 0.5f) * (noIcon.getHeight() + noIcon.getHeight() * 0.5f) + 30.0f;
if (i < position.size()) { if (i < position.size()) {
uint64_t titleID = position.at(i); uint64_t titleID = position.at(i);

18
src/gui/GuiIconGrid.h
View File

@ -16,13 +16,13 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <map>
#include "gui/GuiTitleBrowser.h"
#include "gui/GameIcon.h" #include "gui/GameIcon.h"
#include "gui/GuiDragListener.h" #include "gui/GuiDragListener.h"
#include <gui/GuiParticleImage.h> #include "gui/GuiTitleBrowser.h"
#include "utils/AsyncExecutor.h" #include "utils/AsyncExecutor.h"
#include "utils/logger.h" #include "utils/logger.h"
#include <gui/GuiParticleImage.h>
#include <map>
class GuiIconGrid : public GuiTitleBrowser, public sigslot::has_slots<> { class GuiIconGrid : public GuiTitleBrowser, public sigslot::has_slots<> {
public: public:
@ -131,17 +131,17 @@ private:
int32_t currentLeftPosition; int32_t currentLeftPosition;
int32_t targetLeftPosition; int32_t targetLeftPosition;
uint32_t gameLaunchTimer; uint32_t gameLaunchTimer;
bool bUpdatePositions = false; bool bUpdatePositions = false;
GuiButton *currentlyHeld = nullptr; GuiButton *currentlyHeld = nullptr;
uint64_t currentlyHeldTitleId = 0; uint64_t currentlyHeldTitleId = 0;
int32_t currentlyHeldPosition = -1; int32_t currentlyHeldPosition = -1;
GuiButton *dragTarget = nullptr; GuiButton *dragTarget = nullptr;
class GameInfoContainer { class GameInfoContainer {
public: public:
GameInfoContainer(GuiButton *button, GameIcon *image, gameInfo *info) { GameInfoContainer(GuiButton *button, GameIcon *image, gameInfo *info) {
this->image = image; this->image = image;
this->info = info; this->info = info;
this->button = button; this->button = button;
} }
@ -173,6 +173,4 @@ private:
std::vector<GuiImage *> emptyIcons; std::vector<GuiImage *> emptyIcons;
std::vector<GuiButton *> emptyButtons; std::vector<GuiButton *> emptyButtons;
}; };

2
src/gui/GuiTitleBrowser.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "game/GameList.h"
#include <gui/Gui.h> #include <gui/Gui.h>
#include <gui/sigslot.h> #include <gui/sigslot.h>
#include "game/GameList.h"
class GuiTitleBrowser : public GuiFrame { class GuiTitleBrowser : public GuiFrame {
public: public:

34
src/menu/GameSplashScreen.cpp
View File

@ -1,25 +1,23 @@
#include "GameSplashScreen.h" #include "GameSplashScreen.h"
#include "utils/logger.h"
#include "common/common.h" #include "common/common.h"
#include "fs/FSUtils.h" #include "fs/FSUtils.h"
#include "utils/AsyncExecutor.h" #include "utils/AsyncExecutor.h"
#include "utils/logger.h"
GameSplashScreen::GameSplashScreen(int32_t w, int32_t h, gameInfo *info, bool onTV) : GuiFrame(w, h), GameSplashScreen::GameSplashScreen(int32_t w, int32_t h, gameInfo *info, bool onTV) : GuiFrame(w, h),
bgImageColor(w, h, (GX2Color) { bgImageColor(w, h, (GX2Color){0, 0, 0, 0}) {
0, 0, 0, 0 bgImageColor.setImageColor((GX2Color){
}) { 79, 153, 239, 255},
bgImageColor.setImageColor((GX2Color) { 0);
79, 153, 239, 255 bgImageColor.setImageColor((GX2Color){
}, 0); 79, 153, 239, 255},
bgImageColor.setImageColor((GX2Color) { 1);
79, 153, 239, 255 bgImageColor.setImageColor((GX2Color){
}, 1); 59, 159, 223, 255},
bgImageColor.setImageColor((GX2Color) { 2);
59, 159, 223, 255 bgImageColor.setImageColor((GX2Color){
}, 2); 59, 159, 223, 255},
bgImageColor.setImageColor((GX2Color) { 3);
59, 159, 223, 255
}, 3);
append(&bgImageColor); append(&bgImageColor);
this->onTV = onTV; this->onTV = onTV;
this->info = info; this->info = info;
@ -28,9 +26,9 @@ GameSplashScreen::GameSplashScreen(int32_t w, int32_t h, gameInfo *info, bool on
if (onTV) { if (onTV) {
filepath = "fs:" + info->gamePath + META_PATH + "/bootTVTex.tga"; filepath = "fs:" + info->gamePath + META_PATH + "/bootTVTex.tga";
} }
uint8_t *buffer = nullptr; uint8_t *buffer = nullptr;
uint32_t bufferSize = 0; uint32_t bufferSize = 0;
int iResult = FSUtils::LoadFileToMem(filepath.c_str(), &buffer, &bufferSize); int iResult = FSUtils::LoadFileToMem(filepath.c_str(), &buffer, &bufferSize);
if (iResult > 0) { if (iResult > 0) {
splashScreenData = new GuiImageData(buffer, bufferSize, GX2_TEX_CLAMP_MODE_MIRROR); splashScreenData = new GuiImageData(buffer, bufferSize, GX2_TEX_CLAMP_MODE_MIRROR);
if (splashScreenData) { if (splashScreenData) {

11
src/menu/GameSplashScreen.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "game/GameList.h" #include "game/GameList.h"
#include <gui/GuiImage.h>
#include <gui/GuiFrame.h> #include <gui/GuiFrame.h>
#include <gui/GuiImage.h>
class GameSplashScreen : public GuiFrame, public sigslot::has_slots<> { class GameSplashScreen : public GuiFrame, public sigslot::has_slots<> {
public: public:
@ -15,11 +15,12 @@ public:
virtual void draw(CVideo *v); virtual void draw(CVideo *v);
sigslot::signal3<GuiElement *, gameInfo *, bool> gameGameSplashScreenFinished; sigslot::signal3<GuiElement *, gameInfo *, bool> gameGameSplashScreenFinished;
private: private:
GuiImage bgImageColor; GuiImage bgImageColor;
GuiImageData *splashScreenData = nullptr; GuiImageData *splashScreenData = nullptr;
gameInfo *info = nullptr; gameInfo *info = nullptr;
bool launchGame = false; bool launchGame = false;
uint32_t frameCounter = 0; uint32_t frameCounter = 0;
bool onTV = false; bool onTV = false;
}; };

10
src/menu/KeyboardHelper.cpp
View File

@ -1,7 +1,7 @@
#include <nn/swkbd.h>
#include "KeyboardHelper.h" #include "KeyboardHelper.h"
#include "utils/logger.h" #include "utils/logger.h"
#include <coreinit/memdefaultheap.h> #include <coreinit/memdefaultheap.h>
#include <nn/swkbd.h>
KeyboardHelper::KeyboardHelper() { KeyboardHelper::KeyboardHelper() {
auto *_fsClient = (FSClient *) MEMAllocFromDefaultHeap(sizeof(FSClient)); auto *_fsClient = (FSClient *) MEMAllocFromDefaultHeap(sizeof(FSClient));
@ -12,9 +12,9 @@ KeyboardHelper::KeyboardHelper() {
createArg.regionType = nn::swkbd::RegionType::Europe; createArg.regionType = nn::swkbd::RegionType::Europe;
createArg.workMemory = MEMAllocFromDefaultHeap(nn::swkbd::GetWorkMemorySize(0)); createArg.workMemory = MEMAllocFromDefaultHeap(nn::swkbd::GetWorkMemorySize(0));
memset(createArg.workMemory, 0, sizeof(nn::swkbd::GetWorkMemorySize(0))); memset(createArg.workMemory, 0, sizeof(nn::swkbd::GetWorkMemorySize(0)));
this->workMemory = createArg.workMemory; this->workMemory = createArg.workMemory;
createArg.fsClient = _fsClient; createArg.fsClient = _fsClient;
this->fsClient = createArg.fsClient; this->fsClient = createArg.fsClient;
DEBUG_FUNCTION_LINE("Calling create"); DEBUG_FUNCTION_LINE("Calling create");
if (!nn::swkbd::Create(createArg)) { if (!nn::swkbd::Create(createArg)) {
DEBUG_FUNCTION_LINE("Failed to create keyboard"); DEBUG_FUNCTION_LINE("Failed to create keyboard");
@ -64,7 +64,7 @@ bool KeyboardHelper::checkResult() {
} }
// Update keyboard // Update keyboard
nn::swkbd::ControllerInfo controllerInfo; nn::swkbd::ControllerInfo controllerInfo;
controllerInfo.vpad = &vpadStatus; controllerInfo.vpad = &vpadStatus;
controllerInfo.kpad[0] = nullptr; controllerInfo.kpad[0] = nullptr;
controllerInfo.kpad[1] = nullptr; controllerInfo.kpad[1] = nullptr;
controllerInfo.kpad[2] = nullptr; controllerInfo.kpad[2] = nullptr;
@ -98,7 +98,7 @@ bool KeyboardHelper::checkResult() {
} }
} }
this->resultStr = logStr; this->resultStr = logStr;
keyboardOpen = false; keyboardOpen = false;
nn::swkbd::DisappearInputForm(); nn::swkbd::DisappearInputForm();
return true; return true;
} }

11
src/menu/KeyboardHelper.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string>
#include <coreinit/filesystem.h> #include <coreinit/filesystem.h>
#include <string>
class KeyboardHelper { class KeyboardHelper {
public: public:
@ -24,10 +24,9 @@ public:
std::string getResult(); std::string getResult();
private: private:
void *workMemory = nullptr;
void *workMemory = nullptr; FSClient *fsClient = nullptr;
FSClient *fsClient = nullptr; bool keyboardOpen = false;
bool keyboardOpen = false; bool keyboardCreated = false;
bool keyboardCreated = false;
std::string resultStr = ""; std::string resultStr = "";
}; };

15
src/menu/MainDrcButtonsFrame.h
View File

@ -23,13 +23,13 @@
class MainDrcButtonsFrame : public GuiFrame, public sigslot::has_slots<> { class MainDrcButtonsFrame : public GuiFrame, public sigslot::has_slots<> {
public: public:
MainDrcButtonsFrame(int32_t w, int32_t h) MainDrcButtonsFrame(int32_t w, int32_t h)
: GuiFrame(w, h), buttonClickSound(Resources::GetSound("settings_click_2.mp3")), screenSwitchSound(Resources::GetSound("screenSwitchSound.mp3")), : GuiFrame(w, h), buttonClickSound(Resources::GetSound("settings_click_2.mp3")), screenSwitchSound(Resources::GetSound("screenSwitchSound.mp3")),
switchIconData(Resources::GetImageData("layoutSwitchButton.png")), settingsIconData(Resources::GetImageData("settingsButton.png")), switchIcon(switchIconData), switchIconData(Resources::GetImageData("layoutSwitchButton.png")), settingsIconData(Resources::GetImageData("settingsButton.png")), switchIcon(switchIconData),
settingsIcon(settingsIconData), switchLayoutButton(switchIcon.getWidth(), switchIcon.getHeight()), settingsButton(settingsIcon.getWidth(), settingsIcon.getHeight()), settingsIcon(settingsIconData), switchLayoutButton(switchIcon.getWidth(), switchIcon.getHeight()), settingsButton(settingsIcon.getWidth(), settingsIcon.getHeight()),
gameListFilterButton(w, h), touchTrigger(GuiTrigger::CHANNEL_1, GuiTrigger::VPAD_TOUCH), gameListFilterButton(w, h), touchTrigger(GuiTrigger::CHANNEL_1, GuiTrigger::VPAD_TOUCH),
wpadTouchTrigger(GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5, GuiTrigger::BUTTON_A), wpadTouchTrigger(GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5, GuiTrigger::BUTTON_A),
settingsTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_ZL, true), switchLayoutTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_ZR, true), settingsTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_ZL, true), switchLayoutTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_ZR, true),
plusTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_PLUS, true) { plusTrigger(GuiTrigger::CHANNEL_ALL, GuiTrigger::BUTTON_PLUS, true) {
settingsButton.setClickable(true); settingsButton.setClickable(true);
settingsButton.setImage(&settingsIcon); settingsButton.setImage(&settingsIcon);
settingsButton.setTrigger(&touchTrigger); settingsButton.setTrigger(&touchTrigger);
@ -69,6 +69,7 @@ public:
sigslot::signal1<GuiElement *> settingsButtonClicked; sigslot::signal1<GuiElement *> settingsButtonClicked;
sigslot::signal1<GuiElement *> layoutSwitchClicked; sigslot::signal1<GuiElement *> layoutSwitchClicked;
sigslot::signal1<GuiElement *> gameListFilterClicked; sigslot::signal1<GuiElement *> gameListFilterClicked;
private: private:
void OnSettingsButtonClick(GuiButton *button, const GuiController *controller, GuiTrigger *) { void OnSettingsButtonClick(GuiButton *button, const GuiController *controller, GuiTrigger *) {
settingsButtonClicked(this); settingsButtonClicked(this);

68
src/menu/MainWindow.cpp
View File

@ -16,25 +16,25 @@
****************************************************************************/ ****************************************************************************/
#include "MainWindow.h" #include "MainWindow.h"
#include "Application.h" #include "Application.h"
#include "utils/logger.h"
#include "utils/StringTools.h" #include "utils/StringTools.h"
#include "utils/logger.h"
#include "resources/Resources.h"
#include "gui/GuiTitleBrowser.h"
#include "gui/GuiIconGrid.h"
#include <sysapp/launch.h>
#include <future>
#include <coreinit/title.h>
#include <nn/acp/title.h>
#include "utils/AsyncExecutor.h"
#include "GameSplashScreen.h" #include "GameSplashScreen.h"
#include "gui/GuiIconGrid.h"
#include "gui/GuiTitleBrowser.h"
#include "resources/Resources.h"
#include "utils/AsyncExecutor.h"
#include <coreinit/title.h>
#include <future>
#include <nn/acp/title.h>
#include <sysapp/launch.h>
MainWindow::MainWindow(int32_t w, int32_t h) MainWindow::MainWindow(int32_t w, int32_t h)
: width(w), height(h), gameClickSound(Resources::GetSound("game_click.mp3")), mainSwitchButtonFrame(nullptr), currentTvFrame(nullptr), currentDrcFrame(nullptr) { : width(w), height(h), gameClickSound(Resources::GetSound("game_click.mp3")), mainSwitchButtonFrame(nullptr), currentTvFrame(nullptr), currentDrcFrame(nullptr) {
for (int32_t i = 0; i < 4; i++) { for (int32_t i = 0; i < 4; i++) {
std::string filename = StringTools::strfmt("player%i_point.png", i + 1); std::string filename = StringTools::strfmt("player%i_point.png", i + 1);
pointerImgData[i] = Resources::GetImageData(filename.c_str()); pointerImgData[i] = Resources::GetImageData(filename.c_str());
pointerImg[i] = new GuiImage(pointerImgData[i]); pointerImg[i] = new GuiImage(pointerImgData[i]);
pointerImg[i]->setScale(1.5f); pointerImg[i]->setScale(1.5f);
pointerValid[i] = false; pointerValid[i] = false;
} }
@ -43,7 +43,6 @@ MainWindow::MainWindow(int32_t w, int32_t h)
gameList.titleUpdated.connect(this, &MainWindow::OnGameTitleUpdated); gameList.titleUpdated.connect(this, &MainWindow::OnGameTitleUpdated);
gameList.titleAdded.connect(this, &MainWindow::OnGameTitleAdded); gameList.titleAdded.connect(this, &MainWindow::OnGameTitleAdded);
AsyncExecutor::execute([&] { gameList.load(); }); AsyncExecutor::execute([&] { gameList.load(); });
} }
MainWindow::~MainWindow() { MainWindow::~MainWindow() {
@ -68,7 +67,7 @@ MainWindow::~MainWindow() {
void MainWindow::updateEffects() { void MainWindow::updateEffects() {
//! dont read behind the initial elements in case one was added //! dont read behind the initial elements in case one was added
uint32_t tvSize = tvElements.size(); uint32_t tvSize = tvElements.size();
uint32_t drcSize = drcElements.size(); uint32_t drcSize = drcElements.size();
for (uint32_t i = 0; (i < drcSize) && (i < drcElements.size()); ++i) { for (uint32_t i = 0; (i < drcSize) && (i < drcElements.size()); ++i) {
@ -90,7 +89,7 @@ void MainWindow::updateEffects() {
void MainWindow::process() { void MainWindow::process() {
//! dont read behind the initial elements in case one was added //! dont read behind the initial elements in case one was added
uint32_t tvSize = tvElements.size(); uint32_t tvSize = tvElements.size();
uint32_t drcSize = drcElements.size(); uint32_t drcSize = drcElements.size();
for (uint32_t i = 0; (i < drcSize) && (i < drcElements.size()); ++i) { for (uint32_t i = 0; (i < drcSize) && (i < drcElements.size()); ++i) {
@ -160,25 +159,25 @@ void MainWindow::update(GuiController *controller) {
} }
} }
// //! only update TV elements that are not updated yet because they are on DRC // //! only update TV elements that are not updated yet because they are on DRC
// for(uint32_t i = 0; (i < tvSize) && (i < tvElements.size()); ++i) // for(uint32_t i = 0; (i < tvSize) && (i < tvElements.size()); ++i)
// { // {
// uint32_t n; // uint32_t n;
// for(n = 0; (n < drcSize) && (n < drcElements.size()); n++) // for(n = 0; (n < drcSize) && (n < drcElements.size()); n++)
// { // {
// if(tvElements[i] == drcElements[n]) // if(tvElements[i] == drcElements[n])
// break; // break;
// } // }
// if(n == drcElements.size()) // if(n == drcElements.size())
// { // {
// tvElements[i]->update(controller); // tvElements[i]->update(controller);
// } // }
// } // }
if (controller->chanIdx >= 1 && controller->chanIdx <= 4 && controller->data.validPointer) { if (controller->chanIdx >= 1 && controller->chanIdx <= 4 && controller->data.validPointer) {
int32_t wpadIdx = controller->chanIdx - 1; int32_t wpadIdx = controller->chanIdx - 1;
float posX = controller->data.x; float posX = controller->data.x;
float posY = controller->data.y; float posY = controller->data.y;
pointerImg[wpadIdx]->setPosition(posX, posY); pointerImg[wpadIdx]->setPosition(posX, posY);
pointerImg[wpadIdx]->setAngle(controller->data.pointerAngle); pointerImg[wpadIdx]->setAngle(controller->data.pointerAngle);
pointerValid[wpadIdx] = true; pointerValid[wpadIdx] = true;
@ -312,8 +311,8 @@ void MainWindow::OnLayoutSwitchEffectFinish(GuiElement *element) {
remove(currentTvFrame); remove(currentTvFrame);
GuiTitleBrowser *tmpElement = currentDrcFrame; GuiTitleBrowser *tmpElement = currentDrcFrame;
currentDrcFrame = currentTvFrame; currentDrcFrame = currentTvFrame;
currentTvFrame = tmpElement; currentTvFrame = tmpElement;
appendTv(currentTvFrame); appendTv(currentTvFrame);
appendDrc(currentDrcFrame); appendDrc(currentDrcFrame);
@ -354,7 +353,6 @@ void MainWindow::OnCloseEffectFinish(GuiElement *element) {
} }
void MainWindow::OnSettingsButtonClicked(GuiElement *element) { void MainWindow::OnSettingsButtonClicked(GuiElement *element) {
} }
void MainWindow::OnGameSelectionChange(GuiTitleBrowser *element, uint64_t selectedIdx) { void MainWindow::OnGameSelectionChange(GuiTitleBrowser *element, uint64_t selectedIdx) {
@ -463,7 +461,7 @@ void MainWindow::OnGameLaunch(uint64_t titleId) {
MCPTitleListType titleInfo; MCPTitleListType titleInfo;
int32_t handle = MCP_Open(); int32_t handle = MCP_Open();
auto err = MCP_GetTitleInfo(handle, titleId, &titleInfo); auto err = MCP_GetTitleInfo(handle, titleId, &titleInfo);
MCP_Close(handle); MCP_Close(handle);
if (err == 0) { if (err == 0) {
ACPAssignTitlePatch(&titleInfo); ACPAssignTitlePatch(&titleInfo);

10
src/menu/MainWindow.h
View File

@ -17,13 +17,13 @@
#ifndef _MAIN_WINDOW_H_ #ifndef _MAIN_WINDOW_H_
#define _MAIN_WINDOW_H_ #define _MAIN_WINDOW_H_
#include <vector>
#include <queue>
#include <gui/Gui.h>
#include "game/GameList.h"
#include "KeyboardHelper.h" #include "KeyboardHelper.h"
#include "gui/GuiTitleBrowser.h"
#include "MainDrcButtonsFrame.h" #include "MainDrcButtonsFrame.h"
#include "game/GameList.h"
#include "gui/GuiTitleBrowser.h"
#include <gui/Gui.h>
#include <queue>
#include <vector>
class CVideo; class CVideo;

34
src/resources/Resources.cpp
View File

@ -1,18 +1,18 @@
#include "Resources.h"
#include "filelist.h"
#include "fs/FSUtils.h"
#include "utils/AsyncExecutor.h"
#include <gui/GuiImageData.h>
#include <gui/GuiSound.h>
#include <malloc.h> #include <malloc.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include "Resources.h"
#include "filelist.h"
#include <gui/GuiSound.h>
#include <gui/GuiImageData.h>
#include "fs/FSUtils.h"
#include "utils/AsyncExecutor.h"
#include <chrono> #include <chrono>
#include <future> #include <future>
#include <iostream> #include <iostream>
#include <thread>
#include <strings.h> #include <strings.h>
#include <thread>
Resources *Resources::instance = nullptr; Resources *Resources::instance = nullptr;
@ -46,12 +46,12 @@ bool Resources::LoadFiles(const char *path) {
fullpath += "/"; fullpath += "/";
fullpath += RecourceList[i].filename; fullpath += RecourceList[i].filename;
uint8_t *buffer = nullptr; uint8_t *buffer = nullptr;
uint32_t filesize = 0; uint32_t filesize = 0;
FSUtils::LoadFileToMem(fullpath.c_str(), &buffer, &filesize); FSUtils::LoadFileToMem(fullpath.c_str(), &buffer, &filesize);
RecourceList[i].CustomFile = buffer; RecourceList[i].CustomFile = buffer;
RecourceList[i].CustomFileSize = (uint32_t) filesize; RecourceList[i].CustomFileSize = (uint32_t) filesize;
result |= (buffer != 0); result |= (buffer != 0);
} }
@ -82,7 +82,7 @@ GuiImageData *Resources::GetImageData(const char *filename) {
if (!instance) if (!instance)
instance = new Resources; instance = new Resources;
std::map<std::string, std::pair<uint32_t, GuiImageData *> >::iterator itr = instance->imageDataMap.find(std::string(filename)); std::map<std::string, std::pair<uint32_t, GuiImageData *>>::iterator itr = instance->imageDataMap.find(std::string(filename));
if (itr != instance->imageDataMap.end()) { if (itr != instance->imageDataMap.end()) {
itr->second.first++; itr->second.first++;
return itr->second.second; return itr->second.second;
@ -96,8 +96,8 @@ GuiImageData *Resources::GetImageData(const char *filename) {
if (buff == nullptr) if (buff == nullptr)
return nullptr; return nullptr;
GuiImageData *image = new GuiImageData(buff, size); GuiImageData *image = new GuiImageData(buff, size);
instance->imageDataMap[std::string(filename)].first = 1; instance->imageDataMap[std::string(filename)].first = 1;
instance->imageDataMap[std::string(filename)].second = image; instance->imageDataMap[std::string(filename)].second = image;
return image; return image;
@ -108,7 +108,7 @@ GuiImageData *Resources::GetImageData(const char *filename) {
} }
void Resources::RemoveImageData(GuiImageData *image) { void Resources::RemoveImageData(GuiImageData *image) {
std::map<std::string, std::pair<uint32_t, GuiImageData *> >::iterator itr; std::map<std::string, std::pair<uint32_t, GuiImageData *>>::iterator itr;
for (itr = instance->imageDataMap.begin(); itr != instance->imageDataMap.end(); itr++) { for (itr = instance->imageDataMap.begin(); itr != instance->imageDataMap.end(); itr++) {
if (itr->second.second == image) { if (itr->second.second == image) {
@ -128,7 +128,7 @@ GuiSound *Resources::GetSound(const char *filename) {
if (!instance) if (!instance)
instance = new Resources; instance = new Resources;
std::map<std::string, std::pair<uint32_t, GuiSound *> >::iterator itr = instance->soundDataMap.find(std::string(filename)); std::map<std::string, std::pair<uint32_t, GuiSound *>>::iterator itr = instance->soundDataMap.find(std::string(filename));
if (itr != instance->soundDataMap.end()) { if (itr != instance->soundDataMap.end()) {
itr->second.first++; itr->second.first++;
return itr->second.second; return itr->second.second;
@ -142,8 +142,8 @@ GuiSound *Resources::GetSound(const char *filename) {
if (buff == nullptr) if (buff == nullptr)
return nullptr; return nullptr;
GuiSound *sound = new GuiSound(buff, size); GuiSound *sound = new GuiSound(buff, size);
instance->soundDataMap[std::string(filename)].first = 1; instance->soundDataMap[std::string(filename)].first = 1;
instance->soundDataMap[std::string(filename)].second = sound; instance->soundDataMap[std::string(filename)].second = sound;
return sound; return sound;
@ -154,7 +154,7 @@ GuiSound *Resources::GetSound(const char *filename) {
} }
void Resources::RemoveSound(GuiSound *sound) { void Resources::RemoveSound(GuiSound *sound) {
std::map<std::string, std::pair<uint32_t, GuiSound *> >::iterator itr; std::map<std::string, std::pair<uint32_t, GuiSound *>>::iterator itr;
for (itr = instance->soundDataMap.begin(); itr != instance->soundDataMap.end(); itr++) { for (itr = instance->soundDataMap.begin(); itr != instance->soundDataMap.end(); itr++) {
if (itr->second.second == sound) { if (itr->second.second == sound) {

5
src/resources/Resources.h
View File

@ -2,6 +2,7 @@
#include <map> #include <map>
#include <stdint.h> #include <stdint.h>
#include <string>
//! forward declaration //! forward declaration
class GuiImageData; class GuiImageData;
@ -33,6 +34,6 @@ private:
~Resources() {} ~Resources() {}
std::map<std::string, std::pair<uint32_t, GuiImageData *> > imageDataMap; std::map<std::string, std::pair<uint32_t, GuiImageData *>> imageDataMap;
std::map<std::string, std::pair<uint32_t, GuiSound *> > soundDataMap; std::map<std::string, std::pair<uint32_t, GuiSound *>> soundDataMap;
}; };

58
src/system/CThread.h
View File

@ -17,29 +17,26 @@
#ifndef CTHREAD_H_ #ifndef CTHREAD_H_
#define CTHREAD_H_ #define CTHREAD_H_
#include <coreinit/thread.h>
#include <malloc.h> #include <malloc.h>
#include <unistd.h> #include <unistd.h>
#include <coreinit/thread.h>
class CThread { class CThread {
public: public:
typedef void (* Callback)(CThread *thread, void *arg); typedef void (*Callback)(CThread *thread, void *arg);
//! constructor //! constructor
CThread(int32_t iAttr, int32_t iPriority = 16, int32_t iStackSize = 0x8000, CThread::Callback callback = nullptr, void *callbackArg = nullptr) CThread(int32_t iAttr, int32_t iPriority = 16, int32_t iStackSize = 0x8000, CThread::Callback callback = nullptr, void *callbackArg = nullptr)
: pThread(nullptr) : pThread(nullptr), pThreadStack(nullptr), pCallback(callback), pCallbackArg(callbackArg) {
, pThreadStack(nullptr)
, pCallback(callback)
, pCallbackArg(callbackArg) {
//! save attribute assignment //! save attribute assignment
iAttributes = iAttr; iAttributes = iAttr;
//! allocate the thread //! allocate the thread
pThread = (OSThread*)memalign(8, sizeof(OSThread)); pThread = (OSThread *) memalign(8, sizeof(OSThread));
//! allocate the stack //! allocate the stack
pThreadStack = (uint8_t *) memalign(0x20, iStackSize); pThreadStack = (uint8_t *) memalign(0x20, iStackSize);
//! create the thread //! create the thread
if(pThread && pThreadStack) if (pThread && pThreadStack)
OSCreateThread(pThread, &CThread::threadCallback, 1, (char*)this, pThreadStack+iStackSize, iStackSize, iPriority, iAttributes); OSCreateThread(pThread, &CThread::threadCallback, 1, (char *) this, pThreadStack + iStackSize, iStackSize, iPriority, iAttributes);
} }
//! destructor //! destructor
@ -48,46 +45,46 @@ public:
} }
static CThread *create(CThread::Callback callback, void *callbackArg, int32_t iAttr = eAttributeNone, int32_t iPriority = 16, int32_t iStackSize = 0x8000) { static CThread *create(CThread::Callback callback, void *callbackArg, int32_t iAttr = eAttributeNone, int32_t iPriority = 16, int32_t iStackSize = 0x8000) {
return ( new CThread(iAttr, iPriority, iStackSize, callback, callbackArg) ); return (new CThread(iAttr, iPriority, iStackSize, callback, callbackArg));
} }
//! Get thread ID //! Get thread ID
virtual void* getThread() const { virtual void *getThread() const {
return pThread; return pThread;
} }
//! Thread entry function //! Thread entry function
virtual void executeThread(void) { virtual void executeThread(void) {
if(pCallback) if (pCallback)
pCallback(this, pCallbackArg); pCallback(this, pCallbackArg);
} }
//! Suspend thread //! Suspend thread
virtual void suspendThread(void) { virtual void suspendThread(void) {
if(isThreadSuspended()) if (isThreadSuspended())
return; return;
if(pThread) if (pThread)
OSSuspendThread(pThread); OSSuspendThread(pThread);
} }
//! Resume thread //! Resume thread
virtual void resumeThread(void) { virtual void resumeThread(void) {
if(!isThreadSuspended()) if (!isThreadSuspended())
return; return;
if(pThread) if (pThread)
OSResumeThread(pThread); OSResumeThread(pThread);
} }
//! Set thread priority //! Set thread priority
virtual void setThreadPriority(int32_t prio) { virtual void setThreadPriority(int32_t prio) {
if(pThread) if (pThread)
OSSetThreadPriority(pThread, prio); OSSetThreadPriority(pThread, prio);
} }
//! Check if thread is suspended //! Check if thread is suspended
virtual bool isThreadSuspended(void) const { virtual bool isThreadSuspended(void) const {
if(pThread) if (pThread)
return OSIsThreadSuspended(pThread); return OSIsThreadSuspended(pThread);
return false; return false;
} }
//! Check if thread is terminated //! Check if thread is terminated
virtual bool isThreadTerminated(void) const { virtual bool isThreadTerminated(void) const {
if(pThread) if (pThread)
return OSIsThreadTerminated(pThread); return OSIsThreadTerminated(pThread);
return false; return false;
} }
@ -98,30 +95,31 @@ public:
//! Shutdown thread //! Shutdown thread
virtual void shutdownThread(void) { virtual void shutdownThread(void) {
//! wait for thread to finish //! wait for thread to finish
if(pThread && !(iAttributes & eAttributeDetach)) { if (pThread && !(iAttributes & eAttributeDetach)) {
if(isThreadSuspended()) if (isThreadSuspended())
resumeThread(); resumeThread();
OSJoinThread(pThread, nullptr); OSJoinThread(pThread, nullptr);
} }
//! free the thread stack buffer //! free the thread stack buffer
if(pThreadStack) if (pThreadStack)
free(pThreadStack); free(pThreadStack);
if(pThread) if (pThread)
free(pThread); free(pThread);
pThread = nullptr; pThread = nullptr;
pThreadStack = nullptr; pThreadStack = nullptr;
} }
//! Thread attributes //! Thread attributes
enum eCThreadAttributes { enum eCThreadAttributes {
eAttributeNone = 0x07, eAttributeNone = 0x07,
eAttributeAffCore0 = 0x01, eAttributeAffCore0 = 0x01,
eAttributeAffCore1 = 0x02, eAttributeAffCore1 = 0x02,
eAttributeAffCore2 = 0x04, eAttributeAffCore2 = 0x04,
eAttributeDetach = 0x08, eAttributeDetach = 0x08,
eAttributePinnedAff = 0x10 eAttributePinnedAff = 0x10
}; };
private: private:
static int32_t threadCallback(int32_t argc, const char **argv) { static int32_t threadCallback(int32_t argc, const char **argv) {
//! After call to start() continue with the internal function //! After call to start() continue with the internal function

2
src/utils/AsyncExecutor.cpp
View File

@ -14,7 +14,7 @@ AsyncExecutor::AsyncExecutor() {
while (!exitThread) { while (!exitThread) {
mutex.lock(); mutex.lock();
bool emptyList = elements.empty(); bool emptyList = elements.empty();
auto it = elements.begin(); auto it = elements.begin();
while (it != elements.end()) { while (it != elements.end()) {
auto future = it; auto future = it;
auto status = future->wait_for(std::chrono::seconds(0)); auto status = future->wait_for(std::chrono::seconds(0));

12
src/utils/AsyncExecutor.h
View File

@ -1,12 +1,12 @@
#pragma once #pragma once
#include <vector>
#include <future>
#include <thread>
#include <queue>
#include <gui/GuiElement.h>
#include <coreinit/cache.h>
#include "utils/logger.h" #include "utils/logger.h"
#include <coreinit/cache.h>
#include <future>
#include <gui/GuiElement.h>
#include <queue>
#include <thread>
#include <vector>
class AsyncExecutor { class AsyncExecutor {
public: public:

24
src/utils/StringTools.cpp
View File

@ -23,17 +23,16 @@
* *
* for WiiXplorer 2010 * for WiiXplorer 2010
***************************************************************************/ ***************************************************************************/
#include <vector>
#include <string>
#include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <string.h>
#include <wchar.h> #include <string>
#include <strings.h> #include <strings.h>
#include <wut_types.h>
#include <stdio.h>
#include <utils/StringTools.h> #include <utils/StringTools.h>
#include <vector>
#include <wchar.h>
#include <wut_types.h>
BOOL StringTools::EndsWith(const std::string &a, const std::string &b) { BOOL StringTools::EndsWith(const std::string &a, const std::string &b) {
@ -85,7 +84,7 @@ const wchar_t *StringTools::wfmt(const char *format, ...) {
static char tmp[512]; static char tmp[512];
static wchar_t strWChar[512]; static wchar_t strWChar[512];
strWChar[0] = 0; strWChar[0] = 0;
tmp[0] = 0; tmp[0] = 0;
if (!format) if (!format)
return (const wchar_t *) strWChar; return (const wchar_t *) strWChar;
@ -98,7 +97,7 @@ const wchar_t *StringTools::wfmt(const char *format, ...) {
if ((vsprintf(tmp, format, va) >= 0)) { if ((vsprintf(tmp, format, va) >= 0)) {
int32_t bt; int32_t bt;
int32_t strlength = strlen(tmp); int32_t strlength = strlen(tmp);
bt = mbstowcs(strWChar, tmp, (strlength < 512) ? strlength : 512); bt = mbstowcs(strWChar, tmp, (strlength < 512) ? strlength : 512);
if (bt > 0) { if (bt > 0) {
strWChar[bt] = 0; strWChar[bt] = 0;
@ -112,13 +111,13 @@ const wchar_t *StringTools::wfmt(const char *format, ...) {
int32_t StringTools::strprintf(std::string &str, const char *format, ...) { int32_t StringTools::strprintf(std::string &str, const char *format, ...) {
static char tmp[512]; static char tmp[512];
tmp[0] = 0; tmp[0] = 0;
int32_t result = 0; int32_t result = 0;
va_list va; va_list va;
va_start(va, format); va_start(va, format);
if ((vsprintf(tmp, format, va) >= 0)) { if ((vsprintf(tmp, format, va) >= 0)) {
str = tmp; str = tmp;
result = str.size(); result = str.size();
} }
va_end(va); va_end(va);
@ -214,7 +213,6 @@ bool StringTools::findStringIC(const std::string &strHaystack, const std::string
auto it = std::search( auto it = std::search(
strHaystack.begin(), strHaystack.end(), strHaystack.begin(), strHaystack.end(),
strNeedle.begin(), strNeedle.end(), strNeedle.begin(), strNeedle.end(),
[](char ch1, char ch2) { return std::toupper(ch1) == std::toupper(ch2); } [](char ch1, char ch2) { return std::toupper(ch1) == std::toupper(ch2); });
);
return (it != strHaystack.end()); return (it != strHaystack.end());
} }

9
src/utils/StringTools.h
View File

@ -26,11 +26,11 @@
#ifndef __STRING_TOOLS_H #ifndef __STRING_TOOLS_H
#define __STRING_TOOLS_H #define __STRING_TOOLS_H
#include <vector>
#include <string>
#include <wut_types.h>
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <string>
#include <vector>
#include <wut_types.h>
class StringTools { class StringTools {
public: public:
@ -58,7 +58,7 @@ public:
if (!path) if (!path)
return path; return path;
const char *ptr = path; const char *ptr = path;
const char *Filename = ptr; const char *Filename = ptr;
while (*ptr != '\0') { while (*ptr != '\0') {
@ -91,4 +91,3 @@ public:
}; };
#endif /* __STRING_TOOLS_H */ #endif /* __STRING_TOOLS_H */

15
src/utils/logger.h
View File

@ -1,24 +1,25 @@
#pragma once #pragma once
#include <whb/log.h>
#include <string.h> #include <string.h>
#include <whb/log.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) #define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__) #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
#define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \ #define DEBUG_FUNCTION_LINE(FMT, ARGS...) \
WHBLogPrintf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \ do { \
WHBLogPrintf("[%23s]%30s@L%04d: " FMT "", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
} while (0) } while (0)
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \ #define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) \
WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \ do { \
WHBLogWritef("[%23s]%30s@L%04d: " FMT "", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
} while (0) } while (0)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

6
src/utils/utils.c
View File

@ -1,9 +1,9 @@
#include <string.h> #include <malloc.h>
#include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <malloc.h> #include <stdlib.h>
#include <string.h>
#include <utils/logger.h> #include <utils/logger.h>
// https://gist.github.com/ccbrown/9722406 // https://gist.github.com/ccbrown/9722406

29
src/utils/utils.h
View File

@ -7,23 +7,24 @@
extern "C" { extern "C" {
#endif #endif
#define LIMIT(x, min, max) \ #define LIMIT(x, min, max) \
({ \ ({ \
typeof( x ) _x = x; \ typeof(x) _x = x; \
typeof( min ) _min = min; \ typeof(min) _min = min; \
typeof( max ) _max = max; \ typeof(max) _max = max; \
( ( ( _x ) < ( _min ) ) ? ( _min ) : ( ( _x ) > ( _max ) ) ? ( _max) : ( _x ) ); \ (((_x) < (_min)) ? (_min) : ((_x) > (_max)) ? (_max) \
}) : (_x)); \
})
#define DegToRad(a) ( (a) * 0.01745329252f ) #define DegToRad(a) ((a) *0.01745329252f)
#define RadToDeg(a) ( (a) * 57.29577951f ) #define RadToDeg(a) ((a) *57.29577951f)
#define ALIGN4(x) (((x) + 3) & ~3) #define ALIGN4(x) (((x) + 3) & ~3)
#define ALIGN32(x) (((x) + 31) & ~31) #define ALIGN32(x) (((x) + 31) & ~31)
#define le16(i) ((((uint16_t) ((i) & 0xFF)) << 8) | ((uint16_t) (((i) & 0xFF00) >> 8))) #define le16(i) ((((uint16_t) ((i) &0xFF)) << 8) | ((uint16_t) (((i) &0xFF00) >> 8)))
#define le32(i) ((((uint32_t)le16((i) & 0xFFFF)) << 16) | ((uint32_t)le16(((i) & 0xFFFF0000) >> 16))) #define le32(i) ((((uint32_t) le16((i) &0xFFFF)) << 16) | ((uint32_t) le16(((i) &0xFFFF0000) >> 16)))
#define le64(i) ((((uint64_t)le32((i) & 0xFFFFFFFFLL)) << 32) | ((uint64_t)le32(((i) & 0xFFFFFFFF00000000LL) >> 32))) #define le64(i) ((((uint64_t) le32((i) &0xFFFFFFFFLL)) << 32) | ((uint64_t) le32(((i) &0xFFFFFFFF00000000LL) >> 32)))
//Needs to have log_init() called beforehand. //Needs to have log_init() called beforehand.
void dumpHex(const void *data, size_t size); void dumpHex(const void *data, size_t size);