Calculate tiling at shader compile time instead of using uniforms

Author: luis605

Engine/Core/Entity.cpp

@@ -917,9 +917,6 @@ void Entity::renderSingleModel() {
 void Entity::PassSurfaceMaterials() {
     glUseProgram(entityShader->id);
 
-    static int tilingLocation = shaderManager.GetUniformLocation(entityShader->id, "tiling");
-    SetShaderValue(*entityShader, tilingLocation, surfaceMaterial.tiling, SHADER_UNIFORM_VEC2);
-
     glUniform1i(shaderManager.GetUniformLocation(entityShader->id, "diffuseMapReady"),   !surfaceMaterial.albedoTexturePath.empty());
     glUniform1i(shaderManager.GetUniformLocation(entityShader->id, "normalMapReady"),    !surfaceMaterial.normalTexturePath.empty());
     glUniform1i(shaderManager.GetUniformLocation(entityShader->id, "roughnessMapReady"), !surfaceMaterial.roughnessTexturePath.empty());

Engine/Core/SaveLoad.cpp

@@ -41,7 +41,6 @@ void SaveEntity(json& jsonData, const Entity& entity) {
     j["rotation"]                = entity.rotation;
     j["relativePosition"]        = entity.relativePosition;
     j["modelPath"]               = entity.modelPath;
-    j["tiling"]                  = entity.surfaceMaterial.tiling;
 
     if (IsModelReady(entity.model) && entity.modelPath.empty())
         j["mesh_type"]           = entity.ObjectType;
@@ -390,11 +389,6 @@ Entity* LoadEntity(const json& entityJson) {
         entity->setFlag(Entity::Flag::LOD_ENABLED, entityJson["lodEnabled"].get<bool>());
     }
 
-    if (entityJson.contains("tiling")) {
-        entity->surfaceMaterial.tiling[0] = entityJson["tiling"][0].get<float>();
-        entity->surfaceMaterial.tiling[1] = entityJson["tiling"][1].get<float>();
-    }
-
     if (entityJson.contains("mesh_type")) {
         entity->ObjectType = entityJson["mesh_type"].get<ObjectTypeEnum>();
     }

Engine/Editor/MaterialNodeEditor/MaterialShaderGenerator.cpp

@@ -222,8 +222,9 @@ std::string GenerateMaterialShader(ChildMaterial& material) {
             if (!node) continue;
 
             if (std::optional<Vector2Node*> vec2NodeData = material.GetNodeData<Vector2Node>(node->UUID)) {
-                selectedEntity->surfaceMaterial.tiling[0] = vec2NodeData.value()->vec[0];
-                selectedEntity->surfaceMaterial.tiling[1] = vec2NodeData.value()->vec[1];
+                shaderStream << "#define TILING\n";
+                shaderStream << "vec2 tiling = vec2(" << vec2NodeData.value()->vec[0] << ", "
+                             << vec2NodeData.value()->vec[1] << ");\n";
             }
         }
     }

Engine/Lighting/SurfaceMaterial.hpp

@@ -62,8 +62,6 @@ struct SurfaceMaterial {
     SurfaceMaterialTexture heightTexture;
     SurfaceMaterialTexture metallicTexture;
     SurfaceMaterialTexture emissiveTexture;
-
-    float tiling[2] = { 1.0f, 1.0f };
 };
 
 #endif // SURFACE_MAT_HPP

Engine/Lighting/shaders/lighting_fragment.glsl

@@ -10,7 +10,6 @@ in vec3 fragNormal;
 // Input uniform values
 uniform vec4 ambientLight;
 uniform vec3 viewPos;
-uniform vec2 tiling = vec2(1.0, 1.0);
 
 // PBR Textures
 uniform bool diffuseMapReady;
@@ -238,7 +237,12 @@ float Q_rsqrt(float number) {
 // [ INSERT GENERATED CODE BELOW ]
 
 void main() {
+#ifdef TILING
     mediump vec2 texCoord = fragTexCoord * tiling;
+#else
+    mediump vec2 texCoord = fragTexCoord;
+#endif
+
     highp vec3 viewDir = normalize(viewPos - fragPosition);
     vec3 dp1 = dFdx(fragPosition);
     vec3 dp2 = dFdy(fragPosition);