 s473621
|
8af4e5b15d
|
las
|
2024-03-18 17:34:06 +01:00 |
|
s473621
|
380479f9df
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s473559/Grafika2023
|
2024-03-18 17:14:32 +01:00 |
|
s473621
|
5179989830
|
last_c
|
2024-03-18 16:51:38 +01:00 |
|
s473621
|
a0c5486450
|
fixxxi
|
2024-03-18 14:21:18 +01:00 |
|
s473621
|
7d17f45ea7
|
skript
|
2024-03-04 23:13:45 +01:00 |
|
s473621
|
bdcd7163be
|
fix push_back
|
2024-03-04 19:36:46 +01:00 |
|
s473621
|
1d263b5887
|
comm1
|
2024-03-04 19:22:50 +01:00 |
 dompia5
|
31d2af576d
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s473559/Grafika2023
|
2024-03-04 16:44:38 +01:00 |
|
dompia5
|
7652ce3e9f
|
fixed plant placement for planets not on the (0,0,0)
|
2024-03-04 16:33:16 +01:00 |
|
Maryia Sauko
|
5b34df6782
|
update 'Readme.md'
|
2024-02-08 22:19:07 +01:00 |
|
s473621
|
e5ffb856ef
|
image1
|
2024-02-08 22:16:44 +01:00 |
|
dompia5
|
2cc420e957
|
code cleanup
|
2024-02-08 19:09:21 +01:00 |
|
Dominik Piasecki
|
2e4bbb6443
|
Update 'README.md'
|
2024-02-08 19:02:11 +01:00 |
|
Dominik Piasecki
|
7cecfeecb4
|
Update 'README.md'
|
2024-02-08 19:01:47 +01:00 |
|
Dominik Piasecki
|
33e179fe4e
|
Update 'README.md'
|
2024-02-08 18:56:13 +01:00 |
|
Dominik Piasecki
|
f66d7a9bd3
|
Update 'README.md'
|
2024-02-08 18:55:32 +01:00 |
|
Dominik Piasecki
|
462e240127
|
Update 'README.md'
|
2024-02-08 18:54:51 +01:00 |
|
Dominik Piasecki
|
68cb26d33e
|
Upload files to 'PlanetCreator/cw 6/img'
|
2024-02-08 18:46:41 +01:00 |
|
Dominik Piasecki
|
2b023559a9
|
Update 'README.md'
|
2024-02-08 18:43:33 +01:00 |
|
dompia5
|
4a27bc5ac4
|
skybox, bloom, instancing presentation
|
2024-02-08 10:10:49 +01:00 |
|
dompia5
|
1a8b4cd64e
|
merge
|
2024-02-08 03:27:49 +01:00 |
|
dompia5
|
06fe86f652
|
correct models get picked and rendered
|
2024-02-08 03:09:40 +01:00 |
|
dompia5
|
966f3fdc39
|
sorting works
|
2024-02-08 02:52:23 +01:00 |
|
dompia5
|
41ac514aa1
|
probability finished
|
2024-02-08 02:28:11 +01:00 |
|
dompia5
|
10ad09a79a
|
.
|
2024-02-08 01:46:40 +01:00 |
|
dompia5
|
3f1644dbdb
|
WIP placeObject uses material depending on plant
|
2024-02-08 00:40:47 +01:00 |
|
dompia5
|
50f790fbe7
|
pbr connected
|
2024-02-07 22:51:50 +01:00 |
|
dompia5
|
ad3be0a00b
|
shader + plants spawn on whole planet
|
2024-02-07 22:32:03 +01:00 |
|
dompia5
|
4823629510
|
scale fixed.
|
2024-02-07 22:09:59 +01:00 |
|
dompia5
|
ac6a01d5be
|
instancing but scale is messed up
|
2024-02-07 21:58:19 +01:00 |
|
dompia5
|
3f757feb4a
|
.
|
2024-02-07 20:15:05 +01:00 |
|
s473621
|
339afe2b97
|
dtzip
|
2024-02-07 19:55:04 +01:00 |
|
dompia5
|
de646292bd
|
Revert "Revert "WIP objects appear as dots""
This reverts commit bde2409b59.
|
2024-02-07 18:32:04 +01:00 |
|
dompia5
|
bde2409b59
|
Revert "WIP objects appear as dots"
This reverts commit 968295dc3d.
|
2024-02-07 18:29:06 +01:00 |
|
dompia5
|
968295dc3d
|
WIP objects appear as dots
|
2024-02-07 18:28:36 +01:00 |
|
s473621
|
349ba83ec3
|
upd
|
2024-02-07 15:36:10 +01:00 |
|
s473621
|
c20788feaa
|
Merge branch 'merge_with_textures' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into merge_with_textures
# Conflicts:
# PlanetCreator/cw 6/shaders/shader_5_1_tex.frag
|
2024-02-07 15:33:56 +01:00 |
|
s473621
|
bb40477d86
|
upd shader_tex 2
|
2024-02-07 15:31:46 +01:00 |
|
s473621
|
e571743eb1
|
upd shader_tex
|
2024-02-07 15:22:05 +01:00 |
 Deni
|
66a4f36be1
|
return texture to planet
|
2024-02-07 14:55:02 +01:00 |
|
Deni
|
66d6374d53
|
Merge branch 'importing_ply' into merge_with_textures
# Conflicts:
# PlanetCreator/cw 6/grk-cw6.vcxproj.filters
# PlanetCreator/cw 6/imgui.ini
# PlanetCreator/cw 6/src/ex_6_1.hpp
|
2024-02-07 13:50:55 +01:00 |
|
dompia5
|
b5e8ccca12
|
Almost working instancing .
but total number of uniform components exceeds the limitatin of gl_MaxUniformComponents.
|
2024-02-07 02:59:34 +01:00 |
|
dompia5
|
93f8e5583b
|
plant placement optimisation
|
2024-02-05 23:53:09 +01:00 |
|
dompia5
|
0444c26667
|
Merge branch 'populating_with_plants' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into populating_with_plants
|
2024-02-04 22:49:39 +01:00 |
|
dompia5
|
ba77304023
|
cleaning up
|
2024-02-04 22:42:58 +01:00 |
|
s473621
|
576776b996
|
test
|
2024-02-04 22:10:48 +01:00 |
|
s473621
|
cb7385bc1b
|
adding pbr shader for plants.......?...?..?
|
2024-02-03 21:03:12 +01:00 |
|
s473621
|
6e525f8a6e
|
adding plant growth
|
2024-02-03 17:42:50 +01:00 |
|
dompia5
|
97e8b8a8df
|
plants are placed on planet but only on positive coords
|
2024-02-02 22:08:38 +01:00 |
|
dompia5
|
b364a755fc
|
added plants vector to PlanetParams
|
2024-02-02 19:59:24 +01:00 |