Skip to content

Commit

Permalink
Merge branch 'h4570:master' into Wellinator-Posix
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolf3s authored Nov 13, 2023
2 parents f454c06 + 700e878 commit 279dd0e
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 28 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/master-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -69,6 +64,6 @@ jobs:
if: ${{ success() }}
uses: actions/upload-artifact@v3
with:
name: tyra-${{ env.SHA8 }}
name: demo-elf
path: |
demo/bin
1 change: 1 addition & 0 deletions .vscode/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
/c_cpp_properties.json
/tasks.json
/settings.json
/ps2dev-intellisense
19 changes: 6 additions & 13 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<br />
<p align="center">
<a href="https://github.com/h4570/tyra">
<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/github-splash.png" alt="Logo" width="100%" height="auto">
<img src="https://raw.githubusercontent.com/h4570/tyra/master/assets/github-splash.png" alt="Logo" width="100%" height="auto">
</a>

<h3 align="center">Tyra</h3>
Expand All @@ -27,15 +27,12 @@
</p>
</p>

[![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)
Expand All @@ -45,8 +42,8 @@

## About the Project
<p align="center">
<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/tyra_code.gif" alt="Sample code" width="500" height="auto">
<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/showcase.gif " alt="Sample game" width="500" height="auto">
<img src="https://raw.githubusercontent.com/h4570/tyra/master/assets/tyra_code.gif" alt="Sample code" width="500" height="auto">
<img src="https://raw.githubusercontent.com/h4570/tyra/master/assets/showcase.gif " alt="Sample game" width="500" height="auto">
</p>

---
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -162,7 +155,7 @@ Sandro Sobczyński - [email protected]

<br />
<a href="https://github.com/h4570/tyra">
<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/github-splash2.png" alt="Logo" width="100%" height="auto">
<img src="https://raw.githubusercontent.com/h4570/tyra/master/assets/github-splash2.png" alt="Logo" width="100%" height="auto">
</a>

[contributors-shield]: https://img.shields.io/github/contributors/h4570/tyra.svg?style=flat-square
Expand Down
Binary file added assets/github-splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/github-splash2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/showcase.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tyra_code.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions engine/inc/file/file_utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#pragma once

#include <string>
#include <limits.h>
#include <syslimits.h>

namespace Tyra {

Expand Down Expand Up @@ -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);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ class TextureBuilderData {
TextureBpp clutBpp;
unsigned char clutGsComponents;
};

} // namespace Tyra
3 changes: 0 additions & 3 deletions engine/inc/math/math.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions engine/src/file/file_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
#include <tamtypes.h>
#include <cstdio>
#include <kernel.h>
#include <limits.h>
#include <syslimits.h>

#include <unistd.h>
#include <cstring>
#include "file/file_utils.hpp"
Expand Down

0 comments on commit 279dd0e

Please sign in to comment.