Skip to content

Commit 4935786

Browse files
n3rd0xparoj
authored andcommitted
Components (Overlay & RTS): Fix compiling issues regarding mismatch and ambiguous between float and double.
1 parent fe1aa1b commit 4935786

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Components/Overlay/src/OgreFont.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ namespace Ogre
540540
(Real)m / (Real)finalHeight, // v1
541541
(Real)(l + width) / (Real)finalWidth, // u2
542542
(m + max_height) / (Real)finalHeight); // v2
543-
this->setGlyphInfo({cp, uvs, textureAspect * uvs.width() / uvs.height(),
543+
this->setGlyphInfo({cp, uvs, float(textureAspect * uvs.width() / uvs.height()),
544544
float(x_bearing) / max_height, float(advance) / max_height});
545545

546546
// Advance a column

Components/RTShaderSystem/src/OgreShaderProgram.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ UniformParameterPtr Program::resolveAutoParameterReal(GpuProgramParameters::Auto
167167
}
168168

169169
// Create new parameter.
170-
param = UniformParameterPtr(OGRE_NEW UniformParameter(autoType, data, size));
170+
param = UniformParameterPtr(OGRE_NEW UniformParameter(autoType, float(data), size));
171171
addParameter(param);
172172

173173
return param;

0 commit comments

Comments
 (0)