fixing

.gitignore

@@ -2,4 +2,6 @@ PlanetCreator/cw 6/PlanetCreator.vcxproj.filters
 PlanetCreator/cw 6/PlanetCreator.vcxproj.user
 PlanetCreator/.vs/
 .vs/
-PlanetCreator/Debug/
+PlanetCreator/Debug/
+PlanetCreator/Debug
+PlanetCreator/cw 6/Debug

PlanetCreator/cw 6/Debug/grk-cw3.Build.CppClean.log

@@ -1,17 +0,0 @@
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\vc142.pdb
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\vc142.idb
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\shader_loader.obj
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\render_utils.obj
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\main_3_1.obj
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\camera.obj
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\box.obj
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\vcpkg.applocal.log
-c:\users\andrzej\desktop\grk\zipy\grk-cw\debug\grk-cw3.exe
-c:\users\andrzej\desktop\grk\zipy\grk-cw\debug\grk-cw3.pdb
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\grk-cw3.tlog\cl.command.1.tlog
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\grk-cw3.tlog\cl.read.1.tlog
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\grk-cw3.tlog\cl.write.1.tlog
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\grk-cw3.tlog\grk-cw3.write.1u.tlog
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\grk-cw3.tlog\link.command.1.tlog
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\grk-cw3.tlog\link.read.1.tlog
-c:\users\andrzej\desktop\grk\zipy\grk-cw\cw 3\debug\grk-cw3.tlog\link.write.1.tlog

PlanetCreator/cw 6/Debug/grk-cw3.exe.recipe

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ProjectOutputs>
-    <ProjectOutput>
-      <FullPath>C:\Users\Andrzej\Desktop\grk\2021\rozwiązania\Debug\grk-cw3.exe</FullPath>
-    </ProjectOutput>
-  </ProjectOutputs>
-  <ContentFiles />
-  <SatelliteDlls />
-  <NonRecipeFileRefs />
-</Project>

PlanetCreator/cw 6/Debug/grk-cw3.log

@@ -1,8 +0,0 @@
-  Using triplet "x86-windows" from "C:\Users\Andrzej\Desktop\openvdb\vcpkg\installed\x86-windows\"
-  main.cpp
-C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
-C:\Users\Andrzej\Desktop\grk\2021\rozwiązania\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
-C:\Users\Andrzej\Desktop\grk\2021\rozwiązania\cw 3\src\ex_3_1.hpp(76,16): warning C4305: 'initializing': truncation from 'double' to 'float'
-Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
-LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
-  grk-cw3.vcxproj -> C:\Users\Andrzej\Desktop\grk\2021\rozwiązania\Debug\grk-cw3.exe

PlanetCreator/cw 6/Debug/grk-cw3.tlog/grk-cw3.lastbuildstate

@@ -1,2 +0,0 @@
-PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.28.29333:TargetPlatformVersion=10.0.19041.0:
-Debug|Win32|C:\Users\Andrzej\Desktop\grk\2021\rozwiązania\|

PlanetCreator/cw 6/Debug/grk-cw4.exe.recipe

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ProjectOutputs>
-    <ProjectOutput>
-      <FullPath>C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\Debug\grk-cw4.exe</FullPath>
-    </ProjectOutput>
-  </ProjectOutputs>
-  <ContentFiles />
-  <SatelliteDlls />
-  <NonRecipeFileRefs />
-</Project>

PlanetCreator/cw 6/Debug/grk-cw4.log

@@ -1,10 +0,0 @@
-C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(491,5): warning MSB8028: The intermediate directory (Debug\) contains files shared from another project (grk-cw3.vcxproj).  This can lead to incorrect clean and rebuild behavior.
-  Using triplet "x86-windows" from "C:\Users\Andrzej\Desktop\openvdb\vcpkg\installed\x86-windows\"
-  main.cpp
-C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
-C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
-C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\cw 4\src\ex_4_1.hpp(63,16): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\cw 4\src\ex_4_1.hpp(84,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
-LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
-  grk-cw4.vcxproj -> C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\Debug\grk-cw4.exe

PlanetCreator/cw 6/Debug/grk-cw4.tlog/grk-cw4.lastbuildstate

@@ -1,2 +0,0 @@
-PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.28.29333:TargetPlatformVersion=10.0.19041.0:
-Debug|Win32|C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\|

PlanetCreator/cw 6/Debug/grk-cw5.exe.recipe

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ProjectOutputs>
-    <ProjectOutput>
-      <FullPath>C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\Debug\grk-cw5.exe</FullPath>
-    </ProjectOutput>
-  </ProjectOutputs>
-  <ContentFiles />
-  <SatelliteDlls />
-  <NonRecipeFileRefs />
-</Project>

PlanetCreator/cw 6/Debug/grk-cw5.log

@@ -1,3 +0,0 @@
-C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(491,5): warning MSB8028: The intermediate directory (Debug\) contains files shared from another project (grk-cw3.vcxproj, grk-cw4.vcxproj).  This can lead to incorrect clean and rebuild behavior.
-  Using triplet "x86-windows" from "C:\Users\Andrzej\Desktop\openvdb\vcpkg\installed\x86-windows\"
-  grk-cw5.vcxproj -> C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\Debug\grk-cw5.exe

PlanetCreator/cw 6/Debug/grk-cw5.tlog/grk-cw5.lastbuildstate

@@ -1,2 +0,0 @@
-PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.28.29333:TargetPlatformVersion=10.0.19041.0:
-Debug|Win32|C:\Users\Andrzej\Desktop\grk\2021\grk glfw test\|

PlanetCreator/cw 6/Debug/grk-cw6.Build.CppClean.log

@@ -1,25 +0,0 @@
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\vc143.pdb
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\vc143.idb
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\main.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\texture.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\shader_loader.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\render_utils.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\camera.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\box.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\stb_image_aug.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\image_helper.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\image_dxt.obj
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\soil.obj
-c:\users\andrzej\desktop\grk\2021\grk glfw test\cw 6\debug\vcpkg.applocal.log
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\debug\grk-cw6.exe
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\debug\grk-cw6.pdb
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\vc142.idb
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\vc142.pdb
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\cl.command.1.tlog
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\cl.items.tlog
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\cl.read.1.tlog
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\cl.write.1.tlog
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\grk-cw6.write.1u.tlog
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\link.command.1.tlog
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\link.read.1.tlog
-d:\dane\cppprojects\grk_cw1 (1)\planetcreator\planetcreator\cw 6\debug\grk-cw6.tlog\link.write.1.tlog

PlanetCreator/cw 6/Debug/grk-cw6.exe.recipe

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ProjectOutputs>
-    <ProjectOutput>
-      <FullPath>j:\Desktop\grk\Grafika2023\PlanetCreator\Debug\grk-cw6.exe</FullPath>
-    </ProjectOutput>
-  </ProjectOutputs>
-  <ContentFiles />
-  <SatelliteDlls />
-  <NonRecipeFileRefs />
-</Project>

PlanetCreator/cw 6/Debug/grk-cw6.log

@@ -1,5 +0,0 @@
-C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\Microsoft.CppBuild.targets(531,5): warning MSB8028: Katalog pośredni (Debug\) zawiera pliki udostępnione z innego projektu (grk-cw3.vcxproj, grk-cw4.vcxproj, grk-cw5.vcxproj). Może to spowodować niepoprawne zachowanie podczas oczyszczania i ponownej kompilacji.
-  Render_Utils.cpp
-Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO”
-LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka
-  grk-cw6.vcxproj -> D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\Debug\grk-cw6.exe

PlanetCreator/cw 6/Debug/grk-cw6.tlog/grk-cw6.lastbuildstate

@@ -1,2 +0,0 @@
-PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
-Debug|Win32|j:\Desktop\grk\Grafika2023\PlanetCreator\|

PlanetCreator/cw 6/Debug/vcpkg.applocal.log

@@ -1 +0,0 @@
-

PlanetCreator/cw 6/src/ex_6_1.hpp

@@ -27,13 +27,13 @@ namespace texture {
 	GLuint earth;
 	GLuint clouds;
 	GLuint moon;
-	GLuint ship;
+
 	GLuint planet1;
 	GLuint grid;
 	GLuint sun;
 	GLuint earthNormal;
 	GLuint asteroidNormal;
-	GLuint shipNormal;
+	
 }
 
 
@@ -45,11 +45,9 @@ GLuint plantProgram;
 Core::Shader_Loader shaderLoader;
 
 GLuint programBiomes;
-Core::Shader_Loader shaderLoader;
+
 
 Core::RenderContext plantContext;
-Core::RenderContext shipContext;
-Core::RenderContext sphereContext;
 
 Core::RenderContext sphereContext;
 Core::RenderContext plant2Context;
@@ -243,16 +241,7 @@ void renderScene(GLFWwindow* window)
 	//drawObjectBiomes(plantContext, glm::eulerAngleY(glm::radians(90.f)) * glm::translate(glm::vec3(0.f, 0.f, 0.f)), programBiomes);
 	//drawObjectBiomes(plantContext, glm::eulerAngleX(30.f) * glm::translate(glm::vec3(0.f, 0.f, 0.f)), programBiomes);
 
-	glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f)));
-	glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceshipDir));
-	glm::mat4 specshipCameraRotrationMatrix = glm::mat4({
-		spaceshipSide.x,spaceshipSide.y,spaceshipSide.z,0,
-		spaceshipUp.x,spaceshipUp.y,spaceshipUp.z ,0,
-		-spaceshipDir.x,-spaceshipDir.y,-spaceshipDir.z,0,
-		0.,0.,0.,1.,
-		});
-
-
+	
 	
 	glm::vec3 plantPosition = glm::vec3(1.f, 0.f, 3.5f) ;
 	float scaleFactor = 0.1f; 
@@ -313,7 +302,7 @@ void init(GLFWwindow* window)
 	loadModelToContext2("./models/plants/polygon.obj", plantContext);
 
 	loadModelToContext("./models/sphere.obj", sphereContext);
-	loadModelToContext("./models/spaceship.obj", shipContext);
+	
    loadModelToContext("models/plant_2.ply", plant2Context);
    loadModelToContext("models/plant_4.ply", plant3Context);