Michał Mostowik
|
69b3621215
|
Merge pull request #84 from h4570/feature/non-textured-rendering
Renderer: Non textured rendering (RGBA only)
|
2020-12-28 16:21:25 +01:00 |
|
Michał Mostowik
|
913f52ec6f
|
Merge pull request #77 from h4570/feature/draw-many
Renderer: Fixed sync between processors for draw() array mode.
|
2020-12-27 19:14:51 +01:00 |
|
Michał Mostowik
|
4c8ead755b
|
Merge pull request #74 from h4570/feature/renderer
New VU1 renderer, added VCL preprocessor
|
2020-12-24 14:38:39 +01:00 |
|
Michał Mostowik
|
096f2490ec
|
Merge pull request #73 from h4570/feature/renderer
Renderer: optimized calcs of model-view-proj matrix
|
2020-12-24 12:53:48 +01:00 |
|
Michał Mostowik
|
469ef48051
|
Merge pull request #71 from h4570/refactor/matrix
Refactor of Matrix and Vector3 class.
|
2020-12-24 10:54:04 +01:00 |
|
Foxar
|
3af3576203
|
Added: Multiple doxygen @returns comments.
|
2020-12-21 20:35:09 +01:00 |
|
Foxar
|
ae3dd737e5
|
Changed: Multiple const additions.
|
2020-12-21 20:28:26 +01:00 |
|
Foxar
|
23ea1a28f6
|
Changed: Comments, boundingbox getters in mesh.hpp
|
2020-12-21 20:22:40 +01:00 |
|
Foxar
|
115dac21bc
|
Changed: Return types in mesh_frame and mesh_materials for getBoundingBoxVertex() to const.
|
2020-12-21 20:15:18 +01:00 |
|
Foxar
|
f8f91c6b49
|
Changed: Return type of getVertex() to be const.
|
2020-12-21 20:09:00 +01:00 |
|
Foxar
|
8137bd56d8
|
Changed: Usage of getVertices()[y] to getVertex(y)
|
2020-12-21 20:07:34 +01:00 |
|
Foxar
|
cf07cf78c8
|
Added: Comment for BoundingBox constructor parameters.
|
2020-12-21 20:06:55 +01:00 |
|
Foxar
|
13f6a2ecb7
|
Changed: Changed manual deep-copy of parameter vertex array to usage of memcpy()
|
2020-12-21 20:02:51 +01:00 |
|
Foxar
|
9e1a9e8b3c
|
Changed: Renamed getBoundingBox() to getBoundingBoxVertices() as the function returns the array of vertices from the BoundingBox object.
|
2020-12-21 19:41:29 +01:00 |
|
Foxar
|
5c232aebce
|
Removed: Newline below a doxygen comment.
|
2020-12-21 19:32:40 +01:00 |
|
Foxar
|
586fe136ea
|
Changed: Removed old vertex array boundingbox declaration, forced usage of temporary vector array in initial boundingbox calculations.
|
2020-12-21 19:05:33 +01:00 |
|
Foxar
|
02d7916925
|
Fixed: Fixed incorrect naming of boundingbox constructor parameters.
|
2020-12-21 19:04:34 +01:00 |
|
Foxar
|
1cc1e62ed6
|
Fixed: Fixed incorrect vertex array for-loop iteration.
|
2020-12-21 19:03:40 +01:00 |
|
Foxar
|
1765885bec
|
Removed: Commented-out ('disabled') method declarations.
|
2020-12-21 18:57:01 +01:00 |
|
Foxar
|
d835f83e51
|
Added: New BoundingBox infrastructure into mesh_material, analogous to mesh_frame.
|
2020-12-21 18:48:11 +01:00 |
|
Foxar
|
974138d64e
|
Changed: Replaced old getBoundingBox and getBoundingBoxVertex functions with new ones, using the new bounding_box class infrastructure.
|
2020-12-21 18:31:23 +01:00 |
|
Foxar
|
ae15906c99
|
Added: Accessors in bounding_box class allowing access to vertices array.
|
2020-12-21 18:30:18 +01:00 |
|
Foxar
|
71ce30a8fc
|
Added: Destructor for boundingbox class.
|
2020-12-20 14:13:47 +01:00 |
|
Foxar
|
55d8e445db
|
Fixed: Typo in bounding box getters.
|
2020-12-20 14:12:52 +01:00 |
|
Foxar
|
11a4e2ee76
|
Changed: Updated makefile to include new boundingboxes.
|
2020-12-20 14:11:50 +01:00 |
|
Foxar
|
596bf2d89a
|
Added: Mesh_frame getter for BoundingBox object pointer.
|
2020-12-20 13:44:48 +01:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Michał Mostowik
|
36a637e5e6
|
Merge pull request #54 from h4570/hotfix/texture-size-vars
Texture: Fixed var type bug
|
2020-12-08 21:41:14 +01:00 |
|
Foxar
|
c4fc52b043
|
Added: Sprites representing lifes player has left, and life variable.
|
2020-12-08 19:27:30 +01:00 |
|
Foxar
|
70efbcad46
|
Merge branch 'master' of https://github.com/Foxar/tyra
|
2020-12-08 19:24:22 +01:00 |
|
Michał Mostowik
|
db635c09ea
|
Merge pull request #4 from h4570/develop
Develop pull
|
2020-12-08 19:24:02 +01:00 |
|
Michał Mostowik
|
edf5bd1e55
|
Merge pull request #50 from h4570/hotfix/draw-mesh-color
Add mesh color blending to draw()
|
2020-12-08 16:50:43 +01:00 |
|
Foxar
|
f4421b659d
|
Added: Seabed model/code.
|
2020-12-08 16:48:43 +01:00 |
|
Foxar
|
220caba84a
|
Fixed: Added MODE_STRETCH to wateroverlay, fixing the tiling issue.
|
2020-12-08 15:30:48 +01:00 |
|
Michał Mostowik
|
921b482e61
|
Merge pull request #3 from h4570/develop
Develop pull
|
2020-12-08 14:54:12 +01:00 |
|
Foxar
|
45edf7aedb
|
Added: Static fps member to dolphin.cpp, auto-updated with engine->fps, made player movement multiplied by deltatime of last frame.
|
2020-12-08 14:42:43 +01:00 |
|
Michał Mostowik
|
4557485cab
|
Fixed datatype typos in dolphin.cpp
|
2020-12-08 14:20:00 +01:00 |
|
Foxar
|
582b42c29e
|
Changed: Optimization from code review PR #42
|
2020-12-08 13:36:13 +01:00 |
|
Michał Mostowik
|
62cff819ff
|
Merge pull request #45 from h4570/doc/audio
Audio: Added small comment to loadADPCM().
|
2020-12-07 23:51:13 +01:00 |
|
Michał Mostowik
|
729bcff954
|
Merge pull request #43 from h4570/feature/ambient-color
Renderer: added setAmbientLight() and setWorldColor()
|
2020-12-07 23:50:41 +01:00 |
|
Foxar
|
83dce5cb92
|
Changed: Slowed player rotation speed.
|
2020-12-07 20:09:17 +01:00 |
|
Foxar
|
32422b87eb
|
Added: Collectibles now rotate, float up before disapeparing after being picked up.
|
2020-12-07 20:08:11 +01:00 |
|
Foxar
|
6292c27c50
|
Added: Camera automatically shifts to an angle from behind the player.
|
2020-12-07 19:30:07 +01:00 |
|
Michał Mostowik
|
18f3398687
|
Merge pull request #40 from h4570/feature/texture-inline
Marked texture getters as inline
|
2020-12-07 17:23:28 +01:00 |
|
Michał Mostowik
|
1c3edb3887
|
Merge pull request #38 from h4570/feature/sprite-modes
Sprite modes (stretch/repeat)
|
2020-12-07 17:23:06 +01:00 |
|
Foxar
|
0423e484a5
|
Changed: Dolphin sample FOV is now 75.F, zoomed in the camera, increased the distance for collectibles pickup.
|
2020-12-07 14:28:56 +01:00 |
|
Michał Mostowik
|
ed6c20e5df
|
Merge pull request #2 from h4570/develop
Develop pull
|
2020-12-07 13:37:02 +01:00 |
|
Michał Mostowik
|
f95794c181
|
Merge pull request #36 from h4570/hotfix/vector3
Fixed sqrt() VU0 calcs on real PS2
|
2020-12-07 00:41:34 +01:00 |
|
Michał Mostowik
|
9f4f6f4b18
|
Merge pull request #34 from h4570/bugfix/path3-lighting
Fixed path3 lighting on real PS2
|
2020-12-07 00:40:26 +01:00 |
|
Foxar
|
9a94d93747
|
Merge pull request #30 from h4570/bugfix/2d-sprite-size
Fixed rendering for non square 2D sprites
|
2020-12-06 08:24:37 +01:00 |
|
Foxar
|
20b14a5168
|
Merge pull request #29 from h4570/h4570-patch-1
Add .gitignore to dolphin sample
|
2020-12-05 22:05:55 +01:00 |
|
Foxar
|
c0ab97585c
|
Added: collectibles class. Collectibles are strewn around the level and can be 'picked up' (deactivated, won't be rendered), when the player gets close and jumps.
|
2020-12-05 22:04:38 +01:00 |
|
Foxar
|
b547de9cbb
|
Stretched water overlay to fullscreen, made it appear when camera's sugmerged, disabled the invalid rotation during submerging ( issue number #10 ), enlargened and fixed position of the island mesh.
|
2020-12-04 16:50:25 +01:00 |
|
Foxar
|
a05b4fbd0f
|
Merge pull request #1 from h4570/develop
Updating fork to the current state of main repo's develop branch
|
2020-12-04 16:21:39 +01:00 |
|
Foxar
|
3e385f7c84
|
Merge pull request #6 from h4570/fix/readme
Urls changes in readme file (ps2-tyra to h4570)
|
2020-12-04 10:54:25 +01:00 |
|
Foxar
|
82361e4619
|
Merge pull request #5 from Foxar/master
Included the missing dolphin.cpp and hpp files.
|
2020-12-04 00:21:57 +01:00 |
|
Foxar
|
b48d342adf
|
Included the missing dolphin.cpp and hpp files.
|
2020-12-04 00:20:43 +01:00 |
|
Foxar
|
17ef6b9fbc
|
Revert "Switched audio filenames to available binaries"
This reverts commit 51702d5ef7.
|
2020-12-03 20:25:13 +01:00 |
|
Foxar
|
bae834e599
|
Added water mesh, jumping animation, skybox and diving.
|
2020-12-03 18:33:20 +01:00 |
|
Foxar
|
940271fe8c
|
Merge remote-tracking branch 'upstream/master'
zero
|
2020-12-02 20:59:09 +01:00 |
|
Foxar
|
7e676916a0
|
Added new sample dolphin.
|
2020-12-02 20:54:19 +01:00 |
|
Foxar
|
51702d5ef7
|
Switched audio filenames to available binaries
|
2020-12-01 17:21:07 +01:00 |
|