Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e63ae14792 | |||
| 87b983153a | |||
| cab934763f | |||
| 20d2291a88 | |||
| 4f6e55c0b0 | |||
| fbcb38d37a | |||
| a25594b95c | |||
| 86c0ab74f1 | |||
| e3726600fd | |||
| 8b8500a1c9 | |||
| 789c795c14 | |||
| a0be9022ff | |||
| 77c6702f80 | |||
| d54cba9e58 | |||
| 958ddb4ab7 | |||
| edff3a85d5 | |||
| 165cc4221e | |||
| cc42bbf56b | |||
| a340540d55 | |||
| d790349ab9 | |||
| 0cecbf0a7d | |||
| f46b058ecf | |||
| c833f93db2 | |||
| 6dc73982f9 | |||
| 1fe12962b8 | |||
| e359bcbe2b | |||
| 13f4b5e626 | |||
| 2ae1ccd761 | |||
| d7013f302b | |||
| b3fe92c996 | |||
| 822663f95e | |||
| 3f9bb33177 | |||
| fa173f1e87 | |||
| f08da7b358 | |||
| 945b9c462b | |||
| c9535412a7 | |||
| 2c41930cb2 | |||
| 2a4e2a2109 | |||
| 286b9e43a7 | |||
| f62eaff37b | |||
| 48fa642cef | |||
| cad720a399 | |||
| cf3f5b3443 | |||
| 48a0eec86b | |||
| 6a9f3c6683 | |||
| 325fea1a8b | |||
| ce00f58b89 | |||
| 5d4d2b0f06 | |||
| ca25a6de03 |
@@ -0,0 +1,35 @@
|
|||||||
|
#This is a modified version of the clang format check used on Open-PS2-Loader
|
||||||
|
name: CI-cpp-check
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- '**.hpp'
|
||||||
|
- '**.cpp'
|
||||||
|
- '**.'
|
||||||
|
- '**.h'
|
||||||
|
- './engine/inc/tyra'
|
||||||
|
- '.github/workflows/check-format.yml'
|
||||||
|
- '.clang-format'
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '**.hpp'
|
||||||
|
- '**.cpp'
|
||||||
|
- '**.'
|
||||||
|
- '**.h'
|
||||||
|
- './engine/inc/tyra'
|
||||||
|
- '.github/workflows/check-format.yml'
|
||||||
|
- '.clang-format'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check-format:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: DoozyX/clang-format-lint-action@v0.12
|
||||||
|
with:
|
||||||
|
source: '.'
|
||||||
|
extensions: 'hpp, cpp, h'
|
||||||
|
clangFormatVersion: 12
|
||||||
|
inplace: False
|
||||||
+2
-2
@@ -60,12 +60,12 @@
|
|||||||
{
|
{
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"label": "Send to PS2",
|
"label": "Send to PS2",
|
||||||
"command": "docker exec -t tyra-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'"
|
"command": "docker exec -t tyra-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || $true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"label": "Open PS2 output logger",
|
"label": "Open PS2 output logger",
|
||||||
"command": "docker stop ps2-logs || true && docker run -t --rm --name=ps2-logs -p ${input:local2Ip}:18194:18194/udp h4570/tyra sh -c 'ps2client -h ${input:ps2Ip} listen'",
|
"command": "docker stop ps2-logs || $true && docker run -t --rm --name=ps2-logs -p ${input:local2Ip}:18194:18194/udp h4570/tyra sh -c 'ps2client -h ${input:ps2Ip} listen'",
|
||||||
"runOptions": {
|
"runOptions": {
|
||||||
"instanceLimit": 1
|
"instanceLimit": 1
|
||||||
},
|
},
|
||||||
|
|||||||
Vendored
+2
-1
@@ -3,6 +3,7 @@
|
|||||||
"ms-vscode.cpptools-extension-pack",
|
"ms-vscode.cpptools-extension-pack",
|
||||||
"ryzngard.vscode-header-source",
|
"ryzngard.vscode-header-source",
|
||||||
"maziac.asm-code-lens",
|
"maziac.asm-code-lens",
|
||||||
"dmnsgn.vscode-wavefront"
|
"dmnsgn.vscode-wavefront",
|
||||||
|
"spmeesseman.vscode-taskexplorer"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
[](https://www.codacy.com/gh/h4570/tyra/dashboard?utm_source=github.com&utm_medium=referral&utm_content=h4570/tyra&utm_campaign=Badge_Grade)
|
||||||
[![Contributors][contributors-shield]][contributors-url]
|
[![Contributors][contributors-shield]][contributors-url]
|
||||||
[![MIT License][license-shield]][license-url]
|
[![MIT License][license-shield]][license-url]
|
||||||
[](https://discord.gg/NhhTmg3Gm5)
|
[](https://discord.gg/NhhTmg3Gm5)
|
||||||
@@ -9,11 +10,13 @@
|
|||||||
<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/github-splash.png" alt="Logo" width="100%" height="auto">
|
<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/github-splash.png" alt="Logo" width="100%" height="auto">
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<h3 align="center">Tyra - 2.0.0</h3>
|
<h3 align="center">Tyra</h3>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
Open source game engine for PlayStation 2™
|
Open source game engine for PlayStation 2™
|
||||||
<br />
|
<br />
|
||||||
|
<a href="https://www.youtube.com/watch?v=DGR4vWDjkmc"><strong>Showcase video »</strong></a>
|
||||||
|
|
||||||
<a href="https://youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH"><strong>YouTube tutorials »</strong></a>
|
<a href="https://youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH"><strong>YouTube tutorials »</strong></a>
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
@@ -34,12 +37,11 @@
|
|||||||
* [Features](#features)
|
* [Features](#features)
|
||||||
* [Branches](#branches)
|
* [Branches](#branches)
|
||||||
* [Contributing](#contributing)
|
* [Contributing](#contributing)
|
||||||
|
* [Games](#games)
|
||||||
* [License](#license)
|
* [License](#license)
|
||||||
* [Built With](#built-with)
|
* [Built With](#built-with)
|
||||||
* [Acronyms](#acronyms)
|
* [Acronyms](#acronyms)
|
||||||
* [Thanks](#thanks)
|
* [Credits](#credits)
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
## About the Project
|
## About the Project
|
||||||
<p align="center">
|
<p align="center">
|
||||||
@@ -51,24 +53,25 @@
|
|||||||
### Description
|
### Description
|
||||||
Tyra is a project that allows you to easily create games for the PlayStation 2 console.
|
Tyra is a project that allows you to easily create games for the PlayStation 2 console.
|
||||||
When I tried to make a game for PS2 a few years ago, I realized how many things had to be done to tame this exotic console architecture.
|
When I tried to make a game for PS2 a few years ago, I realized how many things had to be done to tame this exotic console architecture.
|
||||||
Decision was simple - I need to create an engine which will handle 3D file loading, 2D/3D rendering, animation, audio, handling between PS2 CPUs, synchronization and it should be simple as possible - so people with no experience can create a simple game in a few hours.
|
Decision was simple - I need to create an engine which will handle 3D file loading, 2D/3D rendering, animation, audio, handling between PS2 CPUs, synchronization.. It should be simple as possible - so people with no experience can create a simple game in a few hours.
|
||||||
**And that's what Tyra is all about.**
|
**And that's what Tyra is all about.**
|
||||||
|
|
||||||
### Tutorials
|
### Tutorials
|
||||||
* Setup environment - [Text tutorial](https://github.com/h4570/tyra/tree/master/docs/install) or [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH)
|
* 01 - Setup environment - [Text tutorial](https://github.com/h4570/tyra/tree/master/docs/install) or [Video](https://www.youtube.com/watch?v=9IXOU1SPdzc)
|
||||||
* Cook game assets - [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH)
|
* 02 - Cooking game assets - [Video](https://www.youtube.com/watch?v=hpVDeTTLyjI)
|
||||||
* Create game from template - [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH)
|
* 03 - Create a game repository - [Video](https://www.youtube.com/watch?v=DKfIKar3GUM)
|
||||||
|
* 04 - Run game from USB in PS2 - [Video](https://www.youtube.com/watch?v=ZX8fTQqiNho)
|
||||||
---
|
---
|
||||||
* 01 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/01-hello), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - Hello world
|
* 01 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/01-hello) - Hello world
|
||||||
* 02 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/02-sprite), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - 2D rendering
|
* 02 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/02-sprite) - 2D rendering
|
||||||
* 03 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/03-minecraft), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - 3D minecraft blocks
|
* 03 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/03-minecraft) - 3D minecraft blocks
|
||||||
* 04 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/04-de_dust2), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - `de_dust2.obj` rendering
|
* 04 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/04-de_dust2) - `de_dust2.obj` rendering
|
||||||
* 05 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/05-animation), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - 3D animation
|
* 05 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/05-animation) - 3D animation
|
||||||
* 06 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/06-audio), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - Background music and sound effects
|
* 06 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/06-audio) - Background music and sound effects
|
||||||
* 07 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/07-lighting), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - Static lightmap and dynamic directional lights
|
* 07 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/07-lighting) - Static lightmap and dynamic directional lights
|
||||||
* 08 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/08-skybox-debug), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - Skybox and debug rendering
|
* 08 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/08-skybox-debug) - Skybox and debug rendering
|
||||||
* 09 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/09-manual-mode), [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) - Manual rendering (a'la OpenGL)
|
* 09 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/09-manual-mode) - Manual rendering (a'la OpenGL)
|
||||||
|
* Demo game - [Code](https://github.com/h4570/tyra/tree/master/demo)
|
||||||
---
|
---
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
@@ -85,10 +88,12 @@ Decision was simple - I need to create an engine which will handle 3D file loadi
|
|||||||
* Precise - culling only visible parts of mesh
|
* Precise - culling only visible parts of mesh
|
||||||
* Clipping:
|
* Clipping:
|
||||||
* Standard "fake", but fast PS2 clipping done in `VU1`
|
* Standard "fake", but fast PS2 clipping done in `VU1`
|
||||||
* Software triangle done in `EE Core`
|
* Software clipping done in `EE Core`
|
||||||
* Optimized math functions via `VU0` coprocessor
|
* Optimized math functions via `VU0` coprocessor
|
||||||
* Background music and sound effects support
|
* Background music and sound effects support
|
||||||
* Pad support
|
* Pad support
|
||||||
|
* USB support
|
||||||
|
* Memory card support
|
||||||
* `.wav` Audio file support
|
* `.wav` Audio file support
|
||||||
* `.obj` 3D file support
|
* `.obj` 3D file support
|
||||||
* `.md2` 3D file support
|
* `.md2` 3D file support
|
||||||
@@ -100,8 +105,6 @@ Decision was simple - I need to create an engine which will handle 3D file loadi
|
|||||||
|
|
||||||
See the [open issues](https://github.com/h4570/tyra/issues) for a list of proposed features (and known issues).
|
See the [open issues](https://github.com/h4570/tyra/issues) for a list of proposed features (and known issues).
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
## Contributing
|
## 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**.
|
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**.
|
||||||
@@ -112,22 +115,25 @@ Contributions are what make the open source community such an amazing place to b
|
|||||||
4. Push to the Branch (`git push origin feature/amazing-feature`)
|
4. Push to the Branch (`git push origin feature/amazing-feature`)
|
||||||
5. Open a Pull Request
|
5. Open a Pull Request
|
||||||
|
|
||||||
<br />
|
## Games
|
||||||
|
|
||||||
|
List of games developed with Tyra.
|
||||||
|
If you created one, please contact me - I will add it to the list :)
|
||||||
|
|
||||||
|
* [Tyracraft](https://github.com/Wellinator/tyracraft) by [Wellinator](https://github.com/Wellinator)
|
||||||
|
* [Rock, paper, scissors](https://github.com/GuidoDQR/my-ps2-game) by [GuidoDQR](https://github.com/GuidoDQR)
|
||||||
|
* [TyraTale](https://github.com/Br4k2n/TyraTale) by [Br4k2n](https://github.com/Br4k2n)
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
Distributed under the Apache License 2.0 License. See `LICENSE` for more information.
|
Distributed under the Apache License 2.0 License. See `LICENSE` for more information.
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
## Built With
|
## Built With
|
||||||
|
|
||||||
* [PS2DEV](https://github.com/ps2dev/ps2dev)
|
* [PS2DEV](https://github.com/ps2dev/ps2dev)
|
||||||
* [VCLPP](https://github.com/glampert/vclpp)
|
* [VCLPP](https://github.com/glampert/vclpp)
|
||||||
* Sony VCL
|
* Sony VCL
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
## Acronyms
|
## Acronyms
|
||||||
* EE (Emotion Engine) - whole set of processors and subsystems that make up the PlayStation 2
|
* EE (Emotion Engine) - whole set of processors and subsystems that make up the PlayStation 2
|
||||||
* EE Core - main PS2 CPU (c++ done here)
|
* EE Core - main PS2 CPU (c++ done here)
|
||||||
@@ -136,19 +142,17 @@ Distributed under the Apache License 2.0 License. See `LICENSE` for more informa
|
|||||||
* VU1 - programmable (ASM) vector processor, which is similar to vertex shader. Accessed via DMA.
|
* VU1 - programmable (ASM) vector processor, which is similar to vertex shader. Accessed via DMA.
|
||||||
* IOP - I/O processor which enables access to peripheral devices, such the game controller
|
* IOP - I/O processor which enables access to peripheral devices, such the game controller
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
## Credits
|
## Credits
|
||||||
|
|
||||||
Without these guys, Tyra would not happen:
|
Without these guys, Tyra would not happen:
|
||||||
* Dr Henry Fortuna - for code sources, PS2 academy tutorials
|
* [Dr Henry Fortuna](http://ps2-edu.tensioncore.com/index.html) - for code sources, PS2 academy tutorials
|
||||||
* Rick Gaiser, fjtrujy - for maintaining PS2DEV
|
* 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 - for testing, contributing to Tyra and sharing cool ideas!
|
* [Wellington Carvalho](https://github.com/Wellinator), [André Guilheme](https://github.com/wolfysdl) - for testing, contributing to Tyra and sharing cool ideas!
|
||||||
* Lukasz D.K. - for huge archive of PS2 stuff
|
* [Leonardo Ono](https://github.com/leonardo-ono) - for software renderer example (with clipping!)
|
||||||
* Guilherme Lampert - for code sources
|
* [Lukasz D.K.](https://github.com/lukaszdk) - for huge archive of PS2 stuff
|
||||||
* Jesper Svennevid, Daniel Collin - for openvcl's code samples
|
* [Guilherme Lampert](https://github.com/glampert) - for code sources
|
||||||
* Whole PS2DEV team
|
* [Jesper Svennevid](https://github.com/jsvennevid), [Daniel Collin](https://github.com/emoon) - for openvcl's code samples
|
||||||
* Manieq - for nice splash screens!
|
* [Manieq](https://www.facebook.com/mvnieq) - for nice splash screens!
|
||||||
* And so many other guys. Thanks!
|
* And so many other guys. Thanks!
|
||||||
|
|
||||||
Project Link: [https://github.com/h4570/tyra](https://github.com/h4570/tyra)
|
Project Link: [https://github.com/h4570/tyra](https://github.com/h4570/tyra)
|
||||||
|
|||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
------------ Tyra's v2.0 roadmap to publish on GitHub ------------
|
|
||||||
- [General] Readme Credits: clipping, obj loader
|
|
||||||
- [Video] How to setup environment
|
|
||||||
- [Video] How to work with Tyra
|
|
||||||
- [Video] How to create own game
|
|
||||||
- [Video] How to cook assets (audio, textures, obj)
|
|
||||||
- [Video] Tutorial videos
|
|
||||||
- [Video] How to run game from USB
|
|
||||||
|
|
||||||
------------ Github issues for Tyra v2 ------------
|
|
||||||
- [Demo] BBox constructors
|
|
||||||
- [General] Add cpp lint checker in GitHub / static code analysis
|
|
||||||
- [General] Smart pointers and std::array instead of raw pointers
|
|
||||||
- [General] Control generated id to avoid duplication. Maybe Just increment from 0? Add interface IIdentificable?
|
|
||||||
- [renderer] fog
|
|
||||||
- [General] CI in Github via docker image
|
|
||||||
- [MD2] Refactor
|
|
||||||
- [2D] Add zbuffer support (z-index)
|
|
||||||
- [3DUtility] Add zbuffer support (z-index), cupMesh->translation.translateZ(10.0F) - wylaczyc zeby widziec problem
|
|
||||||
- [2D] Fixed font support
|
|
||||||
- [File] Async file loading
|
|
||||||
- [tyrdat] Custom 3D data file with precalculated bboxes with support of async loading
|
|
||||||
- [Renderer] Interlacing, and then 640x448 resolution
|
|
||||||
@@ -12,6 +12,6 @@
|
|||||||
|
|
||||||
namespace Demo {
|
namespace Demo {
|
||||||
|
|
||||||
const bool IS_REAL_PS2 = false;
|
const bool IS_REAL_PS2_VIA_USB = false;
|
||||||
|
|
||||||
} // namespace Demo
|
} // namespace Demo
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@
|
|||||||
int main() {
|
int main() {
|
||||||
Tyra::EngineOptions options;
|
Tyra::EngineOptions options;
|
||||||
|
|
||||||
if (Demo::IS_REAL_PS2) {
|
if (Demo::IS_REAL_PS2_VIA_USB) {
|
||||||
options.writeLogsToFile = true;
|
options.writeLogsToFile = true;
|
||||||
options.loadUsbDriver = true;
|
options.loadUsbDriver = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ EnemyManager::EnemyManager(Engine* engine, const Heightmap& heightmap) {
|
|||||||
|
|
||||||
auto data = loader.load(FileUtils::fromCwd("game/models/zombie/zombie.obj"),
|
auto data = loader.load(FileUtils::fromCwd("game/models/zombie/zombie.obj"),
|
||||||
objOptions);
|
objOptions);
|
||||||
data->normalsEnabled = false;
|
data->loadNormals = false;
|
||||||
motherMesh = new DynamicMesh(data.get());
|
motherMesh = new DynamicMesh(data.get());
|
||||||
|
|
||||||
bodyTexture = textureRepo->add(
|
bodyTexture = textureRepo->add(
|
||||||
@@ -45,7 +45,7 @@ EnemyManager::EnemyManager(Engine* engine, const Heightmap& heightmap) {
|
|||||||
auto* death = engine->audio.adpcm.load(
|
auto* death = engine->audio.adpcm.load(
|
||||||
FileUtils::fromCwd("game/models/zombie/death.adpcm"));
|
FileUtils::fromCwd("game/models/zombie/death.adpcm"));
|
||||||
|
|
||||||
const int enemyCount = IS_REAL_PS2 ? 8 : 12;
|
const int enemyCount = IS_REAL_PS2_VIA_USB ? 8 : 12;
|
||||||
for (int i = 0; i < enemyCount; i++) {
|
for (int i = 0; i < enemyCount; i++) {
|
||||||
EnemyInfo info;
|
EnemyInfo info;
|
||||||
info.adpcmChannel = 9 + i;
|
info.adpcmChannel = 9 + i;
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ void GameState::onStart() {
|
|||||||
|
|
||||||
engine->audio.song.setVolume(85);
|
engine->audio.song.setVolume(85);
|
||||||
|
|
||||||
if (IS_REAL_PS2) engine->renderer.setFrameLimit(false);
|
if (IS_REAL_PS2_VIA_USB) engine->renderer.setFrameLimit(false);
|
||||||
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ Weapon::Weapon(Engine* engine) {
|
|||||||
auto* repo = &engine->renderer.core.texture.repository;
|
auto* repo = &engine->renderer.core.texture.repository;
|
||||||
auto data =
|
auto data =
|
||||||
loader.load(FileUtils::fromCwd("game/models/ak47/ak47.obj"), objOptions);
|
loader.load(FileUtils::fromCwd("game/models/ak47/ak47.obj"), objOptions);
|
||||||
data->normalsEnabled = false;
|
data->loadNormals = false;
|
||||||
mesh = new StaticMesh(data.get());
|
mesh = new StaticMesh(data.get());
|
||||||
|
|
||||||
mesh->translation.translateX(2.85F);
|
mesh->translation.translateX(2.85F);
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ Skybox::Skybox(TextureRepository* repo) {
|
|||||||
|
|
||||||
auto data = loader.load(FileUtils::fromCwd("game/models/skybox/skybox.obj"),
|
auto data = loader.load(FileUtils::fromCwd("game/models/skybox/skybox.obj"),
|
||||||
objOptions);
|
objOptions);
|
||||||
data->normalsEnabled = false;
|
data->loadNormals = false;
|
||||||
mesh = new StaticMesh(data.get());
|
mesh = new StaticMesh(data.get());
|
||||||
|
|
||||||
repo->addByMesh(mesh, FileUtils::fromCwd("game/models/skybox/"), "png");
|
repo->addByMesh(mesh, FileUtils::fromCwd("game/models/skybox/"), "png");
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ Terrain::Terrain(TextureRepository* repo)
|
|||||||
|
|
||||||
auto data = loader.load(FileUtils::fromCwd("game/models/terrain/terrain.obj"),
|
auto data = loader.load(FileUtils::fromCwd("game/models/terrain/terrain.obj"),
|
||||||
objOptions);
|
objOptions);
|
||||||
data->normalsEnabled = false;
|
data->loadNormals = false;
|
||||||
mesh = new StaticMesh(data.get());
|
mesh = new StaticMesh(data.get());
|
||||||
|
|
||||||
repo->addByMesh(mesh, FileUtils::fromCwd("game/models/terrain/"), "png");
|
repo->addByMesh(mesh, FileUtils::fromCwd("game/models/terrain/"), "png");
|
||||||
|
|||||||
@@ -17,9 +17,10 @@
|
|||||||
docker pull h4570/tyra
|
docker pull h4570/tyra
|
||||||
git clone https://github.com/h4570/tyra.git
|
git clone https://github.com/h4570/tyra.git
|
||||||
```
|
```
|
||||||
3. Open `VSCode` and open previously cloned directory.
|
3. Download the [assets.zip](https://github.com/h4570/tyra/releases) file and unzip it into the tyra directory
|
||||||
4. In `VSCode` open `.vscode/configurations/windows-docker` and copy configuration files into `.vscode/`
|
4. Open `VSCode` and open previously cloned directory.
|
||||||
5. In `c_cpp_properties.json` fix all `YOUR-INTELLISENSE-PATH` with path from point 2.
|
5. In `VSCode` open `.vscode/configurations/windows-docker` and copy configuration files into `.vscode/`
|
||||||
6. Click `CTRL+SHIFT+P`, type `Tasks: Run task` and run `Start docker container` - Repeat this step every time you want to start working with Tyra (every reboot)
|
6. In `c_cpp_properties.json` fix all `YOUR-INTELLISENSE-PATH` with path from point 2.
|
||||||
7. Click `CTRL+SHIFT+P`, type `Tasks: Run build task`
|
7. Click `CTRL+SHIFT+P`, type `Tasks: Run task` and run `Start docker container` - Repeat this step every time you want to start working with Tyra (every reboot)
|
||||||
8. Tyra should automatically compile engine, `demo` game and run `PCSX2`. If you want to compile & run tutorials, please change `buildDirectory` in `settings.json` to example `tutorials/01-hello`
|
8. Click `CTRL+SHIFT+P`, type `Tasks: Run build task`
|
||||||
|
9. Tyra should automatically compile engine, `demo` game and run `PCSX2`. If you want to compile & run tutorials, please change `buildDirectory` in `settings.json` to example `tutorials/01-hello`
|
||||||
|
|||||||
@@ -32,6 +32,11 @@ class FileUtils {
|
|||||||
static std::string fromCwd(const std::string& relativePath);
|
static std::string fromCwd(const std::string& relativePath);
|
||||||
static std::string fromCwd(const char* relativePath);
|
static std::string fromCwd(const char* relativePath);
|
||||||
|
|
||||||
|
static std::string getFilenameFromPath(const std::string& path);
|
||||||
|
static std::string getPathFromFilename(const std::string& path);
|
||||||
|
static std::string getFilenameWithoutExtension(const std::string& filename);
|
||||||
|
static std::string getExtensionOfFilename(const std::string& filename);
|
||||||
|
|
||||||
const char* getElfName() const { return elfName; };
|
const char* getElfName() const { return elfName; };
|
||||||
const char* getElfPath() const { return elfPath; };
|
const char* getElfPath() const { return elfPath; };
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ class Version {
|
|||||||
~Version() {}
|
~Version() {}
|
||||||
|
|
||||||
static const u8 major = 2;
|
static const u8 major = 2;
|
||||||
static const u8 minor = 0;
|
static const u8 minor = 2;
|
||||||
static const u8 patch = 0;
|
static const u8 patch = 0;
|
||||||
|
|
||||||
static std::string toString() {
|
static std::string toString() {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class MeshBuilderData {
|
|||||||
|
|
||||||
std::vector<MeshBuilderMaterialData*> materials;
|
std::vector<MeshBuilderMaterialData*> materials;
|
||||||
|
|
||||||
bool textureCoordsEnabled, normalsEnabled, lightMapEnabled;
|
bool loadNormals, loadLightmap;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Tyra
|
} // namespace Tyra
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <optional>
|
||||||
#include "./mesh_builder_material_frame_data.hpp"
|
#include "./mesh_builder_material_frame_data.hpp"
|
||||||
#include "renderer/models/color.hpp"
|
#include "renderer/models/color.hpp"
|
||||||
|
|
||||||
@@ -25,6 +26,7 @@ class MeshBuilderMaterialData {
|
|||||||
|
|
||||||
std::vector<MeshBuilderMaterialFrameData*> frames;
|
std::vector<MeshBuilderMaterialFrameData*> frames;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
std::optional<std::string> texturePath;
|
||||||
Color ambient;
|
Color ambient;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../loader.hpp"
|
|
||||||
#include "../builder/mesh_builder_data.hpp"
|
#include "../builder/mesh_builder_data.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -23,7 +22,7 @@ struct MD2LoaderOptions {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** Class responsible for loading & parsing Quake's II ".md2" 3D files */
|
/** Class responsible for loading & parsing Quake's II ".md2" 3D files */
|
||||||
class MD2Loader : public Loader {
|
class MD2Loader {
|
||||||
public:
|
public:
|
||||||
static std::unique_ptr<MeshBuilderData> load(const char* fullpath);
|
static std::unique_ptr<MeshBuilderData> load(const char* fullpath);
|
||||||
static std::unique_ptr<MeshBuilderData> load(const char* fullpath,
|
static std::unique_ptr<MeshBuilderData> load(const char* fullpath,
|
||||||
|
|||||||
@@ -10,12 +10,12 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../loader.hpp"
|
|
||||||
#include "../builder/mesh_builder_data.hpp"
|
#include "../builder/mesh_builder_data.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "renderer/models/color.hpp"
|
#include "renderer/models/color.hpp"
|
||||||
#include "loaders/3d/obj_loader/tiny_obj_loader.hpp"
|
#include "loaders/3d/obj_loader/tiny_obj_loader.hpp"
|
||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
|
#include <optional>
|
||||||
|
|
||||||
namespace Tyra {
|
namespace Tyra {
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ struct MaterialVertexCount {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** Class responsible for loading & parsing obj files */
|
/** Class responsible for loading & parsing obj files */
|
||||||
class ObjLoader : public Loader {
|
class ObjLoader {
|
||||||
public:
|
public:
|
||||||
static std::unique_ptr<MeshBuilderData> load(const char* fullpath);
|
static std::unique_ptr<MeshBuilderData> load(const char* fullpath);
|
||||||
static std::unique_ptr<MeshBuilderData> load(const char* fullpath,
|
static std::unique_ptr<MeshBuilderData> load(const char* fullpath,
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
/*
|
|
||||||
# _____ ____ ___
|
|
||||||
# | \/ ____| |___|
|
|
||||||
# | | | \ | |
|
|
||||||
#-----------------------------------------------------------------------
|
|
||||||
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
|
||||||
# Licensed under Apache License 2.0
|
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
namespace Tyra {
|
|
||||||
|
|
||||||
class Loader {
|
|
||||||
protected:
|
|
||||||
static std::string getFilenameFromPath(const std::string& path);
|
|
||||||
static std::string getPathFromFilename(const std::string& path);
|
|
||||||
static std::string getFilenameWithoutExtension(const std::string& filename);
|
|
||||||
static std::string getExtensionOfFilename(const std::string& filename);
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Tyra
|
|
||||||
@@ -10,13 +10,12 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "loaders/loader.hpp"
|
|
||||||
#include "loaders/texture/builder/texture_builder_data.hpp"
|
#include "loaders/texture/builder/texture_builder_data.hpp"
|
||||||
#include "renderer/core/texture/models/texture_bpp.hpp"
|
#include "renderer/core/texture/models/texture_bpp.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace Tyra {
|
namespace Tyra {
|
||||||
class TextureLoader : public Loader {
|
class TextureLoader {
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* @brief Loads texture data from file.
|
* @brief Loads texture data from file.
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
#include "debug/debug.hpp"
|
#include "debug/debug.hpp"
|
||||||
#include "./mesh_material_frame.hpp"
|
#include "./mesh_material_frame.hpp"
|
||||||
#include "loaders/3d/builder/mesh_builder_data.hpp"
|
#include "loaders/3d/builder/mesh_builder_data.hpp"
|
||||||
|
#include <optional>
|
||||||
|
|
||||||
namespace Tyra {
|
namespace Tyra {
|
||||||
|
|
||||||
@@ -23,11 +24,9 @@ class MeshMaterial {
|
|||||||
~MeshMaterial();
|
~MeshMaterial();
|
||||||
|
|
||||||
bool isMother, lightmapFlag;
|
bool isMother, lightmapFlag;
|
||||||
|
|
||||||
u32 id;
|
u32 id;
|
||||||
|
|
||||||
std::string name;
|
std::string name;
|
||||||
|
std::optional<std::string> textureName;
|
||||||
Color ambient;
|
Color ambient;
|
||||||
|
|
||||||
std::vector<MeshMaterialFrame*> frames;
|
std::vector<MeshMaterialFrame*> frames;
|
||||||
|
|||||||
@@ -44,8 +44,7 @@ class DynPipRenderer {
|
|||||||
void uploadPrograms();
|
void uploadPrograms();
|
||||||
void setDoubleBuffer();
|
void setDoubleBuffer();
|
||||||
|
|
||||||
void addBufferDataToPacket(DynPipVU1Program* program, DynPipBag** bags,
|
void addBufferDataToPacket(DynPipBag** bags, const u32& count);
|
||||||
const u32& count);
|
|
||||||
void sendPacket();
|
void sendPacket();
|
||||||
|
|
||||||
prim_t* prim;
|
prim_t* prim;
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ class DynamicPipeline : public Renderer3DPipeline {
|
|||||||
|
|
||||||
void setBuffer(DynPipBag* buffers, DynPipBag* buffer, u16* bufferIndex);
|
void setBuffer(DynPipBag* buffers, DynPipBag* buffer, u16* bufferIndex);
|
||||||
|
|
||||||
void sendRestOfBuffers(DynPipBag* buffers, u16* bufferIndex);
|
void sendRestOfBuffers(DynPipBag* buffers, const u16& bufferIndex);
|
||||||
|
|
||||||
void addVertices(const MeshMaterialFrame* materialFrameFrom,
|
void addVertices(const MeshMaterialFrame* materialFrameFrom,
|
||||||
const MeshMaterialFrame* materialFrameTo, DynPipBag* bag,
|
const MeshMaterialFrame* materialFrameTo, DynPipBag* bag,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
#include "debug/debug.hpp"
|
#include "debug/debug.hpp"
|
||||||
#include "renderer/core/2d/sprite/sprite.hpp"
|
#include "renderer/core/2d/sprite/sprite.hpp"
|
||||||
#include "renderer/core/texture/renderer_core_texture_buffers.hpp"
|
#include "renderer/core/texture/renderer_core_texture_buffers.hpp"
|
||||||
|
#include "renderer/3d/pipeline/shared/pipeline_texture_mapping_type.hpp"
|
||||||
#include "renderer/core/texture/models/texture.hpp"
|
#include "renderer/core/texture/models/texture.hpp"
|
||||||
#include "renderer/renderer_settings.hpp"
|
#include "renderer/renderer_settings.hpp"
|
||||||
#include <packet2_utils.h>
|
#include <packet2_utils.h>
|
||||||
@@ -30,6 +31,9 @@ class RendererCore2D {
|
|||||||
void render(const Sprite& sprite,
|
void render(const Sprite& sprite,
|
||||||
const RendererCoreTextureBuffers& texBuffers, Texture* texture);
|
const RendererCoreTextureBuffers& texBuffers, Texture* texture);
|
||||||
|
|
||||||
|
void setTextureMappingType(
|
||||||
|
const PipelineTextureMappingType textureMappingType);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void setPrim();
|
void setPrim();
|
||||||
void setLod();
|
void setLod();
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ class Sprite {
|
|||||||
~Sprite();
|
~Sprite();
|
||||||
|
|
||||||
u32 id;
|
u32 id;
|
||||||
Vec2 position, size;
|
Vec2 position, size, offset;
|
||||||
float scale;
|
float scale;
|
||||||
Color color;
|
Color color;
|
||||||
SpriteMode mode;
|
SpriteMode mode;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ class RendererSettings {
|
|||||||
height(448.0F),
|
height(448.0F),
|
||||||
interlacedHeightF(height / 2),
|
interlacedHeightF(height / 2),
|
||||||
near(0.1F),
|
near(0.1F),
|
||||||
far(8192.0F),
|
far(51200.0F),
|
||||||
projectionScale(4096.0F),
|
projectionScale(4096.0F),
|
||||||
aspectRatio(width / height),
|
aspectRatio(width / height),
|
||||||
interlacedHeightUI(static_cast<unsigned int>(interlacedHeightF)) {}
|
interlacedHeightUI(static_cast<unsigned int>(interlacedHeightF)) {}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
||||||
# Licensed under Apache License 2.0
|
# Licensed under Apache License 2.0
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/audio.hpp"
|
#include "audio/audio.hpp"
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
||||||
# Licensed under Apache License 2.0
|
# Licensed under Apache License 2.0
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/audio_adpcm.hpp"
|
#include "audio/audio_adpcm.hpp"
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
||||||
# Licensed under Apache License 2.0
|
# Licensed under Apache License 2.0
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "audio/audio_song.hpp"
|
#include "audio/audio_song.hpp"
|
||||||
|
|||||||
@@ -64,4 +64,32 @@ std::string FileUtils::fromCwd(const char* file) {
|
|||||||
auto cwd = getCwd();
|
auto cwd = getCwd();
|
||||||
return cwd + file;
|
return cwd + file;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string FileUtils::getFilenameFromPath(const std::string& path) {
|
||||||
|
std::string filename = path.substr(path.find_last_of("/\\") + 1);
|
||||||
|
if (filename.size() == path.size()) {
|
||||||
|
filename = path.substr(path.find_last_of(":\\") + 1);
|
||||||
|
}
|
||||||
|
return filename;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string FileUtils::getPathFromFilename(const std::string& path) {
|
||||||
|
std::string basepath = path.substr(0, path.find_last_of("/\\"));
|
||||||
|
if (basepath.size() == path.size()) {
|
||||||
|
basepath = path.substr(0, path.find_last_of(":\\"));
|
||||||
|
}
|
||||||
|
return basepath;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string FileUtils::getFilenameWithoutExtension(
|
||||||
|
const std::string& filename) {
|
||||||
|
auto lastindex = filename.find_last_of(".");
|
||||||
|
return filename.substr(0, lastindex);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string FileUtils::getExtensionOfFilename(const std::string& filename) {
|
||||||
|
auto lastindex = filename.find_last_of(".");
|
||||||
|
return filename.substr(lastindex + 1);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Tyra
|
} // namespace Tyra
|
||||||
|
|||||||
@@ -14,9 +14,8 @@
|
|||||||
namespace Tyra {
|
namespace Tyra {
|
||||||
|
|
||||||
MeshBuilderData::MeshBuilderData() {
|
MeshBuilderData::MeshBuilderData() {
|
||||||
textureCoordsEnabled = false;
|
loadNormals = false;
|
||||||
normalsEnabled = false;
|
loadLightmap = false;
|
||||||
lightMapEnabled = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MeshBuilderData::~MeshBuilderData() {
|
MeshBuilderData::~MeshBuilderData() {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include "debug/debug.hpp"
|
#include "debug/debug.hpp"
|
||||||
#include "loaders/3d/md2_loader/anorms.hpp"
|
#include "loaders/3d/md2_loader/anorms.hpp"
|
||||||
#include "loaders/loader.hpp"
|
#include "file/file_utils.hpp"
|
||||||
|
|
||||||
namespace Tyra {
|
namespace Tyra {
|
||||||
|
|
||||||
@@ -88,7 +88,7 @@ std::unique_ptr<MeshBuilderData> MD2Loader::load(const char* fullpath,
|
|||||||
std::string path = fullpath;
|
std::string path = fullpath;
|
||||||
TYRA_ASSERT(!path.empty(), "Provided path is empty!");
|
TYRA_ASSERT(!path.empty(), "Provided path is empty!");
|
||||||
|
|
||||||
auto filename = getFilenameFromPath(path);
|
auto filename = FileUtils::getFilenameFromPath(path);
|
||||||
|
|
||||||
FILE* file = fopen(fullpath, "rb");
|
FILE* file = fopen(fullpath, "rb");
|
||||||
TYRA_ASSERT(file != nullptr, "Failed to load: ", filename);
|
TYRA_ASSERT(file != nullptr, "Failed to load: ", filename);
|
||||||
@@ -122,12 +122,13 @@ std::unique_ptr<MeshBuilderData> MD2Loader::load(const char* fullpath,
|
|||||||
auto result = std::make_unique<MeshBuilderData>();
|
auto result = std::make_unique<MeshBuilderData>();
|
||||||
|
|
||||||
auto* material = new MeshBuilderMaterialData();
|
auto* material = new MeshBuilderMaterialData();
|
||||||
material->name = getFilenameWithoutExtension(filename);
|
material->name = FileUtils::getFilenameWithoutExtension(filename);
|
||||||
|
material->texturePath = material->name;
|
||||||
|
material->texturePath.value().append(".png");
|
||||||
|
|
||||||
result->materials.push_back(material);
|
result->materials.push_back(material);
|
||||||
result->normalsEnabled = true;
|
result->loadNormals = true;
|
||||||
result->textureCoordsEnabled = true;
|
result->loadLightmap = false;
|
||||||
result->lightMapEnabled = false;
|
|
||||||
|
|
||||||
Vec4** tempVertices = new Vec4*[framesCount];
|
Vec4** tempVertices = new Vec4*[framesCount];
|
||||||
Vec4** tempNormals = new Vec4*[framesCount];
|
Vec4** tempNormals = new Vec4*[framesCount];
|
||||||
|
|||||||
@@ -10,13 +10,13 @@
|
|||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "math/vec2.hpp"
|
#include "math/vec2.hpp"
|
||||||
#include "math/vec4.hpp"
|
#include "math/vec4.hpp"
|
||||||
#include "renderer/models/color.hpp"
|
#include "renderer/models/color.hpp"
|
||||||
#include "debug/debug.hpp"
|
#include "debug/debug.hpp"
|
||||||
#include "loaders/3d/obj_loader/obj_loader.hpp"
|
#include "loaders/3d/obj_loader/obj_loader.hpp"
|
||||||
|
#include "file/file_utils.hpp"
|
||||||
|
|
||||||
#define TINYOBJLOADER_USE_MAPBOX_EARCUT
|
#define TINYOBJLOADER_USE_MAPBOX_EARCUT
|
||||||
#define TINYOBJLOADER_IMPLEMENTATION
|
#define TINYOBJLOADER_IMPLEMENTATION
|
||||||
@@ -40,12 +40,12 @@ std::unique_ptr<MeshBuilderData> ObjLoader::load(
|
|||||||
std::unique_ptr<MeshBuilderData> ObjLoader::load(
|
std::unique_ptr<MeshBuilderData> ObjLoader::load(
|
||||||
const char* fullpath, const ObjLoaderOptions& options) {
|
const char* fullpath, const ObjLoaderOptions& options) {
|
||||||
std::string path = fullpath;
|
std::string path = fullpath;
|
||||||
std::string basePath = getPathFromFilename(path);
|
std::string basePath = FileUtils::getPathFromFilename(path);
|
||||||
|
|
||||||
TYRA_ASSERT(!path.empty(), "Provided path is empty!");
|
TYRA_ASSERT(!path.empty(), "Provided path is empty!");
|
||||||
|
|
||||||
auto rawFilename = getFilenameWithoutExtension(path);
|
auto rawFilename = FileUtils::getFilenameWithoutExtension(path);
|
||||||
auto extension = getExtensionOfFilename(path);
|
auto extension = FileUtils::getExtensionOfFilename(path);
|
||||||
auto result = std::make_unique<MeshBuilderData>();
|
auto result = std::make_unique<MeshBuilderData>();
|
||||||
|
|
||||||
tinyobj::ObjReaderConfig readerConfig;
|
tinyobj::ObjReaderConfig readerConfig;
|
||||||
@@ -131,9 +131,7 @@ void ObjLoader::addOutputMaterialsAndFrames(
|
|||||||
const std::vector<tinyobj::shape_t>& shapes,
|
const std::vector<tinyobj::shape_t>& shapes,
|
||||||
const std::vector<tinyobj::material_t>& materials, const u16& framesCount,
|
const std::vector<tinyobj::material_t>& materials, const u16& framesCount,
|
||||||
std::vector<MaterialVertexCount>& materialVertexCounts) {
|
std::vector<MaterialVertexCount>& materialVertexCounts) {
|
||||||
if (attrib.texcoords.size()) output->textureCoordsEnabled = true;
|
if (attrib.normals.size()) output->loadNormals = true;
|
||||||
|
|
||||||
if (attrib.normals.size()) output->normalsEnabled = true;
|
|
||||||
|
|
||||||
TYRA_ASSERT(materials.size() > 0,
|
TYRA_ASSERT(materials.size() > 0,
|
||||||
"No material data found! Please add .mtl "
|
"No material data found! Please add .mtl "
|
||||||
@@ -145,6 +143,10 @@ void ObjLoader::addOutputMaterialsAndFrames(
|
|||||||
|
|
||||||
material->name = materials[i].name;
|
material->name = materials[i].name;
|
||||||
|
|
||||||
|
if (!materials[i].diffuse_texname.empty()) {
|
||||||
|
material->texturePath = materials[i].diffuse_texname;
|
||||||
|
}
|
||||||
|
|
||||||
material->ambient.set(materials[i].diffuse[0] * 128.0F,
|
material->ambient.set(materials[i].diffuse[0] * 128.0F,
|
||||||
materials[i].diffuse[1] * 128.0F,
|
materials[i].diffuse[1] * 128.0F,
|
||||||
materials[i].diffuse[2] * 128.0F, 128.0F);
|
materials[i].diffuse[2] * 128.0F, 128.0F);
|
||||||
@@ -157,10 +159,11 @@ void ObjLoader::addOutputMaterialsAndFrames(
|
|||||||
frame->count = counter.count;
|
frame->count = counter.count;
|
||||||
frame->vertices = new Vec4[counter.count];
|
frame->vertices = new Vec4[counter.count];
|
||||||
|
|
||||||
if (output->textureCoordsEnabled)
|
if (material->texturePath.has_value()) {
|
||||||
frame->textureCoords = new Vec4[counter.count];
|
frame->textureCoords = new Vec4[counter.count];
|
||||||
|
}
|
||||||
|
|
||||||
if (output->normalsEnabled) frame->normals = new Vec4[counter.count];
|
if (output->loadNormals) frame->normals = new Vec4[counter.count];
|
||||||
|
|
||||||
material->frames.push_back(frame);
|
material->frames.push_back(frame);
|
||||||
}
|
}
|
||||||
@@ -186,6 +189,8 @@ void ObjLoader::importFrame(MeshBuilderData* output,
|
|||||||
materialInsertControls.push_back(control);
|
materialInsertControls.push_back(control);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::vector<u32> materialIdsWithTextureWarning;
|
||||||
|
|
||||||
// Loop over shapes
|
// Loop over shapes
|
||||||
for (size_t s = 0; s < shapes.size(); s++) {
|
for (size_t s = 0; s < shapes.size(); s++) {
|
||||||
const auto& mesh = shapes[s].mesh;
|
const auto& mesh = shapes[s].mesh;
|
||||||
@@ -197,7 +202,8 @@ void ObjLoader::importFrame(MeshBuilderData* output,
|
|||||||
auto& materialInsertControl = materialInsertControls[materialId];
|
auto& materialInsertControl = materialInsertControls[materialId];
|
||||||
size_t vertCountPerFace = size_t(mesh.num_face_vertices[f]);
|
size_t vertCountPerFace = size_t(mesh.num_face_vertices[f]);
|
||||||
|
|
||||||
auto* outFrame = output->materials[materialId]->frames[frameIndex];
|
auto* outMaterial = output->materials[materialId];
|
||||||
|
auto* outFrame = outMaterial->frames[frameIndex];
|
||||||
|
|
||||||
TYRA_ASSERT(count == 1 || vertCountPerFace == 3,
|
TYRA_ASSERT(count == 1 || vertCountPerFace == 3,
|
||||||
"Please triangulate obj files if you are animating!",
|
"Please triangulate obj files if you are animating!",
|
||||||
@@ -232,14 +238,32 @@ void ObjLoader::importFrame(MeshBuilderData* output,
|
|||||||
// Check if `texcoord_index` is zero or positive. negative =
|
// Check if `texcoord_index` is zero or positive. negative =
|
||||||
// notexcoord data
|
// notexcoord data
|
||||||
if (idx.texcoord_index >= 0) {
|
if (idx.texcoord_index >= 0) {
|
||||||
tinyobj::real_t tx =
|
if (outMaterial->texturePath.has_value()) {
|
||||||
attrib.texcoords[2 * size_t(idx.texcoord_index) + 0];
|
tinyobj::real_t tx =
|
||||||
tinyobj::real_t ty =
|
attrib.texcoords[2 * size_t(idx.texcoord_index) + 0];
|
||||||
attrib.texcoords[2 * size_t(idx.texcoord_index) + 1];
|
tinyobj::real_t ty =
|
||||||
|
attrib.texcoords[2 * size_t(idx.texcoord_index) + 1];
|
||||||
|
|
||||||
auto finalY = invertY ? 1.0F - ty : ty;
|
auto finalY = invertY ? 1.0F - ty : ty;
|
||||||
outFrame->textureCoords[materialInsertControl.inserted].set(
|
outFrame->textureCoords[materialInsertControl.inserted].set(
|
||||||
tx, finalY, 1.0F, 0.0F);
|
tx, finalY, 1.0F, 0.0F);
|
||||||
|
} else {
|
||||||
|
auto warningWasNotPrinted =
|
||||||
|
std::find(materialIdsWithTextureWarning.begin(),
|
||||||
|
materialIdsWithTextureWarning.end(),
|
||||||
|
materialId) == materialIdsWithTextureWarning.end();
|
||||||
|
|
||||||
|
if (frameIndex == 0 && warningWasNotPrinted) {
|
||||||
|
materialIdsWithTextureWarning.push_back(materialId);
|
||||||
|
|
||||||
|
TYRA_WARN(
|
||||||
|
"Material \"", outMaterial->name,
|
||||||
|
"\" has texture coordinates, but texture path was not found "
|
||||||
|
"in .mtl file! ",
|
||||||
|
"Please consider adding texture path to map_Kd field in .mtl "
|
||||||
|
"file!");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
materialInsertControl.inserted++;
|
materialInsertControl.inserted++;
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
|
|
||||||
/*
|
|
||||||
# _____ ____ ___
|
|
||||||
# | \/ ____| |___|
|
|
||||||
# | | | \ | |
|
|
||||||
#-----------------------------------------------------------------------
|
|
||||||
# Copyright 2022, tyra - https://github.com/h4570/tyra
|
|
||||||
# Licensed under Apache License 2.0
|
|
||||||
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "loaders/loader.hpp"
|
|
||||||
|
|
||||||
namespace Tyra {
|
|
||||||
|
|
||||||
std::string Loader::getFilenameFromPath(const std::string& path) {
|
|
||||||
std::string filename = path.substr(path.find_last_of("/\\") + 1);
|
|
||||||
if (filename.size() == path.size()) {
|
|
||||||
filename = path.substr(path.find_last_of(":\\") + 1);
|
|
||||||
}
|
|
||||||
return filename;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string Loader::getPathFromFilename(const std::string& path) {
|
|
||||||
std::string basepath = path.substr(0, path.find_last_of("/\\"));
|
|
||||||
if (basepath.size() == path.size()) {
|
|
||||||
basepath = path.substr(0, path.find_last_of(":\\"));
|
|
||||||
}
|
|
||||||
return basepath;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string Loader::getFilenameWithoutExtension(const std::string& filename) {
|
|
||||||
auto lastindex = filename.find_last_of(".");
|
|
||||||
return filename.substr(0, lastindex);
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string Loader::getExtensionOfFilename(const std::string& filename) {
|
|
||||||
auto lastindex = filename.find_last_of(".");
|
|
||||||
return filename.substr(lastindex + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Tyra
|
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <draw_buffers.h>
|
#include <draw_buffers.h>
|
||||||
#include "loaders/texture/png_loader.hpp"
|
#include "loaders/texture/png_loader.hpp"
|
||||||
|
#include "file/file_utils.hpp"
|
||||||
|
|
||||||
namespace Tyra {
|
namespace Tyra {
|
||||||
|
|
||||||
@@ -32,7 +33,7 @@ TextureBuilderData* PngLoader::load(const char* fullPath) {
|
|||||||
std::string path = fullPath;
|
std::string path = fullPath;
|
||||||
TYRA_ASSERT(!path.empty(), "Provided path is empty!");
|
TYRA_ASSERT(!path.empty(), "Provided path is empty!");
|
||||||
|
|
||||||
auto filename = getFilenameFromPath(path);
|
auto filename = FileUtils::getFilenameFromPath(path);
|
||||||
|
|
||||||
FILE* file = fopen(fullPath, "rb");
|
FILE* file = fopen(fullPath, "rb");
|
||||||
TYRA_ASSERT(file != nullptr, "Failed to load ", fullPath);
|
TYRA_ASSERT(file != nullptr, "Failed to load ", fullPath);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include "renderer/3d/mesh/mesh_material.hpp"
|
#include "renderer/3d/mesh/mesh_material.hpp"
|
||||||
|
#include "file/file_utils.hpp"
|
||||||
|
|
||||||
namespace Tyra {
|
namespace Tyra {
|
||||||
|
|
||||||
@@ -29,7 +30,7 @@ MeshMaterial::MeshMaterial(const MeshBuilderData& data,
|
|||||||
|
|
||||||
id = rand() % 1000000;
|
id = rand() % 1000000;
|
||||||
|
|
||||||
if (data.lightMapEnabled) {
|
if (data.loadLightmap) {
|
||||||
lightmapFlag = true;
|
lightmapFlag = true;
|
||||||
TYRA_ASSERT(material->frames[0]->colors != nullptr,
|
TYRA_ASSERT(material->frames[0]->colors != nullptr,
|
||||||
"Colors faces are required");
|
"Colors faces are required");
|
||||||
@@ -38,8 +39,15 @@ MeshMaterial::MeshMaterial(const MeshBuilderData& data,
|
|||||||
}
|
}
|
||||||
|
|
||||||
ambient.set(material->ambient);
|
ambient.set(material->ambient);
|
||||||
|
|
||||||
name = material->name;
|
name = material->name;
|
||||||
|
|
||||||
|
if (material->texturePath.has_value()) {
|
||||||
|
auto textureFilename =
|
||||||
|
FileUtils::getFilenameFromPath(material->texturePath.value());
|
||||||
|
|
||||||
|
textureName = FileUtils::getFilenameWithoutExtension(textureFilename);
|
||||||
|
}
|
||||||
|
|
||||||
TYRA_ASSERT(name.length() > 0, "MeshMaterial name cannot be empty");
|
TYRA_ASSERT(name.length() > 0, "MeshMaterial name cannot be empty");
|
||||||
|
|
||||||
u32 lastVertexCount = 0;
|
u32 lastVertexCount = 0;
|
||||||
@@ -71,7 +79,7 @@ MeshMaterial::MeshMaterial(const MeshMaterial& mesh) {
|
|||||||
|
|
||||||
lightmapFlag = mesh.lightmapFlag;
|
lightmapFlag = mesh.lightmapFlag;
|
||||||
name = mesh.name;
|
name = mesh.name;
|
||||||
|
textureName = mesh.textureName;
|
||||||
ambient.set(128.0F, 128.0F, 128.0F, 128.0F);
|
ambient.set(128.0F, 128.0F, 128.0F, 128.0F);
|
||||||
|
|
||||||
for (u32 i = 0; i < mesh.frames.size(); i++) {
|
for (u32 i = 0; i < mesh.frames.size(); i++) {
|
||||||
@@ -112,9 +120,14 @@ std::string MeshMaterial::getPrint(const char* name) const {
|
|||||||
res << std::endl;
|
res << std::endl;
|
||||||
res << std::fixed << std::setprecision(2);
|
res << std::fixed << std::setprecision(2);
|
||||||
res << "Id: " << id << ", " << std::endl;
|
res << "Id: " << id << ", " << std::endl;
|
||||||
res << "Name: " << name << ", " << std::endl;
|
res << "Name: " << this->name << ", " << std::endl;
|
||||||
|
|
||||||
|
if (textureName.has_value()) {
|
||||||
|
res << "Texture path: " << textureName.value() << ", " << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
res << "Frames count: " << frames.size() << ", " << std::endl;
|
res << "Frames count: " << frames.size() << ", " << std::endl;
|
||||||
res << "Single color?: " << static_cast<u32>(lightmapFlag) << std::endl;
|
res << "Lightmap?: " << static_cast<u32>(lightmapFlag) << std::endl;
|
||||||
res << ")";
|
res << ")";
|
||||||
|
|
||||||
return res.str();
|
return res.str();
|
||||||
|
|||||||
@@ -36,11 +36,12 @@ MeshMaterialFrame::MeshMaterialFrame(const MeshBuilderData& data,
|
|||||||
TYRA_ASSERT(frame->count > 0, "Vertex count must be greater than 0",
|
TYRA_ASSERT(frame->count > 0, "Vertex count must be greater than 0",
|
||||||
"Material name: ", material->name);
|
"Material name: ", material->name);
|
||||||
TYRA_ASSERT(frame->vertices != nullptr, "Vertex array can't be null");
|
TYRA_ASSERT(frame->vertices != nullptr, "Vertex array can't be null");
|
||||||
TYRA_ASSERT(!data.normalsEnabled || frame->normals != nullptr,
|
TYRA_ASSERT(!data.loadNormals || frame->normals != nullptr,
|
||||||
"Normal array can't be null");
|
"Normal array can't be null");
|
||||||
TYRA_ASSERT(!data.textureCoordsEnabled || frame->textureCoords != nullptr,
|
TYRA_ASSERT(
|
||||||
"Texture coordinate array can't be null");
|
!material->texturePath.has_value() || frame->textureCoords != nullptr,
|
||||||
TYRA_ASSERT(!data.lightMapEnabled || frame->colors != nullptr,
|
"Texture coordinate array can't be null");
|
||||||
|
TYRA_ASSERT(!data.loadLightmap || frame->colors != nullptr,
|
||||||
"Color array can't be null");
|
"Color array can't be null");
|
||||||
|
|
||||||
bbox = new BBox(frame->vertices, frame->count);
|
bbox = new BBox(frame->vertices, frame->count);
|
||||||
@@ -48,7 +49,7 @@ MeshMaterialFrame::MeshMaterialFrame(const MeshBuilderData& data,
|
|||||||
count = frame->count;
|
count = frame->count;
|
||||||
vertices = frame->vertices;
|
vertices = frame->vertices;
|
||||||
|
|
||||||
if (data.normalsEnabled) {
|
if (data.loadNormals) {
|
||||||
normals = frame->normals;
|
normals = frame->normals;
|
||||||
} else {
|
} else {
|
||||||
if (frame->normals != nullptr) delete[] frame->normals;
|
if (frame->normals != nullptr) delete[] frame->normals;
|
||||||
@@ -56,7 +57,7 @@ MeshMaterialFrame::MeshMaterialFrame(const MeshBuilderData& data,
|
|||||||
normals = nullptr;
|
normals = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.textureCoordsEnabled) {
|
if (material->texturePath.has_value()) {
|
||||||
textureCoords = frame->textureCoords;
|
textureCoords = frame->textureCoords;
|
||||||
} else {
|
} else {
|
||||||
if (frame->textureCoords != nullptr) delete[] frame->textureCoords;
|
if (frame->textureCoords != nullptr) delete[] frame->textureCoords;
|
||||||
@@ -64,7 +65,7 @@ MeshMaterialFrame::MeshMaterialFrame(const MeshBuilderData& data,
|
|||||||
textureCoords = nullptr;
|
textureCoords = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.lightMapEnabled) {
|
if (data.loadLightmap) {
|
||||||
colors = frame->colors;
|
colors = frame->colors;
|
||||||
} else {
|
} else {
|
||||||
if (frame->colors != nullptr) delete[] frame->colors;
|
if (frame->colors != nullptr) delete[] frame->colors;
|
||||||
|
|||||||
@@ -160,19 +160,19 @@ void DynPipRenderer::sendObjectData(
|
|||||||
void DynPipRenderer::render(DynPipBag** bags, const u32& count) {
|
void DynPipRenderer::render(DynPipBag** bags, const u32& count) {
|
||||||
if (count <= 0) return;
|
if (count <= 0) return;
|
||||||
|
|
||||||
auto* program = programsRepo->getProgramByBag(bags[0]);
|
addBufferDataToPacket(bags, count);
|
||||||
addBufferDataToPacket(program, bags, count);
|
|
||||||
sendPacket();
|
sendPacket();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DynPipRenderer::addBufferDataToPacket(DynPipVU1Program* program,
|
void DynPipRenderer::addBufferDataToPacket(DynPipBag** bags, const u32& count) {
|
||||||
DynPipBag** bags, const u32& count) {
|
|
||||||
currentPacket = packets[context];
|
currentPacket = packets[context];
|
||||||
packet2_reset(currentPacket, false);
|
packet2_reset(currentPacket, false);
|
||||||
|
|
||||||
for (u32 i = 0; i < count; i++) {
|
for (u32 i = 0; i < count; i++) {
|
||||||
if (bags[i]->count <= 0) continue;
|
if (bags[i]->count <= 0) continue;
|
||||||
|
|
||||||
|
auto* program = programsRepo->getProgramByBag(bags[i]);
|
||||||
|
|
||||||
program->addBufferDataToPacket(currentPacket, bags[i], prim);
|
program->addBufferDataToPacket(currentPacket, bags[i], prim);
|
||||||
|
|
||||||
if (lastProgramName != program->getName()) {
|
if (lastProgramName != program->getName()) {
|
||||||
|
|||||||
@@ -35,6 +35,11 @@ void DynamicPipeline::onUse() {
|
|||||||
|
|
||||||
buffers = new DynPipBag[buffersCount];
|
buffers = new DynPipBag[buffersCount];
|
||||||
|
|
||||||
|
for (u32 i = 0; i < buffersCount; i++) {
|
||||||
|
buffers[i].texture = nullptr;
|
||||||
|
buffers[i].lighting = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
auto packetSize =
|
auto packetSize =
|
||||||
buffersCount * 5.1F; // 5.1 = packet2_get_qw_count / buffersCount
|
buffersCount * 5.1F; // 5.1 = packet2_get_qw_count / buffersCount
|
||||||
|
|
||||||
@@ -96,11 +101,12 @@ void DynamicPipeline::render(const DynamicMesh* mesh,
|
|||||||
|
|
||||||
for (u32 i = 0; i < mesh->materials.size(); i++) {
|
for (u32 i = 0; i < mesh->materials.size(); i++) {
|
||||||
auto* material = mesh->materials[i];
|
auto* material = mesh->materials[i];
|
||||||
|
|
||||||
auto* frameFrom = material->frames[mesh->animation.getState().currentFrame];
|
auto* frameFrom = material->frames[mesh->animation.getState().currentFrame];
|
||||||
auto* frameTo = material->frames[mesh->animation.getState().nextFrame];
|
auto* frameTo = material->frames[mesh->animation.getState().nextFrame];
|
||||||
|
|
||||||
auto partSize = core.getMaxVertCountByParams(
|
auto partSize = core.getMaxVertCountByParams(
|
||||||
options && options->lighting, material->frames[0]->textureCoords);
|
options && options->lighting, material->textureName.has_value());
|
||||||
|
|
||||||
u32 partsCount = ceil(frameFrom->count / static_cast<float>(partSize));
|
u32 partsCount = ceil(frameFrom->count / static_cast<float>(partSize));
|
||||||
|
|
||||||
@@ -109,13 +115,17 @@ void DynamicPipeline::render(const DynamicMesh* mesh,
|
|||||||
setBuffersColorBag(buffers, colorBag);
|
setBuffersColorBag(buffers, colorBag);
|
||||||
u8 isPartInitialized = false;
|
u8 isPartInitialized = false;
|
||||||
|
|
||||||
auto* texture =
|
Texture* texture = nullptr;
|
||||||
rendererCore->texture.repository.getByMeshMaterialId(material->id);
|
|
||||||
|
|
||||||
TYRA_ASSERT(texture, "Texture for material: ", material->name,
|
if (material->textureName.has_value()) {
|
||||||
"Id: ", material->id,
|
texture =
|
||||||
"Was not found in texture repository! Did you forget to add "
|
rendererCore->texture.repository.getByMeshMaterialId(material->id);
|
||||||
"texture or disable texture coords loading in mesh?");
|
|
||||||
|
TYRA_ASSERT(texture, "Texture for material: ", material->name,
|
||||||
|
"Id: ", material->id,
|
||||||
|
"Was not found in texture repository! Did you forget to add "
|
||||||
|
"texture or disable texture coords loading in mesh?");
|
||||||
|
}
|
||||||
|
|
||||||
for (u32 k = 0; k < partsCount; k++) {
|
for (u32 k = 0; k < partsCount; k++) {
|
||||||
auto& buffer = buffers[bufferIndex];
|
auto& buffer = buffers[bufferIndex];
|
||||||
@@ -127,6 +137,7 @@ void DynamicPipeline::render(const DynamicMesh* mesh,
|
|||||||
u32 startIndex = k * partSize;
|
u32 startIndex = k * partSize;
|
||||||
|
|
||||||
addVertices(frameFrom, frameTo, &buffer, startIndex);
|
addVertices(frameFrom, frameTo, &buffer, startIndex);
|
||||||
|
|
||||||
buffer.texture = getTextureBag(texture, frameFrom, frameTo, startIndex);
|
buffer.texture = getTextureBag(texture, frameFrom, frameTo, startIndex);
|
||||||
buffer.lighting = getLightingBag(frameFrom, frameTo, &model, options,
|
buffer.lighting = getLightingBag(frameFrom, frameTo, &model, options,
|
||||||
dirLights, startIndex);
|
dirLights, startIndex);
|
||||||
@@ -139,11 +150,13 @@ void DynamicPipeline::render(const DynamicMesh* mesh,
|
|||||||
setBuffer(buffers, &buffer, &bufferIndex);
|
setBuffer(buffers, &buffer, &bufferIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sendRestOfBuffers(buffers, bufferIndex);
|
||||||
|
bufferIndex = 0;
|
||||||
|
core.begin(infoBag);
|
||||||
|
|
||||||
delete colorBag;
|
delete colorBag;
|
||||||
}
|
}
|
||||||
|
|
||||||
sendRestOfBuffers(buffers, &bufferIndex);
|
|
||||||
|
|
||||||
if (dirLights) {
|
if (dirLights) {
|
||||||
delete dirLights;
|
delete dirLights;
|
||||||
}
|
}
|
||||||
@@ -177,11 +190,12 @@ void DynamicPipeline::setBuffer(DynPipBag* buffers, DynPipBag* buffer,
|
|||||||
*bufferIndex += 1;
|
*bufferIndex += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DynamicPipeline::sendRestOfBuffers(DynPipBag* buffers, u16* bufferIndex) {
|
void DynamicPipeline::sendRestOfBuffers(DynPipBag* buffers,
|
||||||
auto isEndOf1stDBuffer = *bufferIndex <= halfBuffersCount - 1;
|
const u16& bufferIndex) {
|
||||||
|
auto isEndOf1stDBuffer = bufferIndex <= halfBuffersCount - 1;
|
||||||
|
|
||||||
u32 offset = isEndOf1stDBuffer ? 0 : halfBuffersCount;
|
u32 offset = isEndOf1stDBuffer ? 0 : halfBuffersCount;
|
||||||
u32 size = *bufferIndex - offset;
|
u32 size = bufferIndex - offset;
|
||||||
|
|
||||||
if (size <= 0) return;
|
if (size <= 0) return;
|
||||||
|
|
||||||
@@ -258,7 +272,7 @@ DynPipColorBag* DynamicPipeline::getColorBag(
|
|||||||
DynPipTextureBag* DynamicPipeline::getTextureBag(
|
DynPipTextureBag* DynamicPipeline::getTextureBag(
|
||||||
Texture* texture, const MeshMaterialFrame* materialFrameFrom,
|
Texture* texture, const MeshMaterialFrame* materialFrameFrom,
|
||||||
const MeshMaterialFrame* materialFrameTo, const u32& startIndex) {
|
const MeshMaterialFrame* materialFrameTo, const u32& startIndex) {
|
||||||
if (!materialFrameFrom->textureCoords) return nullptr;
|
if (!materialFrameFrom->textureCoords || texture == nullptr) return nullptr;
|
||||||
|
|
||||||
auto* result = new DynPipTextureBag();
|
auto* result = new DynPipTextureBag();
|
||||||
|
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ void StaticPipeline::render(const StaticMesh* mesh,
|
|||||||
!(options->frustumCulling != PipelineFrustumCulling_Precise &&
|
!(options->frustumCulling != PipelineFrustumCulling_Precise &&
|
||||||
infoBag->fullClipChecks == true),
|
infoBag->fullClipChecks == true),
|
||||||
"Full clip checks are only supported with frustum culling == Precise!");
|
"Full clip checks are only supported with frustum culling == Precise!");
|
||||||
|
|
||||||
TYRA_ASSERT(options->transformationType == TyraMVP ||
|
TYRA_ASSERT(options->transformationType == TyraMVP ||
|
||||||
(!options->fullClipChecks &&
|
(!options->fullClipChecks &&
|
||||||
options->frustumCulling == PipelineFrustumCulling_None),
|
options->frustumCulling == PipelineFrustumCulling_None),
|
||||||
@@ -76,6 +77,10 @@ void StaticPipeline::render(const StaticMesh* mesh,
|
|||||||
if (frame->bbox->frustumCheck(
|
if (frame->bbox->frustumCheck(
|
||||||
rendererCore->renderer3D.frustumPlanes.getAll(), model) ==
|
rendererCore->renderer3D.frustumPlanes.getAll(), model) ==
|
||||||
CoreBBoxFrustum::OUTSIDE_FRUSTUM) {
|
CoreBBoxFrustum::OUTSIDE_FRUSTUM) {
|
||||||
|
if (options && optionsManuallyAllocated) {
|
||||||
|
delete options;
|
||||||
|
}
|
||||||
|
delete infoBag;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -146,7 +151,8 @@ StaPipColorBag* StaticPipeline::getColorBag(
|
|||||||
|
|
||||||
StaPipTextureBag* StaticPipeline::getTextureBag(
|
StaPipTextureBag* StaticPipeline::getTextureBag(
|
||||||
const MeshMaterial* material, const MeshMaterialFrame* materialFrame) {
|
const MeshMaterial* material, const MeshMaterialFrame* materialFrame) {
|
||||||
if (!materialFrame->textureCoords) return nullptr;
|
if (!materialFrame->textureCoords || !material->textureName.has_value())
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
auto* result = new StaPipTextureBag();
|
auto* result = new StaPipTextureBag();
|
||||||
|
|
||||||
|
|||||||
@@ -84,10 +84,12 @@ void RendererCore2D::render(const Sprite& sprite,
|
|||||||
else if (sizeY > sizeX)
|
else if (sizeY > sizeX)
|
||||||
texS = texMax / (sizeY / sizeX);
|
texS = texMax / (sizeY / sizeX);
|
||||||
|
|
||||||
rect->t0.s = sprite.flipHorizontal ? texS : 0.0F;
|
rect->t0.s =
|
||||||
rect->t0.t = sprite.flipVertical ? texT : 0.0F;
|
sprite.flipHorizontal ? (texS + sprite.offset.x) : sprite.offset.x;
|
||||||
rect->t1.s = sprite.flipHorizontal ? 0.0F : texS;
|
rect->t0.t = sprite.flipVertical ? (texT + sprite.offset.y) : sprite.offset.y;
|
||||||
rect->t1.t = sprite.flipVertical ? 0.0F : texT;
|
rect->t1.s =
|
||||||
|
sprite.flipHorizontal ? sprite.offset.x : (texS + sprite.offset.x);
|
||||||
|
rect->t1.t = sprite.flipVertical ? sprite.offset.y : (texT + sprite.offset.y);
|
||||||
|
|
||||||
rect->color.r = sprite.color.r;
|
rect->color.r = sprite.color.r;
|
||||||
rect->color.g = sprite.color.g;
|
rect->color.g = sprite.color.g;
|
||||||
@@ -131,4 +133,10 @@ void RendererCore2D::render(const Sprite& sprite,
|
|||||||
context = !context;
|
context = !context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RendererCore2D::setTextureMappingType(
|
||||||
|
const PipelineTextureMappingType textureMappingType) {
|
||||||
|
lod.mag_filter = textureMappingType;
|
||||||
|
lod.min_filter = textureMappingType;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Tyra
|
} // namespace Tyra
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ Sprite::Sprite() {
|
|||||||
flipVertical = false;
|
flipVertical = false;
|
||||||
size.set(32.0F, 32.0F);
|
size.set(32.0F, 32.0F);
|
||||||
position.set(100.0F, 100.0F);
|
position.set(100.0F, 100.0F);
|
||||||
|
offset.set(0.0F, 0.0F);
|
||||||
scale = 1.0F;
|
scale = 1.0F;
|
||||||
mode = MODE_REPEAT;
|
mode = MODE_REPEAT;
|
||||||
setDefaultColor();
|
setDefaultColor();
|
||||||
|
|||||||
@@ -116,8 +116,12 @@ void TextureRepository::addByMesh(const Mesh* mesh, const char* directory,
|
|||||||
if (dirFixed.back() != '/' && dirFixed.back() != ':') dirFixed += "/";
|
if (dirFixed.back() != '/' && dirFixed.back() != ':') dirFixed += "/";
|
||||||
|
|
||||||
for (u32 i = 0; i < mesh->materials.size(); i++) {
|
for (u32 i = 0; i < mesh->materials.size(); i++) {
|
||||||
|
if (!mesh->materials[i]->textureName.has_value()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
std::string fullPath =
|
std::string fullPath =
|
||||||
dirFixed + mesh->materials[i]->name + "." + extension;
|
dirFixed + mesh->materials[i]->textureName.value() + "." + extension;
|
||||||
|
|
||||||
auto* data = loader.load(fullPath.c_str());
|
auto* data = loader.load(fullPath.c_str());
|
||||||
Texture* texture = new Texture(data);
|
Texture* texture = new Texture(data);
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
{
|
{
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"label": "Send to PS2",
|
"label": "Send to PS2",
|
||||||
"command": "docker exec -t tyra-game-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'"
|
"command": "docker exec -t tyra-game-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || $true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
|
|||||||
Vendored
+3
-1
@@ -2,6 +2,8 @@
|
|||||||
"recommendations": [
|
"recommendations": [
|
||||||
"ms-vscode.cpptools-extension-pack",
|
"ms-vscode.cpptools-extension-pack",
|
||||||
"ryzngard.vscode-header-source",
|
"ryzngard.vscode-header-source",
|
||||||
"maziac.asm-code-lens"
|
"maziac.asm-code-lens",
|
||||||
|
"dmnsgn.vscode-wavefront",
|
||||||
|
"spmeesseman.vscode-taskexplorer"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <engine.hpp>
|
#include <tyra>
|
||||||
#include <game.hpp>
|
|
||||||
|
|
||||||
namespace Racer {
|
namespace Racer {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "engine.hpp"
|
#include <tyra>
|
||||||
#include "racer_game.hpp"
|
#include "racer_game.hpp"
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
|
|||||||
@@ -37,9 +37,8 @@ void Tutorial04::loop() {
|
|||||||
/**
|
/**
|
||||||
* Render de_dust2.
|
* Render de_dust2.
|
||||||
*
|
*
|
||||||
* As you see there are clipping issues (visual glitches).
|
* If you see clipping issues (visual glitches),
|
||||||
* If you want to know how to fix it, please
|
* You can check how to fix them in #02 YT tutorial.
|
||||||
* watch video tutorial.
|
|
||||||
*/
|
*/
|
||||||
stapip.render(mesh.get(), renderOptions);
|
stapip.render(mesh.get(), renderOptions);
|
||||||
}
|
}
|
||||||
@@ -52,7 +51,7 @@ void Tutorial04::loadMesh() {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load mesh data
|
* Load mesh data
|
||||||
* Texture names are the material names "usemtl <material name>"
|
* Texture file names are loaded from .mtl file (map_Kd field).
|
||||||
*/
|
*/
|
||||||
auto data =
|
auto data =
|
||||||
ObjLoader::load(FileUtils::fromCwd("de_dust2/de_dust2.obj"), options);
|
ObjLoader::load(FileUtils::fromCwd("de_dust2/de_dust2.obj"), options);
|
||||||
@@ -68,8 +67,9 @@ void Tutorial04::loadMesh() {
|
|||||||
renderOptions.frustumCulling = Tyra::PipelineFrustumCulling_None;
|
renderOptions.frustumCulling = Tyra::PipelineFrustumCulling_None;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function which load all textures into texture repository,
|
* Function which load all textures into texture repository.
|
||||||
* based on material names.
|
* It will automatically extract filename from path (map_Kd) and add
|
||||||
|
* proper extension.
|
||||||
*/
|
*/
|
||||||
engine->renderer.getTextureRepository().addByMesh(
|
engine->renderer.getTextureRepository().addByMesh(
|
||||||
mesh.get(), FileUtils::fromCwd("de_dust2/"), "png");
|
mesh.get(), FileUtils::fromCwd("de_dust2/"), "png");
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ Tutorial05::~Tutorial05() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Tutorial05::init() {
|
void Tutorial05::init() {
|
||||||
|
engine->renderer.setClearScreenColor(Color(32.0F, 32.0F, 32.0F));
|
||||||
|
|
||||||
dynpip.setRenderer(&engine->renderer.core);
|
dynpip.setRenderer(&engine->renderer.core);
|
||||||
|
|
||||||
cameraPosition = Vec4(0.0F, 0.0F, -10.0F);
|
cameraPosition = Vec4(0.0F, 0.0F, -10.0F);
|
||||||
@@ -55,7 +57,7 @@ void Tutorial05::loadZombieMesh() {
|
|||||||
/** Starting file suffix index. It means that 1 will start from _000001.obj */
|
/** Starting file suffix index. It means that 1 will start from _000001.obj */
|
||||||
options.animation.startingIndex = 1;
|
options.animation.startingIndex = 1;
|
||||||
|
|
||||||
/** If you want to know how to cook this file, please watch tutorial video */
|
/** If you want to know how to cook this file, please watch #02 YT tutorial */
|
||||||
auto data = ObjLoader::load(FileUtils::fromCwd("zombie/zombie.obj"), options);
|
auto data = ObjLoader::load(FileUtils::fromCwd("zombie/zombie.obj"), options);
|
||||||
|
|
||||||
zombieMesh = std::make_unique<DynamicMesh>(data.get());
|
zombieMesh = std::make_unique<DynamicMesh>(data.get());
|
||||||
|
|||||||
@@ -76,12 +76,9 @@ void Tutorial07::loadMeshWithLightmap() {
|
|||||||
auto data = ObjLoader::load(FileUtils::fromCwd("cup.obj"), options);
|
auto data = ObjLoader::load(FileUtils::fromCwd("cup.obj"), options);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We don't want to load texture coordinates,
|
* This model has no texture (it was exported without UV data),
|
||||||
* because this obj file has no texture.
|
* but you can use lighting with textures as well.
|
||||||
*
|
|
||||||
* Anyways you can use texture as well.
|
|
||||||
*/
|
*/
|
||||||
data->textureCoordsEnabled = false;
|
|
||||||
|
|
||||||
/** Lets add lightmap manually */
|
/** Lets add lightmap manually */
|
||||||
setLightmap(data.get());
|
setLightmap(data.get());
|
||||||
@@ -120,7 +117,7 @@ void Tutorial07::setDirectionalLightsOptions() {
|
|||||||
|
|
||||||
void Tutorial07::setLightmap(MeshBuilderData* data) {
|
void Tutorial07::setLightmap(MeshBuilderData* data) {
|
||||||
/** Information for mesh, that data has lightmap */
|
/** Information for mesh, that data has lightmap */
|
||||||
data->lightMapEnabled = true;
|
data->loadLightmap = true;
|
||||||
|
|
||||||
/** This object file has only 1 material */
|
/** This object file has only 1 material */
|
||||||
auto* material = data->materials[0];
|
auto* material = data->materials[0];
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ class Tutorial08 : public Game {
|
|||||||
void loadCupMesh();
|
void loadCupMesh();
|
||||||
void loadSkyboxMesh();
|
void loadSkyboxMesh();
|
||||||
|
|
||||||
Vec4 cameraPosition, cameraLookAt;
|
Vec4 cameraPosition;
|
||||||
|
Vec4 cameraLookAt;
|
||||||
|
|
||||||
Engine* engine;
|
Engine* engine;
|
||||||
|
|
||||||
u8 fpsCounter;
|
u8 fpsCounter;
|
||||||
|
|
||||||
StaticPipeline stapip;
|
StaticPipeline stapip;
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ void Tutorial08::loadCupMesh() {
|
|||||||
options.scale = 3.0F;
|
options.scale = 3.0F;
|
||||||
|
|
||||||
auto data = ObjLoader::load(FileUtils::fromCwd("cup/cup.obj"), options);
|
auto data = ObjLoader::load(FileUtils::fromCwd("cup/cup.obj"), options);
|
||||||
data->textureCoordsEnabled = false;
|
|
||||||
|
|
||||||
cupMesh = std::make_unique<StaticMesh>(data.get());
|
cupMesh = std::make_unique<StaticMesh>(data.get());
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
TARGET := tutorial_10.elf
|
||||||
|
ENGINEDIR := ../../engine
|
||||||
|
|
||||||
|
#The Directories, Source, Includes, Objects, Binary and Resources
|
||||||
|
SRCDIR := src
|
||||||
|
INCDIR := inc
|
||||||
|
BUILDDIR := obj
|
||||||
|
TARGETDIR := bin
|
||||||
|
RESDIR := res
|
||||||
|
SRCEXT := cpp
|
||||||
|
VSMEXT := vsm
|
||||||
|
VCLEXT := vcl
|
||||||
|
VCLPPEXT := vclpp
|
||||||
|
DEPEXT := d
|
||||||
|
OBJEXT := o
|
||||||
|
|
||||||
|
#Flags, Libraries and Includes
|
||||||
|
CFLAGS :=
|
||||||
|
LIB :=
|
||||||
|
LIBDIRS :=
|
||||||
|
INC := -I$(INCDIR)
|
||||||
|
INCDEP := -I$(INCDIR)
|
||||||
|
|
||||||
|
include ../Makefile.tutorials-base
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# Ignore everything in this directory
|
||||||
|
*
|
||||||
|
# Except this file
|
||||||
|
!.gitignore
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
/*
|
||||||
|
# _____ ____ ___
|
||||||
|
# | \/ ____| |___|
|
||||||
|
# | | | \ | |
|
||||||
|
#-----------------------------------------------------------------------
|
||||||
|
# Copyright 2022-2023, tyra - https://github.com/h4570/tyra
|
||||||
|
# Licensed under Apache License 2.0
|
||||||
|
# Guido Diego Quispe Robles
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <tyra>
|
||||||
|
|
||||||
|
#define FONT_CHAR_SIZE 96
|
||||||
|
|
||||||
|
namespace Tyra {
|
||||||
|
|
||||||
|
class Font {
|
||||||
|
public:
|
||||||
|
Font();
|
||||||
|
void load(TextureRepository& repository, Renderer2D* renderer);
|
||||||
|
void free(TextureRepository& repository);
|
||||||
|
void drawText(const char* text, const int& x, const int& y, Color color);
|
||||||
|
void drawText(const std::string& text, const int& x, const int& y,
|
||||||
|
Color color);
|
||||||
|
|
||||||
|
private:
|
||||||
|
const static int chars[FONT_CHAR_SIZE];
|
||||||
|
const static int charWidths[FONT_CHAR_SIZE];
|
||||||
|
|
||||||
|
Renderer2D* renderer2D;
|
||||||
|
Sprite allFont;
|
||||||
|
std::array<Sprite, FONT_CHAR_SIZE> font;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Tyra
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
# _____ ____ ___
|
||||||
|
# | \/ ____| |___|
|
||||||
|
# | | | \ | |
|
||||||
|
#-----------------------------------------------------------------------
|
||||||
|
# Copyright 2022-2023, tyra - https://github.com/h4570/tyra
|
||||||
|
# Licensed under Apache License 2.0
|
||||||
|
# Guido Diego Quispe Robles
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <tyra>
|
||||||
|
#include "font_sprite.hpp"
|
||||||
|
|
||||||
|
namespace Tyra {
|
||||||
|
|
||||||
|
class Tutorial10 : public Game {
|
||||||
|
public:
|
||||||
|
explicit Tutorial10(Engine* engine);
|
||||||
|
~Tutorial10();
|
||||||
|
|
||||||
|
void init();
|
||||||
|
void loop();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void loadTexture();
|
||||||
|
void loadSprite();
|
||||||
|
void handlePad();
|
||||||
|
|
||||||
|
int padTimer;
|
||||||
|
Engine* engine;
|
||||||
|
Pad* pad;
|
||||||
|
Font font;
|
||||||
|
|
||||||
|
Sprite sprite;
|
||||||
|
Sprite spriteFlip;
|
||||||
|
Sprite spriteScale;
|
||||||
|
Sprite spriteStretch;
|
||||||
|
std::string strFilter;
|
||||||
|
|
||||||
|
PipelineTextureMappingType textureFilter;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Tyra
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# Ignore everything in this directory
|
||||||
|
*
|
||||||
|
# Except this file
|
||||||
|
!.gitignore
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# Ignore everything in this directory
|
||||||
|
*
|
||||||
|
# Except this file
|
||||||
|
!.gitignore
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
$ConfigFile = Join-Path $PSScriptRoot '../../windows-pcsx2.ps1'
|
||||||
|
. $ConfigFile
|
||||||
|
|
||||||
|
RunPCSX2
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
/*
|
||||||
|
# _____ ____ ___
|
||||||
|
# | \/ ____| |___|
|
||||||
|
# | | | \ | |
|
||||||
|
#-----------------------------------------------------------------------
|
||||||
|
# Copyright 2022-2023, tyra - https://github.com/h4570/tyra
|
||||||
|
# Licensed under Apache License 2.0
|
||||||
|
# Guido Diego Quispe Robles
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "font_sprite.hpp"
|
||||||
|
|
||||||
|
namespace Tyra {
|
||||||
|
|
||||||
|
const int Font::chars[FONT_CHAR_SIZE]{
|
||||||
|
' ', '!', '"', ' ', '$', '%', ' ', '{', '(', ')', ' ', '+', ',', '-',
|
||||||
|
'.', '/', '0', '1', '2', '3', '4', '5', '6', '2', '8', '9', ':', ';',
|
||||||
|
'<', '=', '>', '?', ' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
|
||||||
|
'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
|
||||||
|
'X', 'Y', 'Z', ' ', ' ', ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e',
|
||||||
|
'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
|
||||||
|
't', 'u', 'v', 'w', 'x', 'y', 'z', '[', '}', ']', '~', ' '};
|
||||||
|
|
||||||
|
const int Font::charWidths[FONT_CHAR_SIZE]{
|
||||||
|
0, 1, 3, 0, 5, 9, 0, 9, 3, 3, 0, 5, 2, 2, 1, 4, 4, 2, 4, 4, 5, 4, 4, 4,
|
||||||
|
4, 4, 1, 2, 4, 5, 4, 4, 0, 6, 5, 5, 5, 4, 4, 5, 5, 1, 4, 5, 4, 7, 5, 5,
|
||||||
|
5, 5, 5, 5, 5, 5, 6, 7, 5, 5, 4, 0, 0, 0, 0, 0, 0, 5, 4, 4, 4, 4, 3, 4,
|
||||||
|
4, 1, 2, 4, 1, 7, 4, 4, 4, 4, 3, 4, 3, 4, 5, 7, 4, 4, 4, 2, 5, 2, 6, 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
Font::Font() {}
|
||||||
|
|
||||||
|
void Font::load(TextureRepository& repository, Renderer2D* renderer) {
|
||||||
|
renderer2D = renderer;
|
||||||
|
|
||||||
|
float height = 16.0F;
|
||||||
|
float width = 16.0F;
|
||||||
|
|
||||||
|
allFont.mode = MODE_REPEAT;
|
||||||
|
allFont.size = Vec2(255, 127);
|
||||||
|
|
||||||
|
auto filepath = FileUtils::fromCwd("earthbound-Font.png");
|
||||||
|
auto* texture = repository.add(filepath);
|
||||||
|
texture->addLink(allFont.id);
|
||||||
|
|
||||||
|
int column = 0;
|
||||||
|
int arrow = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < FONT_CHAR_SIZE; i++) {
|
||||||
|
font[i].id = allFont.id;
|
||||||
|
font[i].mode = MODE_REPEAT;
|
||||||
|
font[i].size = Vec2(width, height);
|
||||||
|
font[i].offset = Vec2(width * column, height * arrow);
|
||||||
|
column++;
|
||||||
|
|
||||||
|
if (column == 16) {
|
||||||
|
arrow++;
|
||||||
|
column = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Font::free(TextureRepository& repository) {
|
||||||
|
repository.freeBySprite(allFont);
|
||||||
|
for (int i = 0; i < FONT_CHAR_SIZE; i++) {
|
||||||
|
repository.freeBySprite(font[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Font::drawText(const char* text, const int& x, const int& y, Color color) {
|
||||||
|
drawText(std::string(text), x, y, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Font::drawText(const std::string& text, const int& x, const int& y,
|
||||||
|
Color color) {
|
||||||
|
int sizeText = text.size();
|
||||||
|
|
||||||
|
int offsetY = 0;
|
||||||
|
int offsetX = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < sizeText; i++) {
|
||||||
|
int fontPos = text[i];
|
||||||
|
Sprite fontSpr = font[0];
|
||||||
|
|
||||||
|
for (int j = 0; j < FONT_CHAR_SIZE; j++) {
|
||||||
|
if (fontPos == chars[j]) {
|
||||||
|
fontPos = j;
|
||||||
|
fontSpr = font[j];
|
||||||
|
fontSpr.color = color;
|
||||||
|
fontSpr.position = Vec2(x + offsetX, y + offsetY);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fontPos == '\n') {
|
||||||
|
offsetY += 18;
|
||||||
|
offsetX = 0.0f;
|
||||||
|
} else {
|
||||||
|
if ((fontPos != ' ') && (fontPos != '\t')) {
|
||||||
|
renderer2D->render(fontSpr);
|
||||||
|
offsetX += charWidths[fontPos] + 2;
|
||||||
|
} else {
|
||||||
|
offsetX += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Tyra
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
# _____ ____ ___
|
||||||
|
# | \/ ____| |___|
|
||||||
|
# | | | \ | |
|
||||||
|
#-----------------------------------------------------------------------
|
||||||
|
# Copyright 2022-2023, tyra - https://github.com/h4570/tyra
|
||||||
|
# Licensed under Apache License 2.0
|
||||||
|
# Guido Diego Quispe Robles
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "engine.hpp"
|
||||||
|
#include "tutorial_10.hpp"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* In this tutorial we will learn:
|
||||||
|
* - How works the offset of the sprite
|
||||||
|
* - How works the texture mapping
|
||||||
|
* - How to write text (font)
|
||||||
|
*/
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
Tyra::Engine engine;
|
||||||
|
Tyra::Tutorial10 game(&engine);
|
||||||
|
engine.run(&game);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,290 @@
|
|||||||
|
/*
|
||||||
|
# _____ ____ ___
|
||||||
|
# | \/ ____| |___|
|
||||||
|
# | | | \ | |
|
||||||
|
#-----------------------------------------------------------------------
|
||||||
|
# Copyright 2022-2023, tyra - https://github.com/h4570/tyra
|
||||||
|
# Licensed under Apache License 2.0
|
||||||
|
# Guido Diego Quispe Robles
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <tyra>
|
||||||
|
#include "tutorial_10.hpp"
|
||||||
|
|
||||||
|
namespace Tyra {
|
||||||
|
|
||||||
|
Tutorial10::Tutorial10(Engine* t_engine)
|
||||||
|
: padTimer(0), engine(t_engine), pad(&t_engine->pad) {}
|
||||||
|
|
||||||
|
Tutorial10::~Tutorial10() {
|
||||||
|
engine->renderer.getTextureRepository().freeBySprite(sprite);
|
||||||
|
engine->renderer.getTextureRepository().freeBySprite(spriteFlip);
|
||||||
|
engine->renderer.getTextureRepository().freeBySprite(spriteScale);
|
||||||
|
engine->renderer.getTextureRepository().freeBySprite(spriteStretch);
|
||||||
|
font.free(engine->renderer.getTextureRepository());
|
||||||
|
}
|
||||||
|
|
||||||
|
void Tutorial10::init() {
|
||||||
|
engine->renderer.setClearScreenColor(Color(32.0F, 32.0F, 32.0F));
|
||||||
|
|
||||||
|
/** Load all the sprites of the sprite sheet. */
|
||||||
|
font.load(engine->renderer.getTextureRepository(),
|
||||||
|
&engine->renderer.renderer2D);
|
||||||
|
|
||||||
|
/** Sprite contains rectangle information. */
|
||||||
|
loadSprite();
|
||||||
|
|
||||||
|
/** Texture contains png image. */
|
||||||
|
loadTexture();
|
||||||
|
|
||||||
|
/** Set the texture filtering. */
|
||||||
|
textureFilter = TyraNearest;
|
||||||
|
|
||||||
|
engine->renderer.core.renderer2D.setTextureMappingType(textureFilter);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Tutorial10::loop() {
|
||||||
|
auto& renderer = engine->renderer;
|
||||||
|
|
||||||
|
/** Change the texture filtering of the texture.
|
||||||
|
*
|
||||||
|
* The options are:
|
||||||
|
* TyraNearest (Point Sampling):
|
||||||
|
* uses the color of the texel closest to the pixel center for the pixel
|
||||||
|
* color.
|
||||||
|
*
|
||||||
|
* TyraLinear (Bilinear Sampling):
|
||||||
|
* the four nearest texels to the pixel center are sampled
|
||||||
|
* and their colors are combined by weighted average according to distance.
|
||||||
|
*
|
||||||
|
* By default it is linear.
|
||||||
|
*/
|
||||||
|
|
||||||
|
renderer.core.renderer2D.setTextureMappingType(textureFilter);
|
||||||
|
|
||||||
|
handlePad();
|
||||||
|
|
||||||
|
/** Begin frame will clear our screen. */
|
||||||
|
renderer.beginFrame();
|
||||||
|
|
||||||
|
/** Render sprite. */
|
||||||
|
renderer.renderer2D.render(sprite);
|
||||||
|
renderer.core.renderer2D.setTextureMappingType(TyraLinear);
|
||||||
|
renderer.renderer2D.render(spriteFlip);
|
||||||
|
renderer.core.renderer2D.setTextureMappingType(textureFilter);
|
||||||
|
renderer.renderer2D.render(spriteScale);
|
||||||
|
renderer.renderer2D.render(spriteStretch);
|
||||||
|
|
||||||
|
font.drawText("tests with sprite sheet", (512 / 2) - 60, 10,
|
||||||
|
Color(255, 255, 255));
|
||||||
|
font.drawText("Press Cross for nearest filter", (512 / 2) - 70, 50,
|
||||||
|
Color(255, 255, 255));
|
||||||
|
font.drawText("Press Circle for linear filter", (512 / 2) - 65, 70,
|
||||||
|
Color(255, 255, 255));
|
||||||
|
font.drawText("Use left stick for move the offsets of the sprites",
|
||||||
|
(512 / 2) - 110, 90, Color(255, 255, 255));
|
||||||
|
font.drawText("sprite 32x32\n scaled x3", sprite.position.x + 16,
|
||||||
|
sprite.position.y - 40, Color(255, 255, 255));
|
||||||
|
font.drawText("sprite 32x32\nscaled x3 with flip", spriteFlip.position.x + 4,
|
||||||
|
spriteFlip.position.y - 40, Color(255, 255, 255));
|
||||||
|
font.drawText("sprite 96x96 with\n repeat mode", spriteScale.position.x + 6,
|
||||||
|
spriteScale.position.y - 40, Color(255, 255, 255));
|
||||||
|
font.drawText("sprite 96x96 with\n stretch mode",
|
||||||
|
spriteStretch.position.x + 6, spriteStretch.position.y - 40,
|
||||||
|
Color(255, 255, 255));
|
||||||
|
|
||||||
|
if (textureFilter == TyraLinear) {
|
||||||
|
strFilter = "Filter: Linear";
|
||||||
|
} else {
|
||||||
|
strFilter = "Filter: Nearest";
|
||||||
|
}
|
||||||
|
|
||||||
|
int posX1 = sprite.position.x + 16;
|
||||||
|
int posX2 = spriteFlip.position.x + 16;
|
||||||
|
int posX3 = spriteStretch.position.x + 16;
|
||||||
|
int posX4 = spriteScale.position.x + 16;
|
||||||
|
|
||||||
|
int posY1 = sprite.position.y + (sprite.size.y * sprite.scale) + 16;
|
||||||
|
int posY2 =
|
||||||
|
spriteFlip.position.y + (spriteFlip.size.y * spriteFlip.scale) + 16;
|
||||||
|
int posY3 = spriteStretch.position.y +
|
||||||
|
(spriteStretch.size.y * spriteStretch.scale) + 16;
|
||||||
|
int posY4 =
|
||||||
|
spriteScale.position.y + (spriteScale.size.y * spriteScale.scale) + 16;
|
||||||
|
|
||||||
|
font.drawText(strFilter, posX1, posY1, Color(255, 255, 255));
|
||||||
|
font.drawText("Filter: Linear", posX2, posY2, Color(255, 255, 255));
|
||||||
|
font.drawText(strFilter, posX3, posY3, Color(255, 255, 255));
|
||||||
|
font.drawText(strFilter, posX4, posY4, Color(255, 255, 255));
|
||||||
|
|
||||||
|
/** End frame will perform vsync. */
|
||||||
|
renderer.endFrame();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Tutorial10::handlePad() {
|
||||||
|
if (engine->pad.getClicked().Cross) {
|
||||||
|
textureFilter = TyraNearest;
|
||||||
|
} else if (engine->pad.getClicked().Circle) {
|
||||||
|
textureFilter = TyraLinear;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Move the offset of the sprites.
|
||||||
|
*
|
||||||
|
* The offset of the sprite need to be equal or greater to zero
|
||||||
|
* or a graphical error occurs.
|
||||||
|
*
|
||||||
|
* And the sum of the sprite size and the offset must be less than 1024
|
||||||
|
* or a graphical error occurs.
|
||||||
|
*
|
||||||
|
* Sum with repeat mode:
|
||||||
|
* Max = sprite.size + sprite.offset.
|
||||||
|
*
|
||||||
|
* Sum with strecth mode:
|
||||||
|
* Max = original size of the image + sprite.offset.
|
||||||
|
*
|
||||||
|
* If it continues moving past these values
|
||||||
|
* in a moment it will return to normal but
|
||||||
|
* the error will be repeated with another value.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (padTimer <= 0) {
|
||||||
|
if (pad->getLeftJoyPad().v <= 100) { // up
|
||||||
|
sprite.offset -= Vec2(0, 16);
|
||||||
|
spriteFlip.offset -= Vec2(0, 16);
|
||||||
|
spriteScale.offset -= Vec2(0, 16);
|
||||||
|
spriteStretch.offset -= Vec2(0, 16);
|
||||||
|
padTimer = 20;
|
||||||
|
printf("New offset: %f,%f\n", sprite.offset.x, sprite.offset.y);
|
||||||
|
} else if (pad->getLeftJoyPad().v >= 200) { // down
|
||||||
|
sprite.offset += Vec2(0, 16);
|
||||||
|
spriteFlip.offset += Vec2(0, 16);
|
||||||
|
spriteScale.offset += Vec2(0, 16);
|
||||||
|
spriteStretch.offset += Vec2(0, 16);
|
||||||
|
padTimer = 20;
|
||||||
|
printf("New offset: %f,%f\n", sprite.offset.x, sprite.offset.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pad->getLeftJoyPad().h <= 100) { // left
|
||||||
|
sprite.offset -= Vec2(16, 0);
|
||||||
|
spriteFlip.offset -= Vec2(16, 0);
|
||||||
|
spriteScale.offset -= Vec2(16, 0);
|
||||||
|
spriteStretch.offset -= Vec2(16, 0);
|
||||||
|
padTimer = 20;
|
||||||
|
printf("New offset: %f,%f\n", sprite.offset.x, sprite.offset.y);
|
||||||
|
} else if (pad->getLeftJoyPad().h >= 200) { // right
|
||||||
|
sprite.offset += Vec2(16, 0);
|
||||||
|
spriteFlip.offset += Vec2(16, 0);
|
||||||
|
spriteScale.offset += Vec2(16, 0);
|
||||||
|
spriteStretch.offset += Vec2(16, 0);
|
||||||
|
padTimer = 20;
|
||||||
|
printf("New offset: %f,%f\n", sprite.offset.x, sprite.offset.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
padTimer--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Tutorial10::loadSprite() {
|
||||||
|
const auto& screenSettings = engine->renderer.core.getSettings();
|
||||||
|
|
||||||
|
int offset = 25;
|
||||||
|
|
||||||
|
sprite.mode = SpriteMode::MODE_REPEAT;
|
||||||
|
|
||||||
|
/** Let's scale it down */
|
||||||
|
sprite.size = Vec2(32.0F, 32.0F);
|
||||||
|
sprite.scale = 3;
|
||||||
|
|
||||||
|
/** Set the position */
|
||||||
|
sprite.position =
|
||||||
|
Vec2(offset, screenSettings.getHeight() / 2.0F - sprite.size.y / 2.0F);
|
||||||
|
|
||||||
|
spriteFlip.mode = SpriteMode::MODE_REPEAT;
|
||||||
|
|
||||||
|
spriteFlip.flipHorizontal = true;
|
||||||
|
spriteFlip.flipVertical = true;
|
||||||
|
|
||||||
|
spriteFlip.size = Vec2(32.0F, 32.0F);
|
||||||
|
|
||||||
|
spriteFlip.scale = 3;
|
||||||
|
|
||||||
|
spriteFlip.position =
|
||||||
|
Vec2(((offset * 2) + (32.0F * 3)),
|
||||||
|
screenSettings.getHeight() / 2.0F - sprite.size.y / 2.0F);
|
||||||
|
|
||||||
|
spriteScale.mode = SpriteMode::MODE_REPEAT;
|
||||||
|
|
||||||
|
spriteScale.size = Vec2(96.0F, 96.0F);
|
||||||
|
|
||||||
|
spriteScale.position =
|
||||||
|
Vec2(((offset * 3) + ((32.0F * 3) * 2)),
|
||||||
|
screenSettings.getHeight() / 2.0F - sprite.size.y / 2.0F);
|
||||||
|
|
||||||
|
spriteStretch.mode = SpriteMode::MODE_STRETCH;
|
||||||
|
|
||||||
|
spriteStretch.size = Vec2(96.0F, 96.0F);
|
||||||
|
|
||||||
|
spriteStretch.position =
|
||||||
|
Vec2(((offset * 4) + ((32.0F * 3) * 3)),
|
||||||
|
screenSettings.getHeight() / 2.0F - sprite.size.y / 2.0F);
|
||||||
|
|
||||||
|
TYRA_LOG("Sprite created!");
|
||||||
|
}
|
||||||
|
|
||||||
|
void Tutorial10::loadTexture() {
|
||||||
|
/**
|
||||||
|
* Renderer has high layer functions,
|
||||||
|
* which allows to render:
|
||||||
|
* - Sprite (2D)
|
||||||
|
* - Mesh (3D)
|
||||||
|
*
|
||||||
|
* It uses ONLY low layer functions which are in renderer.core
|
||||||
|
*/
|
||||||
|
auto& renderer = engine->renderer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TextureRepository is a repository of textures.
|
||||||
|
* It is a singleton class, with all game textures.
|
||||||
|
* We are linking these textures with sprite's (2D) and mesh (3D) materials.
|
||||||
|
*/
|
||||||
|
auto& textureRepository = renderer.getTextureRepository();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Texture is stored in "res" directory.
|
||||||
|
* Content of "res" directory is automatically copied into
|
||||||
|
* "bin" directory, which contains our final game.
|
||||||
|
*
|
||||||
|
* File utils automatically add's device prefix to the path,
|
||||||
|
* based on current working directory.
|
||||||
|
*
|
||||||
|
* In PS2 world:
|
||||||
|
* - USB has a "mass:" prefix
|
||||||
|
* - Our PC in PS2Link has a "host:" prefix
|
||||||
|
* - Our PC in PCSX2 has a "host:" prefix
|
||||||
|
*/
|
||||||
|
auto filepath = FileUtils::fromCwd("atlas.png");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tyra supports following PNG formats:
|
||||||
|
* 32bpp (RGBA)
|
||||||
|
* 24bpp (RGB)
|
||||||
|
* 8bpp, palletized (RGBA)
|
||||||
|
* 4bpp, palletized (RGBA)
|
||||||
|
*
|
||||||
|
* 8bpp and 4bpp are the fastest.
|
||||||
|
* All of these formats can be easily exported via GIMP.
|
||||||
|
*/
|
||||||
|
auto* texture = textureRepository.add(filepath);
|
||||||
|
|
||||||
|
/** Let's assign this texture to sprite. */
|
||||||
|
texture->addLink(sprite.id);
|
||||||
|
|
||||||
|
spriteFlip.id = sprite.id;
|
||||||
|
spriteScale.id = sprite.id;
|
||||||
|
spriteStretch.id = sprite.id;
|
||||||
|
|
||||||
|
TYRA_LOG("Texture loaded!");
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Tyra
|
||||||
Reference in New Issue
Block a user