master: small mod

paulgheorghecristian · Oct 8, 2017 · 86509ee · 86509ee
1 parent 2a5f18f
commit 86509ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Core/EngineCore.cpp b/Core/EngineCore.cpp
@@ -75,10 +75,6 @@ EngineCore::EngineCore(rapidjson::Document &gameDocument) : isRunning (false) {
                 scale.x = entity["Transform"]["scale"].GetArray()[0].GetFloat();
                 scale.y = entity["Transform"]["scale"].GetArray()[1].GetFloat();
                 scale.z = entity["Transform"]["scale"].GetArray()[2].GetFloat();
-
-                position.x += rand()%500;
-                position.y += rand()%500;
-                position.z += rand()%500;
             }
             Transform trans(position, rotation, scale);
             new_entity = new Entity (trans);
@@ -215,7 +211,6 @@ void EngineCore::render() {
     }
 
     RenderingMaster::swapBuffers();
-
 }
 
 void EngineCore::update() {

diff --git a/Rendering/RenderComponent.cpp b/Rendering/RenderComponent.cpp
@@ -10,7 +10,7 @@ RenderComponent::RenderComponent(Mesh * mesh,
 
     glm::mat4 viewMatrix = RenderingMaster::getCamera()->getViewMatrix();
     bool result = true;
-    int hasTexture = 0;
+    bool hasTexture = false;
 
     result &= shader->updateUniform ("projectionMatrix", (void *) &RenderingMaster::getProjectionMatrix());
     result &= shader->updateUniform ("viewMatrix", (void *) &viewMatrix);
@@ -21,7 +21,7 @@ RenderComponent::RenderComponent(Mesh * mesh,
 
     if (texture) {
         result &= shader->updateUniform ("textureSampler", (void *) &texture->getTextureUnit());
-        hasTexture = 1;
+        hasTexture = true;
     }
 
     result &= shader->updateUniform ("hasTexture", (void *) &hasTexture);