diff --git a/PlanetCreator/Release/grk-cw6.exe b/PlanetCreator/Release/grk-cw6.exe index 484c4e3..f8c16da 100644 Binary files a/PlanetCreator/Release/grk-cw6.exe and b/PlanetCreator/Release/grk-cw6.exe differ diff --git a/PlanetCreator/Release/grk-cw6.pdb b/PlanetCreator/Release/grk-cw6.pdb index b14b330..913610a 100644 Binary files a/PlanetCreator/Release/grk-cw6.pdb and b/PlanetCreator/Release/grk-cw6.pdb differ diff --git a/PlanetCreator/cw 6/Release/Distribution.obj b/PlanetCreator/cw 6/Release/Distribution.obj index 5b3ff5d..2acb3ad 100644 Binary files a/PlanetCreator/cw 6/Release/Distribution.obj and b/PlanetCreator/cw 6/Release/Distribution.obj differ diff --git a/PlanetCreator/cw 6/Release/Render_Utils.obj b/PlanetCreator/cw 6/Release/Render_Utils.obj index 429fe09..6d36b03 100644 Binary files a/PlanetCreator/cw 6/Release/Render_Utils.obj and b/PlanetCreator/cw 6/Release/Render_Utils.obj differ diff --git a/PlanetCreator/cw 6/Release/Texture.obj b/PlanetCreator/cw 6/Release/Texture.obj index 5eea421..049ac01 100644 Binary files a/PlanetCreator/cw 6/Release/Texture.obj and b/PlanetCreator/cw 6/Release/Texture.obj differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.iobj b/PlanetCreator/cw 6/Release/grk-cw6.iobj index ab15c1b..6ebb3b1 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.iobj and b/PlanetCreator/cw 6/Release/grk-cw6.iobj differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.ipdb b/PlanetCreator/cw 6/Release/grk-cw6.ipdb index 75b3398..eb16645 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.ipdb and b/PlanetCreator/cw 6/Release/grk-cw6.ipdb differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.log b/PlanetCreator/cw 6/Release/grk-cw6.log index 16c7384..e2e5b3b 100644 --- a/PlanetCreator/cw 6/Release/grk-cw6.log +++ b/PlanetCreator/cw 6/Release/grk-cw6.log @@ -5,28 +5,28 @@ C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(138,15): warning C4 C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(159,23): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(207,30): warning C4244: =: преобразование "float" в "int", возможна потеря данных C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(213,20): warning C4244: =: преобразование "int" в "float", возможна потеря данных -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(388,61): warning C4305: аргумент: усечение из "double" в "GLfloat" C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(389,61): warning C4305: аргумент: усечение из "double" в "GLfloat" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(467,16): warning C4305: инициализация: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(571,61): warning C4305: аргумент: усечение из "double" в "GLfloat" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(390,61): warning C4305: аргумент: усечение из "double" в "GLfloat" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(468,16): warning C4305: инициализация: усечение из "double" в "float" C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(572,61): warning C4305: аргумент: усечение из "double" в "GLfloat" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(621,30): warning C4305: инициализация: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(670,17): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(777,16): warning C4244: инициализация: преобразование "_Rep" в "unsigned int", возможна потеря данных +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(573,61): warning C4305: аргумент: усечение из "double" в "GLfloat" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(622,30): warning C4305: инициализация: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(671,17): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(778,16): warning C4244: инициализация: преобразование "_Rep" в "unsigned int", возможна потеря данных with [ _Rep=std::chrono::system_clock::rep ] -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(816,13): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(983,90): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(984,94): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(985,98): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(986,100): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(989,104): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(990,94): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(991,102): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(992,105): warning C4305: аргумент: усечение из "double" в "float" -C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(993,95): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(817,13): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(984,90): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(985,94): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(986,98): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(987,100): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(990,104): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(991,94): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(992,102): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(993,105): warning C4305: аргумент: усечение из "double" в "float" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(994,95): warning C4305: аргумент: усечение из "double" в "float" C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(158,47): warning C4244: инициализация: преобразование "_Ty" в "_Ty", возможна потеря данных with [ @@ -194,8 +194,8 @@ C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(222): message : в _Pr=bool (__cdecl *)(std::tuple,std::tuple) ] Создание кода - 174 of 2522 functions ( 6.9%) were compiled, the rest were copied from previous compilation. + 1 of 2523 functions (<0.1%) were compiled, the rest were copied from previous compilation. 0 functions were new in current compilation - 41 functions had inline decision re-evaluated but remain unchanged + 24 functions had inline decision re-evaluated but remain unchanged Создание кода завершено grk-cw6.vcxproj -> C:\Users\neryt\Grafika2023\PlanetCreator\Release\grk-cw6.exe diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog index 6ad205b..1188d76 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog index 12fe2bb..418a7c4 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/main.obj b/PlanetCreator/cw 6/Release/main.obj index 2cdf0b3..3bf8e9b 100644 Binary files a/PlanetCreator/cw 6/Release/main.obj and b/PlanetCreator/cw 6/Release/main.obj differ diff --git a/PlanetCreator/cw 6/Release/vc142.pdb b/PlanetCreator/cw 6/Release/vc142.pdb index 7a20c4c..f871615 100644 Binary files a/PlanetCreator/cw 6/Release/vc142.pdb and b/PlanetCreator/cw 6/Release/vc142.pdb differ diff --git a/PlanetCreator/cw 6/imgui.ini b/PlanetCreator/cw 6/imgui.ini index d823be7..0dac297 100644 --- a/PlanetCreator/cw 6/imgui.ini +++ b/PlanetCreator/cw 6/imgui.ini @@ -11,6 +11,6 @@ Pos=4,3 Size=218,129 [Window][Dodawanie nowej planety] -Pos=16,7 +Pos=146,127 Size=282,158 diff --git a/PlanetCreator/cw 6/models/cube.obj b/PlanetCreator/cw 6/models/cube.obj new file mode 100644 index 0000000..e98b40f --- /dev/null +++ b/PlanetCreator/cw 6/models/cube.obj @@ -0,0 +1,40 @@ +# Blender v2.90.0 OBJ File: '' +# www.blender.org +mtllib cube.mtl +o Cube +v -10.000000 -10.000000 10.000000 +v -10.000000 10.000000 10.000000 +v -10.000000 -10.000000 -10.000000 +v -10.000000 10.000000 -10.000000 +v 10.000000 -10.000000 10.000000 +v 10.000000 10.000000 10.000000 +v 10.000000 -10.000000 -10.000000 +v 10.000000 10.000000 -10.000000 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.875000 0.500000 +vt 0.875000 0.750000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +usemtl _PBR +s 1 +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 8/5/2 7/6/2 +f 7/6/3 8/5/3 6/7/3 5/8/3 +f 5/8/4 6/7/4 2/9/4 1/10/4 +f 3/11/5 7/6/5 5/8/5 1/12/5 +f 8/5/6 4/13/6 2/14/6 6/7/6 \ No newline at end of file diff --git a/PlanetCreator/cw 6/src/ex_6_1.hpp b/PlanetCreator/cw 6/src/ex_6_1.hpp index 38612a3..f67fae0 100644 --- a/PlanetCreator/cw 6/src/ex_6_1.hpp +++ b/PlanetCreator/cw 6/src/ex_6_1.hpp @@ -278,6 +278,7 @@ namespace texture { GLuint sun; GLuint earthNormal; GLuint asteroidNormal; + GLuint background; } GLuint program_sky; GLuint program_blur; @@ -877,7 +878,7 @@ void renderScene(GLFWwindow* window) skyPos = cameraPos; glm::mat4 skyMatrix = glm::scale(glm::vec3(skySize)); glm::mat4 skyTranslate = glm::translate(skyPos); - drawSky(cubeContext, skyTranslate * skyMatrix, Core::LoadTexture("textures/1.png")); + drawSky(cubeContext, skyTranslate * skyMatrix, texture::planet1); //drawObjectColor(plant2Context, plantModelMatrix, glm::vec3(1,1,1), program); @@ -992,14 +993,16 @@ void init(GLFWwindow* window) plant_specimens.push_back(Plant::Plant(1, 0.2, 1, 1, "testPlant!!!!!!!!!!!!!!!!1", "./models/plant_3_1")); plant_specimens.push_back(Plant::Plant(1, 0.1, 1, 1, "testPlant_MAYBE1", "./models/plant_7_1")); - - defaultTexture = Core::LoadTexture("textures/1.png"); + loadModelToContext("./models/cube.obj", cubeContext); + texture::background = Core::LoadCubeMap("./textures/SkyCut2.jpg"); + defaultTexture = Core::LoadTexture("textures/3.png"); if (defaultTexture == 0) { std::cout << "Failed to load default texture" << std::endl; } - climates.push_back({ -10, 0, 0, 50, Core::LoadTexture("textures/1.png") }); - climates.push_back({ 0, 10, 50, 100, Core::LoadTexture("textures/2.png") }); + climates.push_back({ -10, 0, 1, 50, Core::LoadTexture("textures/1.png") }); + climates.push_back({ 0, 10, 1, 50, Core::LoadTexture("textures/2.png") }); + climates.push_back({ 10, 30, 50, 100, Core::LoadTexture("textures/3.jpg") }); } diff --git a/PlanetCreator/cw 6/textures/photo_5341269364676089473_y.jpg b/PlanetCreator/cw 6/textures/4.jpg similarity index 100% rename from PlanetCreator/cw 6/textures/photo_5341269364676089473_y.jpg rename to PlanetCreator/cw 6/textures/4.jpg diff --git a/PlanetCreator/cw 6/textures/photo_5341269364676089475_y.jpg b/PlanetCreator/cw 6/textures/5.jpg similarity index 100% rename from PlanetCreator/cw 6/textures/photo_5341269364676089475_y.jpg rename to PlanetCreator/cw 6/textures/5.jpg diff --git a/PlanetCreator/cw 6/textures/photo_5341269364676089477_y.jpg b/PlanetCreator/cw 6/textures/6.jpg similarity index 100% rename from PlanetCreator/cw 6/textures/photo_5341269364676089477_y.jpg rename to PlanetCreator/cw 6/textures/6.jpg diff --git a/PlanetCreator/cw 6/textures/skyCut.jpg b/PlanetCreator/cw 6/textures/skyCut.jpg new file mode 100644 index 0000000..176ffc3 Binary files /dev/null and b/PlanetCreator/cw 6/textures/skyCut.jpg differ diff --git a/PlanetCreator/cw 6/textures/skyCut1.jpg b/PlanetCreator/cw 6/textures/skyCut1.jpg new file mode 100644 index 0000000..7f981a0 Binary files /dev/null and b/PlanetCreator/cw 6/textures/skyCut1.jpg differ diff --git a/PlanetCreator/cw 6/textures/skyCut2.jpg b/PlanetCreator/cw 6/textures/skyCut2.jpg new file mode 100644 index 0000000..6188914 Binary files /dev/null and b/PlanetCreator/cw 6/textures/skyCut2.jpg differ