diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index ec78334c..21161234 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -22,11 +22,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Get short SHA - id: slug - run: | - echo "SHA8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_ENV - - name: Compile engine run: | make clean all -C engine @@ -52,7 +47,7 @@ jobs: if: ${{ success() }} uses: actions/upload-artifact@v3 with: - name: binaries-${{ env.SHA8 }} + name: tutorials-elf path: | tutorials/01-hello/bin tutorials/02-sprite/bin @@ -69,6 +64,6 @@ jobs: if: ${{ success() }} uses: actions/upload-artifact@v3 with: - name: tyra-${{ env.SHA8 }} + name: demo-elf path: | demo/bin \ No newline at end of file diff --git a/.vscode/.gitignore b/.vscode/.gitignore index e7e9cc67..cc9f1752 100644 --- a/.vscode/.gitignore +++ b/.vscode/.gitignore @@ -5,3 +5,4 @@ /c_cpp_properties.json /tasks.json /settings.json +/ps2dev-intellisense \ No newline at end of file diff --git a/README.MD b/README.MD index 1e53a85c..545816d0 100644 --- a/README.MD +++ b/README.MD @@ -7,7 +7,7 @@

- Logo + Logo

Tyra

@@ -27,15 +27,12 @@

-[![Stargazers repo roster for h4570/tyra](https://reporoster.com/stars/h4570/tyra)](https://github.com/h4570/tyra/stargazers) - ## Table of Contents * [About the project](#about-the-project) * [Description](#description) * [Tutorials](#tutorials) * [Features](#features) - * [Branches](#branches) * [Contributing](#contributing) * [Games](#games) * [License](#license) @@ -45,8 +42,8 @@ ## About the Project

- Sample code - Sample game + Sample code + Sample game

--- @@ -99,14 +96,10 @@ Decision was simple - I need to create an engine which will handle 3D file loadi * `.md2` 3D file support * `.png` Texture file support -### Branches -* `master` - stable releases - tested on PS2 & PCSX2. -* `develop` - daily builds. +## Contributing See the [open issues](https://github.com/h4570/tyra/issues) for a list of proposed features (and known issues). -## Contributing - Contributions are what make the open source community such an amazing place to be learn, inspire, and create. Any contributions you make are **greatly appreciated**. 1. Fork the Project @@ -148,7 +141,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), [Matías Israelson](https://github.com/israpps) - 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 @@ -162,7 +155,7 @@ Sandro Sobczyński - sandro.sobczynski@gmail.com
- Logo + Logo [contributors-shield]: https://img.shields.io/github/contributors/h4570/tyra.svg?style=flat-square diff --git a/assets/github-splash.png b/assets/github-splash.png new file mode 100644 index 00000000..a0676e30 Binary files /dev/null and b/assets/github-splash.png differ diff --git a/assets/github-splash2.png b/assets/github-splash2.png new file mode 100644 index 00000000..2c2d9259 Binary files /dev/null and b/assets/github-splash2.png differ diff --git a/assets/showcase.gif b/assets/showcase.gif new file mode 100644 index 00000000..a90fe742 Binary files /dev/null and b/assets/showcase.gif differ diff --git a/assets/tyra_code.gif b/assets/tyra_code.gif new file mode 100644 index 00000000..6c693f7e Binary files /dev/null and b/assets/tyra_code.gif differ diff --git a/engine/inc/file/file_utils.hpp b/engine/inc/file/file_utils.hpp index dd5507d5..142856b9 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 c6b515d0..c617aa45 100644 --- a/engine/inc/loaders/texture/builder/texture_builder_data.hpp +++ b/engine/inc/loaders/texture/builder/texture_builder_data.hpp @@ -33,4 +33,5 @@ class TextureBuilderData { TextureBpp clutBpp; unsigned char clutGsComponents; }; + } // namespace Tyra diff --git a/engine/inc/math/math.hpp b/engine/inc/math/math.hpp index 2aa502ab..6b8b6794 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 7277baf2..ca310750 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"