diff --git a/src/library_glemu.js b/src/library_glemu.js index 9ebc0c952477..18a88a8c6844 100644 --- a/src/library_glemu.js +++ b/src/library_glemu.js @@ -1075,14 +1075,14 @@ var LibraryGLEmulation = { func = "textureCube"; break; default: - return abort_sanity("Unknown texType: " + ptrToString(texType)); + return abort_sanity(`Unknown texType: ${ptrToString(texType)}`); } var texCoordExpr = TEX_COORD_VARYING_PREFIX + texUnitID; if (TEX_MATRIX_UNIFORM_PREFIX != null) { - texCoordExpr = "(" + TEX_MATRIX_UNIFORM_PREFIX + texUnitID + " * " + texCoordExpr + ")"; + texCoordExpr = `(${TEX_MATRIX_UNIFORM_PREFIX}${texUnitID} * ${texCoordExpr})`; } - return func + "(" + TEX_UNIT_UNIFORM_PREFIX + texUnitID + ", " + texCoordExpr + ".xy)"; + return `${func}(${TEX_UNIT_UNIFORM_PREFIX}${texUnitID}, ${texCoordExpr}.xy)`; } function getTypeFromCombineOp(op) { @@ -1499,58 +1499,29 @@ var LibraryGLEmulation = { var lines = null; switch (combiner) { case GL_REPLACE: { - var line = [ - outputType + " " + outputVar, - " = ", - src0Expr, - ";", - ]; - lines = [line.join("")]; + lines = [`${outputType} ${outputVar} = ${src0Expr};`] break; } case GL_MODULATE: { - var line = [ - outputType + " " + outputVar + " = ", - src0Expr + " * " + src1Expr, - ";", - ]; - lines = [line.join("")]; + lines = [`${outputType} ${outputVar} = ${src0Expr} * ${src1Expr};`]; break; } case GL_ADD: { - var line = [ - outputType + " " + outputVar + " = ", - src0Expr + " + " + src1Expr, - ";", - ]; - lines = [line.join("")]; + lines = [`${outputType} ${outputVar} = ${src0Expr} + ${src1Expr};`] break; } case GL_SUBTRACT: { - var line = [ - outputType + " " + outputVar + " = ", - src0Expr + " - " + src1Expr, - ";", - ]; - lines = [line.join("")]; + lines = [`${outputType} ${outputVar} = ${src0Expr} - ${src1Expr};`] break; } case GL_INTERPOLATE: { - var prefix = TEXENVJIT_NAMESPACE_PREFIX + 'env' + texUnitID + "_"; - var arg2Var = prefix + "colorSrc2"; - var arg2Line = getTypeFromCombineOp(this.colorOp[2]) + " " + arg2Var + " = " + src2Expr + ";"; + var prefix = `${TEXENVJIT_NAMESPACE_PREFIX}env${texUnitID}_`; + var arg2Var = `${prefix}colorSrc2`; + var arg2Type = getTypeFromCombineOp(this.colorOp[2]); - var line = [ - outputType + " " + outputVar, - " = ", - src0Expr + " * " + arg2Var, - " + ", - src1Expr + " * (1.0 - " + arg2Var + ")", - ";", - ]; lines = [ - arg2Line, - line.join(""), + `${arg2Type} ${arg2Var} = ${src2Expr};`, + `${outputType} ${outputVar} = ${src0Expr} * ${arg2Var} + ${src1Expr} * (1.0 - ${arg2Var});`, ]; break; }