Merge branch 'master' into develop

Signed-off-by: h4570 <sandro.sobczynski@gmail.com>

.github/workflows/compilation.yml

@@ -0,0 +1,60 @@
+# Based on https://github.com/ps2dev/gsKit/blob/master/.github/workflows/compilation.yml
+# Thanks fjtrujy!
+
+name: CI
+
+on:
+  push:
+  pull_request:
+  repository_dispatch:
+    types: [run_build]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2sdk-ports:latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        apk add build-base git
+
+    - name: Compile engine
+      working-directory: ./src/engine
+      env:
+        ZLIB: ${PS2SDK}/ports
+        LIBTIFF: ${PS2SDK}/ports
+        LIBJPEG: ${PS2SDK}/ports
+        LIBPNG: ${PS2SDK}/ports
+        TYRA: ${GITHUB_WORKSPACE}
+      run: |
+        make
+
+    - name: Compile unit test project
+      working-directory: ./src/unit_tests/
+      env:
+        TYRA: ${GITHUB_WORKSPACE}
+      run: |
+        make
+
+    - name: Compile cube project
+      working-directory: ./src/samples/cube/
+      env:
+        TYRA: ${GITHUB_WORKSPACE}
+      run: |
+        make
+    
+    - name: Compile floors project
+      working-directory: ./src/samples/floors/
+      env:
+        TYRA: ${GITHUB_WORKSPACE}
+      run: |
+        make
+        
+    - name: Compile dolphin project
+      working-directory: ./src/samples/dolphin/
+      env:
+        TYRA: ${GITHUB_WORKSPACE}
+      run: |
+        make

.gitignore

@@ -1,4 +1,5 @@
 .vscode/
+.idea/
 
 # ---
 

CHANGELOG.MD

@@ -4,6 +4,22 @@ 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.36.3] - 2021-05-28
+
+### Added
+- Unit test project
+- Assert
+- CI via Github workflows
+- Install tutorial as separated .MD file
+
+### Changed
+- Improved BMP loader.
+- All PRINT_LOG and PRINT_ERR to consoleLog() and assertMsg()
+- Refactored makefiles
+- **CHANGED ENV VARIABLES!**
+- Install tutorial
+- Readme
+
 ## [1.31.2] - 2021-02-06
 
 ### Added
@@ -111,6 +127,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Makefile
 - Primitive floors sample
 
+[1.36.3]: https://github.com/h4570/tyra/compare/v1.31.2-alpha...v1.36.3-alpha
 [1.31.2]: https://github.com/h4570/tyra/compare/v1.29.1-alpha...v1.31.2-alpha
 [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

README.MD

@@ -9,7 +9,7 @@
     <img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/github-splash.png" alt="Logo" width="100%" height="auto">
   </a>
 
-  <h3 align="center">Tyra - alpha 1.31.2</h3>
+  <h3 align="center">Tyra - alpha 1.36.3</h3>
 
   <p align="center">
     Open source game engine for PlayStation 2™
@@ -25,41 +25,63 @@
   </p>
 </p>  
 
+[![Stargazers repo roster for h4570/tyra](https://reporoster.com/stars/h4570/tyra)](https://github.com/h4570/tyra/stargazers)
+
 ## Table of Contents  
 
 * [About the Project](#about-the-project) 
   * [Samples](#samples) 
-  * [About project](#about-project) 
+  * [Description](#description) 
-  * [Tyra features](#tyra-features) 
+  * [Features](#features) 
   * [Branches](#branches) 
 * [Getting Started](#getting-started) 
   * [Installation](#installation) 
   * [Prerequisites](#prerequisites) 
 * [Roadmap](#roadmap) 
-* [Tyra team](#tyra-team)
 * [Contributing](#contributing) 
 * [License](#license) 
 * [Built With](#built-with) 
 * [Acronyms](#acronyms) 
 * [Thanks](#thanks) 
 
-## About The Project  
+<br />
 
-<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/1.31.2/tyra.gif" alt="sample" width="600" height="auto">  
+## About the Project  
+
+<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/tyra.gif" alt="Sample code" width="600" height="auto">  
+<img src="http://apgcglz.cluster028.hosting.ovh.net/tyra/dolphin.gif " alt="Sample game" width="500" height="auto">  
 
 ### Samples
 * [Dolphin](https://github.com/h4570/tyra/tree/master/src/samples/dolphin) 
 * [Floors](https://github.com/h4570/tyra/tree/master/src/samples/floors) 
+* [Cube](https://github.com/h4570/tyra/tree/master/src/samples/cube) 
   
-### About project
+### Description
-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.
+Tyra is a project that aims to facilitate the development of PlayStation 2 games. The goal is simple API which will allow you to develop some nice small homebrew games in a short period of time. Finally, (thanks to PS2DEV team) Tyra supports C++20, so we are free from the 2003's GCC which only supported C++98.  
+**Project is on alpha stage, so keep in mind that there are many things to be done and to fix.**
+Unfortunately there are not many people, which want's to help with this project. **If you want to be a volunteer**, but don't have too much knowledge in this field, write to me on Discord, **I will be happy to help.**
  
-YouTube tutorials soon!  
+When project will be on beta stage, we plan to create some YouTube tutorials :)  
   
-**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.  
+**Why was this project created?** 
-Tyra takes care for you, and rendering, coprocessors communication, synchronization and many more low-level stuff is already done.
+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.  
+For example, if you want to render something using only PS2DEV you must:
+- Create VU1 micro-program
+- Load micro-program and send it to VU1
+- Create parser for your 3D file
+- Create parser for texture file
+- Calculate lights, shadows, MVP matrices (3D->2D)..
+- Clip triangles ([sic!](https://github.com/h4570/tyra/issues/14))
+- Prepare DMA packets for coprocessors communication
+- Setup rasterizer (GS)
+- Send texture to GS
+- Send packets
+- Synchronize all  
 
-### Tyra features
+but with Tyra you can do it with methods like `loadObj()` and `draw()` 😁. 
+
+### Features
 * 3D support - VU1 "Path 1 rendering"  
 * 2D support - PNG & BMP
 * Frustum culling, backface culling  
@@ -75,37 +97,38 @@ Tyra takes care for you, and rendering, coprocessors communication, synchronizat
 * Master - monthly releases - tested on PS2 & PCSX2.
 * Develop - daily builds - can be unstable.
 
+<br />
+
 ## Getting Started  
 
-### Installation [![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5)  
+### Installation 
-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.  
+Step by step [tutorial here](https://github.com/h4570/tyra/tree/develop/docs)  
+If you need any support, feel free to ask questions on discord:  
+[![Discord](https://img.shields.io/badge/discord-Tyra-brightgreen?logo=discord)](https://discord.gg/NhhTmg3Gm5)  
 
 ### Prerequisites 
 
-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 #e8e9edb PS2SDK (06.02.2021) - [PS2SDK](https://github.com/ps2dev/ps2sdk) 
+* At least #58ffb33 PS2SDK (28.05.2021) - [PS2SDK](https://github.com/ps2dev/ps2sdk) 
 * PS2 Emulator. For example [PCSX2](https://pcsx2.net/) 
 
+<br />
+
 ## 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 use your own .obj file, please check "triangulate faces" in blender.  
-* If you want to run .elf in PCSX2, be sure that you have version >=1.6 and **Host access** enabled in PCSX2 configuration file.  
+PS2 is supporting only triangle primitive type.  
-* If you want to use your own .obj file, please check "triangulate faces" in blender. PS2 is supporting only triangle primitive type.  
+
+<br />
 
 ## Roadmap  
 
 ### Roadmap for next master release:  
 [Next release 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). 
 
+<br />
+
 ## Contributing 
 
 Contributions are what make the open source community such an amazing place to be learn, inspire, and create. Any contributions you make are **greatly appreciated**. 
@@ -116,26 +139,34 @@ Contributions are what make the open source community such an amazing place to b
 4. Push to the Branch (`git push origin feature/amazing-feature`)  
 5. Open a Pull Request  
 
+<br />
+
 ## License  
 
 Distributed under the Apache License 2.0 License. See `LICENSE` for more information. 
 
+<br />
+
 ## Built With  
 
-* [PS2SDK](https://github.com/ps2dev/ps2sdk)  
+* [PS2DEV](https://github.com/ps2dev/ps2dev)  
 
-### Acronyms 
+<br />
+
+## 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  
 
+<br />
+
 ## Thanks  
 
 Without these guys, everything would be harder:
 * Dr Henry Fortuna - for code sources
-* Rick Gaiser - for help and new GCC!
+* Rick Gaiser, fjtrujy - 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
@@ -144,6 +175,8 @@ Without these guys, everything would be harder:
 * And so many other guys. Thanks!
 
 Project Link: [https://github.com/h4570/tyra](https://github.com/h4570/tyra)  
+Sandro Sobczyński - sandro.sobczynski@gmail.com  
+[![LinkedIn][linkedin-shield]](https://linkedin.com/in/sandro-sobczyński-28820b15a)  
   
 <br />
 <a href="https://github.com/h4570/tyra">

docs/install.md

@@ -0,0 +1,210 @@
+# Installation tutorial
+
+This tutorial will show you, how to:
+- Setup your WSL machine for PS2DEV
+- Install entire PS2DEV+Tyra environment
+- Setup VSCode with Intelisense
+- Setup PCSX2  
+
+So let's get started!
+
+---
+<br/>
+
+## VSCode and WSL
+- Install VSCode from  
+https://code.visualstudio.com/  
+- Install WSL
+https://docs.microsoft.com/en-us/windows/wsl/install-win10
+`Info: Please choose Ubuntu-20.04`
+- Set root as default WSL user.  
+Open `cmd.exe` and type:   
+`ubuntu2004 config --default-user root`
+
+---
+<br/>
+
+## Ubuntu configuration and PS2DEV+Tyra
+- Open WSL terminal (Windows search -> wsl)   
+`Info: Be sure that are you logged as a root!`
+- Type these commands
+```
+apt-get update && apt-get upgrade -y
+apt-get install -y build-essential make texinfo cmake bison flex gettext libgmp3-dev libmpfr-dev libmpc-dev libz-dev wget patch
+```
+- Configure git (replace your name and email)
+```
+git config --global user.email "your@email.com"
+git config --global user.name "Your Name"
+```
+- Create directories
+```
+mkdir /ps2dev
+mkdir /ps2dev/built
+mkdir /ps2dev/source
+mkdir /repos
+mkdir /repos/tyra
+```
+- Clone repos
+```
+git clone https://github.com/ps2dev/ps2dev.git /ps2dev/source/
+git clone https://github.com/h4570/tyra.git /repos/tyra/
+```
+- Open bashrc via `nano ~/.bashrc` and add these lines at the end of file. Be sure that they are 1:1, so don't add additional spaces!
+```
+export PS2DEV=/ps2dev/built
+export PS2SDK=$PS2DEV/ps2sdk
+export GSKIT=$PS2DEV/gsKit
+export PATH=$PATH:$PS2DEV/bin:$PS2DEV/ee/bin:$PS2DEV/iop/bin:$PS2DEV/dvp/bin:$PS2SDK/bin
+export PS2HOSTNAME=192.168.0.200
+export TYRA=/repos/tyra
+export WSL_MAKE_WINDOWS=\\\\\\\\wsl\$\$\\\\Ubuntu-20.04
+export WSL_LINUX_PCSX2=/mnt/c/Program\\\ Files\\\ \\\(x86\\\)/PCSX2
+```
+- Refresh env variables via -> `. ~/.bashrc`
+- Close wsl terminal
+
+---
+<br/>
+
+## Mapping WSL directories to your Windows machine
+- Open cmd and type `wsl.exe --list`  
+`Info: Remember your distribution name from this list. My is "Ubuntu-20.04"`
+- Click at the windows logo on your keyboard, type "This PC" and open
+- At the upper menu click "Map disk drive"  
+`Info: Replace my name with your WSL name!`
+  -   Folder: \\\\wsl$\\Ubuntu-20.04
+  -   Click OK  
+
+`Info: You will have now new disk on your PC, this is the WSL filesystem.`
+
+---
+<br/>
+
+## Configuring VSCode
+- Open VSCode
+- Install extension "Remote - WSL"
+- Install extension "C/C++"
+- Restart VSCode if required
+- VSCode: Click on "File" -> "Open folder in WSL"
+  - Open "repos/tyra"
+- VSCode: Click on "Terminal" -> "New terminal"  
+
+`Info: New terminal should appear. This is the same WSL terminal :)`  
+
+---
+<br/>
+
+## PS2DEV installation
+- In VSCode's WSL terminal type:
+```
+cd /ps2dev/source
+./build-all.sh
+```
+`Info: This can take some time...`
+- And open again .bashrc via `nano ~/.bashrc` and add these lines at the end of file.
+```
+export ZLIB=${PS2SDK}/ports
+export LIBTIFF=${PS2SDK}/ports
+export LIBJPEG=${PS2SDK}/ports
+export LIBPNG=${PS2SDK}/ports
+```
+- Refresh env variables via `. ~/.bashrc`
+
+### !!! Please don't forgot to remove/refresh these 4 exports when you will want to update PS2DEV (./build-all.sh), because there is circular dependency between these libs and gsKit which is included in PS2DEV !!!
+
+---
+<br/>
+
+## Build Tyra
+- Go to one of the samples via `cd /repos/tyra/src/samples/floors`
+- Build debug version: `make rebuild-dbg-engine`  
+`Info: If you want to build final version in future, type make rebuild-engine `
+
+---
+<br/>
+
+## Install & configure PCSX2
+- Download & install PCSX2 from (1.6+ version)  
+https://pcsx2.net/
+- Extract bios files from  
+https://romsmania.cc/bios/pcsx2-playstation-2-bios-3  
+to  
+`C:\Users%USERNAME%\Documents\PCSX2\bios`
+- Close `PCSX2` if you have opened!
+- Open `C:\Users\hasto\Documents\PCSX2\inis\PCSX2_vm.ini` in notepad
+```
+HostFs=enabled
+```
+- Open PCSX2 and map pad to your keyboard, for example:
+```
+WASD = Left joy
+Arrows = Right joy
+Space = X
+Circle = C
+```
+
+---
+<br/>
+
+## Run one of the samples
+
+- Add assets for "floors" sample
+- Download assets from  
+ https://github.com/h4570/tyra/tree/master/src/samples/floors
+- Windows: Open your WSL folder (This PC -> WSL folder)
+- Extract assets to /repos/tyra/src/samples/floors/bin/ (create bin folder if not exists)
+- Compile sample via `make`  
+`Info: Elf file should be produced in /bin`
+- Run sample in PSX2 via `make run-pcsx2`
+
+---
+<br/>
+
+## How to code?
+Do some changes in your sample and just type `make clean all run-pcsx2` in your sample folder.
+You can create your own sample, by just copying cube folder.
+
+---
+<br/>
+
+## Setup Intelisense
+
+- Download  
+http://apgcglz.cluster028.hosting.ovh.net/tyra/intellisense.zip
+- Unpack `.vscode` folder to WSL's `/repos/tyra/`  
+`Info: This configuration is set for cube sample, but you can change it in tasks.json file`
+
+---
+<br/>
+
+## Advanced: Compiling VU1 programs
+`Info: Based on https://github.com/microsoft/wsl/issues/2468#issuecomment-374904520`
+- Download VCL
+http://lukasz.dk/files/vcl.1.4.beta7.x86.tgz
+- Rename `vcl_14beta7_x86` binary to `vcl`
+- Put `vcl` to WSL's `/usr/bin`
+```
+apt-get install qemu qemu-user-static binfmt-support
+update-binfmts --install i386 /usr/bin/qemu-i386-static --magic '\x7fELF\x01\x01\x01\x03\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x03\x00\x01\x00\x00\x00' --mask '\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xff\xff\xff\xff\xf8\xff\xff\xff\xff\xff\xff\xff'
+dpkg --add-architecture i386
+apt-get update
+apt-get install libstdc++5:i386
+chmod 755 /usr/bin/vcl
+```
+`Info: In Ubuntu 18.04 I was obligated to install lib32ncurses5 also`
+- Add this line to `~/.bashrc`
+```
+service binfmt-support start &>/dev/null
+```
+- Uncomment `.vsm`/`.vcl` recipe from Tyra's engine `Makefile`
+- Download & install VCL preprocessor
+```
+mkdir temp && cd temp
+git clone https://github.com/glampert/vclpp .
+make
+cp vclpp /usr/bin/
+chmod 755 /usr/bin/vclpp
+cd .. && rm -rf ./temp
+```
+- Uncomment `.vclpp`/`.vcl` recipe from Tyra's engine `Makefile`

src/engine/Makefile

@@ -35,10 +35,10 @@ all: $(EE_OBJS)
 	ar rcs $(LIB_NAME) $(EE_OBJS)
 	rm -f $(EE_OBJS)
 
-#%.vcl: %.vclpp
+# %.vcl: %.vclpp
 #	 $(EE_VCLPP) $< $@
 
-#%.vsm: %.vcl
+# %.vsm: %.vcl
 #	$(EE_VCL) $< >> $@
 
 %.o: %.vsm

src/engine/Makefile.pref

@@ -1,8 +1,7 @@
 EE_LIBS := $(EE_LIBS) -ldraw -lcdvd -lgraph -lmath3d -lpacket -ldma -lpacket2 -lpad -laudsrv -lc -lstdc++ -lpng -lz
-EE_INCS := -I$(TYRA_DIR)/include -I$(PS2SDK)/ports/include $(EE_INCS)
+EE_INCS := -I$(TYRA)/src/engine/include -I$(PS2SDK)/ports/include $(EE_INCS)
-EE_LDFLAGS := -L$(PS2SDK)/ports/lib -L$(TYRA_DIR) $(EE_LDFLAGS)
+EE_LDFLAGS := -L$(PS2SDK)/ports/lib -L$(TYRA)/src/engine $(EE_LDFLAGS)
-EE_CFLAGS := -DHAVE_LIBPNG -D_XCDVD -DHAVE_ZLIB $(EE_CFLAGS)
+EE_CXXFLAGS := -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG -DHAVE_ZLIB -D_XCDVD $(EE_CXXFLAGS)
-EE_CXXFLAGS := -DHAVE_LIBPNG -D_XCDVD -DHAVE_ZLIB $(EE_CXXFLAGS)
 EE_DVP = dvp-as
 EE_VCL = vcl
 EE_VCLPP = vclpp

src/engine/engine.cpp

@@ -52,16 +52,12 @@ void Engine::setDefaultScreen()
 
 void Engine::init(Game *t_game, u32 t_gifPacketSize)
 {
-    if (isInitialized)
+    assertMsg(!isInitialized, "Engine was already initialized!");
-        PRINT_ERR("Already initialized!");
-    else
-    {
     game = t_game;
     renderer = new Renderer(t_gifPacketSize, &screen);
     isInitialized = true;
     game->onInit();
     gameLoop();
-    }
 }
 
 /** Do not call this method. This is used in gameLoop() to maintain multithreading */

src/engine/include/models/texture.hpp

@@ -167,10 +167,8 @@ public:
     void removeLinkById(const u32 &t_id)
     {
         s32 index = getIndexOfLink(t_id);
-        if (index != -1)
+        assertMsg(index != -1, "Cant remove link, because it was not found!");
         removeLinkByIndex(index);
-        else
-            PRINT_ERR("Cant remove link, because it was not found!");
     }
 
 private:

src/engine/include/modules/texture_repository.hpp

@@ -119,10 +119,8 @@ public:
     const void removeById(const u32 &t_texId)
     {
         s32 index = getIndexOf(t_texId);
-        if (index != -1)
+        assertMsg(index != -1, "Cant remove texture, because it was not found!");
         removeByIndex(index);
-        else
-            PRINT_ERR("Cant remove texture, because it was not found!");
     }
 
 private:

src/engine/include/utils/debug.hpp

@@ -11,14 +11,16 @@
 #ifndef _TYRA_DEBUG_
 #define _TYRA_DEBUG_
 
-#include <tamtypes.h>
+#ifdef NDEBUG
-#include <math3d.h>
+#define consoleLog(message) ((void)0)
-#include <stdio.h>
+#define assertMsg(condition, message) ((void)0)
 
+#else // IF Debug
+#include <stdio.h>
 class Debug
 {
 public:
-    static void errTrap(char *t_text, char *t_file)
+    static void trap(const char *t_text, const char *t_file)
     {
         printf("\n");
         printf("====================================\n");
@@ -29,8 +31,10 @@ public:
             ;
     }
 };
+#define consoleLog(message) printf("LOG: " message " (" __FILE__ ")\n")
+#define assertMsg(condition, message) \
+    if (!(condition))                 \
+    Debug::trap(message, __FILE__)
+#endif // NDEBUG
 
-#define PRINT_LOG(TEXT) printf("LOG: " TEXT " (" __FILE__ ")\n")
+#endif // _TYRA_DEBUG_
-#define PRINT_ERR(TEXT) Debug::errTrap(TEXT, __FILE__)
-
-#endif

src/engine/include/utils/string.hpp

@@ -17,12 +17,12 @@ class String
 {
 
 public:
-    static char *createU32ToString(u32 a);
+    static char *createU32ToString(const u32 a);
-    static char *createWithLeadingZeros(char *a);
+    static char *createWithLeadingZeros(const char *a);
-    static char *createCopy(char *source);
+    static char *createCopy(const char *source);
-    static u32 getLength(char *a);
+    static u32 getLength(const char *a);
-    static char *createConcatenated(char *a, char *b);
+    static char *createConcatenated(const char *a, const char *b);
-    static char *createWithoutExtension(char *source);
+    static char *createWithoutExtension(const char *source);
 };
 
 #endif

src/engine/loaders/bmp_loader.cpp

@@ -38,25 +38,28 @@ void BmpLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char *
     delete[] path_part1;
     delete[] path_part2;
     FILE *file = fopen(path, "rb");
-
+    assertMsg(file != NULL, "Failed to load .bmp file!");
-    if (file == NULL)
-    {
-        PRINT_ERR("Failed to load .bmp file!");
-        return;
-    }
 
     unsigned char header[54];
     fread(header, sizeof(unsigned char), 54, file);
 
     u32 width = (u32)header[18];
     u32 height = (u32)header[22];
+    u32 bits = (u32)header[28];
+    u32 dataOffset = (u32)header[10];
+
+    assertMsg(bits == 24, "Invalid bits per pixel in .bmp file - expected 24!");
+
     o_texture.setSize(width, height, TEX_TYPE_RGB);
-    printf("BMPLoader - width: %d | height: %d\n", width, height);
+    printf("BMPLoader - width: %d | height: %d | bits: %d\n", width, height, bits);
 
     u64 rowPadded = (width * 3 + 3) & (~3);
 
     unsigned char row[rowPadded];
 
+    //Offset file stream to raster data
+    fseek(file, dataOffset, SEEK_SET);
+
     u32 x = 0;
     for (u32 i = 0; i < height; i++)
     {

src/engine/loaders/dff_loader.cpp

@@ -36,11 +36,10 @@ DffLoader::~DffLoader() {}
 
 void DffLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_invertT)
 {
-    PRINT_LOG("Loading dff file");
+    consoleLog("Loading dff file");
     char *path = String::createConcatenated("host:", t_filename);
     FILE *file = fopen(path, "rb");
-    if (file == NULL)
+    assertMsg(file != NULL, "Failed to load .dff file!");
-        PRINT_ERR("Failed to load .dff file!");
     fseek(file, 0L, SEEK_END);
     long fileSize = ftell(file);
     u8 data[fileSize];
@@ -50,7 +49,7 @@ void DffLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
     serialize(o_result, t_invertT, data, t_scale);
     o_result->calculateBoundingBoxes();
     delete[] path;
-    PRINT_LOG("Dff file loaded!");
+    consoleLog("Dff file loaded!");
 }
 
 // void DffLoader::im_not_used_anywhere(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_invertT)

src/engine/loaders/md2_loader.cpp

@@ -44,7 +44,7 @@ int MEM_fread(char *buf, size_t size, size_t n, const FILE *f)
  */
 MeshFrame *MD2Loader::load(u32 &o_framesCount, char *t_subpath, char *t_nameWithoutExtension, float t_scale, u8 t_invertT)
 {
-    PRINT_LOG("Loading new MD2 file");
+    consoleLog("Loading new MD2 file");
     char *part1 = String::createConcatenated(t_subpath, t_nameWithoutExtension);
     char *part2 = String::createConcatenated("host:", part1);
     char *finalPath = String::createConcatenated(part2, ".md2"); // "folder/object.md2"
@@ -53,20 +53,11 @@ MeshFrame *MD2Loader::load(u32 &o_framesCount, char *t_subpath, char *t_nameWith
     md2_t header;
 
     FILE *file = fopen(finalPath, "rb");
-
+    assertMsg(file != NULL, "Failed to load .md2 file!");
-    if (file == NULL)
-    {
-        PRINT_ERR("Failed to load .md2 file!");
-        return NULL;
-    }
 
     fread((char *)&header, sizeof(md2_t), 1, file);
 
-    if ((header.ident != MD2_IDENT) && (header.version != MD2_VERSION))
+    assertMsg((header.ident == MD2_IDENT) && (header.version == MD2_VERSION), "This MD2 file was not in correct format!");
-    {
-        PRINT_ERR("This MD2 file was not in correct format!");
-        return NULL;
-    }
 
     u32 framesCount = header.num_frames;
     u32 vertexCount = header.num_xyz;
@@ -147,7 +138,7 @@ MeshFrame *MD2Loader::load(u32 &o_framesCount, char *t_subpath, char *t_nameWith
         }
     }
 
-    PRINT_LOG("MD2 file loaded!");
+    consoleLog("MD2 file loaded!");
     delete[] finalPath;
     o_framesCount = framesCount;
     for (u32 i = 0; i < framesCount; i++)

src/engine/loaders/obj_loader.cpp

@@ -30,8 +30,7 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
 {
     char *path = String::createConcatenated("host:", t_filename);
     FILE *file = fopen(path, "rb");
-    if (file == NULL)
+    assertMsg(file != NULL, "Failed to load .obj file!");
-        PRINT_ERR("Failed to load .obj file!");
     allocateObjMemory(file, o_result);
     fseek(file, 0, SEEK_SET);
     u32 verticesI = 0, cordsI = 0, normalsI = 0, faceI = 0, vertexIndex[3], coordIndex[3], normalIndex[3];
@@ -76,7 +75,6 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
                 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 */
@@ -89,7 +87,7 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
                 }
                 break;
                 /** Loaded only two digits (V, VT) succesfuly. Not setting VN. */
-                case 2:
+                case 3:
                 {
                     fscanf(file, "%d/%d/ %d/%d/ %d/%d/\n",
                            &vertexIndex[0], &coordIndex[0],
@@ -101,38 +99,34 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
                 case 1:
                 {
                     /** Check for existance of V/// configuration.. */
-                    newerMatches = fscanf(file, "%d/// %d/// %d///\n", x, x, x);
+                    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]);
+                        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)
+                        assertMsg(newerMatches == 6, "Unknown .obj face for .obj file!");
-                        {
                         /** 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!");
-                        }
-                    }
                     break;
                 }
+                break;
                 default:
-                    PRINT_ERR("Unknown faces format in .obj file!");
+                {
+                    assertMsg(true == false, "Unknown faces format in .obj file!");
                     break;
                 }
+                }
 
                 if (matches == 9 || matches == 2 || matches == 1)
                 {

src/engine/loaders/png_loader.cpp

@@ -40,9 +40,7 @@ void PngLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char *
     delete[] path_part2;
 
     FILE *file = fopen(path, "rb");
-
+    assertMsg(file != NULL, "Failed to open .png file!");
-    if (file == NULL)
-        PRINT_ERR("Failed to open .png file!");
 
     png_structp png_ptr;
     png_infop info_ptr;
@@ -51,27 +49,16 @@ void PngLoader::load(Texture &o_texture, char *t_subfolder, char *t_name, char *
     u32 sig_read = 0, row = 0, i = 0, j = 0;
     int bit_depth, color_type, interlace_type;
 
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, NULL, NULL);
+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
+    assertMsg(png_ptr, "PNG read struct init failed!");
-    if (!png_ptr)
-        PRINT_ERR("PNG struct info init failed(1)!");
-
     info_ptr = png_create_info_struct(png_ptr);
-
+    assertMsg(info_ptr, "PNG info struct init failed!");
-    if (!info_ptr)
+    assertMsg(!setjmp(png_jmpbuf(png_ptr)), "PNG reader fatal error!");
-        PRINT_ERR("PNG struct info init failed(2)!");
-
-    if (setjmp(png_jmpbuf(png_ptr)))
-        PRINT_ERR("PNG reader fatal error!");
 
     png_init_io(png_ptr, file);
-
     png_set_sig_bytes(png_ptr, sig_read);
-
     png_read_info(png_ptr, info_ptr);
-
     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
-
     png_set_strip_16(png_ptr);
 
     if (color_type == PNG_COLOR_TYPE_PALETTE)
@@ -98,7 +85,7 @@ 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! RGB/RGBA only.");
+        assertMsg(true == false, "This png format is not supported! RGB/RGBA only.");
     }
 
     o_texture.setSize(width, height, type);

src/engine/models/mesh.cpp

@@ -70,9 +70,8 @@ void Mesh::loadObj(char *t_subfolder, char *t_objFile, const float &t_scale, con
 
 void Mesh::loadObj(char *t_subfolder, char *t_objFile, const float &t_scale, const u32 &t_framesCount, const u8 &t_invertT)
 {
-    if (t_framesCount == 0)
+    assertMsg(t_framesCount != 0, "Frames count cannot be 0!");
-        PRINT_ERR("Frames count cannot be 0!");
+    if (t_framesCount == 1)
-    else if (t_framesCount == 1)
         loadObj(t_subfolder, t_objFile, t_scale, t_invertT);
     else
     {
@@ -132,39 +131,27 @@ void Mesh::loadFrom(const Mesh &t_mesh)
 
 void Mesh::playAnimation(const u32 &t_startFrame, const u32 &t_endFrame)
 {
-    if (framesCount > 1)
+    assertMsg(framesCount > 0, "Cant play animation, because no mesh data was loaded!");
-    {
+    assertMsg(framesCount != 1, "Cant play animation, because this mesh have only one frame.");
-        if (t_endFrame >= framesCount)
+    assertMsg(t_endFrame < framesCount, "End frame value is too high. Valid range: (0, getFramesCount()-1)");
-            PRINT_ERR("End frame value is too high. Valid range: (0, getFramesCount()-1)");
     animState.startFrame = t_startFrame;
     animState.endFrame = t_endFrame;
     if (animState.currentFrame == t_startFrame)
         animState.nextFrame = t_endFrame;
     else
         animState.nextFrame = t_startFrame;
-    }
-    else if (framesCount == 0)
-        PRINT_ERR("Cant play animation, because no mesh data was loaded!");
-    else if (framesCount == 1)
-        PRINT_ERR("Cant play animation, because this mesh have only one frame.");
 }
 
 void Mesh::playAnimation(const u32 &t_startFrame, const u32 &t_endFrame, const u32 &t_stayFrame)
 {
-    if (framesCount > 1)
+    assertMsg(framesCount > 0, "Cant play animation, because no mesh data was loaded!");
-    {
+    assertMsg(framesCount != 1, "Cant play animation, because this mesh have only one frame.");
-        if (t_endFrame >= framesCount)
+    assertMsg(t_endFrame < framesCount, "End frame value is too high. Valid range: (0, getFramesCount()-1)");
-            PRINT_ERR("End frame value is too high. Valid range: (0, getFramesCount()-1)");
     animState.startFrame = t_startFrame;
     animState.endFrame = t_endFrame;
     animState.isStayFrameSet = true;
     animState.stayFrame = t_stayFrame;
     animState.nextFrame = t_startFrame;
-    }
-    else if (framesCount == 0)
-        PRINT_ERR("Cant play animation, because no mesh data was loaded!");
-    else if (framesCount == 1)
-        PRINT_ERR("Cant play animation, because this mesh have only one frame.");
 }
 
 void Mesh::animate()

src/engine/models/mesh_frame.cpp

@@ -52,11 +52,7 @@ MeshFrame::~MeshFrame()
 
 void MeshFrame::allocateSTs(const u32 &t_val)
 {
-    if (_areSTsAllocated)
+    assertMsg(!_areSTsAllocated, "Can't allocate STs, because were already set!");
-    {
-        PRINT_ERR("Can't allocate STs, because were already set!");
-        return;
-    }
     stsCount = t_val;
     sts = new Point[t_val];
     _areSTsAllocated = true;
@@ -64,11 +60,7 @@ void MeshFrame::allocateSTs(const u32 &t_val)
 
 void MeshFrame::allocateVertices(const u32 &t_val)
 {
-    if (_areVerticesAllocated)
+    assertMsg(!_areVerticesAllocated, "Can't allocate vertices, because were already set!");
-    {
-        PRINT_ERR("Can't allocate vertices, because were already set!");
-        return;
-    }
     vertexCount = t_val;
     vertices = new Vector3[t_val];
     _areVerticesAllocated = true;
@@ -76,11 +68,7 @@ void MeshFrame::allocateVertices(const u32 &t_val)
 
 void MeshFrame::allocateNormals(const u32 &t_val)
 {
-    if (_areNormalsAllocated)
+    assertMsg(!_areNormalsAllocated, "Can't allocate normals, because were already set!");
-    {
-        PRINT_ERR("Can't allocate normals, because were already set!");
-        return;
-    }
     normalsCount = t_val;
     normals = new Vector3[t_val];
     _areNormalsAllocated = true;
@@ -88,11 +76,7 @@ void MeshFrame::allocateNormals(const u32 &t_val)
 
 void MeshFrame::allocateMaterials(const u32 &t_val)
 {
-    if (_areMaterialsAllocated)
+    assertMsg(!_areMaterialsAllocated, "Can't allocate materials, because were already set!");
-    {
-        PRINT_ERR("Can't allocate materials, because were already set!");
-        return;
-    }
     materialsCount = t_val;
     materials = new MeshMaterial[t_val];
     _areMaterialsAllocated = true;
@@ -100,9 +84,7 @@ void MeshFrame::allocateMaterials(const u32 &t_val)
 
 void MeshFrame::calculateBoundingBoxes()
 {
-    if (!_areVerticesAllocated)
+    assertMsg(_areVerticesAllocated, "Can't calculate bounding box, because vertices were not allocated!");
-        PRINT_ERR("Can't calculate bounding box, because vertices were not allocated!");
-
     for (u32 i = 0; i < materialsCount; i++)
         materials->calculateBoundingBox(vertices, vertexCount);
 

src/engine/models/mesh_material.cpp

@@ -52,11 +52,7 @@ MeshMaterial::~MeshMaterial()
 
 void MeshMaterial::allocateFaces(const u32 &t_val)
 {
-    if (_areFacesAllocated)
+    assertMsg(!_areFacesAllocated, "Can't allocate faces, because were already set!");
-    {
-        PRINT_ERR("Can't allocate faces, because were already set!");
-        return;
-    }
     facesCount = t_val;
     stFaces = new u32[t_val];
     normalFaces = new u32[t_val];
@@ -66,11 +62,7 @@ void MeshMaterial::allocateFaces(const u32 &t_val)
 
 void MeshMaterial::setName(char *t_val)
 {
-    if (_isNameSet)
+    assertMsg(!_isNameSet, "Can't set name, because was already set!");
-    {
-        PRINT_ERR("Can't set name, because was already set!");
-        return;
-    }
     name = String::createCopy(t_val);
     _isNameSet = true;
 }
@@ -143,8 +135,8 @@ void MeshMaterial::calculateBoundingBox(Vector3 *t_vertices, u32 t_vertCount)
     boundingBox[7].set(hiX, hiY, hiZ);
     _isBoundingBoxCalculated = true;
 
-    //BoundingBox is declared on the heap to prevent any ill-formed default
+    // BoundingBox is declared on the heap to prevent any ill-formed default
-    //constructor instantiated BoundingBox objects.
+    // constructor instantiated BoundingBox objects.
     boundingBoxObj = new BoundingBox(boundingBox);
 }
 

src/engine/models/texture.cpp

@@ -41,13 +41,8 @@ Texture::~Texture()
 
 void Texture::setSize(const u8 &t_width, const u8 &t_height, const TextureType &t_type)
 {
-    if (_isSizeSet)
+    assertMsg(!_isSizeSet, "Can't set size, because was already set!");
-    {
+    assertMsg(t_width <= 256 && t_height <= 256, "Given texture can be too big for PS2. Please strict to 256x256 max. Prefer 128x128.");
-        PRINT_ERR("Can't set size, because was already set!");
-        return;
-    }
-    if (t_width > 256 || t_height > 256)
-        PRINT_ERR("Given texture can be too big for PS2. Please strict to 256x256 max. Prefer 128x128.");
     width = t_width;
     height = t_height;
     _type = t_type;
@@ -57,11 +52,7 @@ void Texture::setSize(const u8 &t_width, const u8 &t_height, const TextureType &
 
 void Texture::setName(char *t_val)
 {
-    if (_isNameSet)
+    assertMsg(!_isNameSet, "Can't set name, because was already set!");
-    {
-        PRINT_ERR("Can't set name, because was already set!");
-        return;
-    }
     name = String::createCopy(t_val);
     _isNameSet = true;
 }

src/engine/modules/audio.cpp

@@ -52,20 +52,15 @@ void Audio::loadSong(char *t_path)
     char *fullFilename = String::createConcatenated("host:", t_path);
     wav = fopen(fullFilename, "rb");
     delete[] fullFilename;
-    if (wav == NULL)
+    assertMsg(wav != NULL, "Failed to open wav file!");
-        PRINT_ERR("Failed to open wav file!");
-    else
-    {
     rewindSongToStart();
     songLoaded = true;
-        PRINT_LOG("Song loaded!");
+    consoleLog("Song loaded!");
-    }
 }
 
 void Audio::playSong()
 {
-    if (!songLoaded)
+    assertMsg(songLoaded, "Cant play song because was not loaded!");
-        PRINT_ERR("Cant play song because was not loaded!");
     if (songFinished)
         rewindSongToStart();
     volume = realVolume;
@@ -105,8 +100,7 @@ void Audio::removeSongListener(const u32 &t_id)
             index = i;
             break;
         }
-    if (index == -1)
+    assertMsg(index != -1, "Cant remove listener because given id was not found!");
-        PRINT_ERR("Cant remove listener because given id was not found!");
     delete songListeners[index];
     songListeners.erase(songListeners.begin() + index);
 }
@@ -132,7 +126,7 @@ audsrv_adpcm_t *Audio::loadADPCM(char *t_path)
     if (audsrv_load_adpcm(result, data, adpcmFileSize))
     {
         printf("AUDSRV returned error string: %s", audsrv_get_error_string());
-        PRINT_ERR("audsrv_load_adpcm() failed!");
+        assertMsg(true == false, "audsrv_load_adpcm() failed!");
     }
     fclose(file);
     return result;
@@ -143,7 +137,7 @@ void Audio::playADPCM(audsrv_adpcm_t *t_adpcm)
     if (audsrv_play_adpcm(t_adpcm))
     {
         printf("AUDSRV returned error string: %s", audsrv_get_error_string());
-        PRINT_ERR("audsrv_play_adpcm() failed!");
+        assertMsg(true == false, "audsrv_play_adpcm() failed!");
     }
 }
 
@@ -152,7 +146,7 @@ void Audio::playADPCM(audsrv_adpcm_t *t_adpcm, const s8 &t_ch)
     if (audsrv_ch_play_adpcm(t_ch, t_adpcm))
     {
         printf("AUDSRV returned error string: %s", audsrv_get_error_string());
-        PRINT_ERR("audsrv_play_adpcm() failed!");
+        assertMsg(true == false, "audsrv_ch_play_adpcm() failed!");
     }
 }
 
@@ -160,7 +154,7 @@ void Audio::playADPCM(audsrv_adpcm_t *t_adpcm, const s8 &t_ch)
 
 void Audio::startThread(FileService *t_fileService)
 {
-    PRINT_LOG("Creating audio thread");
+    consoleLog("Creating audio thread");
     // fileService = t_fileService;
     extern void *_gp;
     thread.func = (void *)Audio::mainThread;
@@ -168,11 +162,11 @@ void Audio::startThread(FileService *t_fileService)
     thread.stack_size = getThreadStackSize();
     thread.gp_reg = (void *)&_gp;
     thread.initial_priority = 0x17;
-    if ((threadId = CreateThread(&thread)) < 0)
+    threadId = CreateThread(&thread);
-        PRINT_ERR("Create audio thread failed!");
+    assertMsg(threadId >= 0, "Create audio thread failed!");
-    PRINT_LOG("Audio thread created");
+    consoleLog("Audio thread created");
     StartThread(threadId, NULL);
-    PRINT_LOG("Audio thread started");
+    consoleLog("Audio thread started");
 }
 
 /** Main thread loop */
@@ -256,25 +250,23 @@ void Audio::rewindSongToStart()
 /** Initialize semaphore which will wait until chunk of the song is not finished. */
 void Audio::initSema()
 {
-    PRINT_LOG("Creating audio semaphore");
+    consoleLog("Creating audio semaphore");
     sema.init_count = 0;
     sema.max_count = 1;
     sema.option = 0;
     fillbufferSema = CreateSema(&sema);
-    PRINT_LOG("Audio semaphore created");
+    consoleLog("Audio semaphore created");
 }
 
 /** Load LIBSD and AUDSRV modules */
 void Audio::loadModules()
 {
-    PRINT_LOG("Modules loading started (LIBSD, AUDSRV)");
+    consoleLog("Modules loading started (LIBSD, AUDSRV)");
     int ret = SifLoadModule("rom0:LIBSD", 0, NULL);
-    if (ret == -203)
+    assertMsg(ret != -203, "LIBSD loading failed!");
-        PRINT_ERR("LIBSD loading failed!");
     ret = SifLoadModule("host:AUDSRV.IRX", 0, NULL);
-    if (ret == -203)
+    assertMsg(ret != -203, "AUDSRV.IRX loading failed!");
-        PRINT_ERR("AUDSRV.IRX loading failed!");
+    consoleLog("Audio modules loaded");
-    PRINT_LOG("Audio modules loaded");
 }
 
 /** 
@@ -283,26 +275,26 @@ void Audio::loadModules()
  */
 void Audio::initAUDSRV()
 {
-    PRINT_LOG("Initializing AUDSRV");
+    consoleLog("Initializing AUDSRV");
     int ret = audsrv_init();
     if (ret != 0)
     {
         printf("AUDSRV returned error string: %s", audsrv_get_error_string());
-        PRINT_ERR("Failed to initialize AUDSRV!");
+        assertMsg(true == false, "Failed to initialize AUDSRV!");
     }
     ret = audsrv_adpcm_init();
     if (ret != 0)
     {
         printf("AUDSRV returned error string: %s", audsrv_get_error_string());
-        PRINT_ERR("Failed to initialize AUDSRV ADPCM!");
+        assertMsg(true == false, "Failed to initialize AUDSRV ADPCM!");
     }
     ret = audsrv_on_fillbuf(getSongBufferSize(), (audsrv_callback_t)iSignalSema, (void *)fillbufferSema);
     if (ret != 0)
     {
         printf("AUDSRV returned error string: %s", audsrv_get_error_string());
-        PRINT_ERR("Failed to initialize AUDSRV fillbuffer!");
+        assertMsg(true == false, "Failed to initialize AUDSRV fillbuffer!");
     }
-    PRINT_LOG("AUDSRV initialized!");
+    consoleLog("AUDSRV initialized!");
 }
 
 /** 

src/engine/modules/camera_base.cpp

@@ -21,7 +21,7 @@
 CameraBase::CameraBase(ScreenSettings *t_screen, Vector3 *t_position)
     : screen(t_screen)
 {
-    PRINT_LOG("Initializing frustum");
+    consoleLog("Initializing frustum");
     farPlaneDist = screen->farPlaneDist;
     nearPlaneDist = screen->nearPlaneDist;
     float tang = tanf(screen->fov * Math::HALF_ANG2RAD);
@@ -31,7 +31,7 @@ CameraBase::CameraBase(ScreenSettings *t_screen, Vector3 *t_position)
     farWidth = farHeight * screen->aspectRatio;
     p_position = t_position;
     up.set(0.0F, 1.0F, 0.0F);
-    PRINT_LOG("CameraBase initialized!");
+    consoleLog("CameraBase initialized!");
 }
 
 // ----

src/engine/modules/file_service.cpp

@@ -43,8 +43,7 @@ u32 FileService::addReadChunk(FILE *t_file, void *t_destination, const u32 &t_si
 s32 FileService::isTaskDone(const u32 &t_taskId)
 {
     s32 taskIndex = getIndexOf(t_taskId);
-    if (taskIndex == -1)
+    assertMsg(taskIndex != -1, "Task was not found!");
-        PRINT_ERR("Task was not found!");
     s32 result = tasks[taskIndex].readStatus;
     if (result != -2137)
         removeByIndex(taskIndex);
@@ -54,10 +53,8 @@ s32 FileService::isTaskDone(const u32 &t_taskId)
 const void FileService::removeById(const u32 &t_taskId)
 {
     s32 index = getIndexOf(t_taskId);
-    if (index != -1)
+    assertMsg(index != -1, "Cant remove task, because it was not found!");
     removeByIndex(index);
-    else
-        PRINT_ERR("Cant remove task, because it was not found!");
 }
 
 const s32 FileService::getIndexOf(const u32 &t_taskId)
@@ -72,18 +69,18 @@ const s32 FileService::getIndexOf(const u32 &t_taskId)
 
 void FileService::startThread()
 {
-    PRINT_LOG("Creating file service thread");
+    consoleLog("Creating file service thread");
     extern void *_gp;
     thread.func = (void *)FileService::mainThread;
     thread.stack = threadStack;
     thread.stack_size = getThreadStackSize();
     thread.gp_reg = (void *)&_gp;
     thread.initial_priority = 0x12;
-    if ((threadId = CreateThread(&thread)) < 0)
+    threadId = CreateThread(&thread);
-        PRINT_ERR("Create audio thread failed!");
+    assertMsg(threadId >= 0, "Create audio thread failed!");
-    PRINT_LOG("File service created");
+    consoleLog("File service created");
     StartThread(threadId, NULL);
-    PRINT_LOG("File service started");
+    consoleLog("File service started");
 }
 
 /** Main thread loop */

src/engine/modules/gif_sender.cpp

@@ -30,12 +30,12 @@
  */
 GifSender::GifSender(u32 t_packetSize, ScreenSettings *t_screen, Light *t_light) : screen(t_screen)
 {
-    PRINT_LOG("Initializing GifSender");
+    consoleLog("Initializing GifSender");
     light = t_light;
     packetSize = t_packetSize;
     packets[0] = packet2_create(t_packetSize, P2_TYPE_NORMAL, P2_MODE_CHAIN, false);
     packets[1] = packet2_create(t_packetSize, P2_TYPE_NORMAL, P2_MODE_CHAIN, false);
-    PRINT_LOG("GifSender initialized!");
+    consoleLog("GifSender initialized!");
 }
 
 /** Releases packets memory */

src/engine/modules/pad.cpp

@@ -30,15 +30,10 @@ Pad::Pad()
     this->slot = 0; // Always zero if not using multitap
     if ((this->ret = padPortOpen(this->port, this->slot, padBuf)) == 0)
     {
-        PRINT_ERR("padPortOpen failed!");
         printf("padPortOpen returned: %d\n", this->ret);
-        SleepThread();
+        assertMsg(true == false, "padPortOpen failed!");
-    }
-    if (!this->initPad())
-    {
-        PRINT_ERR("initPad failed!");
-        SleepThread();
     }
+    assertMsg(this->initPad(), "initPad failed!");
 }
 
 Pad::~Pad() {}
@@ -50,22 +45,20 @@ Pad::~Pad() {}
 /** Load SIO2MAN and PADMAN modules */
 void Pad::loadModules()
 {
-    PRINT_LOG("Loading pad modules");
+    consoleLog("Loading pad modules");
     this->ret = SifLoadModule("rom0:SIO2MAN", 0, NULL);
     if (this->ret < 0)
     {
-        PRINT_ERR("SifLoadModule (SIO2MAN) failed!");
         printf("SifLoadModule returned: %d\n", this->ret);
-        SleepThread();
+        assertMsg(true == false, "SifLoadModule (SIO2MAN) failed!");
     }
     this->ret = SifLoadModule("rom0:PADMAN", 0, NULL);
     if (this->ret < 0)
     {
-        PRINT_ERR("SifLoadModule (PADMAN) failed!");
         printf("SifLoadModule returned: %d\n", this->ret);
-        SleepThread();
+        assertMsg(true == false, "SifLoadModule (PADMAN) failed!");
     }
-    PRINT_LOG("Pad modules loaded!");
+    consoleLog("Pad modules loaded!");
 }
 
 /** Wait when pad will be ready (stable and ready) */
@@ -81,7 +74,7 @@ int Pad::waitPadReady()
         if (state != lastState)
         {
             padStateInt2String(state, stateString);
-            PRINT_LOG("Pad state changed");
+            consoleLog("Pad state changed");
             printf("Curent pad(%d,%d) status: %s\n", this->port, this->slot, stateString);
         }
         lastState = state;
@@ -89,23 +82,20 @@ int Pad::waitPadReady()
     }
     // Were the pad ever 'out of sync'?
     if (lastState != -1)
-        PRINT_LOG("Pad is ready!");
+        consoleLog("Pad is ready!");
     return 0;
 }
 
 /** Initializes and checks type of pad */
 int Pad::initPad()
 {
-    PRINT_LOG("Initializing pad");
+    consoleLog("Initializing pad");
     this->waitPadReady();
     // How many different modes can this device operate in?
     // i.e. get # entrys in the modetable
     int modes = padInfoMode(this->port, this->slot, PAD_MODETABLE, -1);
-    if (modes == 0)
+    assertMsg(modes, "Connected device is not a dual shock controller!"); // (it has no actuator engines)
-    {
+
-        PRINT_ERR("Connected device is not a dual shock controller!"); // (it has no actuator engines)
-        return 1;
-    }
     // Verify that the controller has a DUAL SHOCK mode
     int i = 0;
     do
@@ -115,22 +105,14 @@ int Pad::initPad()
         i++;
     } while (i < modes);
 
-    if (i >= modes)
+    assertMsg(i < modes, "Connected device is not a dual shock controller!");
-    {
-        PRINT_ERR("Connected device is not a dual shock controller!");
-        return 1;
-    }
 
     // If ExId != 0x0 => This controller has actuator engines
     // This check should always pass if the Dual Shock test above passed
     this->ret = padInfoMode(this->port, this->slot, PAD_MODECUREXID, 0);
-    if (this->ret == 0)
+    assertMsg(this->ret, "Connected device is not a dual shock controller!");
-    {
-        PRINT_ERR("Connected device is not a dual shock controller!");
-        return 1;
-    }
 
-    PRINT_LOG("Enabling dual shock functions.");
+    consoleLog("Enabling dual shock functions.");
 
     // When using MMODE_LOCK, user cant change mode with Select button
     padSetMainMode(this->port, this->slot, PAD_MMODE_DUALSHOCK, PAD_MMODE_LOCK);
@@ -156,7 +138,7 @@ int Pad::initPad()
     else
         printf("Did not find any actuators.\n");
     this->waitPadReady();
-    PRINT_LOG("Pad initialized!");
+    consoleLog("Pad initialized!");
     return 1;
 }
 

src/engine/modules/renderer.cpp

@@ -33,7 +33,7 @@ static const float SCREEN_CENTER = GS_CENTER / 2.0F;
  */
 Renderer::Renderer(u32 t_packetSize, ScreenSettings *t_screen)
 {
-    PRINT_LOG("Initializing renderer");
+    consoleLog("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;
@@ -53,7 +53,7 @@ Renderer::Renderer(u32 t_packetSize, ScreenSettings *t_screen)
     vifSender = new VifSender(&light);
     perspective.setPerspective(*t_screen);
     renderData.projection = &perspective;
-    PRINT_LOG("Renderer initialized!");
+    consoleLog("Renderer initialized!");
 }
 
 Renderer::~Renderer() {}
@@ -69,8 +69,7 @@ void Renderer::allocateTextureBuffer(Texture *t_texture)
     textureBuffer.psm = t_texture->getType();
     textureBuffer.info.components = textureBuffer.psm == TEX_TYPE_RGBA ? TEXTURE_COMPONENTS_RGBA : TEXTURE_COMPONENTS_RGB;
     textureBuffer.address = graph_vram_allocate(t_texture->getWidth(), t_texture->getHeight(), textureBuffer.psm, GRAPH_ALIGN_BLOCK);
-    if (textureBuffer.address <= 1)
+    assertMsg(textureBuffer.address > 1, "Texture buffer allocation error. No memory!");
-        PRINT_ERR("Texture buffer allocation error. No memory!");
     textureBuffer.info.width = draw_log2(t_texture->getWidth());
     textureBuffer.info.height = draw_log2(t_texture->getHeight());
     textureBuffer.info.function = TEXTURE_FUNCTION_MODULATE;
@@ -89,8 +88,7 @@ void Renderer::deallocateTextureBuffer()
 
 void Renderer::changeTexture(Texture *t_tex)
 {
-    if (t_tex != NULL)
+    assertMsg(t_tex != NULL, "Texture was not found in texture repository!");
-    {
     if (t_tex->getId() != lastTextureId)
     {
         lastTextureId = t_tex->getId();
@@ -98,9 +96,6 @@ void Renderer::changeTexture(Texture *t_tex)
         allocateTextureBuffer(t_tex);
         GifSender::sendTexture(*t_tex, &textureBuffer);
     }
-    }
-    else
-        PRINT_ERR("Texture was not found in texture repository!");
 }
 
 void Renderer::draw(Sprite &t_sprite)
@@ -164,7 +159,7 @@ void Renderer::draw(Sprite &t_sprite)
 /** Initializes drawing environment (1st app packet) */
 void Renderer::initDrawingEnv()
 {
-    PRINT_LOG("Initializing drawing environment");
+    consoleLog("Initializing drawing environment");
     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,
@@ -174,7 +169,7 @@ void Renderer::initDrawingEnv()
     dma_channel_send_packet2(packet2, DMA_CHANNEL_GIF, true);
     dma_channel_wait(DMA_CHANNEL_GIF, 0);
     packet2_free(packet2);
-    PRINT_LOG("Drawing environment initialized!");
+    consoleLog("Drawing environment initialized!");
 }
 
 /** Sets drawing prim for all 3D objects */
@@ -189,7 +184,7 @@ void Renderer::setPrim()
     prim.mapping_type = PRIM_MAP_ST;
     prim.colorfix = PRIM_UNFIXED;
     renderData.prim = &prim;
-    PRINT_LOG("Prim set!");
+    consoleLog("Prim set!");
 }
 
 void Renderer::setWorldColor(const color_t &t_rgb)
@@ -219,7 +214,7 @@ void Renderer::allocateBuffers(int t_screenW, int t_screenH)
     zBuffer.method = ZTEST_METHOD_GREATER_EQUAL;
     zBuffer.zsm = GS_ZBUF_24;
     zBuffer.address = graph_vram_allocate(t_screenW, t_screenH, zBuffer.zsm, GRAPH_ALIGN_PAGE);
-    PRINT_LOG("Framebuffers, zBuffer set and allocated!");
+    consoleLog("Framebuffers, zBuffer set and allocated!");
 
     // Initialize the screen and tie the first framebuffer to the read circuits.
     graph_initialize(frameBuffers[0].address, frameBuffers[0].width, frameBuffers[0].height, frameBuffers[0].psm, 0, 0);
@@ -274,9 +269,8 @@ void Renderer::allocateBuffers(int t_screenW, int t_screenH)
 void Renderer::draw(Mesh **t_meshes, u16 t_amount, LightBulb *t_bulbs, u16 t_bulbsCount)
 {
     beginFrameIfNeeded();
-    if (!t_meshes[0]->isDataLoaded())
+    assertMsg(t_meshes[0]->isDataLoaded(), "Can't draw, because no mesh data was loaded!");
-        PRINT_ERR("Can't draw, because no mesh data was loaded!");
+    if (
-    else if (
         t_amount >= 3 &&
         !t_meshes[0]->shouldBeBackfaceCulled &&
         t_meshes[0]->getFramesCount() == 1 &&
@@ -309,9 +303,7 @@ void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount)
 {
     beginFrameIfNeeded();
     vifSender->calcMatrix(renderData, t_mesh.position, t_mesh.rotation);
-    if (!t_mesh.isDataLoaded())
+    assertMsg(t_mesh.isDataLoaded(), "Can't draw, because no mesh data was loaded!");
-        PRINT_ERR("Can't draw, because no mesh data was loaded!");
-
     camRotation.identity();
     camRotation.rotate(-t_mesh.rotation);
     Vector3 rotatedCamera = Vector3(camRotation * *renderData.cameraPosition);

src/engine/modules/texture_repository.cpp

@@ -17,8 +17,8 @@
 
 TextureRepository::TextureRepository()
 {
-    PRINT_LOG("Initializing texture repository");
+    consoleLog("Initializing texture repository");
-    PRINT_LOG("Texture repository initialized!");
+    consoleLog("Texture repository initialized!");
 }
 
 TextureRepository::~TextureRepository()

src/engine/modules/vif_sender.cpp

@@ -33,7 +33,7 @@ extern u32 VU1Draw3D_CodeEnd __attribute__((section(".vudata")));
 
 VifSender::VifSender(Light *t_light)
 {
-    PRINT_LOG("Initializing VifSender");
+    consoleLog("Initializing VifSender");
     light = t_light;
     lastVertCount = 0;
     isDrawWaitEnabled = true;
@@ -44,7 +44,7 @@ VifSender::VifSender(Light *t_light)
     packets[1] = packet2_create(VU1_PACKET_SIZE, P2_TYPE_NORMAL, P2_MODE_CHAIN, true);
     context = 0;
     setDoubleBufferAddStaticData();
-    PRINT_LOG("VifSender initialized!");
+    consoleLog("VifSender initialized!");
 }
 
 VifSender::~VifSender()

src/engine/utils/string.cpp

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #define CHAR_BIT 8
 
-char *String::createU32ToString(u32 a)
+char *String::createU32ToString(const u32 a)
 {
     char *result = new char[(((sizeof a) * CHAR_BIT) + 2) / 3 + 2];
     sprintf(result, "%d", a);
@@ -21,7 +21,7 @@ char *String::createU32ToString(u32 a)
 }
 
 /** Converts "123" to "000123". 6 digits length */
-char *String::createWithLeadingZeros(char *a)
+char *String::createWithLeadingZeros(const char *a)
 {
     const u8 digitsAmount = 6;
     char *part = createConcatenated("00000000", a);
@@ -35,7 +35,7 @@ char *String::createWithLeadingZeros(char *a)
     return result;
 }
 
-char *String::createWithoutExtension(char *source)
+char *String::createWithoutExtension(const char *source)
 {
     u32 length = 0;
     for (;; length++)
@@ -48,7 +48,7 @@ char *String::createWithoutExtension(char *source)
     return res;
 }
 
-char *String::createCopy(char *source)
+char *String::createCopy(const char *source)
 {
     u32 srcLength = getLength(source);
     char *res = new char[srcLength + 1];
@@ -59,7 +59,7 @@ char *String::createCopy(char *source)
 }
 
 // For test\0 will return 4
-u32 String::getLength(char *a)
+u32 String::getLength(const char *a)
 {
     if (a == NULL)
         return 0;
@@ -68,7 +68,7 @@ u32 String::getLength(char *a)
             return i;
 }
 
-char *String::createConcatenated(char *a, char *b)
+char *String::createConcatenated(const char *a, const char *b)
 {
     u32 aLength = getLength(a);
     u32 bLength = getLength(b);

src/samples/cube/.gitignore

@@ -0,0 +1,2 @@
+.vscode/
+fonts/**

src/samples/cube/Makefile

@@ -0,0 +1,39 @@
+# Project settings
+
+DIR_NAME = cube
+EE_LIBS = -ltyra
+EE_OBJS =											\
+	objects/cube.o									\
+	camera.o										\
+	cubes.o											\
+	main.o
+
+# ----------------
+# Other 
+
+EE_BIN = $(DIR_NAME).elf
+
+all: $(EE_BIN)
+	$(EE_STRIP) --strip-all $(EE_BIN)
+	mv $(EE_BIN) bin/$(EE_BIN)
+
+rebuild-engine: 
+	cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
+
+rebuild-dbg-engine: 
+	cd $(TYRA)/src/engine && make clean && make
+
+clean:
+	rm -f $(EE_OBJS)
+
+run:
+	killall -v ps2client || true
+	ps2client reset
+	ps2client reset
+	cd bin/ && ps2client execee host:$(EE_BIN)
+
+run-pcsx2:
+	taskkill.exe /f /t /im pcsx2.exe || true
+	$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\samples\\$(DIR_NAME)\\bin\\$(EE_BIN)
+
+include $(TYRA)/src/engine/Makefile.pref

src/samples/cube/README.MD

@@ -0,0 +1,15 @@
+
+## Cube Sample
+
+### Features
+
+- Rotating Cube
+
+### Assets
+You can download assets from [latest release](https://github.com/h4570/tyra/releases/latest) (unpack to `/repos/tyra/src/samples/cube/bin`)
+
+### Screenshot
+
+[![Cube screenshot][Cube-screenshot]](#)  
+
+[Cube-screenshot]:  http://apgcglz.cluster028.hosting.ovh.net/tyra/cube.gif

src/samples/cube/bin/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

src/samples/cube/camera.cpp

@@ -0,0 +1,67 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Wellington Carvalho <wellcoj@gmail.com>
+*/
+
+#include "camera.hpp"
+
+#include <utils/debug.hpp>
+#include <fastmath.h>
+
+const float CAMERA_Y = 30.0F;
+
+// ----
+// Constructors/Destructors
+// ----
+
+Camera::Camera(ScreenSettings *t_screen) : CameraBase(t_screen, &position)
+{
+    consoleLog("Initializing camera");
+    verticalLevel = 80.0F;
+    consoleLog("Camera initialized!");
+}
+
+Camera::~Camera() {}
+
+// ----
+// Methods
+// ----
+
+void Camera::update(Pad &t_pad, Mesh &t_mesh)
+{
+    rotate(t_pad);
+    followBy(t_mesh);
+    lookAt(t_mesh.position);
+}
+
+/** Set camera rotation by pad right joy and update unit circle
+ * https://en.wikipedia.org/wiki/Unit_circle
+ * https://www.desmos.com/calculator/3e7iypw4ow
+ */
+void Camera::rotate(Pad &t_pad)
+{
+    if (t_pad.rJoyH <= 100)
+        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 = (sin(horizontalLevel) * verticalLevel);
+    unitCirclePosition.y = CAMERA_Y;
+    unitCirclePosition.z = (cos(horizontalLevel) * verticalLevel);
+}
+
+/** Rotate camera around 3D object */
+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;
+}

src/samples/cube/camera.hpp

@@ -0,0 +1,41 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Wellington Carvalho <wellcoj@gmail.com>
+*/
+
+#ifndef _CAMERA_
+#define _CAMERA_
+
+#include <modules/pad.hpp>
+#include <models/mesh.hpp>
+#include <models/math/vector3.hpp>
+#include <models/screen_settings.hpp>
+#include <modules/camera_base.hpp>
+#include <tamtypes.h>
+
+/** 3D camera which follow by 3D object. Can be rotated via pad */
+class Camera : public CameraBase
+{
+
+public:
+    Vector3 up, position, unitCirclePosition;
+    float horizontalLevel, verticalLevel;
+
+    Camera(ScreenSettings *t_screen);
+    ~Camera();
+
+    void update(Pad &t_pad, Mesh &t_mesh);
+    void rotate(Pad &t_pad);
+    void followBy(Mesh &t_mesh);
+
+protected:
+    Vector3 *getPosition() { return &position; };
+    ScreenSettings screen;
+};
+
+#endif

src/samples/cube/cubes.cpp

@@ -0,0 +1,48 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Wellington Carvalho <wellcoj@gmail.com>
+*/
+
+#include "cubes.hpp"
+
+Cubes::Cubes(Engine *t_engine)
+    : engine(t_engine), camera(&t_engine->screen)
+{
+    consoleLog("Initing cubes sample");
+}
+
+Cubes::~Cubes()
+{
+    return;
+}
+
+void Cubes::onInit()
+{
+    texRepo = engine->renderer->getTextureRepository();
+    cube = new Cube(texRepo);
+    setBgColorAndAmbientColor();
+    engine->renderer->setCameraDefinitions(&camera.view, &camera.unitCirclePosition, camera.planes);
+}
+
+void Cubes::onUpdate()
+{
+    camera.update(engine->pad, cube->mesh);
+    cube->update(engine->pad, camera);
+    engine->renderer->draw(cube->mesh);
+}
+
+void Cubes::setBgColorAndAmbientColor()
+{
+    color_t bgColor;
+    bgColor.r = 0x20;
+    bgColor.g = 0x20;
+    bgColor.b = 0x20;
+    engine->renderer->setWorldColor(bgColor);
+    Vector3 ambient = Vector3(0.2F, 0.2F, 0.2F);
+    engine->renderer->setAmbientLight(ambient);
+}

src/samples/cube/cubes.hpp

@@ -0,0 +1,40 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Wellington Carvalho <wellcoj@gmail.com>
+*/
+
+#ifndef _CUBES_
+#define _CUBES_
+
+#include <tamtypes.h>
+#include <game.hpp>
+#include <engine.hpp>
+#include "modules/texture_repository.hpp"
+#include "camera.hpp"
+#include "objects/cube.hpp"
+
+class Cubes : public Game
+{
+
+    public:
+        Cubes(Engine *t_engine);
+        ~Cubes();
+
+        void onInit();
+        void onUpdate();
+
+        Engine *engine;
+
+    private:
+        void setBgColorAndAmbientColor();
+        TextureRepository *texRepo;
+        Cube *cube;
+        Camera camera;
+};
+
+#endif

src/samples/cube/main.cpp

@@ -0,0 +1,20 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Wellington Carvalho <wellcoj@gmail.com>
+*/
+
+#include "cubes.hpp"
+
+int main()
+{
+    Engine engine = Engine();
+    Cubes game = Cubes(&engine);
+    game.engine->init(&game, 128);
+    SleepThread();
+    return 0;
+}

src/samples/cube/objects/cube.cpp

@@ -0,0 +1,78 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Wellington Carvalho <wellcoj@gmail.com>
+*/
+
+#include "cube.hpp"
+#include <models/mesh.hpp>
+#include <loaders/obj_loader.hpp>
+#include <utils/debug.hpp>
+
+// ----
+// Constructors/Destructors
+// ----
+
+Cube::Cube(TextureRepository *t_texRepo)
+{
+    consoleLog("Creating cube");
+    texRepo = t_texRepo;
+    speed = 1.2F;
+
+    mesh.loadObj("meshes/cube/", "cube", 10.0F, true);
+    mesh.position.set(20.00F, 40.00F, 10.00F);
+    mesh.rotation.x = -1.566F;
+    mesh.rotation.z = 1.566F;
+
+    texRepo->addByMesh("meshes/cube/", mesh, PNG);
+
+    consoleLog("Cube object created!");
+}
+
+void Cube::update(const Pad &t_pad, const Camera &t_camera)
+{
+    rotate(t_pad);
+    Vector3 *nextPos = getNextPosition(t_pad, t_camera);
+}
+
+Vector3 *Cube::getNextPosition(const Pad &t_pad, const Camera &t_camera)
+{
+    Vector3 *result = new Vector3(mesh.position);
+    Vector3 normalizedCamera = Vector3(t_camera.unitCirclePosition);
+    normalizedCamera.normalize();
+    normalizedCamera *= speed;
+    if (t_pad.lJoyV <= 100)
+    {
+        result->x += -normalizedCamera.x;
+        result->z += -normalizedCamera.z;
+    }
+    else if (t_pad.lJoyV >= 200)
+    {
+        result->x += normalizedCamera.x;
+        result->z += normalizedCamera.z;
+    }
+    if (t_pad.lJoyH <= 100)
+    {
+        result->x += -normalizedCamera.z;
+        result->z += normalizedCamera.x;
+    }
+    else if (t_pad.lJoyH >= 200)
+    {
+        result->x += normalizedCamera.z;
+        result->z += -normalizedCamera.x;
+    }
+    return result;
+}
+
+void Cube::rotate(const Pad &t_pad)
+{
+    //if (t_pad.rJoyH >= 200)
+    //else if (t_pad.rJoyH <= 100)
+    mesh.rotation.x += (0.01 * speed);
+    mesh.rotation.y += (0.01 * speed);
+    mesh.rotation.z += (0.01 * speed);
+}

src/samples/cube/objects/cube.hpp

@@ -0,0 +1,37 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2020, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Wellington Carvalho <wellcoj@gmail.com>
+*/
+
+#ifndef _CUBE_
+#define _CUBE_
+
+#include "../camera.hpp"
+#include <tamtypes.h>
+#include <modules/pad.hpp>
+#include <modules/timer.hpp>
+#include "modules/texture_repository.hpp"
+
+/** Cube 3D object class  */
+class Cube
+{
+    public:
+        Mesh mesh;
+        Cube( TextureRepository *t_texRepo );
+        ~Cube();
+
+        void update(const Pad &t_pad, const Camera &t_camera);
+
+    private:
+        TextureRepository *texRepo;
+        Vector3 *getNextPosition(const Pad &t_pad, const Camera &t_camera);
+        void rotate(const Pad &t_pad);
+        float speed;
+};
+
+#endif

src/samples/dolphin/.gitignore

@@ -1,3 +1,2 @@
 .vscode/
-bin/**
 fonts/**

src/samples/dolphin/Makefile

@@ -1,7 +1,7 @@
-EE_BIN = dolphin.elf
+# Project settings
-
-TYRA_DIR = ./../../engine
 
+DIR_NAME = dolphin
+EE_LIBS = -ltyra
 EE_OBJS =											\
 	camera.o										\
 	objects/player.o								\
@@ -10,26 +10,32 @@ EE_OBJS =											\
 	dolphin.o										\
 	main.o
 
-EE_LIBS = -ltyra 
+# ----------------
+# Other 
+
+EE_BIN = $(DIR_NAME).elf
 
 all: $(EE_BIN)
 	$(EE_STRIP) --strip-all $(EE_BIN)
 	mv $(EE_BIN) bin/$(EE_BIN)
-	rm $(EE_OBJS)
 
 rebuild-engine: 
-	cd $(TYRA_DIR) && make clean && make
+	cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
+
+rebuild-dbg-engine: 
+	cd $(TYRA)/src/engine && make clean && make
 
 clean:
 	rm -f $(EE_OBJS)
 
-run: $(EE_BIN)
+run:
 	killall -v ps2client || true
 	ps2client reset
 	ps2client reset
-	$(EE_STRIP) --strip-all $(EE_BIN)
-	mv $(EE_BIN) bin/$(EE_BIN)
-	rm $(EE_OBJS)
 	cd bin/ && ps2client execee host:$(EE_BIN)
 
-include $(TYRA_DIR)/Makefile.pref
+run-pcsx2:
+	taskkill.exe /f /t /im pcsx2.exe || true
+	$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\samples\\$(DIR_NAME)\\bin\\$(EE_BIN)
+
+include $(TYRA)/src/engine/Makefile.pref

src/samples/dolphin/README.MD

@@ -11,10 +11,10 @@
 - Usage of draw() in array mode (for water tiles, very fast)
 
 ### Assets
-[Download](http://apgcglz.cluster028.hosting.ovh.net/tyra/1.31.2/samples/dolphin/assets.zip) 
+You can download assets from [latest release](https://github.com/h4570/tyra/releases/latest) (unpack to `/repos/tyra/src/samples/dolphin/bin`)
 
 ### Screenshot  
 
 [![Dolphin screenshot][dolphin-screenshot]](#) 
 
-[dolphin-screenshot]: http://apgcglz.cluster028.hosting.ovh.net/tyra/1.31.2/samples/dolphin/dolphin.gif 
+[dolphin-screenshot]: http://apgcglz.cluster028.hosting.ovh.net/tyra/dolphin.gif 

src/samples/dolphin/bin/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

src/samples/dolphin/dolphin.cpp

@@ -239,7 +239,11 @@ void Dolphin::onUpdate()
     waterbox.position.set(player.mesh.position.x, -260.0F, player.mesh.position.z);
 
     engine->renderer->draw(island);
-    engine->renderer->draw(waterDrawList, WATER_TILES_COUNT);
+
+    for (int i = 0; i < WATER_TILES_COUNT; i++)
+    {
+        engine->renderer->draw(*waterDrawList[i]);
+    }
     engine->renderer->draw(skybox);
     engine->renderer->draw(waterbox);
     engine->renderer->draw(seabed);

src/samples/floors/.gitignore

@@ -1,3 +1,2 @@
 .vscode/
-bin/**
 fonts/**

src/samples/floors/Makefile

@@ -1,7 +1,7 @@
-EE_BIN = floors.elf
+# Project settings
-
-TYRA_DIR = ./../../engine
 
+DIR_NAME = floors
+EE_LIBS = -ltyra
 EE_OBJS =											\
 	managers/light_manager.o						\
 	managers/floor_manager.o						\
@@ -14,26 +14,32 @@ EE_OBJS =											\
 	floors.o										\
 	main.o
 
-EE_LIBS = -ltyra 
+# ----------------
+# Other 
+
+EE_BIN = $(DIR_NAME).elf
 
 all: $(EE_BIN)
 	$(EE_STRIP) --strip-all $(EE_BIN)
 	mv $(EE_BIN) bin/$(EE_BIN)
-	rm $(EE_OBJS)
 
 rebuild-engine: 
-	cd $(TYRA_DIR) && make clean && make
+	cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
+
+rebuild-dbg-engine: 
+	cd $(TYRA)/src/engine && make clean && make
 
 clean:
 	rm -f $(EE_OBJS)
 
-run: $(EE_BIN)
+run:
 	killall -v ps2client || true
 	ps2client reset
 	ps2client reset
-	$(EE_STRIP) --strip-all $(EE_BIN)
-	mv $(EE_BIN) bin/$(EE_BIN)
-	rm $(EE_OBJS)
 	cd bin/ && ps2client execee host:$(EE_BIN)
 
-include $(TYRA_DIR)/Makefile.pref
+run-pcsx2:
+	taskkill.exe /f /t /im pcsx2.exe || true
+	$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\samples\\$(DIR_NAME)\\bin\\$(EE_BIN)
+
+include $(TYRA)/src/engine/Makefile.pref

src/samples/floors/README.MD

@@ -10,10 +10,10 @@
 - Usage of draw() in array mode (for floors, very fast)
 
 ### Assets
-[Download](http://apgcglz.cluster028.hosting.ovh.net/tyra/1.31.2/samples/floors/assets.zip) 
+You can download assets from [latest release](https://github.com/h4570/tyra/releases/latest) (unpack to `/repos/tyra/src/samples/dolphin/bin`)
 
 ### Screenshot  
 
 [![Floors screenshot][floors-screenshot]](#) 
 
-[floors-screenshot]: http://apgcglz.cluster028.hosting.ovh.net/tyra/1.31.2/samples/floors/floors.gif 
+[floors-screenshot]: http://apgcglz.cluster028.hosting.ovh.net/tyra/floors.gif 

src/samples/floors/bin/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

src/samples/floors/camera.cpp

@@ -21,9 +21,9 @@ const float CAMERA_Y = 30.0F;
 
 Camera::Camera(ScreenSettings *t_screen) : CameraBase(t_screen, &position)
 {
-    PRINT_LOG("Initializing camera");
+    consoleLog("Initializing camera");
     verticalLevel = 80.0F;
-    PRINT_LOG("Camera initialized!");
+    consoleLog("Camera initialized!");
 }
 
 Camera::~Camera() {}

src/samples/floors/managers/floor_manager.cpp

@@ -51,7 +51,7 @@ FloorManager::~FloorManager()
 */
 void FloorManager::calcSpiral(int X, int Y)
 {
-    PRINT_LOG("Calculating square spiral for floors");
+    consoleLog("Calculating square spiral for floors");
     int x, y, dx;
     x = y = dx = 0;
     int dy = -1;
@@ -73,7 +73,7 @@ void FloorManager::calcSpiral(int X, int Y)
         x += dx;
         y += dy;
     }
-    PRINT_LOG("Square spiral calculated!");
+    consoleLog("Square spiral calculated!");
 }
 
 /** Initialize all floors by: 
@@ -82,7 +82,7 @@ void FloorManager::calcSpiral(int X, int Y)
  */
 void FloorManager::initFloors()
 {
-    PRINT_LOG("Initializing floors");
+    consoleLog("Initializing floors");
     floors[0].mesh.loadObj("meshes/floor/", "floor", 3.0F, false);
     floors[0].mesh.shouldBeFrustumCulled = true;
     floors[0].mesh.shouldBeLighted = true;
@@ -95,7 +95,7 @@ void FloorManager::initFloors()
         texRepo->getBySpriteOrMesh(floors[0].mesh.getMaterial(0).getId())->addLink(floors[i].mesh.getMaterial(0).getId());
         meshes[i] = &floors[i].mesh;
     }
-    PRINT_LOG("Floors initialized!");
+    consoleLog("Floors initialized!");
 }
 
 /** Main floor loop.

src/samples/floors/managers/light_manager.cpp

@@ -17,7 +17,7 @@
 
 LightManager::LightManager()
 {
-    PRINT_LOG("Creating light manager!");
+    consoleLog("Creating light manager!");
     bulbsCount = 2;
 
     bulbs = new LightBulb[2];
@@ -31,7 +31,7 @@ LightManager::LightManager()
 
     audioOffset = audioTick = 0;
 
-    PRINT_LOG("Light manager created!");
+    consoleLog("Light manager created!");
 }
 
 LightManager::~LightManager()

src/samples/floors/objects/enemy.cpp

@@ -24,7 +24,7 @@
 
 Enemy::Enemy(TextureRepository *t_texRepo)
 {
-    PRINT_LOG("Creating enemy object");
+    consoleLog("Creating enemy object");
 
     meshes = new Mesh[getMeshesCount()];
     drawMeshes = new Mesh *[getMeshesCount()];
@@ -48,7 +48,7 @@ Enemy::Enemy(TextureRepository *t_texRepo)
 
     isKilled = true;
 
-    PRINT_LOG("Enemy object created!");
+    consoleLog("Enemy object created!");
 }
 
 Enemy::~Enemy()

src/samples/floors/objects/player.cpp

@@ -23,7 +23,7 @@
 
 Player::Player(Audio *t_audio, TextureRepository *t_texRepo)
 {
-    PRINT_LOG("Creating player object");
+    consoleLog("Creating player object");
     texRepo = t_texRepo;
     audio = t_audio;
     gravity = 0.1F;
@@ -53,7 +53,7 @@ Player::Player(Audio *t_audio, TextureRepository *t_texRepo)
     boomAdpcm = audio->loadADPCM("sounds/boom.adpcm");
     audio->setADPCMVolume(70, 0);
 
-    PRINT_LOG("Player object created!");
+    consoleLog("Player object created!");
 }
 
 Player::~Player()

src/samples/floors/ui.cpp

@@ -18,7 +18,7 @@
 
 Ui::Ui(TextureRepository *t_texRepo)
 {
-    PRINT_LOG("Initializing ui");
+    consoleLog("Initializing ui");
 
     isTask1Done = false;
     isTask2Done = false;
@@ -52,7 +52,7 @@ Ui::Ui(TextureRepository *t_texRepo)
     grayCheckboxTex->addLink(task1Checkbox.getId());
     grayCheckboxTex->addLink(task2Checkbox.getId());
 
-    PRINT_LOG("Ui initialized!");
+    consoleLog("Ui initialized!");
 }
 
 Ui::~Ui() {}

src/unit_tests/.gitignore

@@ -0,0 +1,2 @@
+.vscode/
+fonts/**

src/unit_tests/Makefile

@@ -0,0 +1,37 @@
+EE_BIN = unit_tests.elf
+EE_LIBS = -ltyra
+EE_OBJS =					\
+	tests/utils/math.o		\
+	main.o
+
+all: $(EE_BIN)
+	$(EE_STRIP) --strip-all $(EE_BIN)
+	mv $(EE_BIN) bin/$(EE_BIN)
+	rm $(EE_OBJS)
+
+rebuild-engine: 
+	cd $(TYRA)/src/engine && make clean && make EE_CXXFLAGS="-DNDEBUG $(EE_CXXFLAGS)"
+
+rebuild-dbg-engine: 
+	cd $(TYRA)/src/engine && make clean && make
+
+clean:
+	rm -f $(EE_OBJS)
+
+run: $(EE_BIN)
+	killall -v ps2client || true
+	ps2client reset
+	ps2client reset
+	$(EE_STRIP) --strip-all $(EE_BIN)
+	mv $(EE_BIN) bin/$(EE_BIN)
+	rm $(EE_OBJS)
+	cd bin/ && ps2client execee host:$(EE_BIN)
+
+run-pcsx2:
+	taskkill.exe /f /t /im pcsx2.exe || true
+	$(WSL_LINUX_PCSX2)/pcsx2.exe --elf=$(WSL_MAKE_WINDOWS)\\repos\\tyra\\src\\unit_tests\\bin\\unit_tests.elf
+
+show:
+	cat bin/test-result.txt
+
+include $(TYRA)/src/engine/Makefile.pref

src/unit_tests/bin/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

src/unit_tests/main.cpp

@@ -0,0 +1,28 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2021, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+// To run unit tests
+// 1. Make sure that your $(PCSX2_PATH) and $(WSL_TYRA_PATH) Makefile variables are correct
+// 2. make && make run-pcsx2 && make show
+// 3. Click 'X' in PCSX2 when screen will be on memory card selection stage
+// 4. Voila :)
+
+const int CUSTOM_ARGC = 5;
+char const *CUSTOM_ARGV[] = {
+    "",
+    "--reporter",
+    "console",
+    "--out",
+    "test-result.txt"};
+
+#define CATCH_CONFIG_MAIN
+#define CATCH_CONFIG_NO_POSIX_SIGNALS
+
+#include "catch.hpp"

src/unit_tests/tests/utils/math.cpp

@@ -0,0 +1,22 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|    
+#   |     |   |   \  |   |       
+#-----------------------------------------------------------------------
+# Copyright 2021, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#include <catch.hpp>
+#include <utils/math.hpp>
+
+SCENARIO("min(a,b) greater 'a' should return 'b'", "[math.cpp]")
+{
+    REQUIRE(Math::min(10, 5) == 5);
+}
+
+SCENARIO("min(a,b) greater 'b' should return 'a'", "[math.cpp]")
+{
+    REQUIRE(Math::min(-5, 5) == -5);
+}