@@ -1075,14 +1075,14 @@ var LibraryGLEmulation = {
10751075 func = "textureCube" ;
10761076 break ;
10771077 default :
1078- return abort_sanity ( " Unknown texType: " + ptrToString ( texType ) ) ;
1078+ return abort_sanity ( ` Unknown texType: ${ ptrToString ( texType ) } ` ) ;
10791079 }
10801080
10811081 var texCoordExpr = TEX_COORD_VARYING_PREFIX + texUnitID ;
10821082 if ( TEX_MATRIX_UNIFORM_PREFIX != null ) {
1083- texCoordExpr = "(" + TEX_MATRIX_UNIFORM_PREFIX + texUnitID + " * " + texCoordExpr + ")" ;
1083+ texCoordExpr = `( ${ TEX_MATRIX_UNIFORM_PREFIX } ${ texUnitID } * ${ texCoordExpr } )` ;
10841084 }
1085- return func + "(" + TEX_UNIT_UNIFORM_PREFIX + texUnitID + ", " + texCoordExpr + " .xy)" ;
1085+ return ` ${ func } ( ${ TEX_UNIT_UNIFORM_PREFIX } ${ texUnitID } , ${ texCoordExpr } .xy)` ;
10861086 }
10871087
10881088 function getTypeFromCombineOp ( op ) {
@@ -1499,58 +1499,29 @@ var LibraryGLEmulation = {
14991499 var lines = null ;
15001500 switch ( combiner ) {
15011501 case GL_REPLACE : {
1502- var line = [
1503- outputType + " " + outputVar ,
1504- " = " ,
1505- src0Expr ,
1506- ";" ,
1507- ] ;
1508- lines = [ line . join ( "" ) ] ;
1502+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } ;` ]
15091503 break ;
15101504 }
15111505 case GL_MODULATE : {
1512- var line = [
1513- outputType + " " + outputVar + " = " ,
1514- src0Expr + " * " + src1Expr ,
1515- ";" ,
1516- ] ;
1517- lines = [ line . join ( "" ) ] ;
1506+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } * ${ src1Expr } ;` ] ;
15181507 break ;
15191508 }
15201509 case GL_ADD : {
1521- var line = [
1522- outputType + " " + outputVar + " = " ,
1523- src0Expr + " + " + src1Expr ,
1524- ";" ,
1525- ] ;
1526- lines = [ line . join ( "" ) ] ;
1510+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } + ${ src1Expr } ;` ]
15271511 break ;
15281512 }
15291513 case GL_SUBTRACT : {
1530- var line = [
1531- outputType + " " + outputVar + " = " ,
1532- src0Expr + " - " + src1Expr ,
1533- ";" ,
1534- ] ;
1535- lines = [ line . join ( "" ) ] ;
1514+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } - ${ src1Expr } ;` ]
15361515 break ;
15371516 }
15381517 case GL_INTERPOLATE : {
1539- var prefix = TEXENVJIT_NAMESPACE_PREFIX + ' env' + texUnitID + "_" ;
1540- var arg2Var = prefix + " colorSrc2" ;
1541- var arg2Line = getTypeFromCombineOp ( this . colorOp [ 2 ] ) + " " + arg2Var + " = " + src2Expr + ";" ;
1518+ var prefix = ` ${ TEXENVJIT_NAMESPACE_PREFIX } env${ texUnitID } _` ;
1519+ var arg2Var = ` ${ prefix } colorSrc2` ;
1520+ var arg2Type = getTypeFromCombineOp ( this . colorOp [ 2 ] ) ;
15421521
1543- var line = [
1544- outputType + " " + outputVar ,
1545- " = " ,
1546- src0Expr + " * " + arg2Var ,
1547- " + " ,
1548- src1Expr + " * (1.0 - " + arg2Var + ")" ,
1549- ";" ,
1550- ] ;
15511522 lines = [
1552- arg2Line ,
1553- line . join ( "" ) ,
1523+ ` ${ arg2Type } ${ arg2Var } = ${ src2Expr } ;` ,
1524+ ` ${ outputType } ${ outputVar } = ${ src0Expr } * ${ arg2Var } + ${ src1Expr } * (1.0 - ${ arg2Var } );` ,
15541525 ] ;
15551526 break ;
15561527 }
0 commit comments