Merge pull request #10539 from bdysvik/dev

updating the snowflake example so that it is compatible with latest gltf specifications

examples/js/loaders/GLTFLoader.js

@@ -538,6 +538,13 @@ THREE.GLTFLoader = ( function () {
 					shaderText = shaderText.replace( regEx, 'uv' );
 					break;
 
+				case 'COLOR_0':
+				case 'COLOR0':
+				case 'COLOR':
+
+					shaderText = shaderText.replace( regEx, 'color' );
+					break;
+
 				case "WEIGHT":
 
 					shaderText = shaderText.replace( regEx, 'skinWeight' );
@@ -1385,7 +1392,10 @@ THREE.GLTFLoader = ( function () {
 
 						var attributes = primitive.attributes;
 
-						_each( attributes, function ( attributeEntry, attributeId ) {
+
+						for ( var attributeId in attributes ) {
+
+							var attributeEntry = attributes[ attributeId ];
 
 							if ( ! attributeEntry ) return;
 
@@ -1396,14 +1406,15 @@ THREE.GLTFLoader = ( function () {
 								case 'POSITION':
 									geometry.addAttribute( 'position', bufferAttribute );
 									break;
-
+				
+								case 'COLOR_0':
+								case 'COLOR0':
 								case 'COLOR':
 									geometry.addAttribute( 'color', bufferAttribute );
 									break;
 
 							}
-
-						} );
+						};
 
 						var material = dependencies.materials[ primitive.material ];
 
@@ -1958,4 +1969,4 @@ THREE.GLTFLoader = ( function () {
 
 	return GLTFLoader;
 
-} )();
+} )();
\ No newline at end of file

examples/models/gltf/snowflake/line_frag.glsl

 precision highp float;
-varying vec3 vertexColor;
+varying vec3 v_color;
 
 void main(void) {
 
-	gl_FragColor = vec4(vertexColor.r, vertexColor.g, vertexColor.b, 1.0);;
+	gl_FragColor = vec4(v_color.r, v_color.g, v_color.b, 1.0);;
 	
 }

examples/models/gltf/snowflake/line_vert.glsl

 precision highp float;
 
-attribute vec3 position;
-attribute vec3 color;
+attribute vec3 a_position;
+attribute vec3 a_color;
 
-uniform mat4 modelViewMatrix;
-uniform mat4 projectionMatrix;
+varying vec3 v_color;
 
-varying vec3 vertexColor;
+uniform mat4 u_modelViewMatrix;
+uniform mat4 u_projectionMatrix;
 
 void main(void) {
-
-	vec4 pos = modelViewMatrix * vec4(position,1.0);
-	vertexColor = vec3(color.x, color.y, color.y);
-	gl_Position = projectionMatrix * pos;
-	
+	vec4 pos = u_modelViewMatrix * vec4(position,1.0);
+	v_color = a_color;
+	gl_Position = u_projectionMatrix * pos;
 }
\ No newline at end of file

examples/models/gltf/snowflake/snowFlake.gltf

@@ -7,6 +7,16 @@
       "componentType": 5126,
       "count": 257,
       "type": "VEC3",
+      "max": [
+        250.0,
+        250.0,
+        0.0
+      ],
+      "min": [
+        -250.0,
+        -250.0,
+        0.0
+      ],
       "name": "VertexAccessor"
     },
     "ColorAccessor": {
@@ -16,9 +26,22 @@
       "componentType": 5126,
       "count": 257,
       "type": "VEC3",
+      "max": [
+        0.999963164,
+        0.99640733,
+        1.0
+      ],
+      "min": [
+        0.500137746,
+        0.5041365,
+        1.0
+      ],
       "name": "ColorAccessor"
     }
   },
+  "asset": {
+    "version": "1.1"
+  },
   "buffers": {
     "Buffer": {
       "uri": "snowFlake.bin",
@@ -58,7 +81,7 @@
         {
           "attributes": {
             "POSITION": "VertexAccessor",
-            "COLOR": "ColorAccessor"
+            "COLOR_0": "ColorAccessor"
           },
           "material": "meshMaterial",
           "mode": 1
@@ -79,8 +102,8 @@
   "programs": {
     "meshProgram": {
       "attributes": [
-        "VertexAccessor",
-        "ColorAccessor"
+        "a_position",
+        "a_color"
       ],
       "fragmentShader": "fragmentShader",
       "vertexShader": "vertexShader",
@@ -112,14 +135,32 @@
   "techniques": {
     "meshTechnique": {
       "parameters": {
+        "modelViewMatrixParameter": {
+          "type": 35676,
+          "semantic": "MODELVIEW"
+        },
+        "projectionMatrixParameter": {
+          "type": 35676,
+          "semantic": "PROJECTION"
+        },
+        "position": {
+          "type": 35665,
+          "semantic": "POSITION"
+        },
         "color": {
           "type": 35665,
-          "semantic": "color"
+          "semantic": "COLOR_0"
         }
       },
-      "attributes": {},
+      "attributes": {
+        "a_position": "position",
+        "a_color": "color"
+      },
       "program": "meshProgram",
-      "uniforms": {},
+      "uniforms": {
+        "u_modelViewMatrix": "modelViewMatrixParameter",
+        "u_projectionMatrix": "projectionMatrixParameter"
+      },
       "states": {
         "enable": [
           3042,

examples/models/gltf/snowflakes/line_frag.glsl

 precision highp float;
-varying vec3 vertexColor;
+varying vec3 v_color;
 
 void main(void) {
 
-	gl_FragColor = vec4(vertexColor.r, vertexColor.g, vertexColor.b, 1.0);;
+	gl_FragColor = vec4(v_color.r, v_color.g, v_color.b, 1.0);;
 	
 }

examples/models/gltf/snowflakes/line_vert.glsl

 precision highp float;
 
-attribute vec3 position;
-attribute vec3 color;
+attribute vec3 a_position;
+attribute vec3 a_color;
 
-uniform mat4 modelViewMatrix;
-uniform mat4 projectionMatrix;
+varying vec3 v_color;
 
-varying vec3 vertexColor;
+uniform mat4 u_modelViewMatrix;
+uniform mat4 u_projectionMatrix;
 
 void main(void) {
-
-	vec4 pos = modelViewMatrix * vec4(position,1.0);
-	vertexColor = vec3(color.x, color.y, color.y);
-	gl_Position = projectionMatrix * pos;
-	
+	vec4 pos = u_modelViewMatrix * vec4(a_position,1.0);
+	v_color = a_color;
+	gl_Position = u_projectionMatrix * pos;
 }
\ No newline at end of file

examples/models/gltf/snowflakes/snowFlakes.gltf

@@ -7,16 +7,32 @@
       "componentType": 5126,
       "count": 1376,
       "type": "VEC3",
+      "max": [
+        2300.0,
+        2450.0,
+        0.0
+      ],
+      "min": [
+        0.0,
+        0.0,
+        0.0
+      ],
       "name": "VertexAccessor"
     },
-    "TriangleAccessor": {
-      "bufferView": "Lines",
+    "LineAccessor": {
+      "bufferView": "LineView",
       "byteOffset": 0,
       "byteStride": 2,
       "componentType": 5123,
       "count": 2720,
       "type": "SCALAR",
-      "name": "TriangleAccessor"
+      "max": [
+        1374.0
+      ],
+      "min": [
+        0.0
+      ],
+      "name": "LineAccessor"
     },
     "ColorAccessor": {
       "bufferView": "ColorView",
@@ -25,9 +41,22 @@
       "componentType": 5126,
       "count": 1376,
       "type": "VEC3",
+      "max": [
+        0.999963164,
+        0.999615431,
+        1.0
+      ],
+      "min": [
+        0.500137746,
+        0.5002869,
+        1.0
+      ],
       "name": "ColorAccessor"
     }
   },
+  "asset": {
+    "version": "1.1"
+  },
   "buffers": {
     "Buffer": {
       "uri": "snowFlakes.bin",
@@ -45,12 +74,12 @@
       "target": 34962,
       "name": "VertexBuffer"
     },
-    "Lines": {
+    "LineView": {
       "buffer": "Buffer",
       "byteOffset": 16512,
       "byteLength": 5440,
-      "target": 34962,
-      "name": "Lines"
+      "target": 34963,
+      "name": "LineView"
     },
     "ColorView": {
       "buffer": "Buffer",
@@ -74,9 +103,9 @@
         {
           "attributes": {
             "POSITION": "VertexAccessor",
-            "COLOR": "ColorAccessor"
+            "COLOR_0": "ColorAccessor"
           },
-          "indices": "TriangleAccessor",
+          "indices": "LineAccessor",
           "material": "meshMaterial",
           "mode": 1
         }
@@ -96,8 +125,8 @@
   "programs": {
     "meshProgram": {
       "attributes": [
-        "VertexAccessor",
-        "ColorAccessor"
+        "a_position",
+        "a_color"
       ],
       "fragmentShader": "fragmentShader",
       "vertexShader": "vertexShader",
@@ -129,14 +158,32 @@
   "techniques": {
     "meshTechnique": {
       "parameters": {
+        "modelViewMatrixParameter": {
+          "type": 35676,
+          "semantic": "MODELVIEW"
+        },
+        "projectionMatrixParameter": {
+          "type": 35676,
+          "semantic": "PROJECTION"
+        },
+        "position": {
+          "type": 35665,
+          "semantic": "POSITION"
+        },
         "color": {
           "type": 35665,
-          "semantic": "color"
+          "semantic": "COLOR_0"
         }
       },
-      "attributes": {},
+      "attributes": {
+        "a_position": "position",
+        "a_color": "color"
+      },
       "program": "meshProgram",
-      "uniforms": {},
+      "uniforms": {
+        "u_modelViewMatrix": "modelViewMatrixParameter",
+        "u_projectionMatrix": "projectionMatrixParameter"
+      },
       "states": {
         "enable": [
           3042,