Commit Graph

10 Commits

Author SHA1 Message Date
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
cb7385bc1b adding pbr shader for plants.......?...?..? 2024-02-03 21:03:12 +01:00
d28c6eecb9 adding texture to plants 2024-01-31 16:09:43 +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
0beb51445f update texture, static planets 2024-01-12 17:03:22 +01:00
a7af8150db ? 2024-01-11 23:37:20 +01:00
03ab368c52 fresh start 2024-01-11 17:57:31 +01:00