From d4f2a1e1a224fc5e3f9015afac8a857ccb8bb6d5 Mon Sep 17 00:00:00 2001 From: Foxar Date: Thu, 17 Dec 2020 14:19:23 +0100 Subject: [PATCH 01/56] Restored: Undid the objloader changes, they should be in its own branch. --- src/engine/loaders/obj_loader.cpp | 144 ++++-------------------------- 1 file changed, 16 insertions(+), 128 deletions(-) diff --git a/src/engine/loaders/obj_loader.cpp b/src/engine/loaders/obj_loader.cpp index dcebc70..a200589 100644 --- a/src/engine/loaders/obj_loader.cpp +++ b/src/engine/loaders/obj_loader.cpp @@ -71,143 +71,31 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_ } else if (strcmp(lineHeader, "f") == 0) { - - int* x; - fpos_t start; - fgetpos(file,&start); - int matches = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n",x,x,x,x,x,x,x,x,x); - fsetpos(file,&start); - int newerMatches =0; - - switch(matches) - { - /* Vs, VTs and VNs all set */ - case 9: - { - printf("Case 9\n\n"); - fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", - &vertexIndex[0], &coordIndex[0], &normalIndex[0], - &vertexIndex[1], &coordIndex[1], &normalIndex[1], - &vertexIndex[2], &coordIndex[2], &normalIndex[2]); - - } - break; - /* Loaded only two digits (V, VT) succesfuly. Not setting VN. */ - case 2: - { - printf("Case 2\n"); - fscanf(file, "%d/%d/ %d/%d/ %d/%d/\n", - &vertexIndex[0], &coordIndex[0], - &vertexIndex[1], &coordIndex[1], - &vertexIndex[2], &coordIndex[2]); - - } - break; - /* Only V set. Checking for existance of VT or VN. */ - case 1: - { - printf("Case 1\n"); - /* Check for existance of V/// configuration.. */ - newerMatches = fscanf(file, "%d/// %d/// %d///\n",x,x,x); - fsetpos(file,&start); - if(newerMatches==3){ - /* Configuration confirmed. */ - fscanf(file, "%d/// %d/// %d///\n",&vertexIndex[0],&vertexIndex[1],&vertexIndex[2]); - - }else - { - /* Failed, checking configuration V//VN */ - newerMatches = fscanf(file, "%d//%d %d//%d %d//%d",x,x,x,x,x,x); - fsetpos(file,&start); - if(newerMatches==6){ - /* Configuration confirmed. */ - newerMatches = fscanf(file, "%d//%d %d//%d %d//%d", - &vertexIndex[0], &normalIndex[0], - &vertexIndex[1], &normalIndex[1], - &vertexIndex[2], &normalIndex[2]); - } - else{ - /*Unknown configuration.*/ - PRINT_ERR("Unknown .obj face for .obj file!"); - printf("Obj file mentioned: \"%s\"\n",path); - } - } - } - default: - PRINT_ERR("Unknown faces format in .obj file!"); - printf(" \"%s\"\n",path); - break; - - } -/* if(ferror(file)) - PRINT_ERR("Failed to load .obj file \"%s\"."); + int matches = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", + &vertexIndex[0], &coordIndex[0], &normalIndex[0], + &vertexIndex[1], &coordIndex[1], &normalIndex[1], + &vertexIndex[2], &coordIndex[2], &normalIndex[2]); + if (matches != 9) + PRINT_ERR(".obj can't be read by this simple parser. Try exporting with other options"); else { - int result=0; - char line [128]={'\0'}; - fgets(line,128,file); - - //if(fscanf + o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1); + o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1); + o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1); - }*/ - switch(matches) - { - case 9: - { - o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1); - - o_result->getMaterial(materialsI).setSTFace(faceI, coordIndex[0] - 1); - o_result->getMaterial(materialsI).setSTFace(faceI + 1, coordIndex[1] - 1); - o_result->getMaterial(materialsI).setSTFace(faceI + 2, coordIndex[2] - 1); - - o_result->getMaterial(materialsI).setNormalFace(faceI, normalIndex[0] - 1); - o_result->getMaterial(materialsI).setNormalFace(faceI + 1, normalIndex[1] - 1); - o_result->getMaterial(materialsI).setNormalFace(faceI + 2, normalIndex[2] - 1); - faceI += 3; - break; - } - case 2: - { - o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1); - - o_result->getMaterial(materialsI).setSTFace(faceI, coordIndex[0] - 1); - o_result->getMaterial(materialsI).setSTFace(faceI + 1, coordIndex[1] - 1); - o_result->getMaterial(materialsI).setSTFace(faceI + 2, coordIndex[2] - 1); - - break; - } - case 1: - { - if(newerMatches==3) - { - o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1); - } - else if(newerMatches==6) - { - o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1); - o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1); - - o_result->getMaterial(materialsI).setNormalFace(faceI, normalIndex[0] - 1); - o_result->getMaterial(materialsI).setNormalFace(faceI + 1, normalIndex[1] - 1); - o_result->getMaterial(materialsI).setNormalFace(faceI + 2, normalIndex[2] - 1); - - } - break; - } + o_result->getMaterial(materialsI).setSTFace(faceI, coordIndex[0] - 1); + o_result->getMaterial(materialsI).setSTFace(faceI + 1, coordIndex[1] - 1); + o_result->getMaterial(materialsI).setSTFace(faceI + 2, coordIndex[2] - 1); + o_result->getMaterial(materialsI).setNormalFace(faceI, normalIndex[0] - 1); + o_result->getMaterial(materialsI).setNormalFace(faceI + 1, normalIndex[1] - 1); + o_result->getMaterial(materialsI).setNormalFace(faceI + 2, normalIndex[2] - 1); + faceI += 3; } } } else break; - } o_result->calculateBoundingBoxes(); fclose(file); From dfee1ab25f4dcdb00897e8306dd64111741cc48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Fri, 18 Dec 2020 22:33:14 +0100 Subject: [PATCH 02/56] Update README.MD --- README.MD | 78 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/README.MD b/README.MD index 972e0cf..6944934 100644 --- a/README.MD +++ b/README.MD @@ -1,19 +1,20 @@ [![Contributors][contributors-shield]][contributors-url] -[![MIT License][license-shield]][license-url] -PS2-Scene [![Discord](https://img.shields.io/discord/652861436992946216?logo=discord)](https://discord.gg/7dCr6ThSN5) +[![MIT License][license-shield]][license-url] +[![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) +[![Discord](https://img.shields.io/badge/discord-PS2--Scene-brightgreen?logo=discord)](https://discord.gg/7dCr6ThSN5)

- Logo + Logo -

Tyra alpha 1.1.0

+

Tyra

- Open source renderer and game engine for PS2 (PlayStation 2™). + Open source game engine for PlayStation 2™
- View Demo (soon) » + View Demo »

Report Bug @@ -26,6 +27,7 @@ PS2-Scene [![Discord](https://img.shields.io/discord/652861436992946216?logo=dis * [About the Project](#about-the-project) * [Samples](#samples) + * [Branches](#branches) * [About project](#about-project) * [Acronyms](#acronyms) * [Tyra features](#tyra-features) @@ -36,7 +38,7 @@ PS2-Scene [![Discord](https://img.shields.io/discord/652861436992946216?logo=dis * [Roadmap](#roadmap) * [Contributing](#contributing) * [License](#license) -* [Contact](#contact) +* [Tyra team](#tyra-team) * [Thanks](#thanks) ## About The Project @@ -44,18 +46,22 @@ PS2-Scene [![Discord](https://img.shields.io/discord/652861436992946216?logo=dis sample ### Samples +* [Dolphin](https://github.com/h4570/tyra/tree/master/src/samples/dolphin) * [Floors](https://github.com/h4570/tyra/tree/master/src/samples/floors) -* [Ari (WIP)](https://github.com/h4570/tyra/tree/master/src/samples/ari) + +### Branches +* Master - monthly releases +* Develop - daily builds. **Please use this at this moment** ### Contributors wanted #### I will be grateful for any help, Discord: h4570#3402 ### About project -Goal of Tyra project is to provide simple API for PS2 (PlayStation 2™) game creation. So you can just run PS2 emulator, grab your .obj file, and put it into live in a seconds. Project is on early stage, so a lot of stuff is changing from release to release. +Goal of Tyra project is to provide simple API for PS2 game creation, so you can just run PS2 emulator, grab .obj file, and put it into live in a seconds. Project is on early stage, so a lot of stuff is changing from release to release. YouTube tutorials soon! -**Why PS2 game dev is so different?** Raw PS2 development can be a big challenge. PS2 it's pretty low-level and there are a lot of stuff that you must do from scratch. +**Why Tyra is needed?** Raw PS2 development can be a big challenge. PS2 it's pretty low-level and there are a lot of stuff that you must do from scratch. Tyra takes care for you, and rendering, coprocessors communication and many more low-level stuff is already done. ### Acronyms @@ -66,18 +72,15 @@ Tyra takes care for you, and rendering, coprocessors communication and many more * IOP - I/O processor which enables access to peripheral devices, such the game controller ### Tyra features -* VU1 rendering (PATH 1), double-buffered -* GIF rendering (PATH 3), double-buffered +* 3D support - VU1 "Path 1 rendering" * Frustum culling, backface culling -* OpenGL adaptions: Perspective projection, lookAt camera -* Texture support (.bmp loader) +* OpenGL adaptions: Frustum projection, lookAt camera +* Texture support - .bmp and png * Mesh loaders: ".obj", ".dff" (RenderWare, GTA:SA) and ".md2" (Quake II) * Threading support -* Lighting support (now PATH3 only) -* Animation support -* Audio support +* Animation support for obj and md2 +* Audio support - .wav and .adpcm * Pad support -* TODO: physics, ADPCM and many more! ### Built With @@ -85,12 +88,12 @@ Tyra takes care for you, and rendering, coprocessors communication and many more ## Getting Started -To get a local copy up and running follow these simple steps. -YouTube tutorials soon! +[![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) +In our Discord channel, there is detailed tutorial which will help you with setting up the all environment - starting from installing dependencies and ending on emulator setup or intellisense. ### Prerequisites -This is an example of how to list things you need to use the software and how to install them. +This is an example of how to list things you need to use the software. * PS2 DEV environment - [PS2DEV](https://github.com/ps2dev/ps2dev) * At least #674b6f4 PS2SDK (01.12.2020) - [PS2SDK](https://github.com/ps2dev/ps2sdk) * PS2 Emulator. For example [PCSX2](https://pcsx2.net/) @@ -103,17 +106,19 @@ git clone https://github.com/h4570/tyra.git ``` 2. Get into src folder and compile it! ```sh +cd src/samples/floors +make rebuild-engine make ``` ## Extra info -* Textures can be saved using GIMP. Just replace red with green color, and when exporting select .bmp, 24bit: RGB888, without saving information about colors +* BMP loader needs some polishing soe be sure that you exporting BMP with 24bit: RGB888 and without information about colors. * If you want to run .elf in PCSX2, be sure that you have version >=1.6 and **Host access** enabled in PCSX2 configuration file. -* If you want to use your own .obj file, please check "triangulate faces" in blender. PS2 is supporting only trinagle primitive type. +* If you want to use your own .obj file, please check "triangulate faces" in blender. PS2 is supporting only triangle primitive type. ## Roadmap -### Roadmap moved to github kanban: +### Roadmap for next master release: [https://github.com/h4570/tyra/projects/1](https://github.com/h4570/tyra/projects/1) @@ -133,26 +138,33 @@ Contributions are what make the open source community such an amazing place to b Distributed under the Apache License 2.0 License. See `LICENSE` for more information. -## Contact +## Tyra team -Sandro Sobczyński - sandro.sobczynski@gmail.com -[![LinkedIn][linkedin-shield]][linkedin-url] +Sandro Sobczyński - sandro.sobczynski@gmail.com +[![LinkedIn][linkedin-shield]](https://linkedin.com/in/sandro-sobczyński-28820b15a) +Michał Mostowik - mostek3pl@gmail.com +[![LinkedIn][linkedin-shield]](https://www.linkedin.com/in/notfoxar) ## Thanks Without these guys, everything would be harder: -* Dr Henry Fortuna - Abertay University (code sources) -* Lukasz D.K. (huge archive of PS2 stuff) -* Guilherme Lampert - PlayStation London (code sources) -* Jesper Svennevid, Daniel Collin - Microcode (openvcl, code samples) -* Whole PS2SDK/PS2Scene team +* Dr Henry Fortuna - for code sources +* Rick Gaiser - for help and new GCC! +* Lukasz D.K. - for huge archive of PS2 stuff- +* Guilherme Lampert - for code sources +* Jesper Svennevid, Daniel Collin - for openvcl's code samples +* Whole PS2DEV team * And so many other guys. Thanks! Project Link: [https://github.com/h4570/tyra](https://github.com/h4570/tyra) + +
+ + Logo + [contributors-shield]: https://img.shields.io/github/contributors/h4570/tyra.svg?style=flat-square [contributors-url]: https://github.com/h4570/tyra/graphs/contributors [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555 -[linkedin-url]: https://linkedin.com/in/sandro-sobczyński-28820b15a/ [license-shield]: https://img.shields.io/github/license/h4570/tyra.svg?style=flat-square [license-url]: https://github.com/h4570/tyra/blob/master/LICENSE From 73a3d1d7e50bf5cdd539c1758aa94a12dcb634ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Fri, 18 Dec 2020 22:36:17 +0100 Subject: [PATCH 03/56] Update README.MD --- README.MD | 1 + 1 file changed, 1 insertion(+) diff --git a/README.MD b/README.MD index 6944934..4d81fd1 100644 --- a/README.MD +++ b/README.MD @@ -154,6 +154,7 @@ Without these guys, everything would be harder: * Guilherme Lampert - for code sources * Jesper Svennevid, Daniel Collin - for openvcl's code samples * Whole PS2DEV team +* Manieq - for nice splash screens! * And so many other guys. Thanks! Project Link: [https://github.com/h4570/tyra](https://github.com/h4570/tyra) From bb0ec257b2cd4c9aa317043b47a5f998a92dce24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sat, 19 Dec 2020 09:21:58 +0100 Subject: [PATCH 04/56] Update README.MD --- README.MD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.MD b/README.MD index 4d81fd1..30fe44b 100644 --- a/README.MD +++ b/README.MD @@ -9,7 +9,7 @@ Logo -

Tyra

+

Tyra - alpha 1.1.0

Open source game engine for PlayStation 2™ @@ -43,7 +43,10 @@ ## About The Project -sample +sample + +### Contributors wanted +I will be grateful for any help [![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) ### Samples * [Dolphin](https://github.com/h4570/tyra/tree/master/src/samples/dolphin) @@ -52,9 +55,6 @@ ### Branches * Master - monthly releases * Develop - daily builds. **Please use this at this moment** - -### Contributors wanted -#### I will be grateful for any help, Discord: h4570#3402 ### About project Goal of Tyra project is to provide simple API for PS2 game creation, so you can just run PS2 emulator, grab .obj file, and put it into live in a seconds. Project is on early stage, so a lot of stuff is changing from release to release. From 44776f7abad3834ee43a5f7003064d7af12550b5 Mon Sep 17 00:00:00 2001 From: Foxar Date: Sun, 20 Dec 2020 13:13:03 +0100 Subject: [PATCH 05/56] Added: Incomplete implenetation of BoundingBox class and BoundingBoxFace struct. --- src/engine/include/models/bounding_box.hpp | 69 ++++++++++++++++++++++ src/engine/models/bounding_box.cpp | 33 +++++++++++ 2 files changed, 102 insertions(+) create mode 100644 src/engine/include/models/bounding_box.hpp create mode 100644 src/engine/models/bounding_box.cpp diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp new file mode 100644 index 0000000..98a9128 --- /dev/null +++ b/src/engine/include/models/bounding_box.hpp @@ -0,0 +1,69 @@ +/* +# ______ ____ ___ +# | \/ ____| |___| +# | | | \ | | +#----------------------------------------------------------------------- +# Copyright 2020, tyra - https://github.com/h4570/tyra +# Licenced under Apache License 2.0 +# Michał Mostowik +*/ + +#ifndef _TYRA_BOUNDING_BOX_ +#define _TYRA_BOUNDING_BOX_ + +#include +#include +#include "math/point.hpp" +#include "math/vector3.hpp" + +/** + * Struct containing face data used in + * bounding box class. + */ +struct BoundingBoxFace +{ + BoundingBoxFace(Vector3 t_minCorner, Vector3 t_maxCorner, float t_axisPos) + { + minCorner = t_minCorner; + maxCorner = t_maxCorner; + axisPosition = t_axisPos; + } + /** Position of the face on it's respective axis. */ + float axisPosition; + /** Corner of the face with lower coordinates */ + Vector3 minCorner; + /** Corner of the face with higher coordinates */ + Vector3 maxCorner; +}; + +/** + * Class containing bounding box data + * which can be used for collision detection. + */ + +class BoundingBox +{ +public: + BoundingBox(Vector3 *t_vertices); + ~BoundingBox(); + const float &getHeight() { return _height; }; + const float &getDepth() { return _depth; }; + const float &getWidth() { return _width; }; + /** Return the vector directly in middle of the bounding box. */ + const Vector3 &getCenter() { return _centerVector; }; + /** Return the front face (furhter on z-axis) */ + const BoundingBoxFace &getFrontFace() { return _frontFace; }; + +private: + Vector3 _vertices[8]; + float _height, _depth, _width; + Vector3 _centerVector; + BoundingBoxFace _frontFace; + BoundingBoxFace _backFace; + BoundingBoxFace _leftFace; + BoundingBoxFace _rightFace; + BoundingBoxFace _topFace; + BoundingBoxFace _bottomFace; +}; + +#endif \ No newline at end of file diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp new file mode 100644 index 0000000..e16f04e --- /dev/null +++ b/src/engine/models/bounding_box.cpp @@ -0,0 +1,33 @@ +/* +# ______ ____ ___ +# | \/ ____| |___| +# | | | \ | | +#----------------------------------------------------------------------- +# Copyright 2020, tyra - https://github.com/h4570/tyra +# Licenced under Apache License 2.0 +# Michał Mostowik +*/ + +#include "../include/models/bounding_box.hpp" +#include "../include/utils/debug.hpp" + +BoundingBox::BoundingBox(Vector3 *t_vectorArray) +{ + if (sizeof(t_vectorArray) / sizeof(Vector3) != 8) + PRINT_ERR("Attempted to create bounding box with invalid count of vectors!"); + + //Perform a deep copy of vertex array parameter + for (int i = 0; i < 9; i++) + _vertices[i] = t_vectorArray[i]; + + //This might be shortened with Vector3 operator overloading, but current + //implementation is more human readable. + _height = _vertices[0].y - _vertices[2].y; + _width = _vertices[0].x - _vertices[4].x; + _depth = _vertices[0].z - _vertices[1].z; + + _centerVector = _vertices[0]; + _centerVector.x += (_width / 2); + _centerVector.y += (_height / 2); + _centerVector.z += (_depth / 2); +} \ No newline at end of file From 9b2d39505b9a35c0fd2b94d96eeab970c93f8095 Mon Sep 17 00:00:00 2001 From: Foxar Date: Sun, 20 Dec 2020 13:24:50 +0100 Subject: [PATCH 06/56] Added: BoundingBoxFaces assignments, calculations and doxygen comments. --- src/engine/include/models/bounding_box.hpp | 20 ++++++++++++++++++-- src/engine/models/bounding_box.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp index 98a9128..b95244c 100644 --- a/src/engine/include/models/bounding_box.hpp +++ b/src/engine/include/models/bounding_box.hpp @@ -22,7 +22,7 @@ */ struct BoundingBoxFace { - BoundingBoxFace(Vector3 t_minCorner, Vector3 t_maxCorner, float t_axisPos) + BoundingBoxFace(const Vector3 &t_minCorner, const Vector3 &t_maxCorner, float t_axisPos) { minCorner = t_minCorner; maxCorner = t_maxCorner; @@ -51,18 +51,34 @@ public: const float &getWidth() { return _width; }; /** Return the vector directly in middle of the bounding box. */ const Vector3 &getCenter() { return _centerVector; }; - /** Return the front face (furhter on z-axis) */ + /** Return the front face (further on z-axis) */ const BoundingBoxFace &getFrontFace() { return _frontFace; }; + /** Return the back face (nearer on z-axis) */ + const BoundingBoxFace &getBackFace() { return _backFace; }; + /** Return the left face (further on x-axis) */ + const BoundingBoxFace &getLeftFace() { return _leftFace; }; + /** Return the right face (nearer on x-axis) */ + const BoundingBoxFace &getRightFace() { return _rightFace; }; + /** Return the top face (further on y-axis) */ + const BoundingBoxFace &getTopFace() { return _frontFace; }; + /** Return the bottom face (nearer on y-axis) */ + const BoundingBoxFace &getBottomFace() { return _bottomFace; }; private: Vector3 _vertices[8]; float _height, _depth, _width; Vector3 _centerVector; + /** Front face (further on z-axis) */ BoundingBoxFace _frontFace; + /** Back face (nearer on z-axis) */ BoundingBoxFace _backFace; + /** Left face (nearer on x-axis) */ BoundingBoxFace _leftFace; + /** Right face (further on x-axis) */ BoundingBoxFace _rightFace; + /** Top face (further on y-axis) */ BoundingBoxFace _topFace; + /** Bottom face (nearer on y-axis) */ BoundingBoxFace _bottomFace; }; diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp index e16f04e..9191021 100644 --- a/src/engine/models/bounding_box.cpp +++ b/src/engine/models/bounding_box.cpp @@ -30,4 +30,14 @@ BoundingBox::BoundingBox(Vector3 *t_vectorArray) _centerVector.x += (_width / 2); _centerVector.y += (_height / 2); _centerVector.z += (_depth / 2); + + //Z-Axis faces + _frontFace = BoundingBoxFace(_vertices[1], _vertices[7], _vertices[1].z); + _backFace = BoundingBoxFace(_vertices[0], _vertices[6], _vertices[0].z); + //X-Axis faces + _leftFace = BoundingBoxFace(_vertices[0], _vertices[3], _vertices[0].x); + _rightFace = BoundingBoxFace(_vertices[4], _vertices[7], _vertices[4].x); + //Y-Axis faces + _topFace = BoundingBoxFace(_vertices[2], _vertices[7], _vertices[2].y); + _bottomFace = BoundingBoxFace(_vertices[0], _vertices[5], _vertices[0].y); } \ No newline at end of file From 53c134b0d526907710c03e4ee9282e4ffdf06bbc Mon Sep 17 00:00:00 2001 From: Foxar Date: Sun, 20 Dec 2020 13:38:26 +0100 Subject: [PATCH 07/56] Added: Integrated new BoundingBox class implentation with mesh_frame boundingbox calculations. --- src/engine/include/models/mesh_frame.hpp | 3 +++ src/engine/models/mesh_frame.cpp | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index 99ec249..f57b581 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -13,6 +13,7 @@ #include #include +#include "bounding_box.hpp" #include "math/point.hpp" #include "math/vector3.hpp" #include "./mesh_material.hpp" @@ -139,7 +140,9 @@ public: void calculateBoundingBoxes(); private: + /** Deprecated. It is advised to use BoundingBox class instead. */ Vector3 boundingBox[8]; + BoundingBox *boundingBoxObj; u8 _areSTsAllocated, _areVerticesAllocated, _areNormalsAllocated, diff --git a/src/engine/models/mesh_frame.cpp b/src/engine/models/mesh_frame.cpp index ff9883d..2180a57 100644 --- a/src/engine/models/mesh_frame.cpp +++ b/src/engine/models/mesh_frame.cpp @@ -37,6 +37,7 @@ MeshFrame::~MeshFrame() delete[] normals; if (_areMaterialsAllocated) delete[] materials; + delete boundingBoxObj; } // ---- @@ -121,6 +122,7 @@ void MeshFrame::calculateBoundingBoxes() if (hiZ < vertices[i].z) hiZ = vertices[i].z; } + boundingBox[0].set(lowX, lowY, lowZ); boundingBox[1].set(lowX, lowY, hiZ); boundingBox[2].set(lowX, hiY, lowZ); @@ -131,4 +133,12 @@ void MeshFrame::calculateBoundingBoxes() boundingBox[6].set(hiX, hiY, lowZ); boundingBox[7].set(hiX, hiY, hiZ); _isBoundingBoxCalculated = true; + + //Function temporarily is a hybrid between old Vector3[8] boundingbox and + //the new class implementation. Upon confirmation that new implementation + //works correctly, delete the old code. + + //BoundingBox is declared on the heap to prevent any ill-formed default + //constructor instantiated BoundingBox objects. + boundingBoxObj = new BoundingBox(boundingBox); } From 596bf2d89a517cd0e8a7277d9e1c76e8730d6137 Mon Sep 17 00:00:00 2001 From: Foxar Date: Sun, 20 Dec 2020 13:44:48 +0100 Subject: [PATCH 08/56] Added: Mesh_frame getter for BoundingBox object pointer. --- src/engine/include/models/mesh_frame.hpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index f57b581..1630078 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -88,6 +88,11 @@ public: */ Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBox[i]; }; + /** + * Returns bounding box (AABB) object pointer. + */ + BoundingBox *getBoundingBoxP() { return boundingBoxObj; }; + // ---- // Setters // ---- From 11a4e2ee7652e26a4dc25cd78af0a6c0fe62f5de Mon Sep 17 00:00:00 2001 From: Foxar Date: Sun, 20 Dec 2020 14:11:50 +0100 Subject: [PATCH 09/56] Changed: Updated makefile to include new boundingboxes. --- src/engine/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/engine/Makefile b/src/engine/Makefile index 4164e49..78c621f 100644 --- a/src/engine/Makefile +++ b/src/engine/Makefile @@ -6,6 +6,7 @@ EE_OBJS = \ models/math/point.o \ models/math/vector3.o \ models/mesh_frame.o \ + models/bounding_box.o \ models/mesh_material.o \ models/mesh.o \ models/sprite.o \ From 55d8e445db27a6a5294ef1d6cff5cff367e1b6d4 Mon Sep 17 00:00:00 2001 From: Foxar Date: Sun, 20 Dec 2020 14:12:52 +0100 Subject: [PATCH 10/56] Fixed: Typo in bounding box getters. --- src/engine/include/models/bounding_box.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp index b95244c..1e7b364 100644 --- a/src/engine/include/models/bounding_box.hpp +++ b/src/engine/include/models/bounding_box.hpp @@ -22,6 +22,9 @@ */ struct BoundingBoxFace { + BoundingBoxFace(){ + + }; BoundingBoxFace(const Vector3 &t_minCorner, const Vector3 &t_maxCorner, float t_axisPos) { minCorner = t_minCorner; @@ -60,7 +63,7 @@ public: /** Return the right face (nearer on x-axis) */ const BoundingBoxFace &getRightFace() { return _rightFace; }; /** Return the top face (further on y-axis) */ - const BoundingBoxFace &getTopFace() { return _frontFace; }; + const BoundingBoxFace &getTopFace() { return _topFace; }; /** Return the bottom face (nearer on y-axis) */ const BoundingBoxFace &getBottomFace() { return _bottomFace; }; From 71ce30a8fca3852fcafa398a0bb180f8af5e6fd8 Mon Sep 17 00:00:00 2001 From: Foxar Date: Sun, 20 Dec 2020 14:13:47 +0100 Subject: [PATCH 11/56] Added: Destructor for boundingbox class. --- src/engine/models/bounding_box.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp index 9191021..ec487b2 100644 --- a/src/engine/models/bounding_box.cpp +++ b/src/engine/models/bounding_box.cpp @@ -13,9 +13,6 @@ BoundingBox::BoundingBox(Vector3 *t_vectorArray) { - if (sizeof(t_vectorArray) / sizeof(Vector3) != 8) - PRINT_ERR("Attempted to create bounding box with invalid count of vectors!"); - //Perform a deep copy of vertex array parameter for (int i = 0; i < 9; i++) _vertices[i] = t_vectorArray[i]; @@ -40,4 +37,8 @@ BoundingBox::BoundingBox(Vector3 *t_vectorArray) //Y-Axis faces _topFace = BoundingBoxFace(_vertices[2], _vertices[7], _vertices[2].y); _bottomFace = BoundingBoxFace(_vertices[0], _vertices[5], _vertices[0].y); +} + +BoundingBox::~BoundingBox() +{ } \ No newline at end of file From ae15906c9928d8ea2f854304b844c605ec314a97 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 18:30:18 +0100 Subject: [PATCH 12/56] Added: Accessors in bounding_box class allowing access to vertices array. --- src/engine/include/models/bounding_box.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp index 1e7b364..e2aaccc 100644 --- a/src/engine/include/models/bounding_box.hpp +++ b/src/engine/include/models/bounding_box.hpp @@ -66,6 +66,13 @@ public: const BoundingBoxFace &getTopFace() { return _topFace; }; /** Return the bottom face (nearer on y-axis) */ const BoundingBoxFace &getBottomFace() { return _bottomFace; }; + /** + * Returns bounding box raw vertices array. + * Total length: 8 + */ + Vector3 &getVertex(const u8 &i) { return _vertices[i]; }; + /** Returns single vertex from raw vertices array.*/ + Vector3 *getVertices() { return _vertices; }; private: Vector3 _vertices[8]; From 974138d64eb9514f501b9f1fb8316c985fc53985 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 18:31:23 +0100 Subject: [PATCH 13/56] Changed: Replaced old getBoundingBox and getBoundingBoxVertex functions with new ones, using the new bounding_box class infrastructure. --- src/engine/include/models/mesh_frame.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index 1630078..e3e2466 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -80,13 +80,15 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - Vector3 *getBoundingBox() { return boundingBox; }; + //Vector3 *getBoundingBox() { return boundingBox; }; + Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. * Total length: 8 */ - Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBox[i]; }; + //Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBox[i]; }; + Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; /** * Returns bounding box (AABB) object pointer. From d835f83e517f2b5a9b33aff5e04360c702bcafc4 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 18:48:11 +0100 Subject: [PATCH 14/56] Added: New BoundingBox infrastructure into mesh_material, analogous to mesh_frame. --- src/engine/include/models/mesh_material.hpp | 13 +++++++++++-- src/engine/models/mesh_material.cpp | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/engine/include/models/mesh_material.hpp b/src/engine/include/models/mesh_material.hpp index 0b5447e..976a32b 100644 --- a/src/engine/include/models/mesh_material.hpp +++ b/src/engine/include/models/mesh_material.hpp @@ -12,6 +12,7 @@ #define _TYRA_MESH_MATERIAL_ #include +#include "bounding_box.hpp" #include "./math/vector3.hpp" #include "./math/plane.hpp" @@ -65,13 +66,20 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - Vector3 *getBoundingBox() { return boundingBox; }; + //Vector3 *getBoundingBox() { return boundingBox; }; + Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. * Total length: 8 */ - Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBox[i]; }; + //Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBox[i]; }; + Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; + + /** + * Returns bounding box (AABB) object pointer. + */ + BoundingBox *getBoundingBoxP() { return boundingBoxObj; }; // ---- // Setters @@ -120,6 +128,7 @@ public: private: Vector3 boundingBox[8]; + BoundingBox *boundingBoxObj; u32 facesCount, id; u32 *vertexFaces, *stFaces, *normalFaces; u8 _isNameSet, _areFacesAllocated, _isBoundingBoxCalculated; diff --git a/src/engine/models/mesh_material.cpp b/src/engine/models/mesh_material.cpp index f435ce6..bf4667e 100644 --- a/src/engine/models/mesh_material.cpp +++ b/src/engine/models/mesh_material.cpp @@ -9,6 +9,7 @@ */ #include "../include/models/mesh_material.hpp" +#include "../include/models/bounding_box.hpp" #include "../include/utils/debug.hpp" #include "../include/utils/string.hpp" #include @@ -132,4 +133,5 @@ void MeshMaterial::calculateBoundingBox(Vector3 *t_vertices, u32 t_vertCount) boundingBox[6].set(hiX, hiY, lowZ); boundingBox[7].set(hiX, hiY, hiZ); _isBoundingBoxCalculated = true; + boundingBoxObj = new BoundingBox(boundingBox); } From 1765885bec0fb94668995ad5530c2053dcee57a4 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 18:57:01 +0100 Subject: [PATCH 15/56] Removed: Commented-out ('disabled') method declarations. --- src/engine/include/models/mesh_frame.hpp | 2 -- src/engine/include/models/mesh_material.hpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index e3e2466..8ffe8e0 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -80,14 +80,12 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - //Vector3 *getBoundingBox() { return boundingBox; }; Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. * Total length: 8 */ - //Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBox[i]; }; Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; /** diff --git a/src/engine/include/models/mesh_material.hpp b/src/engine/include/models/mesh_material.hpp index 976a32b..dffcf8d 100644 --- a/src/engine/include/models/mesh_material.hpp +++ b/src/engine/include/models/mesh_material.hpp @@ -66,14 +66,12 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - //Vector3 *getBoundingBox() { return boundingBox; }; Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. * Total length: 8 */ - //Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBox[i]; }; Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; /** From 1cc1e62ed6c9baab88620bca778ef07fec3528e7 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 19:03:40 +0100 Subject: [PATCH 16/56] Fixed: Fixed incorrect vertex array for-loop iteration. --- src/engine/models/bounding_box.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp index ec487b2..271632f 100644 --- a/src/engine/models/bounding_box.cpp +++ b/src/engine/models/bounding_box.cpp @@ -14,7 +14,7 @@ BoundingBox::BoundingBox(Vector3 *t_vectorArray) { //Perform a deep copy of vertex array parameter - for (int i = 0; i < 9; i++) + for (int i = 0; i < 8; i++) _vertices[i] = t_vectorArray[i]; //This might be shortened with Vector3 operator overloading, but current From 02d79169255638f0c1ddf341981b951626542c11 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 19:04:34 +0100 Subject: [PATCH 17/56] Fixed: Fixed incorrect naming of boundingbox constructor parameters. --- src/engine/models/bounding_box.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp index 271632f..948bacb 100644 --- a/src/engine/models/bounding_box.cpp +++ b/src/engine/models/bounding_box.cpp @@ -11,11 +11,11 @@ #include "../include/models/bounding_box.hpp" #include "../include/utils/debug.hpp" -BoundingBox::BoundingBox(Vector3 *t_vectorArray) +BoundingBox::BoundingBox(Vector3 *t_vertices) { //Perform a deep copy of vertex array parameter for (int i = 0; i < 8; i++) - _vertices[i] = t_vectorArray[i]; + _vertices[i] = t_vertices[i]; //This might be shortened with Vector3 operator overloading, but current //implementation is more human readable. From 586fe136ea0ef78d58621449eddb8f3fddc64fcc Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 19:05:33 +0100 Subject: [PATCH 18/56] Changed: Removed old vertex array boundingbox declaration, forced usage of temporary vector array in initial boundingbox calculations. --- src/engine/include/models/mesh_frame.hpp | 2 -- src/engine/include/models/mesh_material.hpp | 1 - src/engine/models/mesh_frame.cpp | 5 +---- src/engine/models/mesh_material.cpp | 10 +++++++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index 8ffe8e0..8b4214f 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -145,8 +145,6 @@ public: void calculateBoundingBoxes(); private: - /** Deprecated. It is advised to use BoundingBox class instead. */ - Vector3 boundingBox[8]; BoundingBox *boundingBoxObj; u8 _areSTsAllocated, _areVerticesAllocated, diff --git a/src/engine/include/models/mesh_material.hpp b/src/engine/include/models/mesh_material.hpp index dffcf8d..b2588f9 100644 --- a/src/engine/include/models/mesh_material.hpp +++ b/src/engine/include/models/mesh_material.hpp @@ -125,7 +125,6 @@ public: u8 isInFrustum(Plane *t_frustumPlanes, const Vector3 &position); private: - Vector3 boundingBox[8]; BoundingBox *boundingBoxObj; u32 facesCount, id; u32 *vertexFaces, *stFaces, *normalFaces; diff --git a/src/engine/models/mesh_frame.cpp b/src/engine/models/mesh_frame.cpp index 2180a57..0e224cd 100644 --- a/src/engine/models/mesh_frame.cpp +++ b/src/engine/models/mesh_frame.cpp @@ -94,6 +94,7 @@ void MeshFrame::allocateMaterials(const u32 &t_val) void MeshFrame::calculateBoundingBoxes() { + Vector3 boundingBox[8]; if (!_areVerticesAllocated) { PRINT_ERR("Can't calculate bounding box, because vertices were not allocated!"); @@ -134,10 +135,6 @@ void MeshFrame::calculateBoundingBoxes() boundingBox[7].set(hiX, hiY, hiZ); _isBoundingBoxCalculated = true; - //Function temporarily is a hybrid between old Vector3[8] boundingbox and - //the new class implementation. Upon confirmation that new implementation - //works correctly, delete the old code. - //BoundingBox is declared on the heap to prevent any ill-formed default //constructor instantiated BoundingBox objects. boundingBoxObj = new BoundingBox(boundingBox); diff --git a/src/engine/models/mesh_material.cpp b/src/engine/models/mesh_material.cpp index bf4667e..59e5daa 100644 --- a/src/engine/models/mesh_material.cpp +++ b/src/engine/models/mesh_material.cpp @@ -83,9 +83,9 @@ u8 MeshMaterial::isInFrustum(Plane *t_frustumPlanes, const Vector3 &position) for (u8 y = 0; y < 8 && (boxIn == 0 || boxOut == 0); y++) { boxCalcTemp.set( - boundingBox[y].x + position.x, - boundingBox[y].y + position.y, - boundingBox[y].z + position.z); + boundingBoxObj->getVertices()[y].x + position.x, + boundingBoxObj->getVertices()[y].y + position.y, + boundingBoxObj->getVertices()[y].z + position.z); if (t_frustumPlanes[i].distanceTo(boxCalcTemp) < 0) boxOut++; else @@ -102,6 +102,7 @@ u8 MeshMaterial::isInFrustum(Plane *t_frustumPlanes, const Vector3 &position) void MeshMaterial::calculateBoundingBox(Vector3 *t_vertices, u32 t_vertCount) { + Vector3 boundingBox[8]; float lowX, lowY, lowZ, hiX, hiY, hiZ; lowX = hiX = t_vertices[vertexFaces[0]].x; lowY = hiY = t_vertices[vertexFaces[0]].y; @@ -133,5 +134,8 @@ void MeshMaterial::calculateBoundingBox(Vector3 *t_vertices, u32 t_vertCount) boundingBox[6].set(hiX, hiY, lowZ); boundingBox[7].set(hiX, hiY, hiZ); _isBoundingBoxCalculated = true; + + //BoundingBox is declared on the heap to prevent any ill-formed default + //constructor instantiated BoundingBox objects. boundingBoxObj = new BoundingBox(boundingBox); } From 5c232aebce4b7df964ed219f3864c5bcb52814f6 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 19:32:40 +0100 Subject: [PATCH 19/56] Removed: Newline below a doxygen comment. --- src/engine/include/models/bounding_box.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp index e2aaccc..1dec3ee 100644 --- a/src/engine/include/models/bounding_box.hpp +++ b/src/engine/include/models/bounding_box.hpp @@ -43,7 +43,6 @@ struct BoundingBoxFace * Class containing bounding box data * which can be used for collision detection. */ - class BoundingBox { public: From 9e1a9e8b3c51f0d10a2be3bd2ae16b90be3e8741 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 19:41:29 +0100 Subject: [PATCH 20/56] Changed: Renamed getBoundingBox() to getBoundingBoxVertices() as the function returns the array of vertices from the BoundingBox object. --- src/engine/include/models/mesh.hpp | 2 +- src/engine/include/models/mesh_frame.hpp | 4 ++-- src/engine/include/models/mesh_material.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/include/models/mesh.hpp b/src/engine/include/models/mesh.hpp index aec1470..1de33bb 100644 --- a/src/engine/include/models/mesh.hpp +++ b/src/engine/include/models/mesh.hpp @@ -97,7 +97,7 @@ public: Vector3 &getCurrentBoundingBoxVertex(const u8 &i) { return frames[animState.currentFrame].getBoundingBoxVertex(i); }; /** Returns bounding box of current frame. Size: 8 */ - Vector3 *getCurrentBoundingBox() const { return frames[animState.currentFrame].getBoundingBox(); }; + Vector3 *getCurrentBoundingBox() const { return frames[animState.currentFrame].getBoundingBoxVertices(); }; // ---- // Setters diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index 8b4214f..6c33e89 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -80,7 +80,7 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; + Vector3 *getBoundingBoxVertices() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. @@ -91,7 +91,7 @@ public: /** * Returns bounding box (AABB) object pointer. */ - BoundingBox *getBoundingBoxP() { return boundingBoxObj; }; + BoundingBox *getBoundingBox() { return boundingBoxObj; }; // ---- // Setters diff --git a/src/engine/include/models/mesh_material.hpp b/src/engine/include/models/mesh_material.hpp index b2588f9..5099901 100644 --- a/src/engine/include/models/mesh_material.hpp +++ b/src/engine/include/models/mesh_material.hpp @@ -66,7 +66,7 @@ public: * Returns bounding box (AABB). * Total length: 8 */ - Vector3 *getBoundingBox() { return boundingBoxObj->getVertices(); }; + Vector3 *getBoundingBoxVertices() { return boundingBoxObj->getVertices(); }; /** * Returns bounding box (AABB) vertex. @@ -77,7 +77,7 @@ public: /** * Returns bounding box (AABB) object pointer. */ - BoundingBox *getBoundingBoxP() { return boundingBoxObj; }; + BoundingBox *getBoundingBox() { return boundingBoxObj; }; // ---- // Setters From 13f6a2ecb7a3ba5959234e0169209846f3e87220 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:02:51 +0100 Subject: [PATCH 21/56] Changed: Changed manual deep-copy of parameter vertex array to usage of memcpy() --- src/engine/models/bounding_box.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp index 948bacb..15eb78d 100644 --- a/src/engine/models/bounding_box.cpp +++ b/src/engine/models/bounding_box.cpp @@ -10,12 +10,12 @@ #include "../include/models/bounding_box.hpp" #include "../include/utils/debug.hpp" +#include BoundingBox::BoundingBox(Vector3 *t_vertices) { //Perform a deep copy of vertex array parameter - for (int i = 0; i < 8; i++) - _vertices[i] = t_vertices[i]; + memcpy(_vertices, t_vertices, 8 * sizeof(Vector3)); //This might be shortened with Vector3 operator overloading, but current //implementation is more human readable. From cf07cf78c84b95cda6aed982c334653afe7e761f Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:06:55 +0100 Subject: [PATCH 22/56] Added: Comment for BoundingBox constructor parameters. --- src/engine/models/bounding_box.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp index 15eb78d..dc90364 100644 --- a/src/engine/models/bounding_box.cpp +++ b/src/engine/models/bounding_box.cpp @@ -12,6 +12,11 @@ #include "../include/utils/debug.hpp" #include +/** + * Construct a BoundingBox class + * Allows for user friendly access to bounding box data. + * @param t_vertices Array of 8 Vector3 elements. + */ BoundingBox::BoundingBox(Vector3 *t_vertices) { //Perform a deep copy of vertex array parameter From 8137bd56d8b49dc961ab2bf0340281ab21475ea7 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:07:34 +0100 Subject: [PATCH 23/56] Changed: Usage of getVertices()[y] to getVertex(y) --- src/engine/models/mesh_material.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/models/mesh_material.cpp b/src/engine/models/mesh_material.cpp index 59e5daa..d6108da 100644 --- a/src/engine/models/mesh_material.cpp +++ b/src/engine/models/mesh_material.cpp @@ -83,9 +83,9 @@ u8 MeshMaterial::isInFrustum(Plane *t_frustumPlanes, const Vector3 &position) for (u8 y = 0; y < 8 && (boxIn == 0 || boxOut == 0); y++) { boxCalcTemp.set( - boundingBoxObj->getVertices()[y].x + position.x, - boundingBoxObj->getVertices()[y].y + position.y, - boundingBoxObj->getVertices()[y].z + position.z); + boundingBoxObj->getVertex(y).x + position.x, + boundingBoxObj->getVertex(y).y + position.y, + boundingBoxObj->getVertex(y).z + position.z); if (t_frustumPlanes[i].distanceTo(boxCalcTemp) < 0) boxOut++; else From f8f91c6b4954809675337e20b204ad6a04433d86 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:09:00 +0100 Subject: [PATCH 24/56] Changed: Return type of getVertex() to be const. --- src/engine/include/models/bounding_box.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp index 1dec3ee..9ffafd5 100644 --- a/src/engine/include/models/bounding_box.hpp +++ b/src/engine/include/models/bounding_box.hpp @@ -69,7 +69,7 @@ public: * Returns bounding box raw vertices array. * Total length: 8 */ - Vector3 &getVertex(const u8 &i) { return _vertices[i]; }; + const Vector3 &getVertex(const u8 &i) { return _vertices[i]; }; /** Returns single vertex from raw vertices array.*/ Vector3 *getVertices() { return _vertices; }; From 115dac21bceee17e827be4647ad3025ecc616bc8 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:15:18 +0100 Subject: [PATCH 25/56] Changed: Return types in mesh_frame and mesh_materials for getBoundingBoxVertex() to const. --- src/engine/include/models/mesh_frame.hpp | 2 +- src/engine/include/models/mesh_material.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index 6c33e89..9b57699 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -86,7 +86,7 @@ public: * Returns bounding box (AABB) vertex. * Total length: 8 */ - Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; + const Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; /** * Returns bounding box (AABB) object pointer. diff --git a/src/engine/include/models/mesh_material.hpp b/src/engine/include/models/mesh_material.hpp index 5099901..47cf64b 100644 --- a/src/engine/include/models/mesh_material.hpp +++ b/src/engine/include/models/mesh_material.hpp @@ -72,7 +72,7 @@ public: * Returns bounding box (AABB) vertex. * Total length: 8 */ - Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; + const Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; /** * Returns bounding box (AABB) object pointer. From 23ea1a28f6a47c9e8ac7e7a9a727601dee25388c Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:22:40 +0100 Subject: [PATCH 26/56] Changed: Comments, boundingbox getters in mesh.hpp --- src/engine/include/models/mesh.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/engine/include/models/mesh.hpp b/src/engine/include/models/mesh.hpp index 1de33bb..1f9e7ea 100644 --- a/src/engine/include/models/mesh.hpp +++ b/src/engine/include/models/mesh.hpp @@ -94,10 +94,13 @@ public: * Returns bounding vertex of current frame. * @param i 0-7. Because, bounding box have 8 corners */ - Vector3 &getCurrentBoundingBoxVertex(const u8 &i) { return frames[animState.currentFrame].getBoundingBoxVertex(i); }; + const Vector3 &getCurrentBoundingBoxVertex(const u8 &i) { return frames[animState.currentFrame].getBoundingBoxVertex(i); }; - /** Returns bounding box of current frame. Size: 8 */ - Vector3 *getCurrentBoundingBox() const { return frames[animState.currentFrame].getBoundingBoxVertices(); }; + /** @returns bounding box vertex array of current frame. Size: 8 */ + const Vector3 *getCurrentBoundingBoxVertices() const { return frames[animState.currentFrame].getBoundingBoxVertices(); }; + + /** @returns bounding box object of current frame. */ + const BoundingBox *getCurrentBoundingBox() const { return frames[animState.currentFrame].getBoundingBox(); }; // ---- // Setters From ae3dd737e5662753d10d6426993a756b4a817ce7 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:28:26 +0100 Subject: [PATCH 27/56] Changed: Multiple const additions. --- src/engine/models/mesh.cpp | 2 +- src/samples/floors/utils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/models/mesh.cpp b/src/engine/models/mesh.cpp index 84cddce..5a47159 100644 --- a/src/engine/models/mesh.cpp +++ b/src/engine/models/mesh.cpp @@ -347,7 +347,7 @@ u8 Mesh::isInFrustum(Plane *t_frustumPlanes) { Vector3 boxCalcTemp; u8 boxResult = 1, boxIn = 0, boxOut = 0; - Vector3 *currentBoundingBox = getCurrentBoundingBox(); + const Vector3 *currentBoundingBox = getCurrentBoundingBoxVertices(); for (int i = 0; i < 6; i++) { boxOut = 0; diff --git a/src/samples/floors/utils.cpp b/src/samples/floors/utils.cpp index 5195cf9..d8b1021 100644 --- a/src/samples/floors/utils.cpp +++ b/src/samples/floors/utils.cpp @@ -38,7 +38,7 @@ void Utils::getMinMax(const Mesh &t_mesh, Vector3 &t_min, Vector3 &t_max) { Vector3 calc = Vector3(); u8 isInitialized = 0; - Vector3 *boundingBox = t_mesh.getCurrentBoundingBox(); + const Vector3 *boundingBox = t_mesh.getCurrentBoundingBoxVertices(); for (u32 i = 0; i < 8; i++) { calc.set( From 3af357620372670078023a33e9812b3a7db622e2 Mon Sep 17 00:00:00 2001 From: Foxar Date: Mon, 21 Dec 2020 20:35:09 +0100 Subject: [PATCH 28/56] Added: Multiple doxygen @returns comments. --- src/engine/include/models/bounding_box.hpp | 18 +++++++++--------- src/engine/include/models/mesh_frame.hpp | 6 +++--- src/engine/include/models/mesh_material.hpp | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp index 9ffafd5..cab4a9b 100644 --- a/src/engine/include/models/bounding_box.hpp +++ b/src/engine/include/models/bounding_box.hpp @@ -51,26 +51,26 @@ public: const float &getHeight() { return _height; }; const float &getDepth() { return _depth; }; const float &getWidth() { return _width; }; - /** Return the vector directly in middle of the bounding box. */ + /** @returns the vector directly in middle of the bounding box. */ const Vector3 &getCenter() { return _centerVector; }; - /** Return the front face (further on z-axis) */ + /** @returns the front face (further on z-axis) */ const BoundingBoxFace &getFrontFace() { return _frontFace; }; - /** Return the back face (nearer on z-axis) */ + /** @returns the back face (nearer on z-axis) */ const BoundingBoxFace &getBackFace() { return _backFace; }; - /** Return the left face (further on x-axis) */ + /** @returns the left face (further on x-axis) */ const BoundingBoxFace &getLeftFace() { return _leftFace; }; - /** Return the right face (nearer on x-axis) */ + /** @returns the right face (nearer on x-axis) */ const BoundingBoxFace &getRightFace() { return _rightFace; }; - /** Return the top face (further on y-axis) */ + /** @returns the top face (further on y-axis) */ const BoundingBoxFace &getTopFace() { return _topFace; }; - /** Return the bottom face (nearer on y-axis) */ + /** @returns the bottom face (nearer on y-axis) */ const BoundingBoxFace &getBottomFace() { return _bottomFace; }; /** - * Returns bounding box raw vertices array. + * @returns bounding box raw vertices array. * Total length: 8 */ const Vector3 &getVertex(const u8 &i) { return _vertices[i]; }; - /** Returns single vertex from raw vertices array.*/ + /** @returns single vertex from raw vertices array.*/ Vector3 *getVertices() { return _vertices; }; private: diff --git a/src/engine/include/models/mesh_frame.hpp b/src/engine/include/models/mesh_frame.hpp index 9b57699..cd7c299 100644 --- a/src/engine/include/models/mesh_frame.hpp +++ b/src/engine/include/models/mesh_frame.hpp @@ -77,19 +77,19 @@ public: MeshMaterial *getMaterials() const { return materials; }; /** - * Returns bounding box (AABB). + * @returns bounding box (AABB). * Total length: 8 */ Vector3 *getBoundingBoxVertices() { return boundingBoxObj->getVertices(); }; /** - * Returns bounding box (AABB) vertex. + * @returns bounding box (AABB) vertex. * Total length: 8 */ const Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; /** - * Returns bounding box (AABB) object pointer. + * @returns bounding box (AABB) object pointer. */ BoundingBox *getBoundingBox() { return boundingBoxObj; }; diff --git a/src/engine/include/models/mesh_material.hpp b/src/engine/include/models/mesh_material.hpp index 47cf64b..3ba2621 100644 --- a/src/engine/include/models/mesh_material.hpp +++ b/src/engine/include/models/mesh_material.hpp @@ -63,19 +63,19 @@ public: u32 *getNormalFaces() const { return normalFaces; }; /** - * Returns bounding box (AABB). + * @returns bounding box (AABB). * Total length: 8 */ Vector3 *getBoundingBoxVertices() { return boundingBoxObj->getVertices(); }; /** - * Returns bounding box (AABB) vertex. + * @returns bounding box (AABB) vertex. * Total length: 8 */ const Vector3 &getBoundingBoxVertex(const u8 &i) { return boundingBoxObj->getVertex(i); }; /** - * Returns bounding box (AABB) object pointer. + * @returns bounding box (AABB) object pointer. */ BoundingBox *getBoundingBox() { return boundingBoxObj; }; From b935d4da135e195b06b57051407f9e5706c3e03b Mon Sep 17 00:00:00 2001 From: h4570 Date: Wed, 23 Dec 2020 20:24:08 +0100 Subject: [PATCH 29/56] fixed newline warning --- src/engine/include/models/bounding_box.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/include/models/bounding_box.hpp b/src/engine/include/models/bounding_box.hpp index cab4a9b..a2f6c44 100644 --- a/src/engine/include/models/bounding_box.hpp +++ b/src/engine/include/models/bounding_box.hpp @@ -91,4 +91,4 @@ private: BoundingBoxFace _bottomFace; }; -#endif \ No newline at end of file +#endif From f95e805d338cd5a50b32f228777b2f9b018d43a4 Mon Sep 17 00:00:00 2001 From: h4570 Date: Wed, 23 Dec 2020 20:28:28 +0100 Subject: [PATCH 30/56] added data alignment --- src/engine/include/models/math/matrix.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/include/models/math/matrix.hpp b/src/engine/include/models/math/matrix.hpp index 5e13bd7..03f229e 100644 --- a/src/engine/include/models/math/matrix.hpp +++ b/src/engine/include/models/math/matrix.hpp @@ -19,7 +19,7 @@ class Matrix { public: - float data[16]; + float data[16] __attribute__((aligned(64))); Matrix(float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, From e0ad58f72f9f3fc3a116a877c7c4d34b3cef8d1a Mon Sep 17 00:00:00 2001 From: h4570 Date: Wed, 23 Dec 2020 20:28:41 +0100 Subject: [PATCH 31/56] fixed bug with matrix multiply --- src/engine/models/math/matrix.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/models/math/matrix.cpp b/src/engine/models/math/matrix.cpp index ec927a1..b0e9e2f 100644 --- a/src/engine/models/math/matrix.cpp +++ b/src/engine/models/math/matrix.cpp @@ -160,7 +160,7 @@ Matrix Matrix::operator*(const Matrix &t) "sqc2 vf3, 0x20(%0) \n\t" "sqc2 vf4, 0x30(%0) \n\t" : - : "r"(result.data), "r"(this->data), "r"(t.data) + : "r"(result.data), "r"(t.data), "r"(this->data) : "memory"); return result; } @@ -197,7 +197,7 @@ void Matrix::operator*=(const Matrix &t) "sqc2 vf3, 0x20(%0) \n\t" "sqc2 vf4, 0x30(%0) \n\t" : - : "r"(this->data), "r"(this->data), "r"(t.data) + : "r"(this->data), "r"(t.data), "r"(this->data) : "memory"); } From 4b2deb8b3999aa82c9dfec1d740378919b539de7 Mon Sep 17 00:00:00 2001 From: h4570 Date: Wed, 23 Dec 2020 22:10:12 +0100 Subject: [PATCH 32/56] matrix refactor --- src/engine/include/models/math/matrix.hpp | 128 +++++-- src/engine/models/math/matrix.cpp | 413 ++++++++++++---------- 2 files changed, 318 insertions(+), 223 deletions(-) diff --git a/src/engine/include/models/math/matrix.hpp b/src/engine/include/models/math/matrix.hpp index 03f229e..6d97b7d 100644 --- a/src/engine/include/models/math/matrix.hpp +++ b/src/engine/include/models/math/matrix.hpp @@ -13,79 +13,139 @@ #include "vector3.hpp" #include "../screen_settings.hpp" +#include -/** https://en.wikipedia.org/wiki/Matrix_(mathematics) */ +/** 4x4 Matrix class. */ class Matrix { public: float data[16] __attribute__((aligned(64))); - Matrix(float m11, float m12, float m13, float m14, - float m21, float m22, float m23, float m24, - float m31, float m32, float m33, float m34, - float m41, float m42, float m43, float m44); - Matrix(const Matrix &v); - Matrix operator*(const Matrix &v); - void operator*=(const Matrix &v); - Matrix(); - ~Matrix(); + // ---- + // Constructors/Destructors + // ---- - void lookAt(Vector3 &t_up, Vector3 &t_position, Vector3 &t_target); + /** Create empty matrix. */ + Matrix(); + + /** + * Create identity/empty matrix. + * @param t_do_identity Identity matrix if true, random matrix values otherwise + */ + Matrix(const u8 &t_do_identity) + { + if (t_do_identity) + identity(); + } + + /** Init matrix with given values. */ + Matrix(const float &m11, const float &m12, const float &m13, const float &m14, + const float &m21, const float &m22, const float &m23, const float &m24, + const float &m31, const float &m32, const float &m33, const float &m34, + const float &m41, const float &m42, const float &m43, const float &m44); + + /** Init matrix with other matrix values. */ + Matrix(const Matrix &v) { memcpy(data, v.data, 16 * sizeof(float)); } + + // ---- + // Operators + // ---- + + Matrix operator*(const Matrix &v) + { + Matrix result; + cross(result.data, this->data, v.data); + return result; + } + + inline void operator*=(const Matrix &v) { cross(this->data, this->data, v.data); } + + float &operator[](const u8 &t_index) { return data[t_index]; } + + // ---- + // Functions + // ---- + + /** + * 1 0 0 0 + * 0 1 0 0 + * 0 0 1 0 + * 0 0 0 1 + */ void identity(); + + /** + * 1 0 0 0 + * 0 1 0 0 + * 0 0 1 0 + * 0 0 0 1 + */ inline void unit() { identity(); }; - // Translation - - void translate(const Vector3 &t_val); - + /** Create translation matrix. */ inline void translation(const Vector3 &t_val) { identity(); translate(t_val); } - // Rotation - - void rotateX(const float &t_radians); - void rotateY(const float &t_radians); - void rotateZ(const float &t_radians); - + /** Create X rotation matrix. */ inline void rotationX(const float &t_radians) { identity(); rotateX(t_radians); } + /** Create Y rotation matrix. */ inline void rotationY(const float &t_radians) { identity(); rotateY(t_radians); } + /** Create Z rotation matrix. */ inline void rotationZ(const float &t_radians) { identity(); rotateZ(t_radians); } - inline void rotate(const Vector3 &t_val) - { - rotateX(t_val.x); - rotateY(t_val.y); - rotateX(t_val.z); - } + /** Create angle rotation matrix. */ + void rotationByAngle(const float &t_angle, const Vector3 &t_axis); - inline void rotation(const Vector3 &t_val) - { - identity(); - rotate(t_val); - } + /** Create scale matrix. */ + void setScale(const Vector3 &t_val); - // + /** + * Create perspective projection matrix. + * + * Complies with OpenGL standard (gluPerspective). + * @see https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/gluPerspective.xml + * @param screen Screen settings + */ + void setPerspective(const ScreenSettings &screen); - void setPerspective(ScreenSettings &screen); + /** + * Create a view matrix that transforms coordinates in + * such a way that the user looks at a target vector + * direction from a position vector. + * + * Complies with OpenGL standard (glLookAt). + * @see https://learnopengl.com/Getting-started/Camera + */ + void lookAt(const Vector3 &t_position, const Vector3 &t_target); + + /** Print matrix (printf). */ const void print() const; + +private: + void rotateX(const float &t_radians); + void rotateY(const float &t_radians); + void rotateZ(const float &t_radians); + void translate(const Vector3 &t_val); + void cross(float res[16], const float a[16], const float b[16]); + void setCamera(const float t_pos[4], const float t_vz[4], const float t_vy[4]); }; #endif diff --git a/src/engine/models/math/matrix.cpp b/src/engine/models/math/matrix.cpp index b0e9e2f..71032b7 100644 --- a/src/engine/models/math/matrix.cpp +++ b/src/engine/models/math/matrix.cpp @@ -17,11 +17,16 @@ // Constructors/Destructors // ---- -/** Create by specifying all points */ -Matrix::Matrix(float m11, float m12, float m13, float m14, - float m21, float m22, float m23, float m24, - float m31, float m32, float m33, float m34, - float m41, float m42, float m43, float m44) +Matrix::Matrix() +{ + for (u8 i = 0; i < 16; i++) + data[i] = 0.0F; +} + +Matrix::Matrix(const float &m11, const float &m12, const float &m13, const float &m14, + const float &m21, const float &m22, const float &m23, const float &m24, + const float &m31, const float &m32, const float &m33, const float &m34, + const float &m41, const float &m42, const float &m43, const float &m44) { data[0] = m11; data[1] = m12; @@ -44,29 +49,13 @@ Matrix::Matrix(float m11, float m12, float m13, float m14, data[15] = m44; } -/** Create with another matrix values */ -Matrix::Matrix(const Matrix &v) -{ - data[0] = v.data[0]; - data[1] = v.data[1]; - data[2] = v.data[2]; - data[3] = v.data[3]; +// ---- +// Operators +// ---- - data[4] = v.data[4]; - data[5] = v.data[5]; - data[6] = v.data[6]; - data[7] = v.data[7]; - - data[8] = v.data[8]; - data[9] = v.data[9]; - data[10] = v.data[10]; - data[11] = v.data[11]; - - data[12] = v.data[12]; - data[13] = v.data[13]; - data[14] = v.data[14]; - data[15] = v.data[15]; -} +// ---- +// Functions +// ---- void Matrix::identity() { @@ -84,13 +73,145 @@ void Matrix::identity() : "r"(this->data)); } -void Matrix::translate(const Vector3 &t_val) +void Matrix::rotationByAngle(const float &t_angle, const Vector3 &t_axis) { - this->data[12] += t_val.x; // 3,0 - this->data[13] += t_val.y; // 3,1 - this->data[14] += t_val.z; // 3,2 + Vector3 localAxis = Vector3(t_axis); + localAxis.normalize(); + float x = localAxis.x; + float y = localAxis.y; + float z = localAxis.z; + + float c = Math::cos(t_angle); + float s = Math::sin(t_angle); + + this->data[0] = x * x * (1 - c) + c; + this->data[1] = y * x * (1 - c) + z * s; + this->data[2] = x * z * (1 - c) - y * s; + this->data[3] = 0.0F; + + this->data[4] = x * y * (1 - c) - z * s; + this->data[5] = y * y * (1 - c) + c; + this->data[6] = y * z * (1 - c) + x * s; + this->data[7] = 0.0F; + + this->data[8] = x * z * (1 - c) + y * s; + this->data[9] = y * z * (1 - c) - x * s; + this->data[10] = z * z * (1 - c) + c; + this->data[11] = 0.0F; + + this->data[12] = 0.0F; + this->data[13] = 0.0F; + this->data[14] = 0.0F; + this->data[15] = 1.0F; } +void Matrix::setScale(const Vector3 &t_val) +{ + this->identity(); + this->data[0] = t_val.x; + this->data[5] = t_val.y; + this->data[10] = t_val.z; + this->data[15] = 1.0F; +} + +void Matrix::setPerspective(const ScreenSettings &t_screen) +{ + float fovYdiv2 = Math::HALF_ANG2RAD * t_screen.fov; + float cotFOV = 1.0F / (Math::sin(fovYdiv2) / Math::cos(fovYdiv2)); + float w = cotFOV * (t_screen.width / t_screen.projectionScale) / t_screen.aspectRatio; + float h = cotFOV * (t_screen.height / t_screen.projectionScale); + + this->data[0] = w; + this->data[1] = 0.0F; + this->data[2] = 0.0F; + this->data[3] = 0.0F; + + this->data[4] = 0.0F; + this->data[5] = -h; + this->data[6] = 0.0F; + this->data[7] = 0.0F; + + this->data[8] = 0.0F; + this->data[9] = 0.0F; + this->data[10] = + (t_screen.farPlaneDist + t_screen.nearPlaneDist) / + (t_screen.farPlaneDist - t_screen.nearPlaneDist); + this->data[11] = -1.0F; + + this->data[12] = 0.0F; + this->data[13] = 0.0F; + this->data[14] = + (2.0F * t_screen.farPlaneDist * t_screen.nearPlaneDist) / + (t_screen.farPlaneDist - t_screen.nearPlaneDist); + this->data[15] = 0.0F; +} + +void Matrix::lookAt(const Vector3 &t_position, const Vector3 &t_target) +{ + VECTOR up_vec, view_vec; + VECTOR eye = {t_position.x, t_position.y, t_position.z, 1.0F}; + VECTOR obj = {t_target.x, t_target.y, t_target.z, 1.0F}; + asm volatile( + "lqc2 vf4, 0x00(%2) # eye \n\t" + "lqc2 vf5, 0x00(%3) # obj \n\t" + "vsub.xyz vf7, vf4, vf5 # view_vec = vf7 \n\t" + "vmove.xyzw vf6, vf0 \n\t" + "vaddw.y vf6, vf0, vf0 # vf6 = { 0.0f, 1.0f, 0.0f, 1.0f } \n\t" + "vopmula.xyz ACC, vf6, vf7 \n\t" + "vopmsub.xyz vf9, vf7, vf6 # vec = vf9 \n\t" + "vopmula.xyz ACC, vf7, vf9 \n\t" + "vopmsub.xyz vf8, vf9, vf7 # up_vec = vf8 \n\t" + "sqc2 vf7, 0x00(%0) # view_vec \n\t" + "sqc2 vf6, 0x00(%1) # up_vec \n\t" + : + : "r"(view_vec), "r"(up_vec), "r"(eye), "r"(obj)); + Matrix temp; + temp.setCamera(eye, view_vec, up_vec); + identity(); + cross(this->data, this->data, temp.data); + + // Vector3 camForward, camUp, camRight; + // Vector3 t_up = Vector3(0.0F, 1.0F, 0.0F); + // camForward = t_position - t_target; + // camForward.normalize(); + // camRight = t_up * camForward; + // camRight.normalize(); + // camUp = camForward * camRight; + + // data[0] = camRight.x; + // data[4] = camRight.y; + // data[8] = camRight.z; + // data[12] = -camRight.innerProduct(t_position); + + // data[1] = camUp.x; + // data[5] = camUp.y; + // data[9] = camUp.z; + // data[13] = -camUp.innerProduct(t_position); + + // data[2] = camForward.x; + // data[6] = camForward.y; + // data[10] = camForward.z; + // data[14] = -camForward.innerProduct(t_position); + + // data[3] = 0; + // data[7] = 0; + // data[11] = 0; + // data[15] = 1; +} + +const void Matrix::print() const +{ + printf("MATRIX(\n%f, %f, %f, %f\n%f, %f, %f, %f\n%f, %f, %f, %f\n%f, %f, %f, %f\n)\n", + data[0], data[1], data[2], data[3], + data[4], data[5], data[6], data[7], + data[8], data[9], data[10], data[11], + data[12], data[13], data[14], data[15]); +} + +// ---- +// Private +// ---- + void Matrix::rotateX(const float &t_radians) { Matrix temp = Matrix(); @@ -127,45 +248,80 @@ void Matrix::rotateZ(const float &t_radians) this->data[5] = c; // 1,1 } -Matrix Matrix::operator*(const Matrix &t) +void Matrix::translate(const Vector3 &t_val) { - Matrix result; - asm volatile( - "lqc2 vf1, 0x00(%1) \n\t" - "lqc2 vf2, 0x10(%1) \n\t" - "lqc2 vf3, 0x20(%1) \n\t" - "lqc2 vf4, 0x30(%1) \n\t" - "lqc2 vf5, 0x00(%2) \n\t" - "lqc2 vf6, 0x10(%2) \n\t" - "lqc2 vf7, 0x20(%2) \n\t" - "lqc2 vf8, 0x30(%2) \n\t" - "vmulax.xyzw ACC, vf5, vf1 \n\t" - "vmadday.xyzw ACC, vf6, vf1 \n\t" - "vmaddaz.xyzw ACC, vf7, vf1 \n\t" - "vmaddw.xyzw vf1, vf8, vf1 \n\t" - "vmulax.xyzw ACC, vf5, vf2 \n\t" - "vmadday.xyzw ACC, vf6, vf2 \n\t" - "vmaddaz.xyzw ACC, vf7, vf2 \n\t" - "vmaddw.xyzw vf2, vf8, vf2 \n\t" - "vmulax.xyzw ACC, vf5, vf3 \n\t" - "vmadday.xyzw ACC, vf6, vf3 \n\t" - "vmaddaz.xyzw ACC, vf7, vf3 \n\t" - "vmaddw.xyzw vf3, vf8, vf3 \n\t" - "vmulax.xyzw ACC, vf5, vf4 \n\t" - "vmadday.xyzw ACC, vf6, vf4 \n\t" - "vmaddaz.xyzw ACC, vf7, vf4 \n\t" - "vmaddw.xyzw vf4, vf8, vf4 \n\t" - "sqc2 vf1, 0x00(%0) \n\t" - "sqc2 vf2, 0x10(%0) \n\t" - "sqc2 vf3, 0x20(%0) \n\t" - "sqc2 vf4, 0x30(%0) \n\t" - : - : "r"(result.data), "r"(t.data), "r"(this->data) - : "memory"); - return result; + this->data[12] += t_val.x; // 3,0 + this->data[13] += t_val.y; // 3,1 + this->data[14] += t_val.z; // 3,2 } -void Matrix::operator*=(const Matrix &t) +void Matrix::setCamera(const float t_pos[4], const float t_vz[4], const float t_vy[4]) +{ + // Matrix vf4, vf5, vf6, vf7 + // t_pos vf8 + // t_vz vf9 + // t_vy vf10 + // vtmp vf11 + asm volatile( + "lqc2 vf9, 0x00(%2) \n\t" + "lqc2 vf10, 0x00(%3) \n\t" + // mtmp.unit() + "vsub.w vf5, vf0, vf0 # mtmp[1][PW] = 0.0F \n\t" + // vtmp.outerProduct(vy, vz); + "vopmula.xyz ACC, vf10, vf9 \n\t" + "vopmsub.xyz vf11, vf9, vf10 \n\t" + // mtmp[0] = vtmp.normalize(); + "vmul.xyz vf12, vf11, vf11 \n\t" + "vaddy.x vf12, vf12, vf12 \n\t" + "vaddz.x vf12, vf12, vf12 \n\t" + "vrsqrt Q, vf0w, vf12x \n\t" + "vsub.xyzw vf4, vf0, vf0 \n\t" + "vwaitq \n\t" + "vmulq.xyz vf4, vf11, Q \n\t" + // mtmp[2] = vz.normalize(); + "vmul.xyz vf12, vf9, vf9 \n\t" + "vaddy.x vf12, vf12, vf12 \n\t" + "vaddz.x vf12, vf12, vf12 \n\t" + "vrsqrt Q, vf0w, vf12x \n\t" + "vsub.xyzw vf6, vf0, vf0 \n\t" + "vwaitq \n\t" + "vmulq.xyz vf6, vf9, Q \n\t" + // mtmp[1].outerProduct(mtmp[2], mtmp[0]); + "vopmula.xyz ACC, vf6, vf4 \n\t" + "vopmsub.xyz vf5, vf4, vf6 \n\t" + // mtmp.transpose(pos); + "lqc2 vf7, 0x00(%1) \n\t" + // m = mtmp.inverse(); + "qmfc2.ni $11, vf0 \n\t" + "qmfc2.ni $8, vf4 \n\t" + "qmfc2.ni $9, vf5 \n\t" + "qmfc2.ni $10, vf6 \n\t" + + "pextlw $12, $9, $8 \n\t" + "pextuw $13, $9, $8 \n\t" + "pextlw $14, $11, $10 \n\t" + "pextuw $15, $11, $10 \n\t" + "pcpyld $8, $14, $12 \n\t" + "pcpyud $9, $12, $14 \n\t" + "pcpyld $10, $15, $13 \n\t" + + "qmtc2.ni $8, vf16 \n\t" + "qmtc2.ni $9, vf17 \n\t" + "qmtc2.ni $10, vf18 \n\t" + "vmulax.xyz ACC, vf16, vf7 \n\t" + "vmadday.xyz ACC, vf17, vf7 \n\t" + "vmaddz.xyz vf5, vf18, vf7 \n\t" + "vsub.xyzw vf5, vf0, vf5 \n\t" + + "sq $8, 0x00(%0) \n\t" + "sq $9, 0x10(%0) \n\t" + "sq $10, 0x20(%0) \n\t" + "sqc2 vf5, 0x30(%0) \n\t" + : + : "r"(this->data), "r"(t_pos), "r"(t_vz), "r"(t_vy)); +} + +void Matrix::cross(float res[16], const float a[16], const float b[16]) { asm volatile( "lqc2 vf1, 0x00(%1) \n\t" @@ -197,127 +353,6 @@ void Matrix::operator*=(const Matrix &t) "sqc2 vf3, 0x20(%0) \n\t" "sqc2 vf4, 0x30(%0) \n\t" : - : "r"(this->data), "r"(t.data), "r"(this->data) + : "r"(res), "r"(b), "r"(a) : "memory"); } - -/** Create empty matrix */ -Matrix::Matrix() -{ - data[0] = 0.0F; - data[1] = 0.0F; - data[2] = 0.0F; - data[3] = 0.0F; - - data[4] = 0.0F; - data[5] = 0.0F; - data[6] = 0.0F; - data[7] = 0.0F; - - data[8] = 0.0F; - data[9] = 0.0F; - data[10] = 0.0F; - data[11] = 0.0F; - - data[12] = 0.0F; - data[13] = 0.0F; - data[14] = 0.0F; - data[15] = 0.0F; -} - -Matrix::~Matrix() {} - -// ---- -// Methods -// ---- - -/** Set up a perspective projection matrix - * - * Clone of gluPerspective() - * https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/gluPerspective.xml - * @param fov (FOV in radians)/2 - * @param aspect Aspect ratio - * @param scrW Half of screen width - * @param scrH Half of screen height - * @param zNear Distance to near plane - * @param zFar Distance to far plane - * @param projScale Projection scale - */ -void Matrix::setPerspective(ScreenSettings &t_screen) -{ - float fovYdiv2 = Math::HALF_ANG2RAD * t_screen.fov; - float cotFOV = 1.0F / (Math::sin(fovYdiv2) / Math::cos(fovYdiv2)); - float w = cotFOV * (t_screen.width / t_screen.projectionScale) / t_screen.aspectRatio; - float h = cotFOV * (t_screen.height / t_screen.projectionScale); - - this->data[0] = w; - this->data[1] = 0.0F; - this->data[2] = 0.0F; - this->data[3] = 0.0F; - - this->data[4] = 0.0F; - this->data[5] = -h; - this->data[6] = 0.0F; - this->data[7] = 0.0F; - - this->data[8] = 0.0F; - this->data[9] = 0.0F; - this->data[10] = - (t_screen.farPlaneDist + t_screen.nearPlaneDist) / - (t_screen.farPlaneDist - t_screen.nearPlaneDist); - this->data[11] = -1.0F; - - this->data[12] = 0.0F; - this->data[13] = 0.0F; - this->data[14] = - (2.0F * t_screen.farPlaneDist * t_screen.nearPlaneDist) / - (t_screen.farPlaneDist - t_screen.nearPlaneDist); - this->data[15] = 0.0F; -} - -/** Create a view matrix that transforms coordinates in - * such a way that the user looks at a target vector - * direction from a position vector. - * - * Clone of OpenGL lookAt function - * https://learnopengl.com/Getting-started/Camera -*/ -void Matrix::lookAt(Vector3 &t_up, Vector3 &t_position, Vector3 &t_target) -{ - Vector3 camForward, camUp, camRight; - - camForward = t_position - t_target; - camForward.normalize(); - camRight = t_up * camForward; - camRight.normalize(); - camUp = camForward * camRight; - - data[0] = camRight.x; - data[4] = camRight.y; - data[8] = camRight.z; - data[12] = -camRight.innerProduct(t_position); - - data[1] = camUp.x; - data[5] = camUp.y; - data[9] = camUp.z; - data[13] = -camUp.innerProduct(t_position); - - data[2] = camForward.x; - data[6] = camForward.y; - data[10] = camForward.z; - data[14] = -camForward.innerProduct(t_position); - - data[3] = 0; - data[7] = 0; - data[11] = 0; - data[15] = 1; -} - -const void Matrix::print() const -{ - printf("MATRIX(\n%f, %f, %f, %f\n%f, %f, %f, %f\n%f, %f, %f, %f\n%f, %f, %f, %f\n)\n", - data[0], data[1], data[2], data[3], - data[4], data[5], data[6], data[7], - data[8], data[9], data[10], data[11], - data[12], data[13], data[14], data[15]); -} From 7dd89476126431948953c981b84ddf778398bc50 Mon Sep 17 00:00:00 2001 From: h4570 Date: Wed, 23 Dec 2020 22:38:57 +0100 Subject: [PATCH 33/56] added vec3 multiply --- src/engine/include/models/math/matrix.hpp | 13 +++++++++++-- src/engine/models/math/matrix.cpp | 20 +++++++++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/engine/include/models/math/matrix.hpp b/src/engine/include/models/math/matrix.hpp index 6d97b7d..b30f6d1 100644 --- a/src/engine/include/models/math/matrix.hpp +++ b/src/engine/include/models/math/matrix.hpp @@ -52,7 +52,16 @@ public: // Operators // ---- - Matrix operator*(const Matrix &v) + Matrix operator*(const Matrix &v) const + { + Matrix result; + cross(result.data, this->data, v.data); + return result; + } + + Vector3 operator*(const Vector3 &v) const; + + Matrix operator*(const Matrix &v) const { Matrix result; cross(result.data, this->data, v.data); @@ -144,7 +153,7 @@ private: void rotateY(const float &t_radians); void rotateZ(const float &t_radians); void translate(const Vector3 &t_val); - void cross(float res[16], const float a[16], const float b[16]); + void cross(float res[16], const float a[16], const float b[16]) const; void setCamera(const float t_pos[4], const float t_vz[4], const float t_vy[4]); }; diff --git a/src/engine/models/math/matrix.cpp b/src/engine/models/math/matrix.cpp index 71032b7..1f4ff64 100644 --- a/src/engine/models/math/matrix.cpp +++ b/src/engine/models/math/matrix.cpp @@ -53,6 +53,24 @@ Matrix::Matrix(const float &m11, const float &m12, const float &m13, const float // Operators // ---- +Vector3 Matrix::operator*(const Vector3 &v) const +{ + Vector3 result; + asm volatile( + "lqc2 vf4, 0x00(%1) \n\t" + "lqc2 vf5, 0x10(%1) \n\t" + "lqc2 vf6, 0x20(%1) \n\t" + "lqc2 vf7, 0x30(%1) \n\t" + "lqc2 vf8, 0x00(%2) \n\t" + "vmulax.xyzw ACC, vf4, vf8 \n\t" + "vmadday.xyzw ACC, vf5, vf8 \n\t" + "vmaddaz.xyzw ACC, vf6, vf8 \n\t" + "vmaddw.xyzw vf9, vf7, vf8 \n\t" + "sqc2 vf9, 0x00(%0) \n\t" + : + : "r"(result.xyz), "r"(this->data), "r"(v.xyz)); +} + // ---- // Functions // ---- @@ -321,7 +339,7 @@ void Matrix::setCamera(const float t_pos[4], const float t_vz[4], const float t_ : "r"(this->data), "r"(t_pos), "r"(t_vz), "r"(t_vy)); } -void Matrix::cross(float res[16], const float a[16], const float b[16]) +void Matrix::cross(float res[16], const float a[16], const float b[16]) const { asm volatile( "lqc2 vf1, 0x00(%1) \n\t" From 5a932b35ca8d904edf26609acfd15dbb25a56b84 Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 10:32:51 +0100 Subject: [PATCH 34/56] fixed bug, added full rotation --- src/engine/include/models/math/matrix.hpp | 26 +++++++++++++++++------ src/engine/models/math/matrix.cpp | 6 ++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/engine/include/models/math/matrix.hpp b/src/engine/include/models/math/matrix.hpp index b30f6d1..d14855b 100644 --- a/src/engine/include/models/math/matrix.hpp +++ b/src/engine/include/models/math/matrix.hpp @@ -52,13 +52,6 @@ public: // Operators // ---- - Matrix operator*(const Matrix &v) const - { - Matrix result; - cross(result.data, this->data, v.data); - return result; - } - Vector3 operator*(const Vector3 &v) const; Matrix operator*(const Matrix &v) const @@ -99,6 +92,25 @@ public: translate(t_val); } + /** Create rotation matrix. */ + inline void rotation(const Vector3 &t_val) + { + identity(); + Matrix temp = Matrix(); + + temp.identity(); + temp.rotateX(t_val.x); + operator*=(temp); + + temp.identity(); + temp.rotateY(t_val.y); + operator*=(temp); + + temp.identity(); + temp.rotateZ(t_val.z); + operator*=(temp); + } + /** Create X rotation matrix. */ inline void rotationX(const float &t_radians) { diff --git a/src/engine/models/math/matrix.cpp b/src/engine/models/math/matrix.cpp index 1f4ff64..805c433 100644 --- a/src/engine/models/math/matrix.cpp +++ b/src/engine/models/math/matrix.cpp @@ -55,7 +55,8 @@ Matrix::Matrix(const float &m11, const float &m12, const float &m13, const float Vector3 Matrix::operator*(const Vector3 &v) const { - Vector3 result; + float a[4] = {v.x, v.y, v.z, 1.0F}; + float res[4]; asm volatile( "lqc2 vf4, 0x00(%1) \n\t" "lqc2 vf5, 0x10(%1) \n\t" @@ -68,7 +69,8 @@ Vector3 Matrix::operator*(const Vector3 &v) const "vmaddw.xyzw vf9, vf7, vf8 \n\t" "sqc2 vf9, 0x00(%0) \n\t" : - : "r"(result.xyz), "r"(this->data), "r"(v.xyz)); + : "r"(res), "r"(this->data), "r"(a)); + return Vector3(res[0], res[1], res[2]); } // ---- From 8589a298da3a7effebf57d590d6d681bc70a88d1 Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 10:33:30 +0100 Subject: [PATCH 35/56] added comments, increased performance --- src/engine/include/models/math/vector3.hpp | 99 ++++++-- src/engine/models/math/vector3.cpp | 281 ++++++++------------- 2 files changed, 180 insertions(+), 200 deletions(-) diff --git a/src/engine/include/models/math/vector3.hpp b/src/engine/include/models/math/vector3.hpp index 641f6b1..53939af 100644 --- a/src/engine/include/models/math/vector3.hpp +++ b/src/engine/include/models/math/vector3.hpp @@ -12,6 +12,7 @@ #define _TYRA_VECTOR3_ #include +#include class Math; // Forward definition @@ -20,6 +21,7 @@ class Vector3 { public: + /** This trick will allow use to use vec.x and vex[0] */ union { struct @@ -31,32 +33,91 @@ public: float xyz[3] __attribute__((__aligned__(16))); }; - Vector3(float t_x, float t_y, float t_z); - Vector3(const Vector3 &v); + // ---- + // Constructors/Destructors + // ---- + + /** Create empty vector. */ Vector3(); - ~Vector3(); - Vector3 operator+(Vector3 v); - Vector3 operator-(const Vector3 &v); - Vector3 operator*(Vector3 &v); - Vector3 operator*(const float &t); + /** Create vector with given vector values. */ + Vector3(const Vector3 &t_v) { set(t_v); } + + /** Create vector with given values. */ + Vector3(const float &t_x, const float &t_y, const float &t_z) { set(t_x, t_y, t_z); } + + // ---- + // Operators + // ---- + + Vector3 operator+(const Vector3 &v) const; + Vector3 operator-(const Vector3 &v) const; + /** Also called "cross product" */ + Vector3 operator*(const Vector3 &v) const; + Vector3 operator*(const float &t) const; + Vector3 operator/(const float &t) const; + Vector3 operator-(void) const { return Vector3(-x, -y, -z); } + void operator+=(const Vector3 &t); void operator*=(const float &t); - Vector3 operator/(float t); - Vector3 operator-(void); - static u8 shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *v0, const Vector3 *v1, const Vector3 *v2); - u8 collidesSquare(const Vector3 &t_min, const Vector3 &t_max) const; - u8 isOnSquare(const Vector3 &t_min, const Vector3 &t_max) const; - float length(); - void normalize(); - void setByLerp(const Vector3 &v1, const Vector3 &v2, const float &t_interp, const float &t_scale); - float innerProduct(Vector3 &v); + // ---- + // Functions + // ---- + + /** Set vector values via VU0. */ void set(const Vector3 &v); - void rotate(const Vector3 &v, u8 inversed = false); + + /** Set vector values. */ void set(const float &t_x, const float &t_y, const float &t_z); - void copy(Vector3 &v); + + /** Also called dot3. */ + float innerProduct(const Vector3 &v) const; + + /** Get vector length */ + float length() const; + + /** Normalize vector. */ + void normalize(); + + /** Returns distance between two vectors */ float distanceTo(const Vector3 &v) const; - const void print() const; + + /** + * Checks intersection with given box + * @param t_min Opposite min vertex (ex. near, left, down vertex of bounding box) + * @param t_max Opposite max vertex (ex. far, right, up vertex of bounding box) + */ + u8 collidesBox(const Vector3 &t_min, const Vector3 &t_max) const + { + return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y < t_max.y && this->y >= t_min.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0; + } + + /** + * Checks if this vector is on given box (this->y >= box.y) + * @param t_min Opposite min vertex (ex. near, left, down vertex of bounding box) + * @param t_max Opposite max vertex (ex. far, right, up vertex of bounding box) + */ + u8 isOnBox(const Vector3 &t_min, const Vector3 &t_max) const + { + return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y >= t_max.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0; + } + + /** Check if given triangle should be backface culled. */ + static u8 shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *t_v0, const Vector3 *t_v1, const Vector3 *t_v2); + + /** + * Set by linear interpolation between two vertices (animation). + * @param t_v1 Before vertex + * @param t_v2 After vertex + * @param t_interp State of interpolation + * @param t_scale Scale + */ + void setByLerp(const Vector3 &t_v1, const Vector3 &t_v2, const float &t_interp, const float &t_scale); + + const void print() const + { + printf("Vector3(%f, %f, %f)\n", x, y, z); + } }; #endif diff --git a/src/engine/models/math/vector3.cpp b/src/engine/models/math/vector3.cpp index 7adafd3..57f4303 100644 --- a/src/engine/models/math/vector3.cpp +++ b/src/engine/models/math/vector3.cpp @@ -9,63 +9,24 @@ */ #include "../../include/models/math/vector3.hpp" - #include "../../include/utils/math.hpp" -#include // ---- // Constructors/Destructors // ---- -/** Create by specifying 3 points */ -Vector3::Vector3(float t_x, float t_y, float t_z) -{ - x = t_x; - y = t_y; - z = t_z; -} - -/** Create with another vector values */ -Vector3::Vector3(const Vector3 &another) -{ - x = another.x; - y = another.y; - z = another.z; -} - -void Vector3::setByLerp(const Vector3 &v1, const Vector3 &v2, const float &t_interp, const float &t_scale) -{ - asm volatile( - "lqc2 vf4, 0x0(%1) \n\t" // vf4 = v1 - "lqc2 vf5, 0x0(%2) \n\t" // vf5 = v2 - "mfc1 $8, %3 \n\t" // vf6 = t - "qmtc2 $8, vf6 \n\t" // lerp: - "vsub.xyz vf7, vf5, vf4 \n\t" // vf7 = v2 - v1 - "vmulx.xyz vf8, vf7, vf6 \n\t" // vf8 = vf7 * t - "vadd.xyz vf9, vf8, vf4 \n\t" // vf9 = vf8 + vf4 - "sqc2 vf9, 0x0(%0) \n\t" // v0 = vf9 - : - : "r"(&this->xyz), "r"(&v1.xyz), "r"(&v2.xyz), "f"(t_interp)); - x *= t_scale; - y *= t_scale; - z *= t_scale; -} - -/** Create empty vector */ Vector3::Vector3() { - x = 0; - y = 0; - z = 0; + x = 0.0F; + y = 0.0F; + z = 0.0F; } -Vector3::~Vector3() {} - // ---- -// Methods +// Operators // ---- -Vector3 Vector3::operator+(Vector3 v) +Vector3 Vector3::operator+(const Vector3 &v) const { Vector3 result; asm volatile( // VU0 Macro program @@ -78,7 +39,7 @@ Vector3 Vector3::operator+(Vector3 v) return result; } -Vector3 Vector3::operator-(const Vector3 &v) +Vector3 Vector3::operator-(const Vector3 &v) const { Vector3 result; asm volatile( // VU0 Macro program @@ -91,17 +52,7 @@ Vector3 Vector3::operator-(const Vector3 &v) return result; } -Vector3 Vector3::operator-(void) -{ - Vector3 result; - result.x = -x; - result.y = -y; - result.z = -z; - return result; -} - -/** Also called "cross product" */ -Vector3 Vector3::operator*(Vector3 &v) +Vector3 Vector3::operator*(const Vector3 &v) const { Vector3 res; asm volatile( // VU0 Macro program @@ -119,7 +70,7 @@ Vector3 Vector3::operator*(Vector3 &v) return res; } -Vector3 Vector3::operator*(const float &t) +Vector3 Vector3::operator*(const float &t) const { Vector3 result; asm volatile( @@ -133,6 +84,26 @@ Vector3 Vector3::operator*(const float &t) return result; } +Vector3 Vector3::operator/(const float &t) const +{ + Vector3 result; + result.x = x / t; + result.y = y / t; + result.z = z / t; + return result; +} + +void Vector3::operator+=(const Vector3 &t) +{ + asm volatile( // VU0 Macro program + "lqc2 vf4, 0x0(%0) \n\t" + "lqc2 vf5, 0x0(%1) \n\t" + "vadd.xyz vf4, vf4, vf5 \n\t" + "sqc2 vf4, 0x0(%0) \n\t" + : + : "r"(this->xyz), "r"(t.xyz)); +} + void Vector3::operator*=(const float &t) { asm volatile( @@ -145,54 +116,46 @@ void Vector3::operator*=(const float &t) : "r"(this->xyz), "f"(t)); } -Vector3 Vector3::operator/(float t) +// ---- +// Functions +// ---- + +void Vector3::set(const Vector3 &v) { - Vector3 result; - result.x = x / t; - result.y = y / t; - result.z = z / t; + asm volatile( // VU0 Macro program + "lq $6, 0x0(%1) \n\t" + "sq $6, 0x0(%0) \n\t" + : + : "r"(this->xyz), "r"(v.xyz)); +} + +void Vector3::set(const float &t_x, const float &t_y, const float &t_z) +{ + x = t_x; + y = t_y; + z = t_z; +} + +float Vector3::innerProduct(const Vector3 &v) const +{ + float result; + asm volatile( // VU0 Macro program + "lqc2 vf4, 0x0(%1) \n\t" + "lqc2 vf5, 0x0(%2) \n\t" + "vmul.xyz vf6, vf4, vf5 \n\t" + "vaddy.x vf6, vf6, vf6 \n\t" + "vaddz.x vf6, vf6, vf6 \n\t" + "qmfc2 $2, vf6 \n\t" + "mtc1 $2, %0 \n\t" + : "=f"(result) + : "r"(this->xyz), "r"(v.xyz)); return result; + // return (x * v.x + y * v.y + z * v.z); } -u8 Vector3::shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *v0, const Vector3 *v1, const Vector3 *v2) +float Vector3::length() const { - register float dot; - asm volatile( - "lqc2 vf4, 0x0(%1) \n\t" // vf4 = cameraPos - "lqc2 vf5, 0x0(%2) \n\t" // vf5 = v0 - "lqc2 vf6, 0x0(%3) \n\t" // vf6 = v1 - "lqc2 vf7, 0x0(%4) \n\t" // vf7 = v2 - "vsub.xyz vf8, vf7, vf5 \n\t" // vf8 = vf7(v2) - vf5(v0) - "vsub.xyz vf9, vf6, vf5 \n\t" // vf9 = vf6(v1) - vf5(v0) - "vopmula.xyz ACC, vf8, vf9 \n\t" // vf6 = cross(vf8, vf9) - "vopmsub.xyz vf6, vf9, vf8 \n\t" - "vsub.w vf6, vf6, vf6 \n\t" - "vsub.xyz vf7, vf5, vf4 \n\t" // vf7 = vf5(v0) - vf4(cameraPos) - "vmul.xyz vf5, vf7, vf6 \n\t" // vf5 = dot(vf7, vf6) - "vaddy.x vf5, vf5, vf5 \n\t" - "vaddz.x vf5, vf5, vf5 \n\t" - "qmfc2 $2, vf5 \n\t" // store result on `dot` variable - "mtc1 $2, %0 \n\t" - : "=f"(dot) - : "r"(t_cameraPos->xyz), "r"(v0->xyz), "r"(v1->xyz), "r"(v2->xyz)); - return dot <= 0.0F; -} - -/** Checks intersection with given square */ -u8 Vector3::collidesSquare(const Vector3 &t_min, const Vector3 &t_max) const -{ - return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y < t_max.y && this->y >= t_min.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0; -} - -/** Checks is this vector is on given square */ -u8 Vector3::isOnSquare(const Vector3 &t_min, const Vector3 &t_max) const -{ - return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y >= t_max.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0; -} - -float Vector3::length() -{ - register float result; + float result; asm volatile( // VU0 Macro program "lqc2 vf4, 0x0(%1) \n\t" "vmul.xyz vf5, vf4, vf4 \n\t" @@ -227,85 +190,6 @@ void Vector3::normalize() : "r"(this->xyz)); } -/** Also called dot3 */ -float Vector3::innerProduct(Vector3 &v) -{ - register float result; - asm volatile( // VU0 Macro program - "lqc2 vf4, 0x0(%1) \n\t" - "lqc2 vf5, 0x0(%2) \n\t" - "vmul.xyz vf6, vf4, vf5 \n\t" - "vaddy.x vf6, vf6, vf6 \n\t" - "vaddz.x vf6, vf6, vf6 \n\t" - "qmfc2 $2, vf6 \n\t" - "mtc1 $2, %0 \n\t" - : "=f"(result) - : "r"(this->xyz), "r"(v.xyz)); - return result; - // return (x * v.x + y * v.y + z * v.z); -} - -void Vector3::set(const float &t_x, const float &t_y, const float &t_z) -{ - x = t_x; - y = t_y; - z = t_z; -} - -void Vector3::rotate(const Vector3 &v, u8 inversed) -{ - VECTOR cameraPos = {x, y, z, 0.0F}; - VECTOR rotation; - if (inversed) - { - rotation[0] = -v.x; - rotation[1] = -v.y; - rotation[2] = -v.z; - } - else - { - rotation[0] = v.x; - rotation[1] = v.y; - rotation[2] = v.z; - } - rotation[3] = 0.0F; - - MATRIX rotationMatrix; - matrix_unit(rotationMatrix); - matrix_rotate(rotationMatrix, rotationMatrix, rotation); - VECTOR result; - asm volatile( - "lqc2 vf4, 0x0(%1) \n\t" - "lqc2 vf5, 0x10(%1) \n\t" - "lqc2 vf6, 0x20(%1) \n\t" - "lqc2 vf7, 0x30(%1) \n\t" - "lqc2 vf8, 0x0(%2) \n\t" - "vmulax.xyzw ACC, vf4, vf8 \n\t" - "vmadday.xyzw ACC, vf5, vf8 \n\t" - "vmaddaz.xyzw ACC, vf6, vf8 \n\t" - "vmaddw.xyzw vf9, vf7, vf8 \n\t" - "sqc2 vf9, 0x0(%0) \n\t" - : - : "r"(&result), "r"(&rotationMatrix), "r"(&cameraPos)); - set(Vector3(result[0], result[1], result[2])); -} - -void Vector3::set(const Vector3 &v) -{ - this->x = v.x; - this->y = v.y; - this->z = v.z; -} - -void Vector3::copy(Vector3 &v) -{ - asm volatile( // VU0 Macro program - "lq $6, 0x0(%1) \n\t" - "sq $6, 0x0(%0) \n\t" - : - : "r"(v.xyz), "r"(this->xyz)); -} - float Vector3::distanceTo(const Vector3 &v) const { register float result; @@ -329,7 +213,42 @@ float Vector3::distanceTo(const Vector3 &v) const // (this->z - v.z) * (this->z - v.z)); } -const void Vector3::print() const +u8 Vector3::shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *t_v0, const Vector3 *t_v1, const Vector3 *t_v2) { - printf("Vector3(%f, %f, %f)\n", x, y, z); + register float dot; + asm volatile( + "lqc2 vf4, 0x0(%1) \n\t" // vf4 = cameraPos + "lqc2 vf5, 0x0(%2) \n\t" // vf5 = v0 + "lqc2 vf6, 0x0(%3) \n\t" // vf6 = v1 + "lqc2 vf7, 0x0(%4) \n\t" // vf7 = v2 + "vsub.xyz vf8, vf7, vf5 \n\t" // vf8 = vf7(v2) - vf5(v0) + "vsub.xyz vf9, vf6, vf5 \n\t" // vf9 = vf6(v1) - vf5(v0) + "vopmula.xyz ACC, vf8, vf9 \n\t" // vf6 = cross(vf8, vf9) + "vopmsub.xyz vf6, vf9, vf8 \n\t" + "vsub.w vf6, vf6, vf6 \n\t" + "vsub.xyz vf7, vf5, vf4 \n\t" // vf7 = vf5(v0) - vf4(cameraPos) + "vmul.xyz vf5, vf7, vf6 \n\t" // vf5 = dot(vf7, vf6) + "vaddy.x vf5, vf5, vf5 \n\t" + "vaddz.x vf5, vf5, vf5 \n\t" + "qmfc2 $2, vf5 \n\t" // store result on `dot` variable + "mtc1 $2, %0 \n\t" + : "=f"(dot) + : "r"(t_cameraPos->xyz), "r"(t_v0->xyz), "r"(t_v1->xyz), "r"(t_v2->xyz)); + return dot <= 0.0F; +} + +void Vector3::setByLerp(const Vector3 &t_v1, const Vector3 &t_v2, const float &t_interp, const float &t_scale) +{ + asm volatile( + "lqc2 vf4, 0x0(%1) \n\t" // vf4 = v1 + "lqc2 vf5, 0x0(%2) \n\t" // vf5 = v2 + "mfc1 $8, %3 \n\t" // vf6 = t + "qmtc2 $8, vf6 \n\t" // lerp: + "vsub.xyz vf7, vf5, vf4 \n\t" // vf7 = v2 - v1 + "vmulx.xyz vf8, vf7, vf6 \n\t" // vf8 = vf7 * t + "vadd.xyz vf9, vf8, vf4 \n\t" // vf9 = vf8 + vf4 + "sqc2 vf9, 0x0(%0) \n\t" // v0 = vf9 + : + : "r"(&this->xyz), "r"(&t_v1.xyz), "r"(&t_v2.xyz), "f"(t_interp)); + operator*=(t_scale); } From e39c8c5de88feaa255729e2b2515e5be75f9a26d Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 10:34:56 +0100 Subject: [PATCH 36/56] changes to match latest matrix/vector3 api --- src/engine/include/modules/camera_base.hpp | 5 +++-- src/engine/include/modules/renderer.hpp | 2 +- src/engine/modules/camera_base.cpp | 8 ++++---- src/engine/modules/renderer.cpp | 4 ++-- src/samples/dolphin/camera.cpp | 5 +---- src/samples/dolphin/camera.hpp | 3 +-- src/samples/floors/camera.cpp | 5 +---- src/samples/floors/camera.hpp | 1 - src/samples/floors/objects/player.cpp | 4 ++-- 9 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/engine/include/modules/camera_base.hpp b/src/engine/include/modules/camera_base.hpp index 342acc7..3cefcad 100644 --- a/src/engine/include/modules/camera_base.hpp +++ b/src/engine/include/modules/camera_base.hpp @@ -21,7 +21,7 @@ class CameraBase { public: - CameraBase(ScreenSettings *t_screen, Vector3 *t_position, Vector3 *t_up); + CameraBase(ScreenSettings *t_screen, Vector3 *t_position); virtual ~CameraBase(){}; /** @@ -56,9 +56,10 @@ protected: void updatePlanes(Vector3 t_target); private: - Vector3 *p_position, *p_up; + Vector3 *p_position; float farPlaneDist, nearPlaneDist, nearHeight, nearWidth, farHeight, farWidth; Vector3 ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr; + Vector3 up; // always 0.0F, 1.0F, 0.0F }; #endif diff --git a/src/engine/include/modules/renderer.hpp b/src/engine/include/modules/renderer.hpp index d2cdb76..1ad7acb 100644 --- a/src/engine/include/modules/renderer.hpp +++ b/src/engine/include/modules/renderer.hpp @@ -125,7 +125,7 @@ private: void flipBuffers(); void beginFrameIfNeeded(); u8 isFrameEmpty; - Matrix perspective; + Matrix perspective, camRotation; Light light; RenderData renderData; TextureRepository textureRepo; diff --git a/src/engine/modules/camera_base.cpp b/src/engine/modules/camera_base.cpp index 124ee77..9576306 100644 --- a/src/engine/modules/camera_base.cpp +++ b/src/engine/modules/camera_base.cpp @@ -18,7 +18,7 @@ // Constructors/Destructors // ---- -CameraBase::CameraBase(ScreenSettings *t_screen, Vector3 *t_position, Vector3 *t_up) +CameraBase::CameraBase(ScreenSettings *t_screen, Vector3 *t_position) : screen(t_screen) { PRINT_LOG("Initializing frustum"); @@ -30,7 +30,7 @@ CameraBase::CameraBase(ScreenSettings *t_screen, Vector3 *t_position, Vector3 *t farHeight = tang * farPlaneDist; farWidth = farHeight * screen->aspectRatio; p_position = t_position; - p_up = t_up; + up.set(0.0F, 1.0F, 0.0F); PRINT_LOG("CameraBase initialized!"); } @@ -41,7 +41,7 @@ CameraBase::CameraBase(ScreenSettings *t_screen, Vector3 *t_position, Vector3 *t void CameraBase::lookAt(Vector3 &t_target) { updatePlanes(t_target); - worldView.lookAt(*p_up, *p_position, t_target); + worldView.lookAt(*p_position, t_target); } void CameraBase::updatePlanes(Vector3 t_target) @@ -51,7 +51,7 @@ void CameraBase::updatePlanes(Vector3 t_target) Z = *p_position - t_target; Z.normalize(); // X axis of camera of given "up" vector and Z axis - X = *p_up * Z; + X = up * Z; X.normalize(); // the real "up" vector is the cross product of Z and X Y = Z * X; diff --git a/src/engine/modules/renderer.cpp b/src/engine/modules/renderer.cpp index 02cadff..1a7cc2d 100644 --- a/src/engine/modules/renderer.cpp +++ b/src/engine/modules/renderer.cpp @@ -277,8 +277,8 @@ void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount) if (!t_mesh.isDataLoaded()) PRINT_ERR("Can't draw, because no mesh data was loaded!"); - Vector3 rotatedCamera = Vector3(*renderData.cameraPosition); - rotatedCamera.rotate(t_mesh.rotation, true); + camRotation.rotation(-t_mesh.rotation); + Vector3 rotatedCamera = Vector3(camRotation * *renderData.cameraPosition); if (t_mesh.getCurrentAnimationFrame() != t_mesh.getNextAnimationFrame()) t_mesh.animate(); diff --git a/src/samples/dolphin/camera.cpp b/src/samples/dolphin/camera.cpp index 5c122f7..855428f 100755 --- a/src/samples/dolphin/camera.cpp +++ b/src/samples/dolphin/camera.cpp @@ -14,12 +14,9 @@ const float CAMERA_Y = 15.0F; -Camera::Camera(ScreenSettings *t_screen) : CameraBase(t_screen, &position, &up) +Camera::Camera(ScreenSettings *t_screen) : CameraBase(t_screen, &position) { verticalLevel = 30.0F; - up.x = 0.0F; - up.y = 1.0F; - up.z = 0.0F; } Camera::~Camera() {} diff --git a/src/samples/dolphin/camera.hpp b/src/samples/dolphin/camera.hpp index 7bcbde3..d13d38c 100755 --- a/src/samples/dolphin/camera.hpp +++ b/src/samples/dolphin/camera.hpp @@ -22,7 +22,7 @@ class Camera : public CameraBase { public: - Vector3 position,up, unitCirclePosition; + Vector3 position, up, unitCirclePosition; float horizontalLevel, verticalLevel; Camera(ScreenSettings *t_screen); @@ -34,7 +34,6 @@ public: protected: Vector3 *getPosition() { return &position; }; - Vector3 *getUp() { return &up; }; ScreenSettings screen; }; diff --git a/src/samples/floors/camera.cpp b/src/samples/floors/camera.cpp index 56c4aa1..e797c0f 100644 --- a/src/samples/floors/camera.cpp +++ b/src/samples/floors/camera.cpp @@ -19,13 +19,10 @@ const float CAMERA_Y = 30.0F; // Constructors/Destructors // ---- -Camera::Camera(ScreenSettings *t_screen) : CameraBase(t_screen, &position, &up) +Camera::Camera(ScreenSettings *t_screen) : CameraBase(t_screen, &position) { PRINT_LOG("Initializing camera"); verticalLevel = 80.0F; - up.x = 0.0F; - up.y = 1.0F; - up.z = 0.0F; PRINT_LOG("Camera initialized!"); } diff --git a/src/samples/floors/camera.hpp b/src/samples/floors/camera.hpp index 4d6adf8..49735d2 100644 --- a/src/samples/floors/camera.hpp +++ b/src/samples/floors/camera.hpp @@ -35,7 +35,6 @@ public: protected: Vector3 *getPosition() { return &position; }; - Vector3 *getUp() { return &up; }; ScreenSettings screen; }; diff --git a/src/samples/floors/objects/player.cpp b/src/samples/floors/objects/player.cpp index 6d6ae79..738d03a 100644 --- a/src/samples/floors/objects/player.cpp +++ b/src/samples/floors/objects/player.cpp @@ -211,13 +211,13 @@ FloorsCheck *Player::checkFloors(const FloorManager &t_floorManager, const Vecto for (u32 i = 0; i < t_floorManager.floorAmount; i++) { Utils::getMinMax(t_floorManager.floors[i].mesh, min, max); - if (result->currentFloor == NULL && this->mesh.position.isOnSquare(min, max)) + if (result->currentFloor == NULL && this->mesh.position.isOnBox(min, max)) { result->currentFloor = &t_floorManager.floors[i]; result->currFloorMin.set(min); result->currFloorMax.set(max); } - if (result->willCollideFloor == NULL && t_nextPos.collidesSquare(min, max)) + if (result->willCollideFloor == NULL && t_nextPos.collidesBox(min, max)) { result->willCollideFloor = &t_floorManager.floors[i]; result->willCollideFloorMin.set(min); From 91934df5e884dbbfaf68ad85f902f443152f6cc1 Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 10:35:04 +0100 Subject: [PATCH 37/56] fixed warning --- src/engine/models/bounding_box.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/models/bounding_box.cpp b/src/engine/models/bounding_box.cpp index dc90364..2b22fc9 100644 --- a/src/engine/models/bounding_box.cpp +++ b/src/engine/models/bounding_box.cpp @@ -46,4 +46,4 @@ BoundingBox::BoundingBox(Vector3 *t_vertices) BoundingBox::~BoundingBox() { -} \ No newline at end of file +} From b4fe16dcccfe38c025b1f0cfee72f2251bd96b37 Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 12:45:09 +0100 Subject: [PATCH 38/56] added manual calcs of model-view-proj matrix --- src/engine/engine.cpp | 4 +- src/engine/include/models/math/matrix.hpp | 88 ++++++++++-------- src/engine/include/models/render_data.hpp | 16 +++- src/engine/include/modules/camera_base.hpp | 6 +- src/engine/include/modules/vif_sender.hpp | 10 ++ src/engine/models/math/matrix.cpp | 101 ++++++++++----------- src/engine/modules/camera_base.cpp | 2 +- src/engine/modules/gif_sender.cpp | 16 +--- src/engine/modules/renderer.cpp | 13 +-- src/engine/modules/vif_sender.cpp | 26 +++--- src/samples/dolphin/dolphin.cpp | 2 +- src/samples/floors/floors.cpp | 4 +- src/samples/floors/objects/enemy.cpp | 3 + 13 files changed, 156 insertions(+), 135 deletions(-) diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 4a604ba..e9ce377 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -41,13 +41,13 @@ Engine::~Engine() {} void Engine::setDefaultScreen() { - screen.projectionScale = 4096.0F; screen.nearPlaneDist = 2.0F; screen.farPlaneDist = 2000.0F; screen.fov = 60.0F; - screen.aspectRatio = 4.0F / 3.0F; screen.width = 640.0F; screen.height = 480.0F; + screen.aspectRatio = screen.width / screen.height; + screen.projectionScale = 4096.0F; // PS2 have 4k drawing area } void Engine::init(Game *t_game, u32 t_gifPacketSize) diff --git a/src/engine/include/models/math/matrix.hpp b/src/engine/include/models/math/matrix.hpp index d14855b..46b5140 100644 --- a/src/engine/include/models/math/matrix.hpp +++ b/src/engine/include/models/math/matrix.hpp @@ -85,58 +85,70 @@ public: */ inline void unit() { identity(); }; - /** Create translation matrix. */ - inline void translation(const Vector3 &t_val) + /** Translate matrix. */ + inline void translate(const Vector3 &t_val) { - identity(); - translate(t_val); + Matrix temp = Matrix(true); + temp.translation(t_val); + cross(this->data, temp.data, this->data); } - /** Create rotation matrix. */ - inline void rotation(const Vector3 &t_val) + /** Rotate matrix. */ + inline void rotate(const Vector3 &t_val) { - identity(); - Matrix temp = Matrix(); + Matrix temp = Matrix(true); + + temp.rotationZ(t_val.z); + cross(this->data, temp.data, this->data); temp.identity(); - temp.rotateX(t_val.x); - operator*=(temp); + temp.rotationY(t_val.y); + cross(this->data, temp.data, this->data); temp.identity(); - temp.rotateY(t_val.y); - operator*=(temp); - - temp.identity(); - temp.rotateZ(t_val.z); - operator*=(temp); + temp.rotationX(t_val.x); + cross(this->data, temp.data, this->data); } - /** Create X rotation matrix. */ - inline void rotationX(const float &t_radians) + /** Rotate matrix by X. */ + inline void rotateX(const float &t_radians) { - identity(); - rotateX(t_radians); + Matrix temp = Matrix(true); + temp.rotationX(t_radians); + cross(this->data, temp.data, this->data); } - /** Create Y rotation matrix. */ - inline void rotationY(const float &t_radians) + /** Rotate matrix by Y. */ + inline void rotateY(const float &t_radians) { - identity(); - rotateY(t_radians); + Matrix temp = Matrix(true); + temp.rotationY(t_radians); + cross(this->data, temp.data, this->data); } - /** Create Z rotation matrix. */ - inline void rotationZ(const float &t_radians) + /** Rotate matrix by Z. */ + inline void rotateZ(const float &t_radians) { - identity(); - rotateZ(t_radians); + Matrix temp = Matrix(true); + temp.rotationZ(t_radians); + cross(this->data, temp.data, this->data); } - /** Create angle rotation matrix. */ - void rotationByAngle(const float &t_angle, const Vector3 &t_axis); + /** Rotate matrix by angle. */ + void rotateByAngle(const float &t_angle, const Vector3 &t_axis) + { + Matrix temp; + temp.rotationByAngle(t_angle, t_axis); + cross(this->data, temp.data, this->data); + } - /** Create scale matrix. */ - void setScale(const Vector3 &t_val); + /** Scale matrix. */ + void scale(const Vector3 &t_val) + { + Matrix temp = Matrix(true); + temp.setScale(t_val); + cross(this->data, temp.data, this->data); + } /** * Create perspective projection matrix. @@ -161,12 +173,14 @@ public: const void print() const; private: - void rotateX(const float &t_radians); - void rotateY(const float &t_radians); - void rotateZ(const float &t_radians); - void translate(const Vector3 &t_val); - void cross(float res[16], const float a[16], const float b[16]) const; + void rotationX(const float &t_radians); + void rotationY(const float &t_radians); + void rotationZ(const float &t_radians); + void rotationByAngle(const float &t_angle, const Vector3 &t_axis); + void translation(const Vector3 &t_val); + void setScale(const Vector3 &t_val); void setCamera(const float t_pos[4], const float t_vz[4], const float t_vy[4]); + void cross(float res[16], const float a[16], const float b[16]) const; }; #endif diff --git a/src/engine/include/models/render_data.hpp b/src/engine/include/models/render_data.hpp index 4045fd8..f4a89c7 100644 --- a/src/engine/include/models/render_data.hpp +++ b/src/engine/include/models/render_data.hpp @@ -22,10 +22,18 @@ struct RenderData { LightBulb *bulbs; u16 bulbsCount; - /** Camera (lookAt) */ - Matrix *worldView; - /** Perspective projection */ - Matrix *perspective; + /** + * Camera matrix (glLookAt) + * OpenGL name: View + * Sony name: World view + */ + Matrix *view; + /** + * Projection matrix (glPerspective) + * OpenGL name: Projection + * Sony name: View screen + */ + Matrix *projection; Vector3 *cameraPosition; Plane *frustumPlanes; prim_t *prim; diff --git a/src/engine/include/modules/camera_base.hpp b/src/engine/include/modules/camera_base.hpp index 3cefcad..b74ff89 100644 --- a/src/engine/include/modules/camera_base.hpp +++ b/src/engine/include/modules/camera_base.hpp @@ -31,10 +31,10 @@ public: Plane planes[6]; /** - * Projection matrix + * View matrix * Set by lookAt() method. */ - Matrix worldView; + Matrix view; protected: /** Pointer to screen settings */ @@ -42,7 +42,7 @@ protected: /** * Adaption of OpenGL lookAt camera. - * Calculates worldView matrix and update frustum planes + * Calculates view matrix and update frustum planes * Should be called every frame. */ void lookAt(Vector3 &t_target); diff --git a/src/engine/include/modules/vif_sender.hpp b/src/engine/include/modules/vif_sender.hpp index a3e1e36..53153c5 100644 --- a/src/engine/include/modules/vif_sender.hpp +++ b/src/engine/include/modules/vif_sender.hpp @@ -39,6 +39,16 @@ private: void drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_vertices, VECTOR *t_coordinates, prim_t *t_prim, texbuffer_t *textureBuffer); packet2_t *packets[2] __attribute__((aligned(64))); packet2_t *currPacket; + /** + * OpenGL name: Model + * Sony name: local world + */ + Matrix model; + /** + * OpenGL name: ModelViewProjection + * Sony name: local screen + */ + Matrix modelViewProj; u8 context; packet2_t *matricesPacket __attribute__((aligned(64))); VECTOR position, rotation; diff --git a/src/engine/models/math/matrix.cpp b/src/engine/models/math/matrix.cpp index 805c433..41896a5 100644 --- a/src/engine/models/math/matrix.cpp +++ b/src/engine/models/math/matrix.cpp @@ -93,47 +93,6 @@ void Matrix::identity() : "r"(this->data)); } -void Matrix::rotationByAngle(const float &t_angle, const Vector3 &t_axis) -{ - Vector3 localAxis = Vector3(t_axis); - localAxis.normalize(); - float x = localAxis.x; - float y = localAxis.y; - float z = localAxis.z; - - float c = Math::cos(t_angle); - float s = Math::sin(t_angle); - - this->data[0] = x * x * (1 - c) + c; - this->data[1] = y * x * (1 - c) + z * s; - this->data[2] = x * z * (1 - c) - y * s; - this->data[3] = 0.0F; - - this->data[4] = x * y * (1 - c) - z * s; - this->data[5] = y * y * (1 - c) + c; - this->data[6] = y * z * (1 - c) + x * s; - this->data[7] = 0.0F; - - this->data[8] = x * z * (1 - c) + y * s; - this->data[9] = y * z * (1 - c) - x * s; - this->data[10] = z * z * (1 - c) + c; - this->data[11] = 0.0F; - - this->data[12] = 0.0F; - this->data[13] = 0.0F; - this->data[14] = 0.0F; - this->data[15] = 1.0F; -} - -void Matrix::setScale(const Vector3 &t_val) -{ - this->identity(); - this->data[0] = t_val.x; - this->data[5] = t_val.y; - this->data[10] = t_val.z; - this->data[15] = 1.0F; -} - void Matrix::setPerspective(const ScreenSettings &t_screen) { float fovYdiv2 = Math::HALF_ANG2RAD * t_screen.fov; @@ -232,10 +191,8 @@ const void Matrix::print() const // Private // ---- -void Matrix::rotateX(const float &t_radians) +void Matrix::rotationX(const float &t_radians) { - Matrix temp = Matrix(); - temp.identity(); float c = Math::cos(t_radians); float s = Math::sin(t_radians); this->data[5] = c; // 1,1 @@ -244,10 +201,8 @@ void Matrix::rotateX(const float &t_radians) this->data[10] = c; // 2,2 } -void Matrix::rotateY(const float &t_radians) +void Matrix::rotationY(const float &t_radians) { - Matrix temp = Matrix(); - temp.identity(); float c = Math::cos(t_radians); float s = Math::sin(t_radians); this->data[0] = c; // 0,0 @@ -256,10 +211,8 @@ void Matrix::rotateY(const float &t_radians) this->data[10] = c; // 2,2 } -void Matrix::rotateZ(const float &t_radians) +void Matrix::rotationZ(const float &t_radians) { - Matrix temp = Matrix(); - temp.identity(); float c = Math::cos(t_radians); float s = Math::sin(t_radians); this->data[0] = c; // 0,0 @@ -268,11 +221,51 @@ void Matrix::rotateZ(const float &t_radians) this->data[5] = c; // 1,1 } -void Matrix::translate(const Vector3 &t_val) +void Matrix::rotationByAngle(const float &t_angle, const Vector3 &t_axis) { - this->data[12] += t_val.x; // 3,0 - this->data[13] += t_val.y; // 3,1 - this->data[14] += t_val.z; // 3,2 + Vector3 localAxis = Vector3(t_axis); + localAxis.normalize(); + float x = localAxis.x; + float y = localAxis.y; + float z = localAxis.z; + + float c = Math::cos(t_angle); + float s = Math::sin(t_angle); + + this->data[0] = x * x * (1 - c) + c; + this->data[1] = y * x * (1 - c) + z * s; + this->data[2] = x * z * (1 - c) - y * s; + this->data[3] = 0.0F; + + this->data[4] = x * y * (1 - c) - z * s; + this->data[5] = y * y * (1 - c) + c; + this->data[6] = y * z * (1 - c) + x * s; + this->data[7] = 0.0F; + + this->data[8] = x * z * (1 - c) + y * s; + this->data[9] = y * z * (1 - c) - x * s; + this->data[10] = z * z * (1 - c) + c; + this->data[11] = 0.0F; + + this->data[12] = 0.0F; + this->data[13] = 0.0F; + this->data[14] = 0.0F; + this->data[15] = 1.0F; +} + +void Matrix::translation(const Vector3 &t_val) +{ + this->data[12] = t_val.x; // 3,0 + this->data[13] = t_val.y; // 3,1 + this->data[14] = t_val.z; // 3,2 +} + +void Matrix::setScale(const Vector3 &t_val) +{ + this->data[0] = t_val.x; + this->data[5] = t_val.y; + this->data[10] = t_val.z; + this->data[15] = 1.0F; } void Matrix::setCamera(const float t_pos[4], const float t_vz[4], const float t_vy[4]) diff --git a/src/engine/modules/camera_base.cpp b/src/engine/modules/camera_base.cpp index 9576306..8453012 100644 --- a/src/engine/modules/camera_base.cpp +++ b/src/engine/modules/camera_base.cpp @@ -41,7 +41,7 @@ CameraBase::CameraBase(ScreenSettings *t_screen, Vector3 *t_position) void CameraBase::lookAt(Vector3 &t_target) { updatePlanes(t_target); - worldView.lookAt(*p_position, t_target); + view.lookAt(*p_position, t_target); } void CameraBase::updatePlanes(Vector3 t_target) diff --git a/src/engine/modules/gif_sender.cpp b/src/engine/modules/gif_sender.cpp index 08dad58..ab55fc1 100644 --- a/src/engine/modules/gif_sender.cpp +++ b/src/engine/modules/gif_sender.cpp @@ -130,12 +130,7 @@ void GifSender::addClear(zbuffer_t *t_zBuffer, color_t *t_rgb) packet2_chain_close_tag(currentPacket); } -/** Adds 3D objects to current packet - * @param worldView Matrix - * @param perspective Matrix with .setPerpsective() used [clone of gluPerspective] - * @param objects3D Array of 3D objects pointers - * @param amount Amount of 3D objects - */ +/** Adds meshes to current packet */ void GifSender::addObject(RenderData *t_renderData, Mesh &t_mesh, u32 vertexCount, VECTOR *vertices, VECTOR *normals, VECTOR *coordinates, LightBulb *t_bulbs, u16 t_bulbsCount, texbuffer_t *textureBuffer) { packet2_chain_open_cnt(currentPacket, 0, 0, 0); @@ -145,7 +140,7 @@ void GifSender::addObject(RenderData *t_renderData, Mesh &t_mesh, u32 vertexCoun xyz = new xyz_t[vertexCount]; rgbaq = new color_t[vertexCount]; st = new texel_t[vertexCount]; - calc3DObject(*t_renderData->perspective, t_mesh, vertexCount, vertices, normals, coordinates, t_renderData, t_bulbs, t_bulbsCount); + calc3DObject(*t_renderData->projection, t_mesh, vertexCount, vertices, normals, coordinates, t_renderData, t_bulbs, t_bulbsCount); addCurrentCalcs(vertexCount); delete[] xyz; delete[] rgbaq; @@ -155,10 +150,7 @@ void GifSender::addObject(RenderData *t_renderData, Mesh &t_mesh, u32 vertexCoun } /** Calculates 3D object data into xyz, rgbq, st - * After it addCurrentSTQ() can be done - * @param worldView Matrix - * @param perspective Matrix with .setPerpsective() used [clone of gluPerspective] - * @param mesh 3D object + * After it addCurrentCalcs() can be done */ void GifSender::calc3DObject(Matrix t_perspective, Mesh &t_mesh, u32 vertexCount, VECTOR *vertices, VECTOR *normals, VECTOR *coordinates, RenderData *t_renderData, LightBulb *t_bulbs, u16 t_bulbsCount) { @@ -176,7 +168,7 @@ void GifSender::calc3DObject(Matrix t_perspective, Mesh &t_mesh, u32 vertexCount create_local_light(localLight, rotation); // I cant put perspective from renderData here. ee-gcc bug? - create_local_screen(localScreen, localWorld, t_renderData->worldView->data, t_perspective.data); + create_local_screen(localScreen, localWorld, t_renderData->view->data, t_perspective.data); if (SHOULD_BE_LIGHTED) { diff --git a/src/engine/modules/renderer.cpp b/src/engine/modules/renderer.cpp index 1a7cc2d..5ed1027 100644 --- a/src/engine/modules/renderer.cpp +++ b/src/engine/modules/renderer.cpp @@ -51,7 +51,7 @@ Renderer::Renderer(u32 t_packetSize, ScreenSettings *t_screen) gifSender = new GifSender(t_packetSize, t_screen, &light); vifSender = new VifSender(&light); perspective.setPerspective(*t_screen); - renderData.perspective = &perspective; + renderData.projection = &perspective; PRINT_LOG("Renderer initialized!"); } @@ -277,7 +277,8 @@ void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount) if (!t_mesh.isDataLoaded()) PRINT_ERR("Can't draw, because no mesh data was loaded!"); - camRotation.rotation(-t_mesh.rotation); + camRotation.identity(); + camRotation.rotate(-t_mesh.rotation); Vector3 rotatedCamera = Vector3(camRotation * *renderData.cameraPosition); if (t_mesh.getCurrentAnimationFrame() != t_mesh.getNextAnimationFrame()) @@ -287,9 +288,9 @@ void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount) if (t_mesh.shouldBeFrustumCulled && !t_mesh.getMaterial(i).isInFrustum(renderData.frustumPlanes, t_mesh.position)) return; u32 vertCount = t_mesh.getMaterial(i).getFacesCount(); - VECTOR __attribute__((aligned(16))) vertices[vertCount]; - VECTOR __attribute__((aligned(16))) normals[vertCount]; - VECTOR __attribute__((aligned(16))) coordinates[vertCount]; + VECTOR vertices[vertCount] __attribute__((aligned(16))); + VECTOR normals[vertCount] __attribute__((aligned(16))); + VECTOR coordinates[vertCount] __attribute__((aligned(16))); Texture *tex = textureRepo.getByMesh(t_mesh.getId(), t_mesh.getMaterial(i).getId()); changeTexture(tex); vertCount = t_mesh.getDrawData(i, vertices, normals, coordinates, rotatedCamera); @@ -305,7 +306,7 @@ void Renderer::draw(Mesh &t_mesh) { draw(t_mesh, NULL, 0); } void Renderer::setCameraDefinitions(Matrix *t_worldView, Vector3 *t_cameraPos, Plane *t_planes) { - renderData.worldView = t_worldView; + renderData.view = t_worldView; renderData.cameraPosition = t_cameraPos; renderData.frustumPlanes = t_planes; } diff --git a/src/engine/modules/vif_sender.cpp b/src/engine/modules/vif_sender.cpp index 2ef738a..2b7f20c 100644 --- a/src/engine/modules/vif_sender.cpp +++ b/src/engine/modules/vif_sender.cpp @@ -68,22 +68,22 @@ void VifSender::uploadMicroProgram() dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1); packet2_free(packet2); } - +#include void VifSender::sendMatrices(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation) { - vec3ToNative(position, t_position, 1.0F); - vec3ToNative(rotation, t_rotation, 1.0F); - MATRIX localWorld, localScreen; - create_local_world(localWorld, position, rotation); - create_local_screen(localScreen, localWorld, t_renderData.worldView->data, t_renderData.perspective->data); - // Small undo, because im testing new matrix funcs, which are DIFFERENT than PS2SDK, so cant be used right now. - // Matrix viewProj = Matrix(); - // viewProj.rotation(t_rotation); // model matrix - // viewProj.translate(t_position); // model matrix - // viewProj *= *t_renderData.worldView * *t_renderData.perspective; // viewproj = model * (view * projection) + + Matrix model; + model.identity(); + model.rotate(t_rotation); + model.translate(t_position); + + modelViewProj.identity(); + modelViewProj = model * modelViewProj; + modelViewProj = *t_renderData.view * modelViewProj; + modelViewProj = *t_renderData.projection * modelViewProj; + packet2_reset(matricesPacket, false); - // packet2_utils_vu_add_unpack_data(matricesPacket, 0, &viewProj.data, 8, 0); - packet2_utils_vu_add_unpack_data(matricesPacket, 0, localScreen, 8, 0); + packet2_utils_vu_add_unpack_data(matricesPacket, 0, &modelViewProj.data, 8, 0); packet2_utils_vu_add_end_tag(matricesPacket); dma_channel_wait(DMA_CHANNEL_VIF1, 0); dma_channel_send_packet2(matricesPacket, DMA_CHANNEL_VIF1, 1); diff --git a/src/samples/dolphin/dolphin.cpp b/src/samples/dolphin/dolphin.cpp index 6471834..11f4032 100755 --- a/src/samples/dolphin/dolphin.cpp +++ b/src/samples/dolphin/dolphin.cpp @@ -34,7 +34,7 @@ Dolphin::~Dolphin() void Dolphin::onInit() { player.init(engine); - engine->renderer->setCameraDefinitions(&camera.worldView, &camera.position, camera.planes); + engine->renderer->setCameraDefinitions(&camera.view, &camera.position, camera.planes); engine->audio.loadSong("sound/dirediredocks.wav"); engine->audio.playSong(); diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp index 2a55ab1..10e9872 100644 --- a/src/samples/floors/floors.cpp +++ b/src/samples/floors/floors.cpp @@ -38,7 +38,7 @@ Floors::~Floors() void Floors::onInit() { setBgColorAndAmbientColor(); - engine->renderer->setCameraDefinitions(&camera.worldView, &camera.unitCirclePosition, camera.planes); + engine->renderer->setCameraDefinitions(&camera.view, &camera.unitCirclePosition, camera.planes); engine->audio.addSongListener(this); engine->audio.loadSong("sounds/mafikizolo-loot.wav"); engine->audio.playSong(); @@ -61,7 +61,7 @@ void Floors::onUpdate() engine->renderer->draw(player->mesh); engine->renderer->draw(enemy->getMeshes(), enemy->getMeshesCount()); for (u16 i = 0; i < FLOORS_COUNT; i++) - engine->renderer->drawByPath3(floorManager->floors[i].mesh, lightManager.bulbs, lightManager.bulbsCount); + engine->renderer->draw(floorManager->floors[i].mesh, lightManager.bulbs, lightManager.bulbsCount); ui->render(engine->renderer); // 2D rendering ist LAST step, because layers gonna play there. } diff --git a/src/samples/floors/objects/enemy.cpp b/src/samples/floors/objects/enemy.cpp index 858e79c..b7a46a8 100644 --- a/src/samples/floors/objects/enemy.cpp +++ b/src/samples/floors/objects/enemy.cpp @@ -30,14 +30,17 @@ Enemy::Enemy(TextureRepository *t_texRepo) meshes[0].loadMD2("meshes/enemy/", "poss_head", 0.3F, false); meshes[0].rotation.x = -1.566F; meshes[0].rotation.z = 1.566F; + meshes[0].shouldBeFrustumCulled = false; meshes[1].loadMD2("meshes/enemy/", "poss_body", 0.3F, false); meshes[1].rotation.x = -1.566F; meshes[1].rotation.z = 1.566F; + meshes[1].shouldBeFrustumCulled = false; meshes[2].loadMD2("meshes/enemy/", "poss_weapon", 0.3F, false); meshes[2].rotation.x = -1.566F; meshes[2].rotation.z = 1.566F; + meshes[2].shouldBeFrustumCulled = false; Vector3 initPos = Vector3(0.00F, 40.00F, 0.00F); setPosition(initPos); From c0ece7206c4de180509f2730c653fca6339d6e81 Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 13:08:03 +0100 Subject: [PATCH 39/56] tweaked vu1 packets a bit --- src/engine/include/modules/renderer.hpp | 4 +-- src/engine/modules/renderer.cpp | 44 ++++++++++++++----------- src/engine/modules/vif_sender.cpp | 4 +-- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/engine/include/modules/renderer.hpp b/src/engine/include/modules/renderer.hpp index 1ad7acb..be874d9 100644 --- a/src/engine/include/modules/renderer.hpp +++ b/src/engine/include/modules/renderer.hpp @@ -134,8 +134,8 @@ private: VifSender *vifSender; packet2_t *flipPacket; color_t worldColor; - void allocateBuffers(float t_screenW, float t_screenH); - void initDrawingEnv(float t_screenW, float t_screenH); + void allocateBuffers(int t_screenW, int t_screenH); + void initDrawingEnv(); void setPrim(); }; diff --git a/src/engine/modules/renderer.cpp b/src/engine/modules/renderer.cpp index 5ed1027..2287b88 100644 --- a/src/engine/modules/renderer.cpp +++ b/src/engine/modules/renderer.cpp @@ -22,6 +22,9 @@ // Constructors/Destructors // ---- +static const float GS_CENTER = 4096.0F; +static const float SCREEN_CENTER = GS_CENTER / 2.0F; + /** Initialize DMA<->GIF channel * Allocate buffers * Initialize screen @@ -35,19 +38,19 @@ Renderer::Renderer(u32 t_packetSize, ScreenSettings *t_screen) PRINT_LOG("Initializing renderer"); dma_channel_initialize(DMA_CHANNEL_GIF, NULL, 0); // Initialize DMA to enable data transfer dma_channel_fast_waits(DMA_CHANNEL_GIF); + screen = t_screen; context = 0; isTextureVRAMAllocated = false; isVSyncEnabled = true; isFrameEmpty = false; lastTextureId = 0; flipPacket = packet2_create(4, P2_TYPE_UNCACHED_ACCL, P2_MODE_NORMAL, 0); - allocateBuffers(t_screen->width, t_screen->height); - initDrawingEnv(t_screen->width, t_screen->height); + allocateBuffers((int)t_screen->width, (int)t_screen->height); + initDrawingEnv(); setPrim(); worldColor.r = 0x10; worldColor.g = 0x10; worldColor.b = 0x10; - screen = t_screen; gifSender = new GifSender(t_packetSize, t_screen, &light); vifSender = new VifSender(&light); perspective.setPerspective(*t_screen); @@ -142,7 +145,7 @@ void Renderer::draw(Sprite &t_sprite) beginFrameIfNeeded(); changeTexture(texture); packet2_t *packet2 = packet2_create(12, P2_TYPE_NORMAL, P2_MODE_NORMAL, 0); - packet2_update(packet2, draw_primitive_xyoffset(packet2->next, 0, 2048, 2048)); + packet2_update(packet2, draw_primitive_xyoffset(packet2->next, 0, SCREEN_CENTER, SCREEN_CENTER)); packet2_utils_gif_add_set(packet2, 1); packet2_utils_gs_add_texbuff_clut(packet2, &textureBuffer, &t_sprite.clut); draw_enable_blending(); @@ -151,7 +154,8 @@ void Renderer::draw(Sprite &t_sprite) draw_primitive_xyoffset( packet2->next, 0, - (2048 - (screen->width / 2)), (2048 - (screen->height / 2)))); + SCREEN_CENTER - (screen->width / 2.0F), + SCREEN_CENTER - (screen->height / 2.0F))); draw_disable_blending(); packet2_update(packet2, draw_finish(packet2->next)); dma_channel_wait(DMA_CHANNEL_GIF, 0); @@ -160,14 +164,14 @@ void Renderer::draw(Sprite &t_sprite) } /** Initializes drawing environment (1st app packet) */ -void Renderer::initDrawingEnv(float t_screenW, float t_screenH) +void Renderer::initDrawingEnv() { PRINT_LOG("Initializing drawing environment"); - u16 halfW = (u16)t_screenW / 2; - u16 halfH = (u16)t_screenH / 2; packet2_t *packet2 = packet2_create(20, P2_TYPE_NORMAL, P2_MODE_NORMAL, 0); packet2_update(packet2, draw_setup_environment(packet2->base, 0, frameBuffers, &(zBuffer))); - packet2_update(packet2, draw_primitive_xyoffset(packet2->next, 0, (2048 - halfW), (2048 - halfH))); + packet2_update(packet2, draw_primitive_xyoffset(packet2->next, 0, + SCREEN_CENTER - (screen->width / 2.0F), + SCREEN_CENTER - (screen->height / 2.0F))); packet2_update(packet2, draw_finish(packet2->next)); dma_channel_send_packet2(packet2, DMA_CHANNEL_GIF, true); dma_channel_wait(DMA_CHANNEL_GIF, 0); @@ -198,29 +202,29 @@ void Renderer::setWorldColor(const color_t &t_rgb) } /** Defines and allocates framebuffers and zbuffer */ -void Renderer::allocateBuffers(float t_screenW, float t_screenH) +void Renderer::allocateBuffers(int t_screenW, int t_screenH) { - frameBuffers[0].width = (u16)t_screenW; - frameBuffers[0].height = (u16)t_screenH; + frameBuffers[0].width = (unsigned int)t_screenW; + frameBuffers[0].height = (unsigned int)t_screenH; frameBuffers[0].mask = 0; - frameBuffers[0].psm = GS_PSM_24; - frameBuffers[0].address = graph_vram_allocate((u16)t_screenW, (u16)t_screenH, frameBuffers[0].psm, GRAPH_ALIGN_PAGE); + frameBuffers[0].psm = GS_PSM_32; + frameBuffers[0].address = graph_vram_allocate(t_screenW, t_screenH, frameBuffers[0].psm, GRAPH_ALIGN_PAGE); - frameBuffers[1].width = (u16)t_screenW; - frameBuffers[1].height = (u16)t_screenH; + frameBuffers[1].width = (unsigned int)t_screenW; + frameBuffers[1].height = (unsigned int)t_screenH; frameBuffers[1].mask = 0; - frameBuffers[1].psm = GS_PSM_24; - frameBuffers[1].address = graph_vram_allocate((u16)t_screenW, (u16)t_screenH, frameBuffers[1].psm, GRAPH_ALIGN_PAGE); + frameBuffers[1].psm = GS_PSM_32; + frameBuffers[1].address = graph_vram_allocate(t_screenW, t_screenH, frameBuffers[1].psm, GRAPH_ALIGN_PAGE); zBuffer.enable = DRAW_ENABLE; zBuffer.mask = 0; zBuffer.method = ZTEST_METHOD_GREATER_EQUAL; zBuffer.zsm = GS_ZBUF_24; - zBuffer.address = graph_vram_allocate((u16)t_screenW, (u16)t_screenH, zBuffer.zsm, GRAPH_ALIGN_PAGE); + zBuffer.address = graph_vram_allocate(t_screenW, t_screenH, zBuffer.zsm, GRAPH_ALIGN_PAGE); PRINT_LOG("Framebuffers, zBuffer set and allocated!"); // Initialize the screen and tie the first framebuffer to the read circuits. - graph_initialize(frameBuffers[1].address, frameBuffers[1].width, frameBuffers[1].height, frameBuffers[1].psm, 0, 0); + graph_initialize(frameBuffers[0].address, frameBuffers[0].width, frameBuffers[0].height, frameBuffers[0].psm, 0, 0); } /// --- Draw: PATH3 diff --git a/src/engine/modules/vif_sender.cpp b/src/engine/modules/vif_sender.cpp index 2b7f20c..b318a37 100644 --- a/src/engine/modules/vif_sender.cpp +++ b/src/engine/modules/vif_sender.cpp @@ -17,8 +17,8 @@ #include "../include/utils/debug.hpp" const u32 VU1_PACKAGE_VERTS_PER_BUFF = 96; // Remember to modify buffer size in vu1 also -const u32 VU1_PACKAGES_PER_PACKET = 6; -const u32 VU1_PACKET_SIZE = 128; +const u32 VU1_PACKAGES_PER_PACKET = 9; +const u32 VU1_PACKET_SIZE = 256; // should be 128, but 256 is more safe for future // ---- // Constructors/Destructors From d60d42cac6c156dcf2a6d0c3436df86a685dedbd Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 13:09:13 +0100 Subject: [PATCH 40/56] removed unecessary include --- src/engine/modules/vif_sender.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/modules/vif_sender.cpp b/src/engine/modules/vif_sender.cpp index b318a37..647650c 100644 --- a/src/engine/modules/vif_sender.cpp +++ b/src/engine/modules/vif_sender.cpp @@ -68,7 +68,7 @@ void VifSender::uploadMicroProgram() dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1); packet2_free(packet2); } -#include + void VifSender::sendMatrices(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation) { From aeb25ad398c2978fdcc80eb5176db0e699ef98b5 Mon Sep 17 00:00:00 2001 From: h4570 Date: Thu, 24 Dec 2020 14:35:13 +0100 Subject: [PATCH 41/56] new vu1 renderer, added vcl preprocessor --- src/engine/Makefile | 6 +- src/engine/Makefile.pref | 1 + src/engine/include/modules/vif_sender.hpp | 3 +- src/engine/modules/renderer.cpp | 2 +- src/engine/modules/vif_sender.cpp | 75 ++--------- src/engine/vu1_progs/draw3D.vcl | 154 ---------------------- src/engine/vu1_progs/draw3D.vclpp | 143 ++++++++++++++++++++ src/engine/vu1_progs/draw3D.vsm | 110 +++++++++------- src/engine/vu1_progs/geometry.inc | 7 + src/engine/vu1_progs/matrix.inc | 13 ++ src/engine/vu1_progs/vector.inc | 27 ++++ 11 files changed, 273 insertions(+), 268 deletions(-) delete mode 100644 src/engine/vu1_progs/draw3D.vcl create mode 100644 src/engine/vu1_progs/draw3D.vclpp create mode 100644 src/engine/vu1_progs/geometry.inc create mode 100644 src/engine/vu1_progs/matrix.inc create mode 100644 src/engine/vu1_progs/vector.inc diff --git a/src/engine/Makefile b/src/engine/Makefile index 78c621f..949c572 100644 --- a/src/engine/Makefile +++ b/src/engine/Makefile @@ -35,8 +35,10 @@ all: $(EE_OBJS) ar rcs $(LIB_NAME) $(EE_OBJS) rm -f $(EE_OBJS) -# https://github.com/microsoft/wsl/issues/2468#issuecomment-374904520 -#%.vsm: %.vcl # sudo service binfmt-support start +#%.vcl: %.vclpp +# $(EE_VCLPP) $< $@ + +#%.vsm: %.vcl # $(EE_VCL) $< >> $@ %.o: %.vsm diff --git a/src/engine/Makefile.pref b/src/engine/Makefile.pref index 389166e..574715b 100644 --- a/src/engine/Makefile.pref +++ b/src/engine/Makefile.pref @@ -5,6 +5,7 @@ EE_CFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CFLAGS) EE_CXXFLAGS := -DHAVE_LIBPNG -DHAVE_ZLIB $(EE_CXXFLAGS) EE_DVP = dvp-as EE_VCL = vcl +EE_VCLPP = vclpp LIB_NAME = libtyra.a include $(PS2SDK)/samples/Makefile.pref diff --git a/src/engine/include/modules/vif_sender.hpp b/src/engine/include/modules/vif_sender.hpp index 53153c5..43c2d7e 100644 --- a/src/engine/include/modules/vif_sender.hpp +++ b/src/engine/include/modules/vif_sender.hpp @@ -30,7 +30,7 @@ public: // TODO refactor void drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 vertCount2, VECTOR *vertices, VECTOR *normals, VECTOR *coordinates, Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount, texbuffer_t *textureBuffer); - void sendMatrices(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation); + void calcMatrix(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation); private: Light *light; @@ -50,7 +50,6 @@ private: */ Matrix modelViewProj; u8 context; - packet2_t *matricesPacket __attribute__((aligned(64))); VECTOR position, rotation; u32 vertCount; }; diff --git a/src/engine/modules/renderer.cpp b/src/engine/modules/renderer.cpp index 2287b88..425fb0d 100644 --- a/src/engine/modules/renderer.cpp +++ b/src/engine/modules/renderer.cpp @@ -277,7 +277,7 @@ void Renderer::draw(Mesh *t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bulb void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount) { beginFrameIfNeeded(); - vifSender->sendMatrices(renderData, t_mesh.position, t_mesh.rotation); + vifSender->calcMatrix(renderData, t_mesh.position, t_mesh.rotation); if (!t_mesh.isDataLoaded()) PRINT_ERR("Can't draw, because no mesh data was loaded!"); diff --git a/src/engine/modules/vif_sender.cpp b/src/engine/modules/vif_sender.cpp index 647650c..78dd0ce 100644 --- a/src/engine/modules/vif_sender.cpp +++ b/src/engine/modules/vif_sender.cpp @@ -39,7 +39,6 @@ VifSender::VifSender(Light *t_light) uploadMicroProgram(); packets[0] = packet2_create(VU1_PACKET_SIZE, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); packets[1] = packet2_create(VU1_PACKET_SIZE, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); - matricesPacket = packet2_create(4, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); context = 0; setDoubleBuffer(); } @@ -48,7 +47,6 @@ VifSender::~VifSender() { packet2_free(packets[0]); packet2_free(packets[1]); - packet2_free(matricesPacket); } // ---- @@ -69,10 +67,8 @@ void VifSender::uploadMicroProgram() packet2_free(packet2); } -void VifSender::sendMatrices(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation) +void VifSender::calcMatrix(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation) { - - Matrix model; model.identity(); model.rotate(t_rotation); model.translate(t_position); @@ -81,12 +77,6 @@ void VifSender::sendMatrices(const RenderData &t_renderData, const Vector3 &t_po modelViewProj = model * modelViewProj; modelViewProj = *t_renderData.view * modelViewProj; modelViewProj = *t_renderData.projection * modelViewProj; - - packet2_reset(matricesPacket, false); - packet2_utils_vu_add_unpack_data(matricesPacket, 0, &modelViewProj.data, 8, 0); - packet2_utils_vu_add_end_tag(matricesPacket); - dma_channel_wait(DMA_CHANNEL_VIF1, 0); - dma_channel_send_packet2(matricesPacket, DMA_CHANNEL_VIF1, 1); } void VifSender::drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 vertCount2, VECTOR *vertices, VECTOR *normals, VECTOR *coordinates, Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount, texbuffer_t *textureBuffer) @@ -122,9 +112,9 @@ void VifSender::drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 ver void VifSender::setDoubleBuffer() { packet2_t *settings = packet2_create(2, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); - packet2_utils_vu_add_double_buffer(settings, 8, 496); + packet2_utils_vu_add_double_buffer(settings, 10, 498); packet2_utils_vu_add_end_tag(settings); - dma_channel_send_packet2(settings, DMA_CHANNEL_VIF1, 1); + dma_channel_send_packet2(settings, DMA_CHANNEL_VIF1, true); dma_channel_wait(DMA_CHANNEL_VIF1, 0); packet2_free(settings); } @@ -134,67 +124,24 @@ void VifSender::drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_ver { const u32 vertCount = t_end - t_start; u32 vif_added_bytes = 0; - packet2_utils_vu_open_unpack(currPacket, 0, 1); - // TODO get this via screensettings - packet2_add_float(currPacket, 2048.0F); // scale - packet2_add_float(currPacket, 2048.0F); // scale - packet2_add_float(currPacket, ((float)0xFFFFFF) / 32.0F); // scale - packet2_add_u32(currPacket, vertCount); // vertex count + packet2_utils_vu_open_unpack(currPacket, 0, true); + packet2_add_data(currPacket, modelViewProj.data, 4); + packet2_add_u32(currPacket, 0); // Free + packet2_add_u32(currPacket, vertCount); // Vertex count + packet2_add_u32(currPacket, vertCount / 3); // Triangles count + packet2_add_u32(currPacket, 0); // Free packet2_utils_gif_add_set(currPacket, 1); packet2_utils_gs_add_lod(currPacket, &t_mesh.lod); packet2_utils_gs_add_texbuff_clut(currPacket, textureBuffer, &t_mesh.clut); packet2_utils_gs_add_prim_giftag(currPacket, t_prim, vertCount, DRAW_STQ2_REGLIST, 3, 0); - packet2_add_u32(currPacket, t_mesh.color.r); packet2_add_u32(currPacket, t_mesh.color.g); packet2_add_u32(currPacket, t_mesh.color.b); packet2_add_u32(currPacket, t_mesh.color.a); - - // Clipping tests start - - // // const float minZ = 1; - // // const float maxZ = 65535; - // // const int iGuardDimXY = 2048; - - // // vu1.addFloat(1.0F); // f_TODO clipping maybe there is problem? - // // vu1.addFloat(1.0F); - // // vu1.addFloat(1.0F); - // // vu1.addFloat(1.0F); - // // float xClip = (float)2048.0f/(drawContext.GetFBWidth() * 0.5f * 2.0f); - // // packet += Math::Max( xClip, 1.0f ); - // // float yClip = (float)2048.0f/(drawContext.GetFBHeight() * 0.5f * 2.0f); - // // packet += Math::Max( yClip, 1.0f ); - // // float depthClip = 2048.0f / depthClipToGs; - // // // F_FIXME: maybe these 2048's should be 2047.5s... - // // depthClip *= 1.003f; // round up a bit for fp error (????) - // // packet += depthClip; - // // // enable/disable clipping - // // packet += (drawContext.GetDoClipping()) ? 1 : 0; - - // u32 depthBits = 24; // or 28(fog) or 16 - // float depthClipToGs = (float)((1 << depthBits) - 1) / 2.0f; - // vu1.addFloat(2048.0f / (640.0F * 0.5f * 2.0f)); - // vu1.addFloat(2048.0f / (480.0F * 0.5f * 2.0f)); - // vu1.addFloat((2048.0f / depthClipToGs) * 1.003F); - // // vu1.addFloat(2048.0F); // scale - // // vu1.addFloat(2048.0F); // scale - // // vu1.addFloat(((float)0xFFFFFF) / 32.0F); // scale - // vu1.addFloat(0.0F); - // // vu1.addFloat(0.5f * iGuardDimXY); - // // vu1.addFloat(-0.5f * iGuardDimXY); - // // vu1.addFloat(1.0F); - // // vu1.addFloat(500.0F); // far - - packet2_add_float(currPacket, 0.0F); - packet2_add_float(currPacket, 0.0F); - packet2_add_float(currPacket, 0.0F); - packet2_add_float(currPacket, 0.0F); - - //// Clipping tests end vif_added_bytes += packet2_utils_vu_close_unpack(currPacket); - packet2_utils_vu_add_unpack_data(currPacket, vif_added_bytes, t_vertices + t_start, vertCount, 1); + packet2_utils_vu_add_unpack_data(currPacket, vif_added_bytes, t_vertices + t_start, vertCount, true); vif_added_bytes += vertCount; - packet2_utils_vu_add_unpack_data(currPacket, vif_added_bytes, t_coordinates + t_start, vertCount, 1); + packet2_utils_vu_add_unpack_data(currPacket, vif_added_bytes, t_coordinates + t_start, vertCount, true); vif_added_bytes += vertCount; packet2_utils_vu_add_start_program(currPacket, 0); } diff --git a/src/engine/vu1_progs/draw3D.vcl b/src/engine/vu1_progs/draw3D.vcl deleted file mode 100644 index 777d84f..0000000 --- a/src/engine/vu1_progs/draw3D.vcl +++ /dev/null @@ -1,154 +0,0 @@ -; ______ ____ ___ -; | \/ ____| |___| -; | | | \ | | -;--------------------------- -; Copyright 2020, tyra - https://github.com/h4570/tyra -; Sandro Sobczyński -; -;--------------------------------------------------------------- -; draw3D.vcl | -;--------------------------------------------------------------- -; A VU1 microprogram to draw 3D object using XYZ2, RGBAQ and ST| -; This program uses double buffering (xtop) | -; | -; Many thanks to: | -; - Dr Henry Fortuna | -; - Jesper Svennevid, Daniel Collin | -; - Guilherme Lampert | -;--------------------------------------------------------------- - -; TODO -; - Fix vertex clipping (is clipping visible triangles :/) -; - Move lerp() from EE to VU1 (performance) -; - Add dynamic lighting (feature) -; - Add --cont + MSCNT instead of alltime MSCAL (performance) - -.syntax new -.name VU1Draw3D -.vu -.init_vf_all -.init_vi_all - ---enter ---endenter - - ;//////////// --- Load data 1 --- ///////////// - ; Updated once per frame - lq matrixRow0, 0(vi00) ; load view-projection matrix - lq matrixRow1, 1(vi00) - lq matrixRow2, 2(vi00) - lq matrixRow3, 3(vi00) - ;///////////////////////////////////////////// - - fcset 0x000000 ; VCL won't let us use CLIP without first zeroing - ; the clip flags - - ;//////////// --- Load data 2 --- ///////////// - ; Updated dynamically - xtop iBase - - lq.xyz scale, 0(iBase) ; load program params - ; float : X, Y, Z - scale vector that we will use to scale the verts after projecting them. - ; float : W - vert count. - lq gifSetTag, 1(iBase) ; GIF tag - set - lq texGifTag1, 2(iBase) ; GIF tag - texture LOD - lq texGifTag2, 3(iBase) ; GIF tag - texture buffer & CLUT - lq primTag, 4(iBase) ; GIF tag - tell GS how many data we will send - lq rgba, 5(iBase) ; RGBA - ;lq clipScale, 6(iBase) ; TODO clipping tests - ; u32 : R, G, B, A (0-128) - iaddiu vertexData, iBase, 7 ; pointer to vertex data - ilw.w vertCount, 0(iBase) ; load vert count from scale vector - iadd stqData, vertexData, vertCount ; pointer to stq - iadd kickAddress, stqData, vertCount ; pointer for XGKICK - iadd destAddress, stqData, vertCount ; helper pointer for data inserting - ;//////////////////////////////////////////// - - ;/////////// --- Store tags --- ///////////// - sqi gifSetTag, (destAddress++) ; - sqi texGifTag1, (destAddress++) ; texture LOD tag - sqi gifSetTag, (destAddress++) ; - sqi texGifTag2, (destAddress++) ; texture buffer & CLUT tag - sqi primTag, (destAddress++) ; prim + tell gs how many data will be - ;//////////////////////////////////////////// - - ;/////////////// --- Loop --- /////////////// - iadd vertexCounter, iBase, vertCount ; loop vertCount times - vertexLoop: - - ;////////// --- Load loop data --- ////////// - lq vertex, 0(vertexData) ; load xyz - ; float : X, Y, Z - ; any32 : _ = 0 - lq stq, 0(stqData) ; load stq - ; float : S, T - ; any32 : Q = 1 ; 1, because we will mul this by 1/vert[w] and this - ; will be our q for texture perspective correction - ; any32 : _ = 0 - ;//////////////////////////////////////////// - - - ;////////////// --- Vertex --- ////////////// - mul acc, matrixRow0, vertex[x] ; transform each vertex by the matrix - madd acc, matrixRow1, vertex[y] - madd acc, matrixRow2, vertex[z] - madd vertex, matrixRow3, vertex[w] - - ;add.z acc, vf0, clipScale[w] ; TODO clipping maybe this? - ;madd.z clipVec, clipScale, vertex - ;mul.xy clipVec, clipScale, vertex - ;mul.w clipVec, vf0, vertex[z] - - ;mul.xyz clipVec, vertex, clipScale ; TODO clipping maybe this? - - clipw.xyz vertex, vertex ; Dr. Fortuna: This instruction checks if the vertex is outside - ; the viewing frustum. If it is, then the appropriate - ; clipping flags are set - fcand VI01, 0x3FFFF ; Bitwise AND the clipping flags with 0x3FFFF, this makes - ; sure that we get the clipping judgement for the last three - ; verts (i.e. that make up the triangle we are about to draw) - iaddiu iADC, VI01, 0x7FFF ; Add 0x7FFF. If any of the clipping flags were set this will - ; cause the triangle not to be drawn (any values above 0x8000 - ; that are stored in the w component of XYZ2 will set the ADC - ; bit, which tells the GS not to perform a drawing kick on this - ; triangle. - - ;ilw.w iNoDraw, UVStart(Counter) ; Load the iNoDraw flag. If true we should set the ADC bit so the vert isn't drawn - ;iadd iADC, iADC, iNoDraw ; TODO clipping maybe this? - - isw.w iADC, 2(destAddress) - - div q, vf00[w], vertex[w] ; perspective divide (1/vert[w]): - mul.xyz vertex, vertex, q - mula.xyz acc, scale, vf00[w] ; scale to GS screen space - madd.xyz vertex, vertex, scale ; multiply and add the scales -> vert = vert * scale + scale - ftoi4.xyz vertex, vertex ; convert vertex to 12:4 fixed point format - ;//////////////////////////////////////////// - - - ;//////////////// --- ST --- //////////////// - mulq modStq, stq, q - ;//////////////////////////////////////////// - - - ;//////////// --- Store data --- //////////// - sq modStq, 0(destAddress) ; STQ - sq rgba, 1(destAddress) ; RGBA ; q is grabbed from stq - sq.xyz vertex, 2(destAddress) ; XYZ2 - ;//////////////////////////////////////////// - - iaddiu vertexData, vertexData, 1 - iaddiu stqData, stqData, 1 - iaddiu destAddress, destAddress, 3 - - iaddi vertexCounter, vertexCounter, -1 ; decrement the loop counter - ibne vertexCounter, iBase, vertexLoop ; and repeat if needed - - ;//////////////////////////////////////////// - - --barrier - - xgkick kickAddress ; dispatch to the GS rasterizer. - ---exit ---endexit diff --git a/src/engine/vu1_progs/draw3D.vclpp b/src/engine/vu1_progs/draw3D.vclpp new file mode 100644 index 0000000..f38fc42 --- /dev/null +++ b/src/engine/vu1_progs/draw3D.vclpp @@ -0,0 +1,143 @@ +; ______ ____ ___ +; | \/ ____| |___| +; | | | \ | | +;--------------------------- +; Copyright 2020, tyra - https://github.com/h4570/tyra +; Sandro Sobczyński +; +;--------------------------------------------------------------- +; draw3D.vcl | +;--------------------------------------------------------------- +; First tyra VU1 microprogram. | +; Features: | +; - Draw triangles (no strip) with STQ (textures) and 1 RGBA. | +; This program uses double buffering (xtop) | +; | +; I want to say thank you to: | +; - Dr Henry Fortuna - for teaching how things work | +; - Jesper Svennevid, Daniel Collin - for openvcl samples | +; - Guilherme Lampert - for VU1 idea for PS2 Quake and vclpp | +; - Tyler Daniel - for PS2GL source code for PS2 Linux | +;--------------------------------------------------------------- + +; TODO +; - Add dynamic lighting (feature) +; - Add --cont + MSCNT instead of alltime MSCAL + +#include "/repos/tyra/src/engine/vu1_progs/geometry.inc" +#include "/repos/tyra/src/engine/vu1_progs/matrix.inc" +#include "/repos/tyra/src/engine/vu1_progs/vector.inc" + +#vuprog draw3D + +.syntax new +.name VU1Draw3D +.vu +.init_vf_all +.init_vi_all + +--enter +--endenter + +xtop double_buffer + +;//////// LOAD CURRENT BUFFER DATA ////////// +MatrixLoad{ matrix, 0, double_buffer } +ilw.z triangles_count, 4(double_buffer) ; Triangles count +ilw.y vertex_count, 4(double_buffer) ; Vertex count +lq gif_set_tag, 5(double_buffer) ; GIF tag - set +lq tex_gif_tag_1, 6(double_buffer) ; GIF tag - texture LOD +lq tex_gif_tag_2, 7(double_buffer) ; GIF tag - texture buffer & CLUT +lq prim_tag, 8(double_buffer) ; GIF tag - tell GS how many data we will send +lq rgba, 9(double_buffer) ; Mesh RGBA + +iaddiu vertex_data, double_buffer, 10 ; pointer to vertex data +iadd stq_data, vertex_data, vertex_count ; pointer to stq +iadd kick_address, stq_data, vertex_count ; pointer for XGKICK +iadd dest_address, stq_data, vertex_count ; helper pointer for data inserting +;//////////////////////////////////////////// + +LoadScaleConstant{ gs_scale } +fcset 0x000000 ; VCL won't let us use CLIP without first zeroing the clip flags + +;/////////////// STORE TAGS ///////////////// +sqi gif_set_tag, (dest_address++) ; +sqi tex_gif_tag_1, (dest_address++) ; texture LOD tag +sqi gif_set_tag, (dest_address++) ; +sqi tex_gif_tag_2, (dest_address++) ; texture buffer & CLUT tag +sqi prim_tag, (dest_address++) ; prim + tell gs how many data will be +;//////////////////////////////////////////// + +;//////// FIX ADC BIT FOR CLIPPING ////////// +iaddiu adc_bit, vi00, 0x7FFF +iaddiu adc_bit, adc_bit, 1 +;//////////////////////////////////////////// + +;/////////// START TRIANGLE LOOP //////////// +iaddiu triangle_counter, vi00, 0 ; Reset counter +triangle_loop: --LoopCS 1,3 + + ;//////////////// VERTEX 1 ////////////////// + VectorLoad{ vertex, vertex_data, 0 } + VectorLoad{ stq1, stq_data, 0 } + MatrixXForm{ xformed_vertex, matrix, vertex } + VectorClip{ gs_vertex, xformed_vertex } + VectorPerspectiveDivide{ xformed_vertex } + VectorAddGSScales{ gs_vertex, xformed_vertex, gs_scale } + VectorTexturePerspectiveCorrection{ pers_stq, stq1 } + VectorStore{ pers_stq, dest_address, 0 } + VectorStore{ rgba, dest_address, 1 } + VectorStore{ gs_vertex, dest_address, 2 } + ;//////////////////////////////////////////// + + ;//////////////// VERTEX 2 ////////////////// + VectorLoad{ vertex, vertex_data, 1 } + VectorLoad{ stq2, stq_data, 1 } + MatrixXForm{ xformed_vertex, matrix, vertex } + VectorClip{ gs_vertex, xformed_vertex } + VectorPerspectiveDivide{ xformed_vertex } + VectorAddGSScales{ gs_vertex, xformed_vertex, gs_scale } + VectorTexturePerspectiveCorrection{ pers_stq, stq2 } + VectorStore{ pers_stq, dest_address, 3 } + VectorStore{ rgba, dest_address, 4 } + VectorStore{ gs_vertex, dest_address, 5 } + ;//////////////////////////////////////////// + + ;//////////////// VERTEX 3 ////////////////// + VectorLoad{ vertex, vertex_data, 2 } + VectorLoad{ stq3, stq_data, 2 } + MatrixXForm{ xformed_vertex, matrix, vertex } + VectorClip{ gs_vertex, xformed_vertex } + VectorPerspectiveDivide{ xformed_vertex } + VectorAddGSScales{ gs_vertex, xformed_vertex, gs_scale } + VectorTexturePerspectiveCorrection{ pers_stq, stq3 } + VectorStore{ pers_stq, dest_address, 6 } + VectorStore{ rgba, dest_address, 7 } + + fcand vi01, 0x03FFFF + iaddiu new_adc_bit, vi01, 0x7FFF + mfir.w gs_vertex, new_adc_bit + VectorStore{ gs_vertex, dest_address, 8 } + ;//////////////////////////////////////////// + + ;////////////// LOOP CONTROL //////////////// + iaddiu vertex_data, vertex_data, 3 + iaddiu stq_data, stq_data, 3 + iaddiu dest_address, dest_address, 9 + + iaddiu triangle_counter, triangle_counter, 1 // Incrementing this + // by other value than 1 is causing HUGE problems, but.. why? + // My first idea was do vertex_counter and incrementing by 3 + ibne triangle_counter, triangles_count, triangle_loop + ;//////////////////////////////////////////// + +;//////////////////////////////////////////// + +--barrier + +xgkick kick_address ; dispatch to the GS rasterizer. + +--exit +--endexit + +#endvuprog \ No newline at end of file diff --git a/src/engine/vu1_progs/draw3D.vsm b/src/engine/vu1_progs/draw3D.vsm index f8c1e0e..f557b72 100644 --- a/src/engine/vu1_progs/draw3D.vsm +++ b/src/engine/vu1_progs/draw3D.vsm @@ -11,63 +11,83 @@ .global VU1Draw3D_CodeEnd VU1Draw3D_CodeStart: __v_draw3D_vcl_4: -; _LNOPT_w=[ normal2 ] 23 [23 0] 23 [__v_draw3D_vcl_4] - NOP lq VF01,0(VI00) - NOP xtop VI02 - NOP lq VF02,1(VI00) - NOP lq VF06,1(VI02) - NOP lq VF09,2(VI02) - NOP lq VF08,3(VI02) - NOP lq VF07,4(VI02) - NOP lq VF03,2(VI00) - NOP iaddiu VI03,VI02,0x00000007 - NOP ilw.w VI07,0(VI02) - NOP lq VF04,3(VI00) - NOP fcset 0 - NOP lq.xyz VF05,0(VI02) - NOP iadd VI04,VI03,VI07 - NOP iadd VI06,VI04,VI07 - NOP sqi VF06,(VI06++) +; _LNOPT_w=[ normal2 ] 27 [27 0] 27 [__v_draw3D_vcl_4] + NOP xtop VI07 + NOP lq VF01,0(VI07) + NOP ilw.y VI05,4(VI07) + NOP lq VF05,5(VI07) + NOP lq VF09,6(VI07) + NOP lq VF08,7(VI07) + NOP lq VF07,8(VI07) + NOP lq VF02,1(VI07) + NOP iaddiu VI03,VI07,0x0000000a + NOP iadd VI04,VI03,VI05 + NOP lq VF03,2(VI07) + NOP iadd VI06,VI04,VI05 + NOP loi 0x44fff000 + NOP lq VF04,3(VI07) + NOP ilw.z VI02,4(VI07) + NOP sqi VF05,(VI06++) NOP sqi VF09,(VI06++) - NOP sqi VF06,(VI06++) + NOP sqi VF05,(VI06++) NOP sqi VF08,(VI06++) - NOP lq VF06,5(VI02) - NOP iadd VI05,VI04,VI07 + NOP lq VF05,9(VI07) + NOP iaddiu VI07,VI00,0x00007fff + NOP iadd VI05,VI04,VI05 + addi.xy VF06,VF00,I loi 0x492aaaaa + NOP fcset 0 NOP sqi VF07,(VI06++) - NOP iadd VI07,VI02,VI07 -vertexLoop: -; _LNOPT_w=[ normal2 ] 21 [31 14] 31 [vertexLoop] + NOP iaddiu VI07,VI07,0x00000001 + addi.z VF06,VF00,I iaddiu VI08,VI00,0 +triangle_loop: +; _LNOPT_w=[ normal ] 37 [31 30] 45 [triangle_loop] NOP lq VF07,0(VI03) - mulax ACC,VF01,VF07x sq VF06,1(VI06) ; STALL_LATENCY ?3 - madday ACC,VF02,VF07y lq VF08,0(VI04) - maddaz ACC,VF03,VF07z iaddiu VI06,VI06,0x00000003 + mulax ACC,VF01,VF07x iaddiu VI08,VI08,0x00000001 ; STALL_LATENCY ?3 + madday ACC,VF02,VF07y NOP + maddaz ACC,VF03,VF07z NOP + maddw VF10,VF04,VF07w lq VF08,2(VI03) + mulax ACC,VF01,VF08x div Q,VF00w,VF10w ; STALL_LATENCY ?3 + madday ACC,VF02,VF08y NOP + maddaz ACC,VF03,VF08z lq VF07,1(VI03) + maddw VF08,VF04,VF08w NOP + clipw.xyz VF10xyz,VF10w NOP + mulax ACC,VF01,VF07x NOP ; STALL_LATENCY ?1 + madday ACC,VF02,VF07y div Q,VF00w,VF08w + maddaz ACC,VF03,VF07z lq VF09,0(VI04) maddw VF07,VF04,VF07w NOP - clipw.xyz VF07xyz,VF07w div Q,VF00w,VF07w ; STALL_LATENCY ?3 - NOP NOP - NOP NOP - NOP NOP - NOP NOP - NOP NOP - NOP NOP - mulq.xyz VF07,VF07,Q fcand VI01,262143 - mulaw.xyz ACC,VF05,VF00w iaddiu VI03,VI03,0x00000001 - madd.xyz VF07,VF07,VF05 iaddiu VI04,VI04,0x00000001 ; STALL_LATENCY ?2 - mulq VF08,VF08,Q isubiu VI07,VI07,1 - ftoi4.xyz VF07,VF07 iaddiu VI01,VI01,0x00007fff ; STALL_LATENCY ?2 - NOP isw.w VI01,-1(VI06) - NOP sq VF08,-3(VI06) - NOP ibne VI07,VI02,vertexLoop - NOP sq.xyz VF07,-1(VI06) + mulaw.xyz ACC,VF06,VF00w NOP + mulq.xyz VF10,VF10,Q NOP + mulq VF09,VF09,Q sq VF05,1(VI06) + clipw.xyz VF07xyz,VF07w lq VF11,2(VI04) + clipw.xyz VF08xyz,VF08w div Q,VF00w,VF07w + mulq.xyz VF08,VF08,Q sq VF05,4(VI06) + madd.xyz VF09,VF10,VF06 sq VF09,0(VI06) + mulq VF10,VF11,Q sq VF05,7(VI06) + mulaw.xyz ACC,VF06,VF00w mfir.w VF09,VI07 + madd.xyz VF08,VF08,VF06 fcand VI01,262143 + NOP iaddiu VI01,VI01,0x00007fff + mulq.xyz VF10,VF07,Q sq VF10,6(VI06) + ftoi4.xyz VF09,VF09 mfir.w VF07,VI01 + ftoi4.xyz VF07,VF08 lq VF11,1(VI04) + mulaw.xyz ACC,VF06,VF00w iaddiu VI03,VI03,0x00000003 + madd.xyz VF08,VF10,VF06 iaddiu VI04,VI04,0x00000003 + NOP sq VF09,2(VI06) + mulq VF09,VF11,Q sq VF07,8(VI06) + NOP mfir.w VF07,VI07 + ftoi4.xyz VF07,VF08 iaddiu VI06,VI06,0x00000009 + NOP sq VF09,-6(VI06) ; STALL_LATENCY ?1 + NOP ibne VI08,VI02,triangle_loop + NOP sq VF07,-4(VI06) ; _LNOPT_w=[ normal2 ] 3 [1 0] 3 [__v_draw3D_vcl_7] NOP xgkick VI05 NOP[E] NOP NOP NOP .align 4 VU1Draw3D_CodeEnd: -; iCount=47 +; iCount=67 ; register stats: -; 8 VU User integer -; 10 VU User floating point +; 9 VU User integer +; 12 VU User floating point ;------------------------- ;------------------------- ;------------------------- diff --git a/src/engine/vu1_progs/geometry.inc b/src/engine/vu1_progs/geometry.inc new file mode 100644 index 0000000..2562412 --- /dev/null +++ b/src/engine/vu1_progs/geometry.inc @@ -0,0 +1,7 @@ +; Load GS offsets to center xformed vertex in gs coord space and color clamping constant +#macro LoadScaleConstant: gs_scale + loi 2047.5 + addi.xy gs_scale, vf00, i + loi 699050.625000 // ((float)0xFFFFFF) / 24.0F + addi.z gs_scale, vf00, i +#endmacro diff --git a/src/engine/vu1_progs/matrix.inc b/src/engine/vu1_progs/matrix.inc new file mode 100644 index 0000000..47615e5 --- /dev/null +++ b/src/engine/vu1_progs/matrix.inc @@ -0,0 +1,13 @@ +#macro MatrixLoad: matrix, offset, vumem + lq matrix[0], offset+0(vumem) + lq matrix[1], offset+1(vumem) + lq matrix[2], offset+2(vumem) + lq matrix[3], offset+3(vumem) +#endmacro + +#macro MatrixXForm: output_vertex, matrix, input_vertex + mul acc, matrix[0], input_vertex[x] + madd acc, matrix[1], input_vertex[y] + madd acc, matrix[2], input_vertex[z] + madd output_vertex, matrix[3], input_vertex[w] +#endmacro diff --git a/src/engine/vu1_progs/vector.inc b/src/engine/vu1_progs/vector.inc new file mode 100644 index 0000000..c492916 --- /dev/null +++ b/src/engine/vu1_progs/vector.inc @@ -0,0 +1,27 @@ +#macro VectorPerspectiveDivide: vertex + div q, vf00[w], vertex[w] + mulq.xyz vertex, vertex, q +#endmacro + +#macro VectorAddGSScales: output_vertex, input_vertex, gs_scale + mula.xyz acc, gs_scale, vf00[w] + madd.xyz output_vertex, input_vertex, gs_scale + ftoi4.xyz output_vertex, output_vertex +#endmacro + +#macro VectorTexturePerspectiveCorrection: output_vertex, input_vertex + mulq output_vertex, input_vertex, q +#endmacro + +#macro VectorStore: vertex, vumem, num + sq vertex, num(vumem) +#endmacro + +#macro VectorClip: output_vertex, input_vertex + clipw.xyz input_vertex, input_vertex + mfir.w output_vertex, adc_bit +#endmacro + +#macro VectorLoad: output_vertex, vumem, offset + lq output_vertex, offset(vumem) +#endmacro From 8406dcee72d096b4e6daf96543a2a5689bc47d2d Mon Sep 17 00:00:00 2001 From: h4570 Date: Sat, 26 Dec 2020 13:29:37 +0100 Subject: [PATCH 42/56] added optimized array mode to draw() --- src/engine/include/modules/renderer.hpp | 33 +++- src/engine/include/modules/vif_sender.hpp | 9 +- src/engine/modules/renderer.cpp | 33 +++- src/engine/modules/vif_sender.cpp | 104 ++++++++-- src/engine/vu1_progs/draw3D.vclpp | 24 ++- src/engine/vu1_progs/draw3D.vsm | 222 +++++++++++++++------- 6 files changed, 324 insertions(+), 101 deletions(-) diff --git a/src/engine/include/modules/renderer.hpp b/src/engine/include/modules/renderer.hpp index be874d9..913770d 100644 --- a/src/engine/include/modules/renderer.hpp +++ b/src/engine/include/modules/renderer.hpp @@ -13,6 +13,8 @@ #include #include +#include +#include #include #include "gif_sender.hpp" #include "vif_sender.hpp" @@ -38,12 +40,20 @@ public: void enableVSync() { isVSyncEnabled = true; } void disableVSync() { isVSyncEnabled = false; } + void clearAndWaitForRender() + { + *GS_REG_CSR |= 2; // Reset wait flag + draw_wait_finish(); + } + void waitForRender() { draw_wait_finish(); } + + /** 2D draw. */ + void draw(Sprite &t_sprite); /// --- Draw: PATH3 - void draw(Sprite &t_sprite); - /** + * WARNING: THIS FUNC CAUSE VISUAL ARTIFACTS! * Draw many meshes with lighting information. * Slowest way of rendering (PATH 3, using EE and GIF). * NOTICE: Animation supported, lighting supported @@ -51,6 +61,7 @@ public: void drawByPath3(Mesh *t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bulbsCount); /** + * WARNING: THIS FUNC CAUSE VISUAL ARTIFACTS! * Draw mesh with lighting information. * Slowest way of rendering (PATH 3, using EE and GIF). * NOTICE: Animation supported, lighting supported @@ -58,6 +69,7 @@ public: void drawByPath3(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount); /** + * WARNING: THIS FUNC CAUSE VISUAL ARTIFACTS! * Draw many meshes without lighting information. * Slowest way of rendering (PATH 3, using EE and GIF). * NOTICE: Animation supported, lighting supported @@ -65,6 +77,7 @@ public: void drawByPath3(Mesh *t_meshes, u16 t_amount); /** + * WARNING: THIS FUNC CAUSE VISUAL ARTIFACTS! * Draw mesh without lighting information. * Slowest way of rendering (PATH 3, using EE and GIF). * NOTICE: Animation supported, lighting supported @@ -74,25 +87,27 @@ public: /// --- Draw: PATH1 /** - * Draw many meshes with lighting information. + * Draw many meshes with lighting information. + * Draw in array mode, can be A LOT faster than for looping! * Fastest way of rendering (PATH 1, using VU1). * NOTICE: Animation supported, lighting NOT supported (at this moment) */ - void draw(Mesh *t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bulbsCount); + void draw(Mesh **t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bulbsCount); /** - * Draw mesh with lighting information. - * Fastest way of rendering (PATH 1, using VU1). + * Draw mesh with lighting information. + * Fastest way of rendering (PATH 1, using VU1). * NOTICE: Animation supported, lighting NOT supported (at this moment) */ void draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount); /** - * Draw many meshes without lighting information. - * Fastest way of rendering (PATH 1, using VU1). + * Draw many meshes without lighting information. + * Draw in array mode, can be A LOT faster than for looping! + * Fastest way of rendering (PATH 1, using VU1). * NOTICE: Animation supported, lighting NOT supported (at this moment) */ - void draw(Mesh *t_meshes, u16 t_amount); + void draw(Mesh **t_meshes, u16 t_amount); /** * Draw mesh without lighting information. diff --git a/src/engine/include/modules/vif_sender.hpp b/src/engine/include/modules/vif_sender.hpp index 43c2d7e..c1fdbc6 100644 --- a/src/engine/include/modules/vif_sender.hpp +++ b/src/engine/include/modules/vif_sender.hpp @@ -31,12 +31,17 @@ public: // TODO refactor void drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 vertCount2, VECTOR *vertices, VECTOR *normals, VECTOR *coordinates, Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount, texbuffer_t *textureBuffer); void calcMatrix(const RenderData &t_renderData, const Vector3 &t_position, const Vector3 &t_rotation); + void drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mesh **t_meshes, const u32 &t_skip, const u32 &t_count); + void enableWait() { isDrawWaitEnabled = true; } + void disableWait() { isDrawWaitEnabled = false; } private: + u32 lastVertCount; // needed for drawTheSameWithOtherMatrices() + u8 isDrawWaitEnabled; Light *light; void uploadMicroProgram(); - void setDoubleBuffer(); - void drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_vertices, VECTOR *t_coordinates, prim_t *t_prim, texbuffer_t *textureBuffer); + void setDoubleBufferAddStaticData(); + void drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_vertices, VECTOR *t_coordinates, prim_t *t_prim, texbuffer_t *t_textureBuffer, u8 t_addDrawWait); packet2_t *packets[2] __attribute__((aligned(64))); packet2_t *currPacket; /** diff --git a/src/engine/modules/renderer.cpp b/src/engine/modules/renderer.cpp index 425fb0d..35961b3 100644 --- a/src/engine/modules/renderer.cpp +++ b/src/engine/modules/renderer.cpp @@ -13,8 +13,6 @@ #include #include #include -#include -#include #include "../include/utils/debug.hpp" #include "../include/utils/math.hpp" @@ -268,10 +266,33 @@ void Renderer::drawByPath3(Mesh &t_mesh) { drawByPath3(t_mesh, NULL, 0); } /// --- Draw: PATH1 -void Renderer::draw(Mesh *t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bulbsCount) +void Renderer::draw(Mesh **t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bulbsCount) { - for (u16 i = 0; i < t_amount; i++) - draw(t_meshes[i], t_bulbs, t_bulbsCount); + beginFrameIfNeeded(); + if (!t_meshes[0]->isDataLoaded()) + PRINT_ERR("Can't draw, because no mesh data was loaded!"); + else if ( + t_amount >= 3 && + !t_meshes[0]->shouldBeBackfaceCulled && + t_meshes[0]->getFramesCount() == 1 && + t_meshes[0]->getMaterialsCount() == 1 && + t_meshes[0]->getFrame(0).getVertexCount() <= 96) + { + vifSender->disableWait(); + Mesh **meshesInFrustum = new Mesh *[t_amount]; + u16 addedMeshes = 0; + for (u16 i = 0; i < t_amount; i++) + if (t_meshes[i]->getMaterial(0).isInFrustum(renderData.frustumPlanes, t_meshes[i]->position)) + meshesInFrustum[addedMeshes++] = t_meshes[i]; + draw(*meshesInFrustum[0], t_bulbs, t_bulbsCount); + draw(*meshesInFrustum[1], t_bulbs, t_bulbsCount); + vifSender->enableWait(); + vifSender->drawTheSameWithOtherMatrices(renderData, meshesInFrustum, 2, addedMeshes); + delete[] meshesInFrustum; + } + else + for (u16 i = 0; i < t_amount; i++) + draw(*t_meshes[i], t_bulbs, t_bulbsCount); } void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount) @@ -302,7 +323,7 @@ void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount) } } -void Renderer::draw(Mesh *t_meshes, u16 t_amount) { draw(t_meshes, t_amount, NULL, 0); } +void Renderer::draw(Mesh **t_meshes, u16 t_amount) { draw(t_meshes, t_amount, NULL, 0); } void Renderer::draw(Mesh &t_mesh) { draw(t_mesh, NULL, 0); } diff --git a/src/engine/modules/vif_sender.cpp b/src/engine/modules/vif_sender.cpp index 78dd0ce..a72c50a 100644 --- a/src/engine/modules/vif_sender.cpp +++ b/src/engine/modules/vif_sender.cpp @@ -19,6 +19,8 @@ const u32 VU1_PACKAGE_VERTS_PER_BUFF = 96; // Remember to modify buffer size in vu1 also const u32 VU1_PACKAGES_PER_PACKET = 9; const u32 VU1_PACKET_SIZE = 256; // should be 128, but 256 is more safe for future +const u8 VU1_PARAMS_ADDRESS = 4; +const u8 VU1_RGBA_ADDRESS = 8; // ---- // Constructors/Destructors @@ -31,16 +33,18 @@ extern u32 VU1Draw3D_CodeEnd __attribute__((section(".vudata"))); VifSender::VifSender(Light *t_light) { - light = t_light; PRINT_LOG("Initializing VifSender"); - PRINT_LOG("VifSender initialized!"); + light = t_light; + lastVertCount = 0; + isDrawWaitEnabled = true; dma_channel_initialize(DMA_CHANNEL_VIF1, NULL, 0); dma_channel_fast_waits(DMA_CHANNEL_VIF1); uploadMicroProgram(); packets[0] = packet2_create(VU1_PACKET_SIZE, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); packets[1] = packet2_create(VU1_PACKET_SIZE, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); context = 0; - setDoubleBuffer(); + setDoubleBufferAddStaticData(); + PRINT_LOG("VifSender initialized!"); } VifSender::~VifSender() @@ -93,7 +97,7 @@ void VifSender::drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 ver i -= 3; const u32 endI = i + (VU1_PACKAGE_VERTS_PER_BUFF - 1) > vertCount2 ? vertCount2 : i + (VU1_PACKAGE_VERTS_PER_BUFF - 1); - drawVertices(t_mesh, i, endI, vertices, coordinates, t_renderData->prim, textureBuffer); + drawVertices(t_mesh, i, endI, vertices, coordinates, t_renderData->prim, textureBuffer, isDrawWaitEnabled ? endI == vertCount2 : false); if (endI == vertCount2) // if there are no more vertices to draw, break { i = vertCount2; @@ -109,9 +113,15 @@ void VifSender::drawMesh(RenderData *t_renderData, Matrix t_perspective, u32 ver } } -void VifSender::setDoubleBuffer() +void VifSender::setDoubleBufferAddStaticData() { - packet2_t *settings = packet2_create(2, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); + packet2_t *settings = packet2_create(10, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); + packet2_utils_vu_open_unpack(settings, 0, false); + { + packet2_utils_gs_add_draw_finish_giftag(settings); + packet2_utils_gif_add_set(settings, 1); + } + packet2_utils_vu_close_unpack(settings); packet2_utils_vu_add_double_buffer(settings, 10, 498); packet2_utils_vu_add_end_tag(settings); dma_channel_send_packet2(settings, DMA_CHANNEL_VIF1, true); @@ -120,28 +130,98 @@ void VifSender::setDoubleBuffer() } /** Draw using PATH1 */ -void VifSender::drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_vertices, VECTOR *t_coordinates, prim_t *t_prim, texbuffer_t *textureBuffer) +void VifSender::drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_vertices, VECTOR *t_coordinates, prim_t *t_prim, texbuffer_t *t_texBuff, u8 t_addDrawWait) { const u32 vertCount = t_end - t_start; - u32 vif_added_bytes = 0; + lastVertCount = vertCount; packet2_utils_vu_open_unpack(currPacket, 0, true); packet2_add_data(currPacket, modelViewProj.data, 4); - packet2_add_u32(currPacket, 0); // Free + packet2_add_u32(currPacket, t_addDrawWait); // Draw finish? packet2_add_u32(currPacket, vertCount); // Vertex count packet2_add_u32(currPacket, vertCount / 3); // Triangles count packet2_add_u32(currPacket, 0); // Free - packet2_utils_gif_add_set(currPacket, 1); packet2_utils_gs_add_lod(currPacket, &t_mesh.lod); - packet2_utils_gs_add_texbuff_clut(currPacket, textureBuffer, &t_mesh.clut); + packet2_utils_gs_add_texbuff_clut(currPacket, t_texBuff, &t_mesh.clut); packet2_utils_gs_add_prim_giftag(currPacket, t_prim, vertCount, DRAW_STQ2_REGLIST, 3, 0); packet2_add_u32(currPacket, t_mesh.color.r); packet2_add_u32(currPacket, t_mesh.color.g); packet2_add_u32(currPacket, t_mesh.color.b); packet2_add_u32(currPacket, t_mesh.color.a); - vif_added_bytes += packet2_utils_vu_close_unpack(currPacket); + u32 vif_added_bytes = packet2_utils_vu_close_unpack(currPacket); packet2_utils_vu_add_unpack_data(currPacket, vif_added_bytes, t_vertices + t_start, vertCount, true); vif_added_bytes += vertCount; packet2_utils_vu_add_unpack_data(currPacket, vif_added_bytes, t_coordinates + t_start, vertCount, true); vif_added_bytes += vertCount; packet2_utils_vu_add_start_program(currPacket, 0); } + +void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mesh **t_meshes, const u32 &t_skip, const u32 &t_count) +{ + packet2_t *packet2 = packet2_create(300, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); + u8 switchCounter = 0; + u32 i; + for (i = t_skip; i < t_count; i++) + { + model.identity(); + model.rotate(t_meshes[i]->rotation); + model.translate(t_meshes[i]->position); + + modelViewProj.identity(); + modelViewProj = model * modelViewProj; + modelViewProj = *t_renderData.view * modelViewProj; + modelViewProj = *t_renderData.projection * modelViewProj; + + packet2_utils_vu_open_unpack(packet2, 0, true); + { + packet2_add_data(packet2, modelViewProj.data, 4); + } + packet2_utils_vu_close_unpack(packet2); + packet2_utils_vu_open_unpack(packet2, VU1_RGBA_ADDRESS, true); + { + packet2_add_u32(packet2, t_meshes[i]->color.r); + packet2_add_u32(packet2, t_meshes[i]->color.g); + packet2_add_u32(packet2, t_meshes[i]->color.b); + packet2_add_u32(packet2, t_meshes[i]->color.a); + } + packet2_utils_vu_close_unpack(packet2); + if (i != t_count - 1) + packet2_utils_vu_add_start_program(packet2, 0); + + if (switchCounter++ >= 32) + { + switchCounter = 0; + if (i == t_count - 1) // is last + { + packet2_utils_vu_open_unpack(packet2, VU1_PARAMS_ADDRESS, true); + { + packet2_add_u32(packet2, true); // Draw wait finish? + packet2_add_u32(packet2, lastVertCount); // Vertex count + packet2_add_u32(packet2, lastVertCount / 3); // Triangles count + packet2_add_u32(packet2, 0); // Free + } + packet2_utils_vu_close_unpack(packet2); + packet2_utils_vu_add_start_program(packet2, 0); + } + packet2_utils_vu_add_end_tag(packet2); + dma_channel_wait(DMA_CHANNEL_VIF1, 0); + dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1); + packet2_reset(packet2, false); + } + } + if (switchCounter != 0) + { + packet2_utils_vu_open_unpack(packet2, VU1_PARAMS_ADDRESS, true); + { + packet2_add_u32(packet2, true); // Draw wait finish? + packet2_add_u32(packet2, lastVertCount); // Vertex count + packet2_add_u32(packet2, lastVertCount / 3); // Triangles count + packet2_add_u32(packet2, 0); // Free + } + packet2_utils_vu_close_unpack(packet2); + packet2_utils_vu_add_start_program(packet2, 0); + packet2_utils_vu_add_end_tag(packet2); + dma_channel_wait(DMA_CHANNEL_VIF1, 0); + dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1); + } + packet2_free(packet2); +} diff --git a/src/engine/vu1_progs/draw3D.vclpp b/src/engine/vu1_progs/draw3D.vclpp index f38fc42..f50a7be 100644 --- a/src/engine/vu1_progs/draw3D.vclpp +++ b/src/engine/vu1_progs/draw3D.vclpp @@ -39,19 +39,24 @@ --enter --endenter +;///////////// LOAD STATIC DATA ///////////// +lq gif_draw_finish_tag, 0(vi00) ; GIF tag - wait +lq gif_set_tag, 1(vi00) ; GIF tag - set +;//////////////////////////////////////////// + xtop double_buffer ;//////// LOAD CURRENT BUFFER DATA ////////// MatrixLoad{ matrix, 0, double_buffer } -ilw.z triangles_count, 4(double_buffer) ; Triangles count +ilw.x do_draw_finish, 4(double_buffer) ; Add draw finish tag? (sync) ilw.y vertex_count, 4(double_buffer) ; Vertex count -lq gif_set_tag, 5(double_buffer) ; GIF tag - set -lq tex_gif_tag_1, 6(double_buffer) ; GIF tag - texture LOD -lq tex_gif_tag_2, 7(double_buffer) ; GIF tag - texture buffer & CLUT -lq prim_tag, 8(double_buffer) ; GIF tag - tell GS how many data we will send -lq rgba, 9(double_buffer) ; Mesh RGBA +ilw.z triangles_count, 4(double_buffer) ; Triangles count +lq tex_gif_tag_1, 5(double_buffer) ; GIF tag - texture LOD +lq tex_gif_tag_2, 6(double_buffer) ; GIF tag - texture buffer & CLUT +lq prim_tag, 7(double_buffer) ; GIF tag - tell GS how many data we will send +lq rgba, 8(double_buffer) ; Mesh RGBA -iaddiu vertex_data, double_buffer, 10 ; pointer to vertex data +iaddiu vertex_data, double_buffer, 9 ; pointer to vertex data iadd stq_data, vertex_data, vertex_count ; pointer to stq iadd kick_address, stq_data, vertex_count ; pointer for XGKICK iadd dest_address, stq_data, vertex_count ; helper pointer for data inserting @@ -65,6 +70,10 @@ sqi gif_set_tag, (dest_address++) ; sqi tex_gif_tag_1, (dest_address++) ; texture LOD tag sqi gif_set_tag, (dest_address++) ; sqi tex_gif_tag_2, (dest_address++) ; texture buffer & CLUT tag +iblez do_draw_finish, kick +sqi gif_set_tag, (dest_address++) ; +sqi gif_draw_finish_tag, (dest_address++) ; do draw_finish is needed +kick: sqi prim_tag, (dest_address++) ; prim + tell gs how many data will be ;//////////////////////////////////////////// @@ -135,6 +144,7 @@ triangle_loop: --LoopCS 1,3 --barrier + xgkick kick_address ; dispatch to the GS rasterizer. --exit diff --git a/src/engine/vu1_progs/draw3D.vsm b/src/engine/vu1_progs/draw3D.vsm index f557b72..e312e7e 100644 --- a/src/engine/vu1_progs/draw3D.vsm +++ b/src/engine/vu1_progs/draw3D.vsm @@ -3,6 +3,10 @@ ;-----VCL CODE------------ ;------------------------- ;------------------------- +; === __LP__ EXPL_draw3D_vcl_triangle_loop__MAIN_LOOP: +; === hDown : optimal=30 clid=0 mlid=2 size=(31) +; === dUp : optimal=30 clid=0 mlid=2 size=(31) +; === another : optimal=30 clid=0 mlid=2 size=(31) ; ================================================= ; flowMon::Emit() vcl 1.4beta7 produced this code: .vu @@ -11,83 +15,171 @@ .global VU1Draw3D_CodeEnd VU1Draw3D_CodeStart: __v_draw3D_vcl_4: -; _LNOPT_w=[ normal2 ] 27 [27 0] 27 [__v_draw3D_vcl_4] - NOP xtop VI07 - NOP lq VF01,0(VI07) - NOP ilw.y VI05,4(VI07) - NOP lq VF05,5(VI07) - NOP lq VF09,6(VI07) - NOP lq VF08,7(VI07) - NOP lq VF07,8(VI07) - NOP lq VF02,1(VI07) - NOP iaddiu VI03,VI07,0x0000000a - NOP iadd VI04,VI03,VI05 - NOP lq VF03,2(VI07) - NOP iadd VI06,VI04,VI05 +; _LNOPT_w=[ normal2 ] 26 [26 0] 26 [__v_draw3D_vcl_4] + NOP xtop VI05 + NOP lq VF02,1(VI00) + NOP lq VF01,0(VI00) + NOP ilw.x VI01,4(VI05) + NOP ilw.y VI07,4(VI05) + NOP lq VF03,0(VI05) + NOP lq VF08,5(VI05) + NOP lq VF10,6(VI05) + NOP lq VF04,1(VI05) + NOP lq VF05,2(VI05) + NOP iaddiu VI03,VI05,0x00000009 + NOP iadd VI04,VI03,VI07 + NOP lq VF06,3(VI05) + NOP iadd VI06,VI04,VI07 NOP loi 0x44fff000 - NOP lq VF04,3(VI07) - NOP ilw.z VI02,4(VI07) - NOP sqi VF05,(VI06++) - NOP sqi VF09,(VI06++) - NOP sqi VF05,(VI06++) + NOP ilw.z VI02,4(VI05) + NOP lq VF07,7(VI05) + NOP sqi VF02,(VI06++) NOP sqi VF08,(VI06++) - NOP lq VF05,9(VI07) - NOP iaddiu VI07,VI00,0x00007fff - NOP iadd VI05,VI04,VI05 - addi.xy VF06,VF00,I loi 0x492aaaaa + NOP sqi VF02,(VI06++) + NOP lq VF08,8(VI05) + NOP iadd VI05,VI04,VI07 + addi.xy VF09,VF00,I loi 0x492aaaaa NOP fcset 0 + NOP iblez VI01,kick + addi.z VF09,VF00,I sqi VF10,(VI06++) +; _LNOPT_w=[ normal2 ] 2 [2 0] 2 [__v_draw3D_vcl_5] + NOP sqi VF02,(VI06++) + NOP sqi VF01,(VI06++) +kick: +; _LNOPT_w=[ normal2 ] 27 [27 0] 32 [kick] NOP sqi VF07,(VI06++) - NOP iaddiu VI07,VI07,0x00000001 - addi.z VF06,VF00,I iaddiu VI08,VI00,0 -triangle_loop: -; _LNOPT_w=[ normal ] 37 [31 30] 45 [triangle_loop] NOP lq VF07,0(VI03) - mulax ACC,VF01,VF07x iaddiu VI08,VI08,0x00000001 ; STALL_LATENCY ?3 - madday ACC,VF02,VF07y NOP - maddaz ACC,VF03,VF07z NOP - maddw VF10,VF04,VF07w lq VF08,2(VI03) - mulax ACC,VF01,VF08x div Q,VF00w,VF10w ; STALL_LATENCY ?3 - madday ACC,VF02,VF08y NOP - maddaz ACC,VF03,VF08z lq VF07,1(VI03) - maddw VF08,VF04,VF08w NOP - clipw.xyz VF10xyz,VF10w NOP - mulax ACC,VF01,VF07x NOP ; STALL_LATENCY ?1 - madday ACC,VF02,VF07y div Q,VF00w,VF08w - maddaz ACC,VF03,VF07z lq VF09,0(VI04) - maddw VF07,VF04,VF07w NOP - mulaw.xyz ACC,VF06,VF00w NOP - mulq.xyz VF10,VF10,Q NOP - mulq VF09,VF09,Q sq VF05,1(VI06) - clipw.xyz VF07xyz,VF07w lq VF11,2(VI04) - clipw.xyz VF08xyz,VF08w div Q,VF00w,VF07w - mulq.xyz VF08,VF08,Q sq VF05,4(VI06) - madd.xyz VF09,VF10,VF06 sq VF09,0(VI06) - mulq VF10,VF11,Q sq VF05,7(VI06) - mulaw.xyz ACC,VF06,VF00w mfir.w VF09,VI07 - madd.xyz VF08,VF08,VF06 fcand VI01,262143 - NOP iaddiu VI01,VI01,0x00007fff - mulq.xyz VF10,VF07,Q sq VF10,6(VI06) - ftoi4.xyz VF09,VF09 mfir.w VF07,VI01 - ftoi4.xyz VF07,VF08 lq VF11,1(VI04) - mulaw.xyz ACC,VF06,VF00w iaddiu VI03,VI03,0x00000003 - madd.xyz VF08,VF10,VF06 iaddiu VI04,VI04,0x00000003 - NOP sq VF09,2(VI06) - mulq VF09,VF11,Q sq VF07,8(VI06) - NOP mfir.w VF07,VI07 - ftoi4.xyz VF07,VF08 iaddiu VI06,VI06,0x00000009 - NOP sq VF09,-6(VI06) ; STALL_LATENCY ?1 - NOP ibne VI08,VI02,triangle_loop - NOP sq VF07,-4(VI06) -; _LNOPT_w=[ normal2 ] 3 [1 0] 3 [__v_draw3D_vcl_7] + mulax ACC,VF03,VF07x lq VF14,1(VI03) ; STALL_LATENCY ?3 + madday ACC,VF04,VF07y sq VF08,1(VI06) + maddaz ACC,VF05,VF07z sq VF08,7(VI06) + maddw VF11,VF06,VF07w NOP + mulax ACC,VF03,VF14x lq VF07,2(VI03) + madday ACC,VF04,VF14y NOP + maddaz ACC,VF05,VF14z NOP + maddw VF14,VF06,VF14w div Q,VF00w,VF11w + mulax ACC,VF03,VF07x NOP + madday ACC,VF04,VF07y iaddiu VI07,VI00,0x00007fff + maddaz ACC,VF05,VF07z iaddiu VI07,VI07,0x00000001 + maddw VF07,VF06,VF07w iaddiu VI08,VI00,0 + clipw.xyz VF11xyz,VF11w iaddiu VI04,VI04,0 + clipw.xyz VF14xyz,VF14w div Q,VF00w,VF14w ; STALL_THRUPUT ?1 + clipw.xyz VF07xyz,VF07w lq VF15,0(VI04) + mulq.xyz VF02,VF11,Q sq VF08,4(VI06) + mulaw.xyz ACC,VF09,VF00w iaddiu VI03,VI03,0 + mulq VF11,VF15,Q iaddiu VI06,VI06,0 ; STALL_LATENCY ?1 + madd.xyz VF01,VF02,VF09 lq VF02,1(VI04) + NOP div Q,VF00w,VF07w + mulq.xyz VF15,VF14,Q iaddiu VI08,VI08,0x00000001 + mulaw.xyz ACC,VF09,VF00w sq VF11,0(VI06) + mulq VF14,VF02,Q mfir.w VF11,VI07 + ftoi4.xyz VF11,VF01 ibeq VI08,VI02,EXPL_draw3D_vcl_triangle_loop__EPI1 + madd.xyz VF02,VF15,VF09 lq VF15,2(VI04) +; _LNOPT_w=[ ] 31 [29 0] 31 [EXPL_draw3D_vcl_triangle_loop__PRO1] + NOP lq VF12,3(VI03) + NOP NOP + mulq.xyz VF01,VF07,Q NOP + mulq VF11,VF15,Q sq VF11,2(VI06) + mulax ACC,VF03,VF12x lq VF10,4(VI03) + madday ACC,VF04,VF12y NOP + maddaz ACC,VF05,VF12z NOP + maddw VF11,VF06,VF12w sq VF11,6(VI06) + mulax ACC,VF03,VF10x lq VF07,5(VI03) + madday ACC,VF04,VF10y sq VF14,3(VI06) + maddaz ACC,VF05,VF10z sq VF08,10(VI06) + maddw VF10,VF06,VF10w div Q,VF00w,VF11w + mulax ACC,VF03,VF07x sq VF08,13(VI06) + madday ACC,VF04,VF07y sq VF08,16(VI06) + maddaz ACC,VF05,VF07z iaddiu VI03,VI03,0x00000006 + maddw VF07,VF06,VF07w iaddiu VI04,VI04,0x00000006 + clipw.xyz VF11xyz,VF11w lq VF12,-3(VI04) + clipw.xyz VF10xyz,VF10w iaddiu VI06,VI06,0x00000012 + mulq.xyz VF14,VF11,Q div Q,VF00w,VF10w + clipw.xyz VF07xyz,VF07w fcand VI01,262143 + mulq VF12,VF12,Q iaddiu VI08,VI08,0x00000001 + ftoi4.xyz VF11,VF02 iaddiu VI01,VI01,0x00007fff + mulaw.xyz ACC,VF09,VF00w mfir.w VF11,VI07 + madd.xyz VF14,VF14,VF09 mfir.w VF10,VI01 + mulaw.xyz ACC,VF09,VF00w lq VF02,-2(VI04) + madd.xyz VF01,VF01,VF09 div Q,VF00w,VF07w + mulq.xyz VF10,VF10,Q lq VF15,-1(VI04) + ftoi4.xyz VF11,VF14 sq VF11,-13(VI06) + mulq VF14,VF02,Q sq VF12,-9(VI06) + mulaw.xyz ACC,VF09,VF00w ibeq VI08,VI02,EXPL_draw3D_vcl_triangle_loop__EPI0 + madd.xyz VF02,VF10,VF09 mfir.w VF11,VI07 +EXPL_draw3D_vcl_triangle_loop__MAIN_LOOP: +; _LPOPT_w=[ hDown ] 31 [30 30] 31 [EXPL_draw3D_vcl_triangle_loop__MAIN_LOOP] + ftoi4.xyz VF10,VF01 lq VF13,0(VI03) + NOP lq VF12,1(VI03) + mulq.xyz VF01,VF07,Q sq VF14,-6(VI06) + mulq VF11,VF15,Q sq VF11,-7(VI06) + mulax ACC,VF03,VF13x sq VF10,-10(VI06) + madday ACC,VF04,VF13y sq VF08,1(VI06) + maddaz ACC,VF05,VF13z NOP + maddw VF11,VF06,VF13w sq VF11,-3(VI06) + mulax ACC,VF03,VF12x lq VF07,2(VI03) + madday ACC,VF04,VF12y sq VF08,4(VI06) + maddaz ACC,VF05,VF12z sq VF08,7(VI06) + maddw VF10,VF06,VF12w div Q,VF00w,VF11w + mulax ACC,VF03,VF07x NOP + madday ACC,VF04,VF07y iaddiu VI03,VI03,0x00000003 + maddaz ACC,VF05,VF07z NOP + maddw VF07,VF06,VF07w iaddiu VI04,VI04,0x00000003 + clipw.xyz VF11xyz,VF11w lq VF12,-3(VI04) + clipw.xyz VF10xyz,VF10w iaddiu VI06,VI06,0x00000009 + mulq.xyz VF13,VF11,Q fcand VI01,262143 + clipw.xyz VF07xyz,VF07w div Q,VF00w,VF10w + mulq VF12,VF12,Q iaddiu VI08,VI08,0x00000001 + ftoi4.xyz VF11,VF02 iaddiu VI01,VI01,0x00007fff + mulaw.xyz ACC,VF09,VF00w mfir.w VF10,VI01 + madd.xyz VF13,VF13,VF09 mfir.w VF11,VI07 + mulaw.xyz ACC,VF09,VF00w lq VF02,-2(VI04) + madd.xyz VF01,VF01,VF09 sq VF12,-9(VI06) + mulq.xyz VF10,VF10,Q div Q,VF00w,VF07w + ftoi4.xyz VF11,VF13 sq VF11,-13(VI06) + mulq VF14,VF02,Q mfir.w VF11,VI07 + mulaw.xyz ACC,VF09,VF00w ibne VI08,VI02,EXPL_draw3D_vcl_triangle_loop__MAIN_LOOP + madd.xyz VF02,VF10,VF09 lq VF15,-1(VI04) +EXPL_draw3D_vcl_triangle_loop__EPI0: +; _LNOPT_w=[ ] 13 [13 0] 15 [EXPL_draw3D_vcl_triangle_loop__EPI0] + NOP NOP + ftoi4.xyz VF10,VF01 fcand VI01,262143 + mulq.xyz VF01,VF07,Q sq VF14,-6(VI06) + mulq VF11,VF15,Q sq VF11,-7(VI06) + mulaw.xyz ACC,VF09,VF00w iaddiu VI01,VI01,0x00007fff + madd.xyz VF01,VF01,VF09 sq VF10,-10(VI06) ; STALL_LATENCY ?1 + ftoi4.xyz VF11,VF02 sq VF11,-3(VI06) + NOP mfir.w VF11,VI07 + NOP mfir.w VF10,VI01 + ftoi4.xyz VF10,VF01 NOP + NOP sq VF11,-4(VI06) ; STALL_LATENCY ?1 + NOP b EXPL_draw3D_vcl_triangle_loop__EXIT_POINT + NOP sq VF10,-1(VI06) +EXPL_draw3D_vcl_triangle_loop__EPI1: +; _LNOPT_w=[ ] 12 [13 0] 14 [EXPL_draw3D_vcl_triangle_loop__EPI1] + NOP NOP + mulq.xyz VF14,VF07,Q sq VF14,3(VI06) + NOP NOP + mulq VF11,VF15,Q sq VF11,2(VI06) + mulaw.xyz ACC,VF09,VF00w fcand VI01,262143 + madd.xyz VF14,VF14,VF09 iaddiu VI01,VI01,0x00007fff + NOP mfir.w VF14,VI01 + ftoi4.xyz VF11,VF02 sq VF11,6(VI06) + NOP mfir.w VF11,VI07 + ftoi4.xyz VF14,VF14 NOP + NOP sq VF11,5(VI06) ; STALL_LATENCY ?2 + NOP sq VF14,8(VI06) +EXPL_draw3D_vcl_triangle_loop__EXIT_POINT: +; _LNOPT_w=[ ] 0 [0 0] 0 [EXPL_draw3D_vcl_triangle_loop__EXIT_POINT] +; _LNOPT_w=[ normal2 ] 3 [1 0] 3 [__v_draw3D_vcl_9] NOP xgkick VI05 NOP[E] NOP NOP NOP .align 4 VU1Draw3D_CodeEnd: -; iCount=67 +; iCount=145 ; register stats: ; 9 VU User integer -; 12 VU User floating point +; 16 VU User floating point ;------------------------- ;------------------------- ;------------------------- From 91772a905c6ae0c3f187146050635ab614e1ab30 Mon Sep 17 00:00:00 2001 From: h4570 Date: Sat, 26 Dec 2020 13:31:30 +0100 Subject: [PATCH 43/56] cleanup --- src/samples/floors/objects/enemy.cpp | 30 ++++++++++------------------ src/samples/floors/objects/enemy.hpp | 4 +++- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/samples/floors/objects/enemy.cpp b/src/samples/floors/objects/enemy.cpp index b7a46a8..57bf4b9 100644 --- a/src/samples/floors/objects/enemy.cpp +++ b/src/samples/floors/objects/enemy.cpp @@ -26,33 +26,25 @@ Enemy::Enemy(TextureRepository *t_texRepo) PRINT_LOG("Creating enemy object"); meshes = new Mesh[getMeshesCount()]; + drawMeshes = new Mesh *[getMeshesCount()]; meshes[0].loadMD2("meshes/enemy/", "poss_head", 0.3F, false); - meshes[0].rotation.x = -1.566F; - meshes[0].rotation.z = 1.566F; - meshes[0].shouldBeFrustumCulled = false; - meshes[1].loadMD2("meshes/enemy/", "poss_body", 0.3F, false); - meshes[1].rotation.x = -1.566F; - meshes[1].rotation.z = 1.566F; - meshes[1].shouldBeFrustumCulled = false; - meshes[2].loadMD2("meshes/enemy/", "poss_weapon", 0.3F, false); - meshes[2].rotation.x = -1.566F; - meshes[2].rotation.z = 1.566F; - meshes[2].shouldBeFrustumCulled = false; + + for (u8 i = 0; i < 3; i++) + { + meshes[i].rotation.x = -1.566F; + meshes[i].rotation.z = 1.566F; + meshes[i].shouldBeFrustumCulled = false; + t_texRepo->addByMesh("meshes/enemy/", meshes[i], PNG); + meshes[i].playAnimation(1, 6); + drawMeshes[i] = &meshes[i]; + } Vector3 initPos = Vector3(0.00F, 40.00F, 0.00F); setPosition(initPos); - t_texRepo->addByMesh("meshes/enemy/", meshes[0], PNG); - t_texRepo->addByMesh("meshes/enemy/", meshes[1], PNG); - t_texRepo->addByMesh("meshes/enemy/", meshes[2], PNG); - - meshes[0].playAnimation(1, 6); - meshes[1].playAnimation(1, 6); - meshes[2].playAnimation(1, 6); - isKilled = true; PRINT_LOG("Enemy object created!"); diff --git a/src/samples/floors/objects/enemy.hpp b/src/samples/floors/objects/enemy.hpp index 601a4e9..4ed530a 100644 --- a/src/samples/floors/objects/enemy.hpp +++ b/src/samples/floors/objects/enemy.hpp @@ -24,7 +24,7 @@ public: Enemy(TextureRepository *t_texRepo); ~Enemy(); - inline Mesh *getMeshes() const { return meshes; } + inline Mesh **getMeshes() const { return drawMeshes; } inline u8 getMeshesCount() const { return 3; } inline Vector3 getPosition() const { return position; } void setPosition(const Vector3 &t_vec); @@ -35,6 +35,8 @@ public: private: /** 0 - head, 1 - body, 2 - weapon */ Mesh *meshes; + /** Only for draw() method. */ + Mesh **drawMeshes; const Floor *currentFloor; Vector3 position, currFloorMin, currFloorMax; u8 isKilled; From 7f9f86d7c37ad3fb7bc9e7c76b7ae28e9e28b6aa Mon Sep 17 00:00:00 2001 From: h4570 Date: Sat, 26 Dec 2020 13:31:43 +0100 Subject: [PATCH 44/56] added draw() in array mode --- src/samples/floors/floors.cpp | 9 +++++++-- src/samples/floors/managers/floor_manager.cpp | 4 ++++ src/samples/floors/managers/floor_manager.hpp | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp index 10e9872..82e5766 100644 --- a/src/samples/floors/floors.cpp +++ b/src/samples/floors/floors.cpp @@ -60,8 +60,13 @@ void Floors::onUpdate() player->update(engine->pad, camera, *floorManager, *enemy); engine->renderer->draw(player->mesh); engine->renderer->draw(enemy->getMeshes(), enemy->getMeshesCount()); - for (u16 i = 0; i < FLOORS_COUNT; i++) - engine->renderer->draw(floorManager->floors[i].mesh, lightManager.bulbs, lightManager.bulbsCount); + + // You can draw array of meshes in draw() function also. It can be A LOT faster than for looping! + // Why? When given mesh is small, is not animated and is not backface culled, vertex data are send once! + engine->renderer->draw(floorManager->getMeshes(), FLOORS_COUNT, lightManager.bulbs, lightManager.bulbsCount); + // draw() in array mode, sometimes will force you to do synchronization between EE <-> VU1 <-> GS via: + // renderer->clearAndWaitForRender(); or renderer->waitForRender(); + ui->render(engine->renderer); // 2D rendering ist LAST step, because layers gonna play there. } diff --git a/src/samples/floors/managers/floor_manager.cpp b/src/samples/floors/managers/floor_manager.cpp index e1b1d09..24a6b40 100644 --- a/src/samples/floors/managers/floor_manager.cpp +++ b/src/samples/floors/managers/floor_manager.cpp @@ -22,6 +22,7 @@ */ FloorManager::FloorManager(int t_floorAmount, TextureRepository *t_texRepo) { + meshes = new Mesh *[t_floorAmount]; texRepo = t_texRepo; floorAmount = t_floorAmount; spirals = new Point[t_floorAmount]; @@ -85,12 +86,15 @@ void FloorManager::initFloors() floors[0].mesh.loadObj("meshes/floor/", "floor", 3.0F, false); floors[0].mesh.shouldBeFrustumCulled = true; floors[0].mesh.shouldBeLighted = true; + meshes[0] = &floors[0].mesh; texRepo->addByMesh("meshes/floor/", floors[0].mesh, BMP); for (u16 i = 1; i < floorAmount; i++) { + floors[i].mesh.shouldBeFrustumCulled = true; floors[i].init(floors[0].mesh, spirals[i], i); texRepo->getByMesh(floors[0].mesh.getId(), floors[0].mesh.getMaterial(0).getId()) ->addLink(floors[i].mesh.getId(), floors[i].mesh.getMaterial(0).getId()); + meshes[i] = &floors[i].mesh; } PRINT_LOG("Floors initialized!"); } diff --git a/src/samples/floors/managers/floor_manager.hpp b/src/samples/floors/managers/floor_manager.hpp index 61a64b7..342aefd 100644 --- a/src/samples/floors/managers/floor_manager.hpp +++ b/src/samples/floors/managers/floor_manager.hpp @@ -31,8 +31,10 @@ public: u16 floorAmount; void update(Player &t_player); void onAudioTick(); + Mesh **getMeshes() { return meshes; } private: + Mesh **meshes; TextureRepository *texRepo; u8 audioOffset, audioMode; u32 audioTick; From d0c2dfcaa3f74aeefc26ed568e878a4eb5dde76a Mon Sep 17 00:00:00 2001 From: h4570 Date: Sat, 26 Dec 2020 17:29:07 +0100 Subject: [PATCH 45/56] disabled file service --- src/engine/engine.cpp | 5 +- src/engine/include/engine.hpp | 2 +- src/engine/include/modules/audio.hpp | 2 +- src/engine/loaders/png_loader.cpp | 99 ++++++---------------------- src/engine/modules/audio.cpp | 17 ++--- src/samples/floors/floors.cpp | 6 +- 6 files changed, 38 insertions(+), 93 deletions(-) diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index e9ce377..65a111e 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -77,8 +77,9 @@ void Engine::firePS2() { SifInitRpc(0); srand(time(NULL)); - fileService.startThread(); - audio.startThread(&fileService); + // fileService.startThread(); + // audio.startThread(&fileService); + audio.startThread(NULL); isInitialized = 0; mainThreadId = GetThreadId(); } diff --git a/src/engine/include/engine.hpp b/src/engine/include/engine.hpp index 5f10f65..17be5a8 100644 --- a/src/engine/include/engine.hpp +++ b/src/engine/include/engine.hpp @@ -32,7 +32,7 @@ public: void init(Game *t_game, u32 t_gifPacketSize); void setDefaultScreen(); Renderer *renderer; - FileService fileService; + // FileService fileService; Audio audio; ScreenSettings screen; Pad pad; diff --git a/src/engine/include/modules/audio.hpp b/src/engine/include/modules/audio.hpp index ea1dfe2..be2709a 100644 --- a/src/engine/include/modules/audio.hpp +++ b/src/engine/include/modules/audio.hpp @@ -126,7 +126,7 @@ public: private: u8 songLoaded, volume, realVolume, songPlaying, songInLoop, songFinished; - std::vector songListeners; + std::vector songListeners; FILE *wav; audsrv_fmt_t format; FileService *fileService; diff --git a/src/engine/loaders/png_loader.cpp b/src/engine/loaders/png_loader.cpp index bc46b9f..402800c 100644 --- a/src/engine/loaders/png_loader.cpp +++ b/src/engine/loaders/png_loader.cpp @@ -38,13 +38,11 @@ void PngLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char * char *path = String::createConcatenated(path_part2, t_extension); delete[] path_part1; delete[] path_part2; + FILE *file = fopen(path, "rb"); if (file == NULL) - { - PRINT_ERR("Failed to load .png file!"); - return; - } + PRINT_ERR("Failed to open .png file!"); png_structp png_ptr; png_infop info_ptr; @@ -56,29 +54,15 @@ void PngLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char * png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, NULL, NULL); if (!png_ptr) - { - printf("PNG Read Struct Init Failed\n"); - fclose(file); - return; - } + PRINT_ERR("PNG struct info init failed(1)!"); info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) - { - printf("PNG Info Struct Init Failed\n"); - fclose(file); - png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); - return; - } + PRINT_ERR("PNG struct info init failed(2)!"); if (setjmp(png_jmpbuf(png_ptr))) - { - printf("Got PNG Error!\n"); - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - fclose(file); - return; - } + PRINT_ERR("PNG reader fatal error!"); png_init_io(png_ptr, file); @@ -114,80 +98,39 @@ void PngLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char * type = TEX_TYPE_RGB; break; default: - PRINT_ERR("This png format is not supported!"); + PRINT_ERR("This png format is not supported! RGB/RGBA only."); } o_texture.setSize(width, height, type); printf("PNGLoader - width: %d | height: %d\n", width, height); - if (type == TEX_TYPE_RGBA) - { - int row_bytes = png_get_rowbytes(png_ptr, info_ptr); - png_byte *row_pointers[height]; + size_t row_bytes = png_get_rowbytes(png_ptr, info_ptr); + png_byte *row_pointers[height]; + for (row = 0; row < height; row++) + row_pointers[row] = new png_byte[row_bytes]; - for (row = 0; row < height; row++) - row_pointers[row] = new png_byte[row_bytes]; + png_read_image(png_ptr, row_pointers); - png_read_image(png_ptr, row_pointers); + u32 x = 0; - struct pixel + for (i = 0; i < height; i++) + for (j = 0; j < width; j++) { - u8 r, g, b, a; - }; - - u32 x = 0; - for (i = 0; i < height; i++) - { - for (j = 0; j < width; j++) + o_texture.setData(x, row_pointers[i][4 * j]); + o_texture.setData(x + 1, row_pointers[i][4 * j + 1]); + o_texture.setData(x + 2, row_pointers[i][4 * j + 2]); + if (type == TEX_TYPE_RGBA) { - o_texture.setData(x, row_pointers[i][4 * j]); - o_texture.setData(x + 1, row_pointers[i][4 * j + 1]); - o_texture.setData(x + 2, row_pointers[i][4 * j + 2]); o_texture.setData(x + 3, ((int)row_pointers[i][4 * j + 3] * 128 / 255)); x += 4; } - } - - for (row = 0; row < height; row++) - delete row_pointers[row]; - } - else if (type == TEX_TYPE_RGB) - { - int row_bytes = png_get_rowbytes(png_ptr, info_ptr); - png_byte *row_pointers[height]; - - for (row = 0; row < height; row++) - row_pointers[row] = new png_byte[row_bytes]; - - png_read_image(png_ptr, row_pointers); - - struct pixel3 - { - u8 r, g, b; - }; - - u32 x = 0; - for (i = 0; i < height; i++) - { - for (j = 0; j < width; j++) - { - o_texture.setData(x, row_pointers[i][4 * j]); - o_texture.setData(x + 1, row_pointers[i][4 * j + 1]); - o_texture.setData(x + 2, row_pointers[i][4 * j + 2]); + else if (type == TEX_TYPE_RGB) x += 3; - } } - for (row = 0; row < height; row++) - delete row_pointers[row]; - } - else - { - printf("This texture depth is not supported yet!\n"); - return; - } + for (row = 0; row < height; row++) + delete[] row_pointers[row]; - // Texture->Filter = GS_FILTER_NEAREST; png_read_end(png_ptr, NULL); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); diff --git a/src/engine/modules/audio.cpp b/src/engine/modules/audio.cpp index 2d7e836..369413c 100644 --- a/src/engine/modules/audio.cpp +++ b/src/engine/modules/audio.cpp @@ -89,24 +89,25 @@ void Audio::setSongVolume(const u8 &t_vol) u32 Audio::addSongListener(AudioListener *t_listener) { - AudioListenerRef ref; - ref.id = rand() % 1000000; - ref.listener = t_listener; + AudioListenerRef *ref = new AudioListenerRef; + ref->id = rand() % 1000000; + ref->listener = t_listener; songListeners.push_back(ref); - return ref.id; + return ref->id; } void Audio::removeSongListener(const u32 &t_id) { s32 index = -1; for (u32 i = 0; i < songListeners.size(); i++) - if (songListeners[i].id == t_id) + if (songListeners[i]->id == t_id) { index = i; break; } if (index == -1) PRINT_ERR("Cant remove listener because given id was not found!"); + delete songListeners[index]; songListeners.erase(songListeners.begin() + index); } @@ -160,7 +161,7 @@ void Audio::playADPCM(audsrv_adpcm_t *t_adpcm, const s8 &t_ch) void Audio::startThread(FileService *t_fileService) { PRINT_LOG("Creating audio thread"); - fileService = t_fileService; + // fileService = t_fileService; extern void *_gp; thread.func = (void *)Audio::mainThread; thread.stack = threadStack; @@ -186,7 +187,7 @@ void Audio::threadLoop() { printf("Running again.\n"); for (u32 i = 0; i < getSongListenersCount(); i++) - songListeners[i].listener->onAudioFinish(); + songListeners[i]->listener->onAudioFinish(); rewindSongToStart(); } else @@ -202,7 +203,7 @@ void Audio::threadLoop() WaitSema(fillbufferSema); // wait until previous chunk wasn't finished audsrv_play_audio(wavChunk, chunkReadStatus); for (u32 i = 0; i < getSongListenersCount(); i++) - songListeners[i].listener->onAudioTick(); + songListeners[i]->listener->onAudioTick(); } chunkReadStatus = fread(wavChunk, 1, sizeof(wavChunk), wav); diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp index 82e5766..d83aaee 100644 --- a/src/samples/floors/floors.cpp +++ b/src/samples/floors/floors.cpp @@ -37,15 +37,15 @@ Floors::~Floors() void Floors::onInit() { + texRepo = engine->renderer->getTextureRepository(); setBgColorAndAmbientColor(); engine->renderer->setCameraDefinitions(&camera.view, &camera.unitCirclePosition, camera.planes); + enemy = new Enemy(texRepo); // I know that here is bug with PNG loading + ui = new Ui(texRepo); // Will be resolved in December version engine->audio.addSongListener(this); engine->audio.loadSong("sounds/mafikizolo-loot.wav"); engine->audio.playSong(); engine->audio.setSongVolume(80); - texRepo = engine->renderer->getTextureRepository(); - enemy = new Enemy(texRepo); - ui = new Ui(texRepo); floorManager = new FloorManager(FLOORS_COUNT, texRepo); player = new Player(&engine->audio, texRepo); } From e987089df0ed074e7a2e3a7a0a188c9c1b1d66ad Mon Sep 17 00:00:00 2001 From: h4570 Date: Sun, 27 Dec 2020 13:39:44 +0100 Subject: [PATCH 46/56] fixed floors bug --- src/samples/floors/floors.cpp | 10 +++++----- src/samples/floors/managers/floor_manager.cpp | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp index d83aaee..15e8346 100644 --- a/src/samples/floors/floors.cpp +++ b/src/samples/floors/floors.cpp @@ -38,16 +38,16 @@ Floors::~Floors() void Floors::onInit() { texRepo = engine->renderer->getTextureRepository(); + enemy = new Enemy(texRepo); + ui = new Ui(texRepo); + floorManager = new FloorManager(FLOORS_COUNT, texRepo); // we must init FloorManager before starting audio! + player = new Player(&engine->audio, texRepo); setBgColorAndAmbientColor(); engine->renderer->setCameraDefinitions(&camera.view, &camera.unitCirclePosition, camera.planes); - enemy = new Enemy(texRepo); // I know that here is bug with PNG loading - ui = new Ui(texRepo); // Will be resolved in December version engine->audio.addSongListener(this); engine->audio.loadSong("sounds/mafikizolo-loot.wav"); engine->audio.playSong(); - engine->audio.setSongVolume(80); - floorManager = new FloorManager(FLOORS_COUNT, texRepo); - player = new Player(&engine->audio, texRepo); + engine->audio.setSongVolume(1); } void Floors::onUpdate() diff --git a/src/samples/floors/managers/floor_manager.cpp b/src/samples/floors/managers/floor_manager.cpp index 24a6b40..2662527 100644 --- a/src/samples/floors/managers/floor_manager.cpp +++ b/src/samples/floors/managers/floor_manager.cpp @@ -30,10 +30,9 @@ FloorManager::FloorManager(int t_floorAmount, TextureRepository *t_texRepo) calcSpiral(floorSpiralMaxOffset, floorSpiralMaxOffset); initFloors(); trick = 0.0F; - trickMode = 0; isTimeForChangeTriggerColor = true; isTimeForChangeDefaultColor = true; - audioOffset = audioMode = audioTick = 0; + audioOffset = audioMode = audioTick = trickMode = 0; } FloorManager::~FloorManager() From c7fe915174a7ddd9a9aad72be2c0dea64245cf07 Mon Sep 17 00:00:00 2001 From: h4570 Date: Sun, 27 Dec 2020 13:41:32 +0100 Subject: [PATCH 47/56] fixed volume --- src/samples/floors/floors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp index 15e8346..e1d7179 100644 --- a/src/samples/floors/floors.cpp +++ b/src/samples/floors/floors.cpp @@ -47,7 +47,7 @@ void Floors::onInit() engine->audio.addSongListener(this); engine->audio.loadSong("sounds/mafikizolo-loot.wav"); engine->audio.playSong(); - engine->audio.setSongVolume(1); + engine->audio.setSongVolume(80); } void Floors::onUpdate() From 1d7730504bc01e2c38d35e48f7eb0e4cd4a034d5 Mon Sep 17 00:00:00 2001 From: h4570 Date: Sun, 27 Dec 2020 19:09:50 +0100 Subject: [PATCH 48/56] fixed sync between processors --- src/engine/include/modules/renderer.hpp | 22 ++++++-- src/engine/modules/renderer.cpp | 5 ++ src/engine/modules/vif_sender.cpp | 72 +++++++++++++++---------- src/samples/floors/floors.cpp | 2 - 4 files changed, 66 insertions(+), 35 deletions(-) diff --git a/src/engine/include/modules/renderer.hpp b/src/engine/include/modules/renderer.hpp index 913770d..f86d07b 100644 --- a/src/engine/include/modules/renderer.hpp +++ b/src/engine/include/modules/renderer.hpp @@ -40,12 +40,26 @@ public: void enableVSync() { isVSyncEnabled = true; } void disableVSync() { isVSyncEnabled = false; } - void clearAndWaitForRender() + + /** Reset draw wait flag. */ + inline void resetWaitFlag() { - *GS_REG_CSR |= 2; // Reset wait flag - draw_wait_finish(); + *GS_REG_CSR |= 2; + } + + /** Checks if draw wait flag is set */ + inline u8 isWaitFlagSet() const + { + return *GS_REG_CSR & 2; + } + + /** Waits for draw wait flag and reset it. */ + inline void waitForRender() + { + while (!isWaitFlagSet()) + ; + resetWaitFlag(); } - void waitForRender() { draw_wait_finish(); } /** 2D draw. */ void draw(Sprite &t_sprite); diff --git a/src/engine/modules/renderer.cpp b/src/engine/modules/renderer.cpp index 35961b3..b76c8be 100644 --- a/src/engine/modules/renderer.cpp +++ b/src/engine/modules/renderer.cpp @@ -287,7 +287,12 @@ void Renderer::draw(Mesh **t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bul draw(*meshesInFrustum[0], t_bulbs, t_bulbsCount); draw(*meshesInFrustum[1], t_bulbs, t_bulbsCount); vifSender->enableWait(); + resetWaitFlag(); vifSender->drawTheSameWithOtherMatrices(renderData, meshesInFrustum, 2, addedMeshes); + if (isWaitFlagSet()) + resetWaitFlag(); + else + waitForRender(); delete[] meshesInFrustum; } else diff --git a/src/engine/modules/vif_sender.cpp b/src/engine/modules/vif_sender.cpp index a72c50a..2215685 100644 --- a/src/engine/modules/vif_sender.cpp +++ b/src/engine/modules/vif_sender.cpp @@ -157,7 +157,10 @@ void VifSender::drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_ver void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mesh **t_meshes, const u32 &t_skip, const u32 &t_count) { + packet2_t *packet1 = packet2_create(300, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); packet2_t *packet2 = packet2_create(300, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); + packet2_t *currMPacket = packet1; + u8 currPacketIndex = 1; u8 switchCounter = 0; u32 i; for (i = t_skip; i < t_count; i++) @@ -171,57 +174,68 @@ void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mes modelViewProj = *t_renderData.view * modelViewProj; modelViewProj = *t_renderData.projection * modelViewProj; - packet2_utils_vu_open_unpack(packet2, 0, true); + packet2_utils_vu_open_unpack(currMPacket, 0, true); { - packet2_add_data(packet2, modelViewProj.data, 4); + packet2_add_data(currMPacket, modelViewProj.data, 4); } - packet2_utils_vu_close_unpack(packet2); - packet2_utils_vu_open_unpack(packet2, VU1_RGBA_ADDRESS, true); + packet2_utils_vu_close_unpack(currMPacket); + packet2_utils_vu_open_unpack(currMPacket, VU1_RGBA_ADDRESS, true); { - packet2_add_u32(packet2, t_meshes[i]->color.r); - packet2_add_u32(packet2, t_meshes[i]->color.g); - packet2_add_u32(packet2, t_meshes[i]->color.b); - packet2_add_u32(packet2, t_meshes[i]->color.a); + packet2_add_u32(currMPacket, t_meshes[i]->color.r); + packet2_add_u32(currMPacket, t_meshes[i]->color.g); + packet2_add_u32(currMPacket, t_meshes[i]->color.b); + packet2_add_u32(currMPacket, t_meshes[i]->color.a); } - packet2_utils_vu_close_unpack(packet2); + packet2_utils_vu_close_unpack(currMPacket); if (i != t_count - 1) - packet2_utils_vu_add_start_program(packet2, 0); + packet2_utils_vu_add_start_program(currMPacket, 0); if (switchCounter++ >= 32) { switchCounter = 0; if (i == t_count - 1) // is last { - packet2_utils_vu_open_unpack(packet2, VU1_PARAMS_ADDRESS, true); + packet2_utils_vu_open_unpack(currMPacket, VU1_PARAMS_ADDRESS, true); { - packet2_add_u32(packet2, true); // Draw wait finish? - packet2_add_u32(packet2, lastVertCount); // Vertex count - packet2_add_u32(packet2, lastVertCount / 3); // Triangles count - packet2_add_u32(packet2, 0); // Free + packet2_add_u32(currMPacket, true); // Draw wait finish? + packet2_add_u32(currMPacket, lastVertCount); // Vertex count + packet2_add_u32(currMPacket, lastVertCount / 3); // Triangles count + packet2_add_u32(currMPacket, 0); // Free } - packet2_utils_vu_close_unpack(packet2); - packet2_utils_vu_add_start_program(packet2, 0); + packet2_utils_vu_close_unpack(currMPacket); + packet2_utils_vu_add_start_program(currMPacket, 0); } - packet2_utils_vu_add_end_tag(packet2); + packet2_utils_vu_add_end_tag(currMPacket); dma_channel_wait(DMA_CHANNEL_VIF1, 0); - dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1); - packet2_reset(packet2, false); + dma_channel_send_packet2(currMPacket, DMA_CHANNEL_VIF1, 1); + if (currPacketIndex == 1) + { + currPacketIndex = 2; + currMPacket = packet2; + } + else + { + currPacketIndex = 1; + currMPacket = packet1; + } + packet2_reset(currMPacket, false); } } if (switchCounter != 0) { - packet2_utils_vu_open_unpack(packet2, VU1_PARAMS_ADDRESS, true); + packet2_utils_vu_open_unpack(currMPacket, VU1_PARAMS_ADDRESS, true); { - packet2_add_u32(packet2, true); // Draw wait finish? - packet2_add_u32(packet2, lastVertCount); // Vertex count - packet2_add_u32(packet2, lastVertCount / 3); // Triangles count - packet2_add_u32(packet2, 0); // Free + packet2_add_u32(currMPacket, true); // Draw wait finish? + packet2_add_u32(currMPacket, lastVertCount); // Vertex count + packet2_add_u32(currMPacket, lastVertCount / 3); // Triangles count + packet2_add_u32(currMPacket, 0); // Free } - packet2_utils_vu_close_unpack(packet2); - packet2_utils_vu_add_start_program(packet2, 0); - packet2_utils_vu_add_end_tag(packet2); + packet2_utils_vu_close_unpack(currMPacket); + packet2_utils_vu_add_start_program(currMPacket, 0); + packet2_utils_vu_add_end_tag(currMPacket); dma_channel_wait(DMA_CHANNEL_VIF1, 0); - dma_channel_send_packet2(packet2, DMA_CHANNEL_VIF1, 1); + dma_channel_send_packet2(currMPacket, DMA_CHANNEL_VIF1, 1); } + packet2_free(packet1); packet2_free(packet2); } diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp index e1d7179..330c68a 100644 --- a/src/samples/floors/floors.cpp +++ b/src/samples/floors/floors.cpp @@ -64,8 +64,6 @@ void Floors::onUpdate() // You can draw array of meshes in draw() function also. It can be A LOT faster than for looping! // Why? When given mesh is small, is not animated and is not backface culled, vertex data are send once! engine->renderer->draw(floorManager->getMeshes(), FLOORS_COUNT, lightManager.bulbs, lightManager.bulbsCount); - // draw() in array mode, sometimes will force you to do synchronization between EE <-> VU1 <-> GS via: - // renderer->clearAndWaitForRender(); or renderer->waitForRender(); ui->render(engine->renderer); // 2D rendering ist LAST step, because layers gonna play there. } From 55f476e9ed4a1e1067f98105cec50038997de971 Mon Sep 17 00:00:00 2001 From: h4570 Date: Sun, 27 Dec 2020 19:10:14 +0100 Subject: [PATCH 49/56] fixed sync between draw many --- src/engine/modules/vif_sender.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/engine/modules/vif_sender.cpp b/src/engine/modules/vif_sender.cpp index 2215685..394c653 100644 --- a/src/engine/modules/vif_sender.cpp +++ b/src/engine/modules/vif_sender.cpp @@ -157,13 +157,15 @@ void VifSender::drawVertices(Mesh &t_mesh, u32 t_start, u32 t_end, VECTOR *t_ver void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mesh **t_meshes, const u32 &t_skip, const u32 &t_count) { + // Standard double buffering (packets) packet2_t *packet1 = packet2_create(300, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); packet2_t *packet2 = packet2_create(300, P2_TYPE_NORMAL, P2_MODE_CHAIN, true); packet2_t *currMPacket = packet1; u8 currPacketIndex = 1; + + // We are sending 32 matrices max per one VU1 send u8 switchCounter = 0; - u32 i; - for (i = t_skip; i < t_count; i++) + for (u32 i = t_skip; i < t_count; i++) { model.identity(); model.rotate(t_meshes[i]->rotation); @@ -187,7 +189,8 @@ void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mes packet2_add_u32(currMPacket, t_meshes[i]->color.a); } packet2_utils_vu_close_unpack(currMPacket); - if (i != t_count - 1) + + if (i != t_count - 1) // if it is last, we must also add draw wait finish interrupt. packet2_utils_vu_add_start_program(currMPacket, 0); if (switchCounter++ >= 32) @@ -203,12 +206,12 @@ void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mes packet2_add_u32(currMPacket, 0); // Free } packet2_utils_vu_close_unpack(currMPacket); - packet2_utils_vu_add_start_program(currMPacket, 0); + packet2_utils_vu_add_start_program(currMPacket, 0); // and start program } packet2_utils_vu_add_end_tag(currMPacket); dma_channel_wait(DMA_CHANNEL_VIF1, 0); dma_channel_send_packet2(currMPacket, DMA_CHANNEL_VIF1, 1); - if (currPacketIndex == 1) + if (currPacketIndex == 1) // Switch double buffer (packets) { currPacketIndex = 2; currMPacket = packet2; @@ -221,7 +224,7 @@ void VifSender::drawTheSameWithOtherMatrices(const RenderData &t_renderData, Mes packet2_reset(currMPacket, false); } } - if (switchCounter != 0) + if (switchCounter != 0) // if there are any not sended matrices { packet2_utils_vu_open_unpack(currMPacket, VU1_PARAMS_ADDRESS, true); { From ea0d47e09c070526c6c303008b402711828774a4 Mon Sep 17 00:00:00 2001 From: h4570 Date: Sun, 27 Dec 2020 19:49:36 +0100 Subject: [PATCH 50/56] cleanup & changed water logic --- src/samples/dolphin/camera.cpp | 20 +--- src/samples/dolphin/dolphin.cpp | 111 ++++++++++++++------ src/samples/dolphin/dolphin.hpp | 13 ++- src/samples/dolphin/main.cpp | 2 +- src/samples/dolphin/objects/collectible.cpp | 4 - src/samples/dolphin/objects/collectible.hpp | 1 - src/samples/dolphin/objects/mine.cpp | 4 - src/samples/dolphin/objects/mine.hpp | 1 - src/samples/dolphin/objects/player.cpp | 18 +--- src/samples/dolphin/objects/player.hpp | 1 - 10 files changed, 91 insertions(+), 84 deletions(-) diff --git a/src/samples/dolphin/camera.cpp b/src/samples/dolphin/camera.cpp index 855428f..69d8669 100755 --- a/src/samples/dolphin/camera.cpp +++ b/src/samples/dolphin/camera.cpp @@ -12,7 +12,7 @@ #include -const float CAMERA_Y = 15.0F; +const float CAMERA_Y = 25.0F; Camera::Camera(ScreenSettings *t_screen) : CameraBase(t_screen, &position) { @@ -40,12 +40,7 @@ void Camera::rotate(Pad &t_pad) horizontalLevel -= 0.08; else if (t_pad.rJoyH >= 200) horizontalLevel += 0.08; - /* - if (t_pad.rJoyV <= 50 && verticalLevel > 25.0F) - verticalLevel -= 0.9F; - else if (t_pad.rJoyV >= 200 && verticalLevel < 80.0F) - verticalLevel += 0.9F; - */ + unitCirclePosition.x = (Math::sin(horizontalLevel) * verticalLevel); unitCirclePosition.y = CAMERA_Y; unitCirclePosition.z = (Math::cos(horizontalLevel) * verticalLevel); @@ -56,15 +51,4 @@ void Camera::followBy(Mesh &t_mesh) position.x = unitCirclePosition.x + t_mesh.position.x; position.y = unitCirclePosition.y + t_mesh.position.y; position.z = unitCirclePosition.z + t_mesh.position.z; - - if (position.x > (-0.04F * verticalLevel) && - position.x < 0.0F && - position.z > (0.998F * verticalLevel)) - { - // TODO - // position.x = 0.0F; - // position.y = 0.0F; - // position.z = 0.0F; - // horizontalLevel = 0.0F; - } } \ No newline at end of file diff --git a/src/samples/dolphin/dolphin.cpp b/src/samples/dolphin/dolphin.cpp index 11f4032..f016115 100755 --- a/src/samples/dolphin/dolphin.cpp +++ b/src/samples/dolphin/dolphin.cpp @@ -11,14 +11,12 @@ #include "dolphin.hpp" #include "utils/math.hpp" -const u8 WATER_TILE_SCALE = 5; -const u8 WATER_SIZE = 100; - +float Dolphin::engineFPS = 60.0F; +const float WATER_TILE_SCALE = 6.0F; +const u8 WATER_SIZE = 4; const u8 MINES_COUNT = 15; const u8 OYSTERS_COUNT = 5; -float Dolphin::engineFPS = 60.F; - Dolphin::Dolphin(Engine *t_engine) : engine(t_engine), camera(&engine->screen) { oysters = new Collectible[OYSTERS_COUNT]; @@ -29,6 +27,7 @@ Dolphin::~Dolphin() { delete[] oysters; delete[] mines; + delete[] waterDrawList; } void Dolphin::onInit() @@ -73,11 +72,26 @@ void Dolphin::onInit() printf("Loaded.\n"); printf("Loading water...\n"); - water.loadObj("water/", "water", WATER_TILE_SCALE, false); - water.position.set(0, WATER_LEVEL, 0); - texRepo->addByMesh("water/", water, BMP); - water.shouldBeFrustumCulled = false; - water.shouldBeBackfaceCulled = false; + + u32 spiralOffset = (u32)Math::sqrt(WATER_TILES_COUNT); + waterDrawList = new Mesh *[WATER_TILES_COUNT]; + calcSpiral(spiralOffset, spiralOffset); + water[0].loadObj("water/", "water", WATER_TILE_SCALE, false); + water[0].position.set(0.0F, WATER_LEVEL, 0.0F); + texRepo->addByMesh("water/", water[0], BMP); + water[0].shouldBeFrustumCulled = true; + water[0].shouldBeBackfaceCulled = false; + waterDrawList[0] = &water[0]; + for (size_t i = 1; i < WATER_TILES_COUNT; i++) + { + water[i].loadFrom(water[0]); + water[i].shouldBeFrustumCulled = true; + water[i].shouldBeBackfaceCulled = false; + water[i].position.set(WATER_TILE_SCALE * 2.0F * spirals[i].x, WATER_LEVEL, WATER_TILE_SCALE * 2.0F * spirals[i].y); + texRepo->getByMesh(water[0].getId(), water[0].getMaterial(0).getId()) + ->addLink(water[i].getId(), water[i].getMaterial(0).getId()); + waterDrawList[i] = &water[i]; + } printf("Loading seabed...\n"); seabed.loadObj("seabed/", "seabed", 10.0F, false); @@ -96,7 +110,6 @@ void Dolphin::onInit() waterbox.position.y = -100.F; printf("Loading oyster dff\n"); - //oysters[0].loadDff("oyster/", "oyster", 1.F, false); oysters[0].mesh.loadObj("oyster/", "oyster", 10.F, false); printf("Loaded."); oysters[0].mesh.shouldBeBackfaceCulled = false; @@ -117,7 +130,6 @@ void Dolphin::onInit() printf("Loading mine .obj\n"); mines[0].mesh.loadObj("mine/", "mine", 10.F, false); - printf("Loaded."); mines[0].mesh.shouldBeBackfaceCulled = false; mines[0].mesh.shouldBeFrustumCulled = false; mines[0].mesh.position.set(5, -15, 32); @@ -135,7 +147,8 @@ void Dolphin::onInit() } Texture *pLifeTex = texRepo->add("2d/", "life", PNG); - //pLifeTex->addLink(lifeSprites[0].getId()); + // pLifeTex->addLink(lifeSprites[0].getId()); + for (int i = 0; i < 3; i++) { lifeSprites[i].size.set(64.0F, 64.0F); @@ -164,12 +177,13 @@ void Dolphin::onUpdate() engine->renderer->draw(gameOver); return; } - Dolphin::engineFPS = engine->fps; - if (engine->pad.isCrossClicked) - printf("Delta multiplier: %f\n", 60.0F / engine->fps); - float xDist = player.mesh.position.x - water.position.x; - float zDist = player.mesh.position.z - water.position.z; + Dolphin::engineFPS = engine->fps; + // if (engine->pad.isCrossClicked) + // printf("Delta multiplier: %f\n", 60.0F / engine->fps); + + float xDist = player.mesh.position.x - water[0].position.x; + float zDist = player.mesh.position.z - water[0].position.z; if (xDist < 0) xDist *= -1; if (zDist < 0) @@ -177,8 +191,11 @@ void Dolphin::onUpdate() if (xDist > WATER_SIZE * WATER_TILE_SCALE / 4 || zDist > WATER_SIZE * WATER_TILE_SCALE / 4) { - water.position.x = (player.mesh.position.x / WATER_SIZE) * WATER_SIZE; - water.position.z = (player.mesh.position.z / WATER_SIZE) * WATER_SIZE; + for (size_t i = 0; i < WATER_TILES_COUNT; i++) + { + water[i].position.x = player.mesh.position.x + (WATER_TILE_SCALE * 2.0F * spirals[i].x); + water[i].position.z = player.mesh.position.z + (WATER_TILE_SCALE * 2.0F * spirals[i].y); + } } for (int i = 0; i < OYSTERS_COUNT; i++) @@ -188,7 +205,7 @@ void Dolphin::onUpdate() float dist = vecDist.length(); if (dist < 20.F && player.isJumping() && oysters[i].isActive()) { - printf("Pickup %d Dist %d\n", i, dist); + printf("Pickup:%d Dist:%f\n", i, dist); oysters[i].disappear(); player.setLife(player.getLifes() + 1); engine->audio.setADPCMVolume(30, 3); @@ -204,11 +221,11 @@ void Dolphin::onUpdate() if (dist < 20.F && !mines[i].getExplosionTicks()) { - printf("Vecdist %f,%f,%f\n", vecDist.x, vecDist.y, vecDist.z); - printf("Explode %d Dist %d\n", i, dist); + printf("Vecdist: %f,%f,%f\n", vecDist.x, vecDist.y, vecDist.z); + printf("Explode:%d Dist:%f\n", i, dist); mines[i].explode(); player.setLife(player.getLifes() - 1); - //Buffer switching to prevent playing two sounds on one buffer + // Buffer switching to prevent playing two sounds on one buffer engine->audio.setADPCMVolume(65, Mine::lastSoundBuffer); engine->audio.playADPCM(boomSound, Mine::lastSoundBuffer); Mine::lastSoundBuffer = Mine::lastSoundBuffer == 4 ? 5 : 4; @@ -220,35 +237,34 @@ void Dolphin::onUpdate() player.update(engine->pad); camera.update(engine->pad, player.mesh); + skybox.position.set(player.mesh.position.x, +200.0F, player.mesh.position.z); waterbox.position.set(player.mesh.position.x, -260.0F, player.mesh.position.z); + engine->renderer->draw(island); - engine->renderer->draw(water); + engine->renderer->draw(waterDrawList, WATER_TILES_COUNT); engine->renderer->draw(skybox); engine->renderer->draw(waterbox); engine->renderer->draw(seabed); + for (u8 i = 0; i < OYSTERS_COUNT; i++) - { if (oysters[i].isActive()) - { engine->renderer->draw(oysters[i].mesh); - } - } + for (u8 i = 0; i < MINES_COUNT; i++) - { if (mines[i].getExplosionTicks() < MINE_EXPLOSION_TICKS) engine->renderer->draw(mines[i].mesh); - } + for (u8 i = 0; i < player.getLifes(); i++) - { engine->renderer->draw(lifeSprites[i]); - } + engine->renderer->draw(player.mesh); + if (camera.position.y < WATER_LEVEL) { engine->renderer->draw(waterOverlay); - engine->audio.setADPCMVolume(0, 0); //Surface ambient - engine->audio.setADPCMVolume(65, 1); //Underwater ambient + engine->audio.setADPCMVolume(0, 0); // Surface ambient + engine->audio.setADPCMVolume(65, 1); // Underwater ambient } else { @@ -256,3 +272,28 @@ void Dolphin::onUpdate() engine->audio.setADPCMVolume(0, 1); //Underwater ambient } } + +void Dolphin::calcSpiral(int X, int Y) +{ + int x, y, dx; + x = y = dx = 0; + int dy = -1; + int t = X > Y ? X : Y; + int maxI = t * t; + for (int i = 0; i < maxI; i++) + { + if ((-X / 2 <= x) && (x <= X / 2) && (-Y / 2 <= y) && (y <= Y / 2)) + { + spirals[i].x = x; + spirals[i].y = y; + } + if ((x == y) || ((x < 0) && (x == -y)) || ((x > 0) && (x == 1 - y))) + { + t = dx; + dx = -dy; + dy = t; + } + x += dx; + y += dy; + } +} diff --git a/src/samples/dolphin/dolphin.hpp b/src/samples/dolphin/dolphin.hpp index ad7b3c1..5ee4d05 100755 --- a/src/samples/dolphin/dolphin.hpp +++ b/src/samples/dolphin/dolphin.hpp @@ -37,8 +37,15 @@ public: static float engineFPS; private: - /*DO NOT TOUCH ORDER OF DECLARATION! - GCC BUG CAUSES RENDERING TO FAIL IN ANY OTHER ORDER OF DECLARATION!*/ + void calcSpiral(int X, int Y); + static const u16 WATER_TILES_COUNT = 1024; + + Point spirals[WATER_TILES_COUNT]; + Mesh **waterDrawList; + /** + * DO NOT TOUCH ORDER OF DECLARATION! + * GCC BUG CAUSES RENDERING TO FAIL IN ANY OTHER ORDER OF DECLARATION! + */ Mesh seabed; Mesh island; Mesh skybox; @@ -49,7 +56,7 @@ private: Collectible *oysters; TextureRepository *texRepo; Sprite waterOverlay; - Mesh water; + Mesh water[WATER_TILES_COUNT]; Mesh waterbox; Sprite lifeSprites[3]; Sprite gameOver; diff --git a/src/samples/dolphin/main.cpp b/src/samples/dolphin/main.cpp index d094a17..fdf11cb 100755 --- a/src/samples/dolphin/main.cpp +++ b/src/samples/dolphin/main.cpp @@ -18,4 +18,4 @@ int main() game.engine->init(&game, 128); SleepThread(); return 0; -} \ No newline at end of file +} diff --git a/src/samples/dolphin/objects/collectible.cpp b/src/samples/dolphin/objects/collectible.cpp index 9cd7d78..0bdd01c 100644 --- a/src/samples/dolphin/objects/collectible.cpp +++ b/src/samples/dolphin/objects/collectible.cpp @@ -25,10 +25,6 @@ Collectible::Collectible() bDisappearing = false; } -Collectible::~Collectible() -{ -} - void Collectible::disappear() { bDisappearing = true; diff --git a/src/samples/dolphin/objects/collectible.hpp b/src/samples/dolphin/objects/collectible.hpp index 32795ea..bac0b37 100644 --- a/src/samples/dolphin/objects/collectible.hpp +++ b/src/samples/dolphin/objects/collectible.hpp @@ -21,7 +21,6 @@ public: float rotation; Mesh mesh; Collectible(); - ~Collectible(); void update(); void disappear(); void setActive(const u8 &b) { bActive = b; } diff --git a/src/samples/dolphin/objects/mine.cpp b/src/samples/dolphin/objects/mine.cpp index 9a7a19b..a64da3a 100644 --- a/src/samples/dolphin/objects/mine.cpp +++ b/src/samples/dolphin/objects/mine.cpp @@ -20,10 +20,6 @@ Mine::Mine() explosionTicks = 0; } -Mine::~Mine() -{ -} - void Mine::update() { if (bExploding && explosionTicks < MINE_EXPLOSION_TICKS) diff --git a/src/samples/dolphin/objects/mine.hpp b/src/samples/dolphin/objects/mine.hpp index 5dce106..51faa71 100644 --- a/src/samples/dolphin/objects/mine.hpp +++ b/src/samples/dolphin/objects/mine.hpp @@ -24,7 +24,6 @@ public: void explode() { bExploding = true; } void update(); Mine(); - ~Mine(); const u8 &getExplosionTicks() { return explosionTicks; } private: diff --git a/src/samples/dolphin/objects/player.cpp b/src/samples/dolphin/objects/player.cpp index 84669cc..718f33a 100755 --- a/src/samples/dolphin/objects/player.cpp +++ b/src/samples/dolphin/objects/player.cpp @@ -28,10 +28,6 @@ Player::Player() lifes = 3; } -Player::~Player() -{ -} - void Player::init(Engine *t_engine) { pEngine = t_engine; @@ -63,8 +59,7 @@ void Player::update(Pad &t_pad) if (t_pad.isCrossClicked && mesh.getCurrentAnimationFrame() <= 14 && WATER_LEVEL - 15 < mesh.position.y) { - printf("Cross\n"); - mesh.setAnimSpeed(0.8F); + mesh.setAnimSpeed(1.0F); mesh.playAnimation(14, 58, 0); } @@ -72,19 +67,10 @@ void Player::update(Pad &t_pad) bIsJumping = true; else bIsJumping = false; - /* - if (lift < 0) - mesh.rotation.y = 1; - else if (lift > 0) - mesh.rotation.y = -1; - else - mesh.rotation.y = 0; - */ if (velocity > 0 && mesh.getCurrentAnimationFrame() == 0) { mesh.setAnimSpeed(0.05F); - printf("Swim animation\n"); mesh.playAnimation(1, 14, 0); } if (mesh.getCurrentAnimationFrame() == 42) @@ -101,7 +87,7 @@ void Player::update(Pad &t_pad) bIsImpactingWater = false; } - velocity *= 60.0F / Dolphin::engineFPS; //Moving by deltatime of last frame. + velocity *= 60.0F / Dolphin::engineFPS; // Moving by deltatime of last frame. mesh.position.z += Math::cos(mesh.rotation.z) * velocity * (bIsJumping + 1); mesh.position.x += diff --git a/src/samples/dolphin/objects/player.hpp b/src/samples/dolphin/objects/player.hpp index 3aed608..93cde51 100755 --- a/src/samples/dolphin/objects/player.hpp +++ b/src/samples/dolphin/objects/player.hpp @@ -25,7 +25,6 @@ public: float gravity, velocity, lift; Mesh mesh; Player(); - ~Player(); void init(Engine *t_engine); void update(Pad &t_pad); const u8 &isJumping() { return bIsJumping; } From c1ed10eb3bb3ee069f32303b7ea067cf10d107a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sun, 27 Dec 2020 20:53:57 +0100 Subject: [PATCH 51/56] Create CHANGELOG.MD --- CHANGELOG.MD | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 CHANGELOG.MD diff --git a/CHANGELOG.MD b/CHANGELOG.MD new file mode 100644 index 0000000..16785c0 --- /dev/null +++ b/CHANGELOG.MD @@ -0,0 +1,101 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [1.29.1] - 2020-12-27 +### Added +- Created libpacket2 in PS2SDK +- Dolphin sample +- 2D support (Sprite class) +- Alpha blending (transparency) +- PNG support +- ADPCM support in audio class +- AudioFinish event in audio class +- BoundingBox class +- A lot of useful funcs in Matrix class +- Mock of file service +- Array mode to draw() (highly optimized for small meshes) +- VCLPP - Usage of VU1 Preprocessor + +### Changed +- Project setup (makefile mostly) +- Readme +- Switched into libpacket2 in `vifsender` and `gifsender` +- Timer class refactor +- Engine base refactor +- MeshTexture into Texture +- Refactored floors sample +- Refactored Audio class +- Fixed Path 3 lighting +- Refactored, optimized math classes (vector, matrix..) +- Cleanup in camera base +- Refactored Path 3 and Path 1 rendering +- Synchronization functions (`renderer->waitForRender()`) +- BMP class refactor +- Dff Loader refactor +- Optimized rendering data preparation + +### Removed +- Ari sample +- VU1 class + +## [1.1.0] - 2020-11-03 +### Added +- A lot of useful functions to Mesh class +- MeshFrame class +- MeshMaterial class +- MeshTexture class +- TextureLink struct +- Texture wrapping settings +- TextureRepository class +- PRINT_ERR() +- Ari sample + +### Changed +- Project setup (gitignore etc.) +- Readme +- DFF loader refactor +- OBJ loader refactor +- MD2 loader refactor +- 3D data classes refactor (one interface for all) +- Rendering refactor + +### Removed +- MeshSpec class +- Texture class +- Md2Model class +- ObjModel class +- DffModel class + +## [1.0.0] - 2020-10-28 +### Added +- Project setup (gitignore etc.) +- License +- Readme +- BMP support +- DFF support +- MD2 support +- OBJ support +- Animation support +- Engine base +- AudioListener class +- Rendering base +- Path 1 renderer (VU1) +- Path 3 renderer (GIF) +- Math classes (matrix, vector, plane..) +- Audio support (bg song only) +- Camera base +- Base lighting support (bugged) for Path 3 +- Pad support +- EE Timer +- Math class +- String class +- Mesh class with AABB +- Makefile +- Primitive floors sample + +[1.29.1]: https://github.com/h4570/tyra/compare/1.1.0...1.29.1 +[1.1.0]: https://github.com/h4570/tyra/compare/1.0.0...1.1.0 +[1.0.0]: https://github.com/h4570/tyra/compare/1.0.0 From b94fa40eaccab08ae19d9d1ef0162046c923183b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sun, 27 Dec 2020 21:03:31 +0100 Subject: [PATCH 52/56] Update README.MD --- README.MD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.MD b/README.MD index 30fe44b..6bd663f 100644 --- a/README.MD +++ b/README.MD @@ -9,7 +9,7 @@ Logo -

Tyra - alpha 1.1.0

+

Tyra - alpha 1.29.1

Open source game engine for PlayStation 2™ @@ -43,7 +43,7 @@ ## About The Project -sample +sample ### Contributors wanted I will be grateful for any help [![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) @@ -53,8 +53,8 @@ I will be grateful for any help [![Discord](https://img.shields.io/badge/discord * [Floors](https://github.com/h4570/tyra/tree/master/src/samples/floors) ### Branches -* Master - monthly releases -* Develop - daily builds. **Please use this at this moment** +* Master - monthly releases - tested on PS2 & PCSX2. +* Develop - daily builds - can be unstable. ### About project Goal of Tyra project is to provide simple API for PS2 game creation, so you can just run PS2 emulator, grab .obj file, and put it into live in a seconds. Project is on early stage, so a lot of stuff is changing from release to release. @@ -73,8 +73,9 @@ Tyra takes care for you, and rendering, coprocessors communication and many more ### Tyra features * 3D support - VU1 "Path 1 rendering" +* 2D support - PNG & BMP * Frustum culling, backface culling -* OpenGL adaptions: Frustum projection, lookAt camera +* OpenGL adaptions: Perspective projection, lookAt camera * Texture support - .bmp and png * Mesh loaders: ".obj", ".dff" (RenderWare, GTA:SA) and ".md2" (Quake II) * Threading support @@ -112,14 +113,14 @@ make ``` ## Extra info -* BMP loader needs some polishing soe be sure that you exporting BMP with 24bit: RGB888 and without information about colors. +* BMP loader needs some polishing so be sure that you exporting BMP with 24bit: RGB888 and without information about colors. * If you want to run .elf in PCSX2, be sure that you have version >=1.6 and **Host access** enabled in PCSX2 configuration file. * If you want to use your own .obj file, please check "triangulate faces" in blender. PS2 is supporting only triangle primitive type. ## Roadmap ### Roadmap for next master release: -[https://github.com/h4570/tyra/projects/1](https://github.com/h4570/tyra/projects/1) +[January 2021 Roadmap](https://github.com/h4570/tyra/projects/4) See the [open issues](https://github.com/h4570/tyra/issues) for a list of proposed features (and known issues). From a971309e2da471534ae8e680cb7ee719f186321c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sun, 27 Dec 2020 21:13:21 +0100 Subject: [PATCH 53/56] Update README.MD --- src/samples/floors/README.MD | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/samples/floors/README.MD b/src/samples/floors/README.MD index 7f8391d..626159b 100644 --- a/src/samples/floors/README.MD +++ b/src/samples/floors/README.MD @@ -1,14 +1,19 @@ ## Floors sample -### Description - -Simple demo which shows lighting using PATH3, and player movement and animation. +### Features +- Box collision +- 2 animated characters +- Texture tricks showcase +- Background song +- Audio effects - walking, fighting (ADPCM) +- Transparent 2D UI +- Usage of draw() in array mode (for floors, very fast) ### Assets -[Download](http://apgcglz.cluster028.hosting.ovh.net/tyra/1.1.0/samples/floors/assets.zip) +[Download](http://apgcglz.cluster028.hosting.ovh.net/tyra/1.29.1/samples/floors/assets.zip) ### Screenshot [![Floors screenshot][floors-screenshot]](#) -[floors-screenshot]: http://apgcglz.cluster028.hosting.ovh.net/tyra/1.1.0/samples/floors/floors.gif +[floors-screenshot]: http://apgcglz.cluster028.hosting.ovh.net/tyra/1.29.1/samples/floors/floors.gif From 6432fc183e38423ce14b0f2f694a7b14fba8daeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sun, 27 Dec 2020 21:21:38 +0100 Subject: [PATCH 54/56] Create README.MD --- src/samples/dolphin/README.MD | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/samples/dolphin/README.MD diff --git a/src/samples/dolphin/README.MD b/src/samples/dolphin/README.MD new file mode 100644 index 0000000..85b23e6 --- /dev/null +++ b/src/samples/dolphin/README.MD @@ -0,0 +1,20 @@ +## Dolphin sample + +### Features +- Animated character +- Collectibles and mines +- Big DFF mesh +- Background songs +- Overlay +- Audio effects (ADPCM) +- Transparent 2D UI +- Usage of draw() in array mode (for water tiles, very fast) + +### Assets +[Download](http://apgcglz.cluster028.hosting.ovh.net/tyra/1.29.1/samples/dolphin/assets.zip) + +### Screenshot + +[![Dolphin screenshot][dolphin-screenshot]](#) + +[dolphin-screenshot]: http://apgcglz.cluster028.hosting.ovh.net/tyra/1.29.1/samples/dolphin/dolphin.gif From 55bc876dfb6fbcb47ddd841ae337f17fb3152c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sun, 27 Dec 2020 21:32:18 +0100 Subject: [PATCH 55/56] Update README.MD --- README.MD | 74 +++++++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 43 deletions(-) diff --git a/README.MD b/README.MD index 6bd663f..1c03075 100644 --- a/README.MD +++ b/README.MD @@ -14,7 +14,9 @@

Open source game engine for PlayStation 2™
- View Demo » + Dolphin sample » +   + Floors sample »

Report Bug @@ -27,49 +29,38 @@ * [About the Project](#about-the-project) * [Samples](#samples) - * [Branches](#branches) * [About project](#about-project) - * [Acronyms](#acronyms) * [Tyra features](#tyra-features) - * [Built With](#built-with) + * [Branches](#branches) * [Getting Started](#getting-started) - * [Prerequisites](#prerequisites) * [Installation](#installation) + * [Prerequisites](#prerequisites) * [Roadmap](#roadmap) +* [Tyra team](#tyra-team) * [Contributing](#contributing) * [License](#license) -* [Tyra team](#tyra-team) +* [Built With](#built-with) +* [Acronyms](#acronyms) * [Thanks](#thanks) ## About The Project sample -### Contributors wanted -I will be grateful for any help [![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) +### Contributors wanted [![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) +We will be grateful for any help. If you dont know PS2.. don't worry, we are open to explain how things work. ### Samples * [Dolphin](https://github.com/h4570/tyra/tree/master/src/samples/dolphin) * [Floors](https://github.com/h4570/tyra/tree/master/src/samples/floors) - -### Branches -* Master - monthly releases - tested on PS2 & PCSX2. -* Develop - daily builds - can be unstable. ### About project -Goal of Tyra project is to provide simple API for PS2 game creation, so you can just run PS2 emulator, grab .obj file, and put it into live in a seconds. Project is on early stage, so a lot of stuff is changing from release to release. +Goal of Tyra project is to provide simple API for PS2 game creation, so you can just run PS2 emulator, grab .obj file, and put it into live in a seconds. Project is on alpha stage, so keep in mind that there are many things to be done and to fix. YouTube tutorials soon! **Why Tyra is needed?** Raw PS2 development can be a big challenge. PS2 it's pretty low-level and there are a lot of stuff that you must do from scratch. -Tyra takes care for you, and rendering, coprocessors communication and many more low-level stuff is already done. - -### Acronyms -* EE (Emotion Engine) - whole set of processors and subsystems that make up the PlayStation 2 -* GS (Graphic synthesizer) - configurable rasterizer and texture mapper. Has only 2MB~ memory for textures, but for the opposite have very high transfer rate, so you can switch textures in the blink -* VU0 - programmable (ASM) vector processor that is accessed by inline assembly code injected into C program. -* 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 +Tyra takes care for you, and rendering, coprocessors communication, synchronization and many more low-level stuff is already done. ### Tyra features * 3D support - VU1 "Path 1 rendering" @@ -83,13 +74,13 @@ Tyra takes care for you, and rendering, coprocessors communication and many more * Audio support - .wav and .adpcm * Pad support -### Built With - -* [PS2SDK](https://github.com/ps2dev/ps2sdk) +### Branches +* Master - monthly releases - tested on PS2 & PCSX2. +* Develop - daily builds - can be unstable. ## Getting Started -[![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) +### Installation [![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5) In our Discord channel, there is detailed tutorial which will help you with setting up the all environment - starting from installing dependencies and ending on emulator setup or intellisense. ### Prerequisites @@ -99,19 +90,6 @@ This is an example of how to list things you need to use the software. * At least #674b6f4 PS2SDK (01.12.2020) - [PS2SDK](https://github.com/ps2dev/ps2sdk) * PS2 Emulator. For example [PCSX2](https://pcsx2.net/) -### Installation - -1. Clone the repo -```sh -git clone https://github.com/h4570/tyra.git -``` -2. Get into src folder and compile it! -```sh -cd src/samples/floors -make rebuild-engine -make -``` - ## Extra info * BMP loader needs some polishing so be sure that you exporting BMP with 24bit: RGB888 and without information about colors. * If you want to run .elf in PCSX2, be sure that you have version >=1.6 and **Host access** enabled in PCSX2 configuration file. @@ -122,6 +100,12 @@ make ### Roadmap for next master release: [January 2021 Roadmap](https://github.com/h4570/tyra/projects/4) +## Tyra team + +Sandro Sobczyński - sandro.sobczynski@gmail.com +[![LinkedIn][linkedin-shield]](https://linkedin.com/in/sandro-sobczyński-28820b15a) +Michał Mostowik - mostek3pl@gmail.com +[![LinkedIn][linkedin-shield]](https://www.linkedin.com/in/notfoxar) See the [open issues](https://github.com/h4570/tyra/issues) for a list of proposed features (and known issues). @@ -139,12 +123,16 @@ Contributions are what make the open source community such an amazing place to b Distributed under the Apache License 2.0 License. See `LICENSE` for more information. -## Tyra team +## Built With -Sandro Sobczyński - sandro.sobczynski@gmail.com -[![LinkedIn][linkedin-shield]](https://linkedin.com/in/sandro-sobczyński-28820b15a) -Michał Mostowik - mostek3pl@gmail.com -[![LinkedIn][linkedin-shield]](https://www.linkedin.com/in/notfoxar) +* [PS2SDK](https://github.com/ps2dev/ps2sdk) + +### Acronyms +* EE (Emotion Engine) - whole set of processors and subsystems that make up the PlayStation 2 +* GS (Graphic synthesizer) - configurable rasterizer and texture mapper. Has only 2MB~ memory for textures, but for the opposite have very high transfer rate, so you can switch textures in the blink +* VU0 - programmable (ASM) vector processor that is accessed by inline assembly code injected into C program. +* 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 ## Thanks From afa98e8bdf330109bb79dcd8ad54ff61b31ec970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sun, 27 Dec 2020 21:39:19 +0100 Subject: [PATCH 56/56] Update CHANGELOG.MD --- CHANGELOG.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 16785c0..a08afdb 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -96,6 +96,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Makefile - Primitive floors sample -[1.29.1]: https://github.com/h4570/tyra/compare/1.1.0...1.29.1 +[1.29.1]: https://github.com/h4570/tyra/compare/1.1.0...v1.29.1-alpha [1.1.0]: https://github.com/h4570/tyra/compare/1.0.0...1.1.0 [1.0.0]: https://github.com/h4570/tyra/compare/1.0.0