aesthetics

cw 2/Release/grk-cw2.log

@@ -6,12 +6,11 @@ G:\studia\grafika komputerowa\ggit\cw 2\src\main_2_1a.cpp(246,23): warning C4018
 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
-  2 of 1874 functions ( 0.1%) were compiled, the rest were copied from previous compilation.
+  4 of 1874 functions ( 0.2%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
     7 functions had inline decision re-evaluated but remain unchanged
   Finished generating code

cw 2/src/main_2_1a.cpp

@@ -27,11 +27,11 @@ using namespace std;
 #define SIZE 1.0f
 #define SCREEN_X 1280
 #define SCREEN_Y 720
-#define SEAWEED_NUM 200
+#define SEAWEED_NUM 900
-#define PLANT1_NUM 100
+#define PLANT1_NUM 200
-#define FISH_NUM 100
+#define FISH_NUM 300
-#define PARTICLE_NUM 300
+#define PARTICLE_NUM 600
-#define GROUND_XY 250
+#define GROUND_XY 850
 #define GROUND_SQUARESXY 111
 #define GEYSER_NUM 3
 #define numOctaves 5
@@ -419,7 +419,7 @@ void initBubbles() {
             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() % 84 + 5), geyserList[j].z + static_cast<float>(rand() % 4000 - 2000) / 1000.0f);
+            new_particle.position = glm::vec3(geyserList[j].x + static_cast<float>(rand() % 4000 - 2000) / 1000.0f, static_cast<float>(rand() % 194 + 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;
 
@@ -451,7 +451,7 @@ void initGround() {
             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;
+                //height[y][x] = height[y][x] + 15.0;
             }
 	    }
     }
@@ -686,7 +686,7 @@ void renderBubbles()
             glm::mat4 particleModelMatrix = glm::translate(particleList[j][i].position) * glm::scale(glm::vec3(particleList[j][i].size));
 
 
-            if (particleList[j][i].position.y > 90) {
+            if (particleList[j][i].position.y > 200) {
                 particleList[j][i].position.y = 5;
                 particleList[j][i].velocity = 50 / 1000.0f;
             }