RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/h4570/tyra

Browse Source
This commit is contained in:
h4570
2022-08-28 17:21:13 +02:00
parent 822663f95e fa173f1e87
commit b3fe92c996
8 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/extensions.json
Vendored
+2 -1
View File
@@ -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"
] ]
} }
README.MD
+13 -13
View File
@@ -54,20 +54,20 @@ Decision was simple - I need to create an engine which will handle 3D file loadi
**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=LjO71ovPFJs)
* 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)
* Run game from USB in PS2 - [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) * 04 - Run game from USB in PS2 - [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH)
--- ---
* 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) * Demo game - [Code](https://github.com/h4570/tyra/tree/master/demo)
--- ---
engine/inc/renderer/renderer_settings.hpp
+1 -1
View File
@@ -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)) {}
template/.vscode/extensions.json
Vendored
+3 -1
View File
@@ -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"
] ]
} }
template/inc/racer_game.hpp
+1 -2
View File
@@ -1,7 +1,6 @@
#pragma once #pragma once
#include <engine.hpp> #include <tyra>
#include <game.hpp>
namespace Racer { namespace Racer {
template/src/main.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "engine.hpp" #include <tyra>
#include "racer_game.hpp" #include "racer_game.hpp"
int main() { int main() {
tutorials/04-de_dust2/src/tutorial_04.cpp
+2 -3
View File
@@ -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);
} }
tutorials/05-animation/src/tutorial_05.cpp
+1 -1
View File
@@ -55,7 +55,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());