Bubbles fix

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

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

cw 2/Release/grk-cw2.log

@@ -1,20 +1,20 @@
   main_2_1a.cpp
-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(449,34): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
-G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(490,58): warning C4305: 'initializing': truncation from 'double' to 'float'
-G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(707,69): warning C4305: 'argument': truncation from 'double' to 'float'
-G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(831,15): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
+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
   Generating code
-  1 of 1874 functions (<0.1%) were compiled, the rest were copied from previous compilation.
+  5 of 1871 functions ( 0.3%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    6 functions had inline decision re-evaluated but remain unchanged
+    5 functions had inline decision re-evaluated but remain unchanged
   Finished generating code
-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
+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

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

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

cw 2/src/main_2_1a.cpp

@@ -417,8 +417,10 @@ void initBubbles() {
         std::vector<particle> particleGroup;
         for (int i = 0; i < PARTICLE_NUM; i++) {
             particle new_particle;
-            new_particle.position = glm::vec3(geyserList[j].x + static_cast<float>(rand() % 4000 - 2000) / 1000.0f, static_cast<float>(rand() % 60 + 5), geyserList[j].z + static_cast<float>(rand() % 4000 - 2000) / 1000.0f);
-            new_particle.velocity = static_cast<float>(rand() % 50 + 300) / 1000.0f;
+            //new_particle.position = glm::vec3(geyserList[j].x + static_cast<float>(rand() % 4000 - 2000) / 1000.0f, static_cast<float>(rand() % 60 + 5), geyserList[j].z + static_cast<float>(rand() % 4000 - 2000) / 1000.0f);
+            //new_particle.velocity = static_cast<float>(rand() % 50 + 300) / 1000.0f;
+            new_particle.position = glm::vec3(geyserList[j].x + static_cast<float>(rand() % 4000 - 2000) / 1000.0f, static_cast<float>(rand() % 84 + 5), geyserList[j].z + static_cast<float>(rand() % 4000 - 2000) / 1000.0f);
+            new_particle.velocity = 50 / 1000.0f;
             new_particle.size = static_cast<float>(rand() % 150 + 150) / 1000.0f;
 
             particleGroup.push_back(new_particle);
@@ -682,7 +684,7 @@ void renderBubbles()
 
             if (particleList[j][i].position.y > 90) {
                 particleList[j][i].position.y = 5;
-                particleList[j][i].velocity = static_cast<float>(rand() % 90 + 10) / 1000.0f;
+                particleList[j][i].velocity = 50 / 1000.0f;
             }
             particleList[j][i].position.y += particleList[j][i].velocity;//particleList[i].color
             drawObjectTexture(&particleContext, particleModelMatrix, particleTexture);