Commit Graph

36 Commits

Author SHA1 Message Date
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
Mateusz Drewniak
034cb87981 Fix Camera movement 2022-01-31 17:18:09 +01:00
Mateusz Drewniak
8ee1167265 Change cameraMatrix to perspectiveMatrix in shaders 2022-01-24 13:31:07 +01:00
Michal Zaporski
da407c4993 Add skybox move with camera. 2022-01-23 17:54:55 +01:00
Michal Zaporski
03b82de106 Merge branch 'main' 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-23 17:53:09 +01:00
Michal Zaporski
44ce730c8b Add new sub and shipwreck. 2022-01-23 17:42:46 +01:00
Mateusz Drewniak
c223db50c6 Implement alpha blending 2022-01-23 17:36:19 +01:00
Michal Zaporski
770cdb4b47 Add three plants. 2022-01-23 15:33:38 +01:00
Mateusz Drewniak
bfa4483f76 Add blue underwater fog to shaders 2022-01-23 14:22:04 +01:00
Michal Zaporski
f20ed91d6f add second_fish, third_fish, sea_turtle, crab, fix fish movement 2022-01-20 03:10:14 +01:00
Mateusz Drewniak
6eea90dca6 Add physics examples 2022-01-17 17:00:43 +01:00
Michal Zaporski
5c866f1426 first fish model object and texture 2022-01-11 00:45:37 +01:00
Michal Zaporski
546c120b14 first 15 fishes, but we need better movement 2022-01-04 17:25:05 +01:00
Mateusz Drewniak
5f116faf2a Ship model changed 2022-01-03 23:04:35 +01:00
Mateusz Drewniak
40c425b64e Skybox and seafloor implemented 2022-01-03 20:19:33 +01:00
Mateusz Drewniak
f648151410 Working camera using mouse 2022-01-03 17:33:53 +01:00
Mateusz Drewniak
c8afd00b4b Instructions for compiling on MacOS 2021-12-31 02:40:07 +01:00
Mateusz Drewniak
59301e15eb Initial commit with codes from labs 2021-12-27 21:29:18 +01:00