Commit Graph

Select branches

Hide Pull Requests

imgui

importing_ply

maryia

master

merge_with_textures

plant_placement

populating_with_plants

test_branch

scx

Mono Color

• 8af4e5b15d las master s473621 2024-03-18 17:34:06 +0100
• 380479f9df Merge branch 'master' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 s473621 2024-03-18 17:14:32 +0100
• 5179989830 last_c s473621 2024-03-18 16:48:46 +0100
• a0c5486450 fixxxi scx s473621 2024-03-18 14:21:18 +0100
• 7d17f45ea7 skript s473621 2024-03-04 23:13:45 +0100
• bdcd7163be fix push_back s473621 2024-03-04 19:36:46 +0100
• 1d263b5887 comm1 s473621 2024-03-04 19:22:50 +0100
• 31d2af576d Merge branch 'master' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 dompia5 2024-03-04 16:44:38 +0100
• 7652ce3e9f fixed plant placement for planets not on the (0,0,0) dompia5 2024-03-04 16:33:16 +0100
• 5b34df6782 update 'Readme.md' Maryia Sauko 2024-02-08 22:19:07 +0100
• e5ffb856ef image1 s473621 2024-02-08 22:16:44 +0100
• 2cc420e957 code cleanup dompia5 2024-02-08 19:09:21 +0100
• 2e4bbb6443 Update 'README.md' Dominik Piasecki 2024-02-08 19:02:11 +0100
• 7cecfeecb4 Update 'README.md' Dominik Piasecki 2024-02-08 19:01:47 +0100
• 33e179fe4e Update 'README.md' Dominik Piasecki 2024-02-08 18:56:13 +0100
• f66d7a9bd3 Update 'README.md' Dominik Piasecki 2024-02-08 18:55:32 +0100
• 462e240127 Update 'README.md' Dominik Piasecki 2024-02-08 18:54:51 +0100
• 68cb26d33e Upload files to 'PlanetCreator/cw 6/img' Dominik Piasecki 2024-02-08 18:46:41 +0100
• 2b023559a9 Update 'README.md' Dominik Piasecki 2024-02-08 18:43:33 +0100
• afdb6c6d01 final merge_with_textures s473621 2024-02-08 12:42:03 +0100
• 01482ed96a :))) s473621 2024-02-08 11:53:34 +0100
• 4a27bc5ac4 skybox, bloom, instancing presentation populating_with_plants dompia5 2024-02-08 10:10:49 +0100
• 354af7cef5 UPDATE)) s473621 2024-02-08 09:40:55 +0100
• 6cd9fd3851 mcl s473621 2024-02-08 00:28:38 +0100
• 1a8b4cd64e merge dompia5 2024-02-08 03:27:49 +0100
• 06fe86f652 correct models get picked and rendered dompia5 2024-02-08 03:09:40 +0100
• 966f3fdc39 sorting works dompia5 2024-02-08 02:52:23 +0100
• 41ac514aa1 probability finished dompia5 2024-02-08 02:28:11 +0100
• 10ad09a79a . dompia5 2024-02-08 01:46:40 +0100
• 3f1644dbdb WIP placeObject uses material depending on plant dompia5 2024-02-08 00:40:47 +0100
• 50f790fbe7 pbr connected dompia5 2024-02-07 22:51:50 +0100
• ad3be0a00b shader + plants spawn on whole planet dompia5 2024-02-07 22:32:03 +0100
• 4823629510 scale fixed. dompia5 2024-02-07 22:09:59 +0100
• ac6a01d5be instancing but scale is messed up dompia5 2024-02-07 21:58:19 +0100
• 3f757feb4a . dompia5 2024-02-07 20:15:05 +0100
• 339afe2b97 dtzip s473621 2024-02-07 19:55:04 +0100
• de646292bd Revert "Revert "WIP objects appear as dots"" dompia5 2024-02-07 18:32:04 +0100
• bde2409b59 Revert "WIP objects appear as dots" dompia5 2024-02-07 18:29:06 +0100
• 968295dc3d WIP objects appear as dots dompia5 2024-02-07 18:28:36 +0100
• 349ba83ec3 upd s473621 2024-02-07 15:36:10 +0100
• c20788feaa Merge branch 'merge_with_textures' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into merge_with_textures s473621 2024-02-07 15:33:56 +0100
• bb40477d86 upd shader_tex 2 s473621 2024-02-07 15:31:46 +0100
• e571743eb1 upd shader_tex s473621 2024-02-07 15:22:05 +0100
• 66a4f36be1 return texture to planet Deni 2024-02-07 14:13:42 +0100
• 66d6374d53 Merge branch 'importing_ply' into merge_with_textures Deni 2024-02-07 13:23:44 +0100
• b5e8ccca12 Almost working instancing . but total number of uniform components exceeds the limitatin of gl_MaxUniformComponents. dompia5 2024-02-07 02:59:34 +0100
• 93f8e5583b plant placement optimisation dompia5 2024-02-05 23:53:09 +0100
• 0444c26667 Merge branch 'populating_with_plants' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into populating_with_plants dompia5 2024-02-04 22:49:39 +0100
• ba77304023 cleaning up dompia5 2024-02-04 22:42:58 +0100
• 576776b996 test s473621 2024-02-04 22:10:48 +0100
• cb7385bc1b adding pbr shader for plants.......?...?..? s473621 2024-02-03 21:03:12 +0100
• 6e525f8a6e adding plant growth s473621 2024-02-03 17:42:50 +0100
• 97e8b8a8df plants are placed on planet but only on positive coords plant_placement dompia5 2024-02-02 22:08:38 +0100
• b364a755fc added plants vector to PlanetParams dompia5 2024-02-02 19:59:24 +0100
• 1195ec1b91 plant_placement on planet that is in center of the world dompia5 2024-02-01 19:49:53 +0100
• e514ce6699 moved loadMTL Texture to init to improve performance dompia5 2024-02-01 17:01:03 +0100
• d28c6eecb9 adding texture to plants s473621 2024-01-31 16:09:43 +0100
• c8d8f9bd38 Some fixing importing_ply Deni 2024-01-31 10:12:40 +0100
• 00471a1b93 changed percipation to temperature, plant calculates probability of spawning on new planet Dominik Piasecki 2024-01-29 12:53:03 +0100
• 06362ba989 changes s473621 2024-01-29 12:05:14 +0100
• c9fbf89cc3 Add parametrs test_branch Deni 2024-01-29 12:09:42 +0100
• fdfa841264 changes maryia s473621 2024-01-29 12:05:14 +0100
• 3f409f9c8e Dodawanie nowej planety Deni 2024-01-29 11:15:00 +0100
• db7f06c19b Merge branch 'importing_ply' into test_branch Deni 2024-01-29 09:03:16 +0100
• f02f02acf7 different aproach to rotating but not working :( Dominik Piasecki 2024-01-29 00:53:42 +0100
• ab4adb48fe fixing s473621 2024-01-27 15:30:47 +0100
• bdfff74d08 Merge branch 'imgui' into test_branch Deni 2024-01-27 15:11:11 +0100
• dea910ca2c Fix bug with flicker imgui Deni 2024-01-22 12:49:32 +0100
• d06bc6b54a compiles, header file empty Dominik Piasecki 2024-01-22 13:10:12 +0100
• 3f62438460 Import imgui Deni 2024-01-22 11:20:11 +0100
• 7431154600 broken because of using Core::RenderContext Dominik Piasecki 2024-01-22 00:37:08 +0100
• 0d4cfed3be importing ply objects s473621 2024-01-15 00:59:09 +0100
• 6718cd7e5e placeObjectOnPlanet (not complete) Dominik Piasecki 2024-01-15 00:06:05 +0100
• f52d3aa18d single polygon on screen no normals workaround Dominik Piasecki 2024-01-12 20:50:11 +0100
• 0beb51445f update texture, static planets s473621 2024-01-12 17:03:22 +0100
• a7af8150db ? Dominik Piasecki 2024-01-11 23:37:20 +0100
• 66915f4ff7 deleted old .vs Dominik Piasecki 2024-01-11 18:03:00 +0100
• 55ba312a32 ignore .vs Dominik Piasecki 2024-01-11 18:00:24 +0100
• 03ab368c52 fresh start Dominik Piasecki 2024-01-11 17:57:31 +0100
• 39fda15c3a adding planets s473621 2024-01-10 01:33:43 +0100
• d98f296c4c dependencies Dominik_Piasecki 2023-12-18 17:00:22 +0100
• f4aee89194 initial3 Dominik_Piasecki 2023-12-18 16:22:58 +0100
• fe6a6b81a1 Initial commit Dominik Piasecki 2023-12-18 16:07:46 +0100