cosmetics

cw 2/Release/grk-cw2.exe.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\pyron\Documents\grafika\submarine\Release\grk-cw2.exe</FullPath>
+      <FullPath>G:\studia\grafika komputerowa\ggit\Release\grk-cw2.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

cw 2/Release/grk-cw2.log

@@ -1,20 +1,21 @@
   main_2_1a.cpp
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(88,19): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(90,19): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(191,23): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(246,23): warning C4018: '<': signed/unsigned mismatch
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(328,22): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(329,22): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(451,34): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(492,58): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(709,69): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\pyron\Documents\grafika\submarine\cw 2\src\main_2_1a.cpp(833,15): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(88,19): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(90,19): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(191,23): warning C4305: 'initializing': truncation from 'double' to 'float'
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(246,23): warning C4018: '<': signed/unsigned mismatch
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(328,22): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(329,22): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(451,34): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(454,45): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(496,58): warning C4305: 'initializing': truncation from 'double' to 'float'
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(713,69): warning C4305: 'argument': truncation from 'double' to 'float'
+G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(837,15): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
   Generating code
-  5 of 1871 functions ( 0.3%) were compiled, the rest were copied from previous compilation.
+  2 of 1874 functions ( 0.1%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    5 functions had inline decision re-evaluated but remain unchanged
+    7 functions had inline decision re-evaluated but remain unchanged
   Finished generating code
-PhysXExtensions_static_32.lib(ExtCpuWorkerThread.obj) : warning LNK4099: PDB 'PhysXExtensions_static_32.pdb' was not found with 'PhysXExtensions_static_32.lib(ExtCpuWorkerThread.obj)' or at 'C:\Users\pyron\Documents\grafika\submarine\Release\PhysXExtensions_static_32.pdb'; linking object as if no debug info
-PhysXExtensions_static_32.lib(ExtDefaultCpuDispatcher.obj) : warning LNK4099: PDB 'PhysXExtensions_static_32.pdb' was not found with 'PhysXExtensions_static_32.lib(ExtDefaultCpuDispatcher.obj)' or at 'C:\Users\pyron\Documents\grafika\submarine\Release\PhysXExtensions_static_32.pdb'; linking object as if no debug info
-PhysXExtensions_static_32.lib(ExtDefaultErrorCallback.obj) : warning LNK4099: PDB 'PhysXExtensions_static_32.pdb' was not found with 'PhysXExtensions_static_32.lib(ExtDefaultErrorCallback.obj)' or at 'C:\Users\pyron\Documents\grafika\submarine\Release\PhysXExtensions_static_32.pdb'; linking object as if no debug info
-  grk-cw2.vcxproj -> C:\Users\pyron\Documents\grafika\submarine\Release\grk-cw2.exe
+PhysXExtensions_static_32.lib(ExtCpuWorkerThread.obj) : warning LNK4099: PDB '' was not found with 'PhysXExtensions_static_32.lib(ExtCpuWorkerThread.obj)' or at ''; linking object as if no debug info
+PhysXExtensions_static_32.lib(ExtDefaultCpuDispatcher.obj) : warning LNK4099: PDB 'PhysXExtensions_static_32.pdb' was not found with 'PhysXExtensions_static_32.lib(ExtDefaultCpuDispatcher.obj)' or at 'G:\studia\grafika komputerowa\ggit\Release\PhysXExtensions_static_32.pdb'; linking object as if no debug info
+PhysXExtensions_static_32.lib(ExtDefaultErrorCallback.obj) : warning LNK4099: PDB 'PhysXExtensions_static_32.pdb' was not found with 'PhysXExtensions_static_32.lib(ExtDefaultErrorCallback.obj)' or at 'G:\studia\grafika komputerowa\ggit\Release\PhysXExtensions_static_32.pdb'; linking object as if no debug info
+  grk-cw2.vcxproj -> G:\studia\grafika komputerowa\ggit\Release\grk-cw2.exe

cw 2/Release/grk-cw2.tlog/grk-cw2.lastbuildstate

@@ -1,2 +1,2 @@
-PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.30.30705:TargetPlatformVersion=10.0.19041.0:
-Release|Win32|C:\Users\pyron\Documents\grafika\submarine\|
+PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.19041.0:
+Release|Win32|G:\studia\grafika komputerowa\ggit\|

cw 2/src/main_2_1a.cpp

@@ -449,6 +449,10 @@ void initGround() {
 	    for (int x = 0; x < GROUND_SQUARESXY; ++x) {
 		    double noise = ValueNoise_2D(x, y);
             height[y][x] = noise * 10;
+            if (y == 0 || y == GROUND_SQUARESXY - 1 || x == 0 || x == GROUND_SQUARESXY - 1)
+            {
+                height[y][x] = height[y][x] + 15.0;
+            }
 	    }
     }
 
@@ -696,7 +700,7 @@ void renderGeyser()
     for (int j = 0; j < GEYSER_NUM; j++)
     {
         glm::vec3 new_geyser = search_for_y(geyserList[j].x, geyserList[j].z, groundModel);
-        glm::mat4 gayserModelMatrix = glm::translate(new_geyser) * scale(glm::vec3(0.006f)) * scale(glm::vec3(1.0f, 3.0f, 1.0f));
+        glm::mat4 gayserModelMatrix = glm::translate(new_geyser) * scale(glm::vec3(0.0025f)) * scale(glm::vec3(1.0f, 3.0f, 1.0f));
         drawObjectTexture(&geyserContext, gayserModelMatrix, geyserTexture);
     }
 }
@@ -792,7 +796,7 @@ void init()
     geyserModel = obj::loadModelFromFile("models/geyser.obj");
     plantModel1 = obj::loadModelFromFile("models/plant1.obj");
 
-    groundTexture = Core::LoadTexture("textures/diffuse.jpg");
+    groundTexture = Core::LoadTexture("textures/land.jpg");
     seaweedTexture = Core::LoadTexture("textures/sea.jpg");
     submarineTexture = Core::LoadTexture("textures/Base_color.png");
     particleTexture = Core::LoadTexture("textures/bubble2.png");