@@ -22,29 +22,22 @@ var GetCalcMatrix = require('../GetCalcMatrix');
2222 */
2323var MeshWebGLRenderer = function ( renderer , src , camera , parentMatrix )
2424{
25- // var faces = src.faces ;
26- // var totalFaces = faces .length;
25+ var models = src . models ;
26+ var totalModels = models . length ;
2727
28- // if (totalFaces === 0)
29- // {
30- // return;
31- // }
28+ if ( totalModels === 0 )
29+ {
30+ return ;
31+ }
3232
3333 var pipeline = renderer . pipelines . set ( src . pipeline , src ) ;
3434
3535 var calcMatrix = GetCalcMatrix ( src , camera , parentMatrix ) . calc ;
3636
37- var textureUnit = pipeline . setGameObject ( src ) ;
38-
39- var F32 = pipeline . vertexViewF32 ;
40- var U32 = pipeline . vertexViewU32 ;
41-
4237 var vertexOffset = ( pipeline . vertexCount * pipeline . vertexComponentCount ) - 1 ;
4338
44- var tintEffect = src . tintFill ;
45-
39+ var debugVerts ;
4640 var debugCallback = src . debugCallback ;
47- var debugVerts = [ ] ;
4841
4942 var a = calcMatrix . a ;
5043 var b = calcMatrix . b ;
@@ -53,11 +46,12 @@ var MeshWebGLRenderer = function (renderer, src, camera, parentMatrix)
5346 var e = calcMatrix . e ;
5447 var f = calcMatrix . f ;
5548
56- var globalAlpha = camera . alpha * src . alpha ;
49+ var F32 = pipeline . vertexViewF32 ;
50+ var U32 = pipeline . vertexViewU32 ;
5751
58- var models = src . models ;
52+ var globalAlpha = camera . alpha * src . alpha ;
5953
60- for ( var m = 0 ; m < models . length ; m ++ )
54+ for ( var m = 0 ; m < totalModels ; m ++ )
6155 {
6256 var model = models [ m ] ;
6357
@@ -82,6 +76,9 @@ var MeshWebGLRenderer = function (renderer, src, camera, parentMatrix)
8276 debugVerts = [ ] ;
8377 }
8478
79+ var tintEffect = model . tintFill ;
80+ var textureUnit = pipeline . setGameObject ( model ) ;
81+
8582 for ( var i = 0 ; i < totalFaces ; i ++ )
8683 {
8784 var face = faces [ i ] ;
@@ -97,7 +94,7 @@ var MeshWebGLRenderer = function (renderer, src, camera, parentMatrix)
9794
9895 pipeline . vertexCount += 3 ;
9996
100- if ( debugCallback )
97+ if ( debugCallback && model . drawDebug )
10198 {
10299 debugVerts . push (
103100 F32 [ vertexOffset - 20 ] ,
@@ -110,7 +107,7 @@ var MeshWebGLRenderer = function (renderer, src, camera, parentMatrix)
110107 }
111108 }
112109
113- if ( debugCallback )
110+ if ( debugCallback && model . drawDebug )
114111 {
115112 debugCallback . call ( src , src , debugVerts ) ;
116113 }
0 commit comments