Commit Graph

37 Commits

Author SHA1 Message Date
a2902e6eeb Lots of additional comments, terrain shifted by 0.3f 2023-02-13 19:07:38 +01:00
Jakub-Prus
747aa7c8c9 add Comments 2023-02-13 15:35:55 +01:00
a1796fd0cd final commit with comments and uncomented boids 2023-02-13 15:16:27 +01:00
xxxEGOxxx
e59c0f8112 Add some comments, change the color of generated terrain. 2023-02-13 12:56:16 +01:00
Jakub-Prus
b4ad61e342 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464988/AkwariumRoom 2023-02-13 08:02:49 +01:00
Jakub-Prus
9bff8a1d0d boids 2023-02-13 08:02:41 +01:00
2be10bdd8b fix terrain generation 2023-02-13 07:04:56 +01:00
546f36eb86 First Generated Terrain, not resized or moved 2023-02-13 06:34:42 +01:00
b66ffaf1d5 added 4 more fishes in case that the boids won't work 2023-02-13 00:02:39 +01:00
xxxEGOxxx
ee021db197 Fix shadows 2023-02-12 21:03:18 +01:00
xxxEGOxxx
8462bafdce Add more model with textures 2023-02-12 20:58:52 +01:00
xxxEGOxxx
d7e11c39e2 Some replaces 2023-02-12 16:36:55 +01:00
e9904895c4 better collision with cuboid 2023-02-12 16:25:44 +01:00
acb0e7bb2a little changes to movement of fish 2023-02-11 12:42:27 +01:00
df0e474e8a added moon to skybox, changed ball to fish, added more random movement to fish, added commented cuboid blocking movement 2023-02-10 21:27:53 +01:00
xxxEGOxxx
35fab0f392 Add shadows, add glass, add aquaruim, replace some models 2023-02-10 19:23:28 +01:00
xxxEGOxxx
760ccd368b Merge branch 'master' of https://git.wmi.amu.edu.pl/s464988/AkwariumRoom
# Conflicts:
#	cw 9/src/ex_9_1.hpp
2023-02-10 14:31:06 +01:00
xxxEGOxxx
d18f2c340a Rework textures 2023-02-10 14:25:02 +01:00
5ed94d4af3 some textures/skybox changes and turned off flashlight 2023-02-10 13:29:12 +01:00
155c33cfd5 fixed transparency 2023-02-10 11:34:47 +01:00
c80833393b first approach to transparent textures 2023-02-09 22:47:11 +01:00
feade04d3e fixed points of light 2023-02-09 20:04:42 +01:00
xxxEGOxxx
ec8aff3425 Add textures to models + add 3 fish models + add 1 door model 2023-02-09 18:58:12 +01:00
xxxEGOxxx
b6c23a2bc1 textures 2023-02-09 15:39:55 +01:00
xxxEGOxxx
07dd942cdc add textures 2023-02-09 15:33:19 +01:00
9df280d211 added another 2 points of lights 2023-02-09 13:32:22 +01:00
1575ad67af first version of interaction 2023-02-08 14:28:34 +01:00
0d0c17b2cc added skybox 2023-02-07 18:51:59 +01:00
f380daaf2d Merge branch 'master' of https://git.wmi.amu.edu.pl/s464988/AkwariumRoom 2023-02-07 12:09:01 +01:00
53743c609b Fixed gitignore, added missing models and dependecies 2023-02-07 12:08:21 +01:00
93b96f85ed Upload files to 'cw 9'
Add model again
2023-02-07 11:56:40 +01:00
xxxEGOxxx
192eed80ad Change the room and objects colors, add some models (shelf, fish, glass wall). Starting implementation of shadows. 2023-01-31 18:45:44 +01:00
xxxEGOxxx
1da5b3928a Merge branch 'master' of https://git.wmi.amu.edu.pl/s464988/AkwariumRoom 2023-01-29 23:32:46 +01:00
xxxEGOxxx
a8666bbd1a Restructure scene and add some models, change light intensity 2023-01-29 23:32:30 +01:00
d7fbd9e1b8 Upload files to 'cw 9/models'
Models
2023-01-29 23:29:13 +01:00
xxxEGOxxx
08c4a506ef Add project files. 2023-01-29 16:27:16 +01:00
xxxEGOxxx
3f8dba5c12 Add .gitattributes and .gitignore. 2023-01-29 16:27:12 +01:00