Commit Graph

15 Commits

Author SHA1 Message Date
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
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