Rearrange shader construction

CesiumGS · Sep 20, 2016 · b7c2dfd · b7c2dfd
1 parent 8e98836
commit b7c2dfd
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Source/Scene/PointCloud3DTileContent.js b/Source/Scene/PointCloud3DTileContent.js
@@ -840,7 +840,11 @@ define([
             attributeLocations.a_batchId = batchIdLocation;
         }
 
-        var attributeIncludes = '';
+        var vs = 'attribute vec3 a_position; \n' +
+                 'varying vec4 v_color; \n' +
+                 'uniform float u_pointSize; \n' +
+                 'uniform vec4 u_highlightColor; \n';
+
         var length = styleableProperties.length;
         for (i = 0; i < length; ++i) {
             name = styleableProperties[i];
@@ -861,16 +865,10 @@ define([
                 attributeType = 'vec' + componentCount;
             }
 
-            attributeIncludes += 'attribute ' + attributeType + ' ' + attributeName + '; \n';
+            vs += 'attribute ' + attributeType + ' ' + attributeName + '; \n';
             attributeLocations[attributeName] = attribute.location;
         }
 
-        var vs = 'attribute vec3 a_position; \n' +
-                 'varying vec4 v_color; \n' +
-                 'uniform float u_pointSize; \n' +
-                 'uniform vec4 u_highlightColor; \n' +
-                 attributeIncludes;
-
         if (hasColors && !hasColorStyle) {
             if (isTranslucent) {
                 vs += 'attribute vec4 a_color; \n';