some linter warnings

Author: mathis

OpenGL/OpenGL/src/Application.cpp

@@ -134,7 +134,7 @@ int main(int argc, char* argv[]) {
 
         // draw the terrain
         window.camera.activate();
-        // shadows.activate(shader);
+        shadows.activate(shader);
         terrain.render();
 
         // dot in the middle of the screen

OpenGL/OpenGL/src/entity/Entity.cpp

@@ -4,13 +4,13 @@ using namespace glm;
 static const mat4 I(1.f);
 
 Entity::Entity(Hitbox hitbox)
-: maxSpeed(4.3f), maxAccel(10.f), verticalFriction(5.5f), horizontalFriction(5.f),
+: view(View::FIRST_PERSON), state(State::Idle), god(true), sprint(false),
+	maxSpeed(4.3f), maxAccel(10.f), verticalFriction(5.5f), horizontalFriction(5.f),
 	gravity(32.f), jumpSpeed(10.5f), maxFallSpeed(78.4f),
-	speed(0), accel(0),
-	onFloor(false), god(true), sprint(false),
-	state(State::Idle),
-	hitbox(std::move(hitbox)),
-	playerFovY(45.0f)
+	playerFovY(45.0f),
+	speed(0), accel(0), direction(0),
+  onFloor(false),
+	hitbox(std::move(hitbox))
 {}
 
 Entity::~Entity() {}

OpenGL/OpenGL/src/entity/Entity.hpp

@@ -75,10 +75,10 @@ class Entity
 
 	glm::vec3 speed;
 	glm::vec3 accel;
+	glm::vec3 direction;
 
 	bool onFloor;
 	Hitbox hitbox;
-	glm::vec3 direction;
 
 	Node node;
 	Node headNode;

OpenGL/OpenGL/src/terrain/Generator.cpp

@@ -37,19 +37,16 @@ std::unique_ptr<Chunk> Generator::generate(ivec3 cpos) const {
 }
 
 Block::unique_ptr_t Generator::computeSurfaceBlock(ivec3 const& pos, Biome const& biome, int const& blockHeight) const {
-    if (abs(pos.y) < 3 && biome.type == BiomeType::SEA) return Block::create_static<Sand_Block>();
-    if (abs(pos.y) < 2) return Block::create_static<Sand_Block>();
-    if (pos.y <= 0) return AllBlocks::create_static(biome.underWaterBlock);
-    if (pos.y > 35 + valueNoise.sample1D(ivec2(pos.x, pos.z) + ivec2(67, 102)) % 5 && biome.surface != BlockType::Ice) return Block::create_static<Snow_Block>();
-    if(pos.y > 8 + valueNoise.sample1D(ivec2(pos.x, pos.z) + ivec2(-12, 0)) % 2 && biome.surface == BlockType::Sand) return Block::create_static<Snow_Block>();
+    if (abs(pos.y) < 3.f && biome.type == BiomeType::SEA) return Block::create_static<Sand_Block>();
+    if (abs(pos.y) < 2.f) return Block::create_static<Sand_Block>();
+    if (pos.y <= 0.f) return AllBlocks::create_static(biome.underWaterBlock);
+    if (pos.y > 35.f + valueNoise.sample1D(ivec2(pos.x, pos.z) + ivec2(67, 102)) % 5 && biome.surface != BlockType::Ice) return Block::create_static<Snow_Block>();
+    if(pos.y > 8.f + valueNoise.sample1D(ivec2(pos.x, pos.z) + ivec2(-12, 0)) % 2 && biome.surface == BlockType::Sand) return Block::create_static<Snow_Block>();
     if (pos.y != blockHeight && biome.surface == BlockType::Grass)return Block::create_static<Dirt_Block>();
 
     return AllBlocks::create_static(biome.surface);
 }
 
-
-
-
 Block::unique_ptr_t Generator::createBlock(ivec3 pos, Biome const& biome) const {
   Block::unique_ptr_t block;
   float height = noise.fractal2(ivec2(pos.x, pos.z), biome.frequencies);
@@ -65,13 +62,13 @@ Block::unique_ptr_t Generator::createBlock(ivec3 pos, Biome const& biome) const
           return Block::create_static<Air_Block>();
       }
   }
-  if(pos.y >= blockHeight - (valueNoise.sample1D(ivec2(pos.x, pos.z) + ivec2(-91, 859)) % 3))
+  if(pos.y >= blockHeight - (int)(valueNoise.sample1D(ivec2(pos.x, pos.z) + ivec2(-91, 859)) % 3))
       return computeSurfaceBlock(pos, biome, blockHeight);
-  
-  if(pos.y >= blockHeight - (2+ valueNoise.sample1D(ivec2(pos.x,pos.z) + ivec2(2,-59)) % 3))
+
+  if(pos.y >= blockHeight - (int)(2+ valueNoise.sample1D(ivec2(pos.x,pos.z) + ivec2(2,-59)) % 3))
     block = AllBlocks::create_static(biome.underLayers);
-  
-  
+
+
   return Block::create_static<Stone_Block>();
 }