Commit Graph

361 Commits

Author SHA1 Message Date
Foxar 53c134b0d5 Added: Integrated new BoundingBox class implentation with mesh_frame boundingbox calculations. 2020-12-20 13:38:26 +01:00
Foxar 9b2d39505b Added: BoundingBoxFaces assignments, calculations and doxygen comments. 2020-12-20 13:24:50 +01:00
Foxar 44776f7aba Added: Incomplete implenetation of BoundingBox class and BoundingBoxFace struct. 2020-12-20 13:13:03 +01:00
Sandro Sobczyński bb0ec257b2 Update README.MD 2020-12-19 09:21:58 +01:00
Michał Mostowik a8a649d723 Merge pull request #67 from h4570/feature/new-readme
Readme: Add new logo and modify some things
2020-12-18 22:58:29 +01:00
Sandro Sobczyński 73a3d1d7e5 Update README.MD 2020-12-18 22:36:17 +01:00
Sandro Sobczyński dfee1ab25f Update README.MD 2020-12-18 22:33:14 +01:00
Sandro Sobczyński fcf03b27fa Merge pull request #65 from Foxar/feature/objloader-refactor
.obj file loader refactor, allowing multiple face element formats loading.
2020-12-17 17:50:20 +01:00
Foxar b8d31fc1cc Removed: Commented out return statement. 2020-12-17 17:14:14 +01:00
Foxar 249c2431a2 Fixed: Missing break; in obj faces format recognition. 2020-12-17 17:12:56 +01:00
Foxar 2d1d36ddcc Changed: Adjusted the if checks and reduced redundancy. 2020-12-17 16:23:39 +01:00
Foxar bd11955fd4 Changed: Comments to fit doxygen standard. 2020-12-17 16:09:06 +01:00
Foxar 3c827a407b Removed: Commented out code bit. 2020-12-17 15:49:31 +01:00
Foxar 607c2abc0c Added: Information in mesh_frame on if STs/Normals are present, misc changes for PR #65 code review. 2020-12-17 15:42:33 +01:00
Foxar 49713dc145 Added: Missing faceI integer increments. 2020-12-17 14:51:45 +01:00
Foxar 18db9875ad Removed: Redundant printf() calls below PRINT_ERR. 2020-12-17 14:48:35 +01:00
Foxar 37703e69d0 Changed: Use VSCode auto-formatter. 2020-12-17 14:45:57 +01:00
Foxar d4f2a1e1a2 Restored: Undid the objloader changes, they should be in its own branch. 2020-12-17 14:19:23 +01:00
Foxar 91e8f791b0 Removed: Some test printfs I forgot to remove in last commit. 2020-12-17 14:01:52 +01:00
Foxar 12ef639516 Changed: Allowed obj_loader to load different .obj face element configurations.
New authorised .obj face elements configurations: v, v/t, v/vt/vn, v//vn
2020-12-17 13:33:22 +01:00
Michał Mostowik 552f2c6e4a Merge pull request #4 from h4570/develop
Develop
2020-12-16 15:24:03 +01:00
h4570 ea6d5215d1 fixed funcs declaration 2020-12-13 00:39:32 +01:00
h4570 4a1bca12aa small undo in rendering pipeline 2020-12-13 00:23:04 +01:00
h4570 0156d4444f Merge branch 'develop' of https://github.com/ps2-tyra/tyra into develop 2020-12-13 00:20:19 +01:00
Sandro Sobczyński 623576a387 Merge pull request #63 from h4570/revert-61-hotfix/matrix
Revert "Urgent hotfix in matrix multiply, added few funcs"
2020-12-13 00:19:42 +01:00
Sandro Sobczyński 3f4d2c5521 Revert "Urgent hotfix in matrix multiply, added few funcs" 2020-12-13 00:19:18 +01:00
h4570 206ccdf415 Merge branch 'develop' of https://github.com/ps2-tyra/tyra into develop 2020-12-12 23:57:21 +01:00
Sandro Sobczyński 7025f5371b Merge pull request #62 from h4570/feature/math
Math: Add max/min and tangens
2020-12-12 23:21:16 +01:00
Sandro Sobczyński 2455ce82dd Merge pull request #61 from h4570/hotfix/matrix
Urgent hotfix in matrix multiply, added few funcs
2020-12-12 23:20:30 +01:00
h4570 2ce2e76663 Merge branch 'hotfix/matrix' into develop 2020-12-12 23:19:33 +01:00
h4570 f4e699025a added useful funcs 2020-12-12 23:19:12 +01:00
h4570 b050e4643b multiply hotfix! added scale, angle rotation 2020-12-12 23:18:31 +01:00
Sandro Sobczyński e38f569bc4 Merge pull request #60 from h4570/feature/pipeline
Small refactoring of viewproj matrix calcs
2020-12-12 14:13:29 +01:00
h4570 3dd51607f0 refactored viewproj matrix calcs a bit 2020-12-12 14:12:30 +01:00
Sandro Sobczyński b7618c014a Merge pull request #59 from h4570/feature/math-matrix
Added some matrix/math funcs
2020-12-12 14:11:54 +01:00
h4570 8256efa7c8 switched zbuffer to 24bit mode 2020-12-12 14:10:50 +01:00
h4570 ac36012545 added some matrix/math funcs 2020-12-12 14:07:23 +01:00
Sandro Sobczyński 968718a549 Merge pull request #58 from Foxar/master
Missing commits and files from last PR
2020-12-10 18:01:19 +01:00
Michał Mostowik 24bab8464a Merge pull request #3 from Foxar/develop
Foxar develop->Foxar master-> PR #58 h4570/tyra
2020-12-10 17:59:09 +01:00
Foxar 4bee938106 PR Review: Memory de-allocation, misc. fixes. 2020-12-10 17:49:53 +01:00
Michał Mostowik 86c48eeca4 Merge pull request #2 from Foxar/master
PR Review, removing commented line
2020-12-10 17:43:36 +01:00
Michał Mostowik 97151ffc78 PR Review, removing commented line 2020-12-10 17:37:44 +01:00
Michał Mostowik bc44f598c1 Merge pull request #1 from Foxar/master
Master to develop
2020-12-10 16:35:09 +01:00
Foxar 5129d53b27 Added: Missing mine class files. 2020-12-10 16:32:01 +01:00
Foxar 1539aa4108 Merge branch 'master' of https://github.com/Foxar/tyra
I really freaked last pr up so here's a merge to fix it
2020-12-10 16:31:12 +01:00
Sandro Sobczyński 083c041973 Merge pull request #56 from Foxar/master
Added: Sea mines, healing by collectibles, game over screen
2020-12-10 14:46:35 +01:00
Foxar 0c0512b37f Added: Game over screen 2020-12-10 14:38:12 +01:00
Foxar e7aa4d13cc Added: Mines now explode and hurt the player, added new makefile and made more mines spawn on game start. 2020-12-10 13:52:45 +01:00
Foxar 1c9351e5e9 Added: Sea mines, when fully implemented, will explode and take lifes from player. 2020-12-10 12:52:54 +01:00
Foxar f86a1bf190 Added: Underwater/Above water soundscape, misc sound effects. Reworked player class a bit to contain pointer to the game engine for sound playing. 2020-12-09 14:27:40 +01:00