@@ -1075,14 +1075,14 @@ var LibraryGLEmulation = {
1075
1075
func = "textureCube" ;
1076
1076
break ;
1077
1077
default :
1078
- return abort_sanity ( " Unknown texType: " + ptrToString ( texType ) ) ;
1078
+ return abort_sanity ( ` Unknown texType: ${ ptrToString ( texType ) } ` ) ;
1079
1079
}
1080
1080
1081
1081
var texCoordExpr = TEX_COORD_VARYING_PREFIX + texUnitID ;
1082
1082
if ( TEX_MATRIX_UNIFORM_PREFIX != null ) {
1083
- texCoordExpr = "(" + TEX_MATRIX_UNIFORM_PREFIX + texUnitID + " * " + texCoordExpr + ")" ;
1083
+ texCoordExpr = `( ${ TEX_MATRIX_UNIFORM_PREFIX } ${ texUnitID } * ${ texCoordExpr } )` ;
1084
1084
}
1085
- return func + "(" + TEX_UNIT_UNIFORM_PREFIX + texUnitID + ", " + texCoordExpr + " .xy)" ;
1085
+ return ` ${ func } ( ${ TEX_UNIT_UNIFORM_PREFIX } ${ texUnitID } , ${ texCoordExpr } .xy)` ;
1086
1086
}
1087
1087
1088
1088
function getTypeFromCombineOp ( op ) {
@@ -1499,58 +1499,29 @@ var LibraryGLEmulation = {
1499
1499
var lines = null ;
1500
1500
switch ( combiner ) {
1501
1501
case GL_REPLACE : {
1502
- var line = [
1503
- outputType + " " + outputVar ,
1504
- " = " ,
1505
- src0Expr ,
1506
- ";" ,
1507
- ] ;
1508
- lines = [ line . join ( "" ) ] ;
1502
+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } ;` ]
1509
1503
break ;
1510
1504
}
1511
1505
case GL_MODULATE : {
1512
- var line = [
1513
- outputType + " " + outputVar + " = " ,
1514
- src0Expr + " * " + src1Expr ,
1515
- ";" ,
1516
- ] ;
1517
- lines = [ line . join ( "" ) ] ;
1506
+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } * ${ src1Expr } ;` ] ;
1518
1507
break ;
1519
1508
}
1520
1509
case GL_ADD : {
1521
- var line = [
1522
- outputType + " " + outputVar + " = " ,
1523
- src0Expr + " + " + src1Expr ,
1524
- ";" ,
1525
- ] ;
1526
- lines = [ line . join ( "" ) ] ;
1510
+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } + ${ src1Expr } ;` ]
1527
1511
break ;
1528
1512
}
1529
1513
case GL_SUBTRACT : {
1530
- var line = [
1531
- outputType + " " + outputVar + " = " ,
1532
- src0Expr + " - " + src1Expr ,
1533
- ";" ,
1534
- ] ;
1535
- lines = [ line . join ( "" ) ] ;
1514
+ lines = [ `${ outputType } ${ outputVar } = ${ src0Expr } - ${ src1Expr } ;` ]
1536
1515
break ;
1537
1516
}
1538
1517
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 ] ) ;
1542
1521
1543
- var line = [
1544
- outputType + " " + outputVar ,
1545
- " = " ,
1546
- src0Expr + " * " + arg2Var ,
1547
- " + " ,
1548
- src1Expr + " * (1.0 - " + arg2Var + ")" ,
1549
- ";" ,
1550
- ] ;
1551
1522
lines = [
1552
- arg2Line ,
1553
- line . join ( "" ) ,
1523
+ ` ${ arg2Type } ${ arg2Var } = ${ src2Expr } ;` ,
1524
+ ` ${ outputType } ${ outputVar } = ${ src0Expr } * ${ arg2Var } + ${ src1Expr } * (1.0 - ${ arg2Var } );` ,
1554
1525
] ;
1555
1526
break ;
1556
1527
}
0 commit comments