|
|
4a27bc5ac4
|
skybox, bloom, instancing presentation
|
2024-02-08 10:10:49 +01:00 |
|
|
|
1a8b4cd64e
|
merge
|
2024-02-08 03:27:49 +01:00 |
|
|
|
06fe86f652
|
correct models get picked and rendered
|
2024-02-08 03:09:40 +01:00 |
|
|
|
966f3fdc39
|
sorting works
|
2024-02-08 02:52:23 +01:00 |
|
|
|
41ac514aa1
|
probability finished
|
2024-02-08 02:28:11 +01:00 |
|
|
|
10ad09a79a
|
.
|
2024-02-08 01:46:40 +01:00 |
|
|
|
3f1644dbdb
|
WIP placeObject uses material depending on plant
|
2024-02-08 00:40:47 +01:00 |
|
|
|
50f790fbe7
|
pbr connected
|
2024-02-07 22:51:50 +01:00 |
|
|
|
ad3be0a00b
|
shader + plants spawn on whole planet
|
2024-02-07 22:32:03 +01:00 |
|
|
|
4823629510
|
scale fixed.
|
2024-02-07 22:09:59 +01:00 |
|
|
|
ac6a01d5be
|
instancing but scale is messed up
|
2024-02-07 21:58:19 +01:00 |
|
|
|
3f757feb4a
|
.
|
2024-02-07 20:15:05 +01:00 |
|
|
|
339afe2b97
|
dtzip
|
2024-02-07 19:55:04 +01:00 |
|
|
|
de646292bd
|
Revert "Revert "WIP objects appear as dots""
This reverts commit bde2409b59.
|
2024-02-07 18:32:04 +01:00 |
|
|
|
bde2409b59
|
Revert "WIP objects appear as dots"
This reverts commit 968295dc3d.
|
2024-02-07 18:29:06 +01:00 |
|
|
|
968295dc3d
|
WIP objects appear as dots
|
2024-02-07 18:28:36 +01:00 |
|
|
|
349ba83ec3
|
upd
|
2024-02-07 15:36:10 +01:00 |
|
|
|
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 |
|
|
|
bb40477d86
|
upd shader_tex 2
|
2024-02-07 15:31:46 +01:00 |
|
|
|
e571743eb1
|
upd shader_tex
|
2024-02-07 15:22:05 +01:00 |
|
|
|
66a4f36be1
|
return texture to planet
|
2024-02-07 14:55:02 +01:00 |
|
|
|
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 |
|
|
|
b5e8ccca12
|
Almost working instancing .
but total number of uniform components exceeds the limitatin of gl_MaxUniformComponents.
|
2024-02-07 02:59:34 +01:00 |
|
|
|
93f8e5583b
|
plant placement optimisation
|
2024-02-05 23:53:09 +01:00 |
|
|
|
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 |
|
|
|
ba77304023
|
cleaning up
|
2024-02-04 22:42:58 +01:00 |
|
|
|
576776b996
|
test
|
2024-02-04 22:10:48 +01:00 |
|
|
|
cb7385bc1b
|
adding pbr shader for plants.......?...?..?
|
2024-02-03 21:03:12 +01:00 |
|
|
|
6e525f8a6e
|
adding plant growth
|
2024-02-03 17:42:50 +01:00 |
|
|
|
97e8b8a8df
|
plants are placed on planet but only on positive coords
|
2024-02-02 22:08:38 +01:00 |
|
|
|
b364a755fc
|
added plants vector to PlanetParams
|
2024-02-02 19:59:24 +01:00 |
|
|
|
1195ec1b91
|
plant_placement on planet that is in center of the world
|
2024-02-01 19:49:53 +01:00 |
|
|
|
e514ce6699
|
moved loadMTL Texture to init to improve performance
|
2024-02-01 17:01:03 +01:00 |
|
|
|
d28c6eecb9
|
adding texture to plants
|
2024-01-31 16:09:43 +01:00 |
|
|
|
c8d8f9bd38
|
Some fixing
|
2024-01-31 10:12:40 +01:00 |
|
|
|
00471a1b93
|
changed percipation to temperature, plant calculates probability of spawning on new planet
|
2024-01-29 12:53:03 +01:00 |
|
|
|
06362ba989
|
changes
|
2024-01-29 12:12:16 +01:00 |
|
|
|
c9fbf89cc3
|
Add parametrs
|
2024-01-29 12:09:42 +01:00 |
|
|
|
3f409f9c8e
|
Dodawanie nowej planety
|
2024-01-29 11:15:00 +01:00 |
|
|
|
db7f06c19b
|
Merge branch 'importing_ply' into test_branch
|
2024-01-29 09:03:16 +01:00 |
|
|
|
f02f02acf7
|
different aproach to rotating but not working :(
|
2024-01-29 00:53:42 +01:00 |
|
|
|
ab4adb48fe
|
fixing
|
2024-01-27 15:30:47 +01:00 |
|
|
|
bdfff74d08
|
Merge branch 'imgui' into test_branch
# Conflicts:
# PlanetCreator/Debug/grk-cw6.exe
# PlanetCreator/Debug/grk-cw6.pdb
# PlanetCreator/cw 6/Debug/Box.obj
# PlanetCreator/cw 6/Debug/Camera.obj
# PlanetCreator/cw 6/Debug/Render_Utils.obj
# PlanetCreator/cw 6/Debug/SOIL.obj
# PlanetCreator/cw 6/Debug/Shader_Loader.obj
# PlanetCreator/cw 6/Debug/Texture.obj
# PlanetCreator/cw 6/Debug/grk-cw6.Build.CppClean.log
# PlanetCreator/cw 6/Debug/grk-cw6.log
# PlanetCreator/cw 6/Debug/grk-cw6.tlog/CL.command.1.tlog
# PlanetCreator/cw 6/Debug/grk-cw6.tlog/CL.read.1.tlog
# PlanetCreator/cw 6/Debug/grk-cw6.tlog/CL.write.1.tlog
# PlanetCreator/cw 6/Debug/grk-cw6.tlog/link.command.1.tlog
# PlanetCreator/cw 6/Debug/grk-cw6.tlog/link.read.1.tlog
# PlanetCreator/cw 6/Debug/grk-cw6.tlog/link.write.1.tlog
# PlanetCreator/cw 6/Debug/image_DXT.obj
# PlanetCreator/cw 6/Debug/image_helper.obj
# PlanetCreator/cw 6/Debug/main.obj
# PlanetCreator/cw 6/Debug/stb_image_aug.obj
# PlanetCreator/cw 6/Debug/vc142.idb
# PlanetCreator/cw 6/Debug/vc142.pdb
# PlanetCreator/cw 6/Debug/vc143.idb
# PlanetCreator/cw 6/Debug/vc143.pdb
# PlanetCreator/cw 6/grk-cw6.vcxproj.filters
# PlanetCreator/cw 6/src/ex_6_1.hpp
|
2024-01-27 15:11:11 +01:00 |
|
|
|
dea910ca2c
|
Fix bug with flicker
|
2024-01-25 17:16:15 +01:00 |
|
|
|
d06bc6b54a
|
compiles, header file empty
|
2024-01-22 13:10:12 +01:00 |
|
|
|
3f62438460
|
Import imgui
|
2024-01-22 11:20:11 +01:00 |
|
|
|
7431154600
|
broken because of using Core::RenderContext
|
2024-01-22 00:37:08 +01:00 |
|
|
|
0d4cfed3be
|
importing ply objects
|
2024-01-15 00:59:09 +01:00 |
|
|
|
6718cd7e5e
|
placeObjectOnPlanet (not complete)
|
2024-01-15 00:06:05 +01:00 |
|
|
|
f52d3aa18d
|
single polygon on screen no normals workaround
|
2024-01-12 20:50:11 +01:00 |
|
