Michal Zaporski
|
a68557c44e
|
Git ignore update
|
2022-02-11 16:07:12 +01:00 |
|
Michal Zaporski
|
89141bf31a
|
Final commit
|
2022-02-11 16:03:50 +01:00 |
|
Michal Zaporski
|
5d725bc097
|
Merge branch 'main' of https://git.wmi.amu.edu.pl/s452722/grafika-uam-rybki-21-22 into main
|
2022-02-11 15:47:33 +01:00 |
|
Michal Zaporski
|
c6436b950d
|
Remove unused code.
|
2022-02-11 15:44:30 +01:00 |
|
Michal Zaporski
|
c03e2d4212
|
Remove not using code
|
2022-02-11 15:37:45 +01:00 |
|
Michal Zaporski
|
3096126ed2
|
Delete unnecessary files.
|
2022-02-11 15:27:22 +01:00 |
|
Michal Zaporski
|
c3c1cf3ac3
|
Skybox fog and deleting shaders program at the end.
|
2022-02-11 02:25:57 +01:00 |
|
Michal Zaporski
|
1f3e82e6ed
|
Skybox!!! But fog needed
|
2022-02-11 01:46:42 +01:00 |
|
Mateusz Drewniak
|
ffeb37d296
|
Add caustics to more elements
|
2022-02-10 21:11:55 +01:00 |
|
Mateusz Drewniak
|
1d61bef466
|
* Improved Caustics
* Bloom scaffolding
|
2022-02-10 18:46:30 +01:00 |
|
Michal Zaporski
|
34249468fc
|
Add 1 and 3 perspective
|
2022-02-10 00:19:19 +01:00 |
|
Michal Zaporski
|
a23eed7119
|
Add plant movement
|
2022-02-09 23:49:47 +01:00 |
|
Mateusz Drewniak
|
f047a6422c
|
Further improvements to water caustics
|
2022-02-09 21:43:26 +01:00 |
|
Mateusz Drewniak
|
3d7bf8a0fe
|
* Enlarge the Skybox
* Increase draw distance
|
2022-02-09 20:01:57 +01:00 |
|
Mateusz Drewniak
|
ef1223d05d
|
Improve the caustics shader
|
2022-02-09 19:45:27 +01:00 |
|
Mateusz Drewniak
|
91b7dd80c7
|
Typo fix
|
2022-02-09 19:39:18 +01:00 |
|
Mateusz Drewniak
|
63d54451c1
|
Add separate shaders for water caustics
|
2022-02-09 19:38:16 +01:00 |
|
Michal Zaporski
|
4cd41e9797
|
Delete not using models
|
2022-02-09 18:58:44 +01:00 |
|
Michal Zaporski
|
7e4497c4ce
|
Single bubbles
|
2022-02-09 18:54:34 +01:00 |
|
Michal Zaporski
|
f309802e69
|
New bubble texture and bubble render void function
|
2022-02-09 18:21:37 +01:00 |
|
Michal Zaporski
|
1a2461c422
|
Phorphium model
|
2022-02-09 18:05:08 +01:00 |
|
Michal Zaporski
|
2b291b5317
|
Good looking scene
|
2022-02-09 18:04:46 +01:00 |
|
Michal Zaporski
|
5c26c5b2ef
|
Delete not using function
|
2022-02-09 14:28:13 +01:00 |
|
Michal Zaporski
|
fc233f0aa3
|
Game works
|
2022-02-09 00:05:39 +01:00 |
|
Michal Zaporski
|
0f49f1b417
|
Game, but works bad
|
2022-02-08 23:28:46 +01:00 |
|
Michal Zaporski
|
565dd071f3
|
Merge branch 'main' of https://git.wmi.amu.edu.pl/s452722/grafika-uam-rybki-21-22 into main
|
2022-02-08 21:41:19 +01:00 |
|
Mateusz Drewniak
|
b7904ec8e1
|
Double rendering for rocks only
|
2022-02-08 21:39:29 +01:00 |
|
Michal Zaporski
|
85cb5236e8
|
Merge branch 'main' of https://git.wmi.amu.edu.pl/s452722/grafika-uam-rybki-21-22 into main
|
2022-02-08 21:29:37 +01:00 |
|
s416496
|
2b219b999e
|
Leaving caustics only on rocks and stones
|
2022-02-08 21:23:41 +01:00 |
|
Michal Zaporski
|
53bab8ae44
|
Check collision draft function
|
2022-02-08 21:09:56 +01:00 |
|
s416496
|
1752d750c2
|
Added caustics over textures + refactor
|
2022-02-08 21:03:50 +01:00 |
|
Mateusz Drewniak
|
5a8c08d4a3
|
Turtles rendering refactoring
|
2022-02-08 20:42:06 +01:00 |
|
Michal Zaporski
|
24be8cda07
|
Rock, stones and coral trees
|
2022-02-08 19:05:46 +01:00 |
|
Michal Zaporski
|
f37babba7e
|
Animals display and movement
|
2022-02-08 18:26:06 +01:00 |
|
Michal Zaporski
|
0943bc94ca
|
Merge branch 'main' of https://git.wmi.amu.edu.pl/s452722/grafika-uam-rybki-21-22 into main
|
2022-02-08 16:15:47 +01:00 |
|
Michal Zaporski
|
a9aaf2a13e
|
Add models: coral_stone, dolphin, ivy, nemo fish, reeds, rock, seahorse, seaweed, starfish, steering_wheel, stone
|
2022-02-08 16:15:01 +01:00 |
|
Mateusz Drewniak
|
b4a1f81498
|
Reset blend function after the second rendering pass
|
2022-02-01 02:37:00 +01:00 |
|
Mateusz Drewniak
|
2ecef81078
|
Merge branch 'main' of https://git.wmi.amu.edu.pl/s452722/grafika-uam-rybki-21-22 into main
|
2022-02-01 02:14:57 +01:00 |
|
Mateusz Drewniak
|
e49f4ae225
|
Semi-functional water caustics
|
2022-02-01 02:14:48 +01:00 |
|
Michal Zaporski
|
2b5d3e1d6e
|
Add bubbles for shipwreck
|
2022-02-01 02:14:30 +01:00 |
|
Michal Zaporski
|
3d5fd62eda
|
Add 2 sharks
|
2022-02-01 00:13:40 +01:00 |
|
Mateusz Drewniak
|
ac8330324c
|
Water caustics draught
|
2022-01-31 22:27:01 +01:00 |
|
Mateusz Drewniak
|
36348eb990
|
Merge branch 'main' of https://git.wmi.amu.edu.pl/s452722/grafika-uam-rybki-21-22 into main
|
2022-01-31 22:02:04 +01:00 |
|
Mateusz Drewniak
|
58f3685de2
|
Merge branch 'bombelki' of https://git.wmi.amu.edu.pl/s452722/grafika-uam-rybki-21-22 into main
# Conflicts:
# cw 6/src/main_6_1.cpp
|
2022-01-31 22:01:55 +01:00 |
|
Michal Zaporski
|
9f13d15b01
|
Submarine texture
|
2022-01-31 22:01:04 +01:00 |
|
Michal Zaporski
|
d34d8c66dd
|
New terrain and new submarine
|
2022-01-31 21:49:34 +01:00 |
|
s416496
|
e618a37b96
|
bąbelki w gure
|
2022-01-31 21:08:09 +01:00 |
|
Mateusz Drewniak
|
7e221fc95d
|
Calculate perspectiveMatrix while intializing the programme
|
2022-01-31 19:41:17 +01:00 |
|
Mateusz Drewniak
|
096fc55d8b
|
Calculate shipInitialTransformation when initalizing the programme
|
2022-01-31 19:14:31 +01:00 |
|
Michal Zaporski
|
956fec9a4f
|
Hide cursor
|
2022-01-31 17:44:15 +01:00 |
|