From 699e5f0ff583bdde56c137741e97c2c7fe3297af Mon Sep 17 00:00:00 2001 From: Wolf3s <75867486+wolfysdl@users.noreply.github.com> Date: Sun, 4 Jun 2023 09:36:57 -0300 Subject: [PATCH 1/2] misc cleanup --- .vscode/.gitignore | 1 + engine/inc/file/file_utils.hpp | 8 +++++--- .../inc/loaders/texture/builder/texture_builder_data.hpp | 9 +++++---- engine/inc/math/math.hpp | 3 --- engine/src/file/file_utils.cpp | 3 +-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.vscode/.gitignore b/.vscode/.gitignore index dae89fb..8bea732 100644 --- a/.vscode/.gitignore +++ b/.vscode/.gitignore @@ -4,3 +4,4 @@ /c_cpp_properties.json /tasks.json /settings.json +/ps2dev-intellisense \ No newline at end of file diff --git a/engine/inc/file/file_utils.hpp b/engine/inc/file/file_utils.hpp index dd5507d..142856b 100644 --- a/engine/inc/file/file_utils.hpp +++ b/engine/inc/file/file_utils.hpp @@ -11,6 +11,8 @@ #pragma once #include +#include +#include namespace Tyra { @@ -42,9 +44,9 @@ class FileUtils { private: // Argv name+path & just path - char cwd[255]; - char elfName[255]; - char elfPath[255 - 14]; + char cwd[NAME_MAX]; + char elfName[NAME_MAX]; + char elfPath[NAME_MAX - 14]; void setPathInfo(const char* path); }; diff --git a/engine/inc/loaders/texture/builder/texture_builder_data.hpp b/engine/inc/loaders/texture/builder/texture_builder_data.hpp index c6b515d..6adb7bf 100644 --- a/engine/inc/loaders/texture/builder/texture_builder_data.hpp +++ b/engine/inc/loaders/texture/builder/texture_builder_data.hpp @@ -24,13 +24,14 @@ class TextureBuilderData { std::string name; int width, height; - unsigned char* data; + u8* data; TextureBpp bpp; - unsigned char gsComponents; + u8 gsComponents; int clutWidth, clutHeight; - unsigned char* clut; + u8* clut; TextureBpp clutBpp; - unsigned char clutGsComponents; + u8 clutGsComponents; }; + } // namespace Tyra diff --git a/engine/inc/math/math.hpp b/engine/inc/math/math.hpp index 2aa502a..6b8b679 100644 --- a/engine/inc/math/math.hpp +++ b/engine/inc/math/math.hpp @@ -36,9 +36,6 @@ class Math { static int randomi(const int& min, const int& max); static bool equalf(const float& a, const float& b, const float& epsilon = 0.00001F); - - private: - Math(); }; } // namespace Tyra diff --git a/engine/src/file/file_utils.cpp b/engine/src/file/file_utils.cpp index 7277baf..ca31075 100644 --- a/engine/src/file/file_utils.cpp +++ b/engine/src/file/file_utils.cpp @@ -12,8 +12,7 @@ #include #include #include -#include -#include + #include #include #include "file/file_utils.hpp" From ea5849095e7b0893af3bbe84e0fa6164fe1dd4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Guilherme?= <75867486+Wolf3s@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:25:28 -0300 Subject: [PATCH 2/2] Update README.MD --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index 673dc28..5a0f73d 100644 --- a/README.MD +++ b/README.MD @@ -147,7 +147,7 @@ Distributed under the Apache License 2.0 License. See `LICENSE` for more informa Without these guys, Tyra would not happen: * [Dr Henry Fortuna](http://ps2-edu.tensioncore.com/index.html) - for code sources, PS2 academy tutorials * Whole [PS2DEV](https://github.com/ps2dev) team, and specially to [Rick Gaiser](https://github.com/rickgaiser), [fjtrujy](https://github.com/fjtrujy) - for a lot of good tips! -* [Wellington Carvalho](https://github.com/Wellinator), [André Guilheme](https://github.com/wolfysdl) - for testing, contributing to Tyra and sharing cool ideas! +* [Wellington Carvalho](https://github.com/Wellinator), [André Guilheme](https://github.com/Wolf3s) - for testing, contributing to Tyra and sharing cool ideas! * [Leonardo Ono](https://github.com/leonardo-ono) - for software renderer example (with clipping!) * [Lukasz D.K.](https://github.com/lukaszdk) - for huge archive of PS2 stuff * [Guilherme Lampert](https://github.com/glampert) - for code sources