Components (Overlay & RTS): Fix compiling issues regarding mismatch a…

…nd ambiguous between float and double.
OGRECave · Aug 23, 2021 · 4935786 · 4935786
1 parent fe1aa1b
commit 4935786
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Components/Overlay/src/OgreFont.cpp b/Components/Overlay/src/OgreFont.cpp
@@ -540,7 +540,7 @@ namespace Ogre
                            (Real)m / (Real)finalHeight,                  // v1
                            (Real)(l + width) / (Real)finalWidth,         // u2
                            (m + max_height) / (Real)finalHeight); // v2
-                this->setGlyphInfo({cp, uvs, textureAspect * uvs.width() / uvs.height(),
+                this->setGlyphInfo({cp, uvs, float(textureAspect * uvs.width() / uvs.height()),
                                     float(x_bearing) / max_height, float(advance) / max_height});
 
                 // Advance a column

diff --git a/Components/RTShaderSystem/src/OgreShaderProgram.cpp b/Components/RTShaderSystem/src/OgreShaderProgram.cpp
@@ -167,7 +167,7 @@ UniformParameterPtr Program::resolveAutoParameterReal(GpuProgramParameters::Auto
     }
 
     // Create new parameter.
-    param = UniformParameterPtr(OGRE_NEW UniformParameter(autoType, data, size));
+    param = UniformParameterPtr(OGRE_NEW UniformParameter(autoType, float(data), size));
     addParameter(param);
 
     return param;