Merge pull request #11485 from donmccurdy/feat-gltf2-common-materials

[glTF] Implement glTF2.0 common materials, clean up loadMaterials().
mrdoob · Jun 11, 2017 · 28ba5ed · 28ba5ed
2 parents ef4844b + fd6fe6e
commit 28ba5ed
Show file tree

Hide file tree

Showing 7 changed files with 871 additions and 742 deletions.
diff --git a/docs/examples/loaders/GLTF2Loader.html b/docs/examples/loaders/GLTF2Loader.html
@@ -14,13 +14,12 @@ <h1>[name]</h1>
 		<div class="desc">
 		A loader for *glTF* 2.0 resources.
 		<br /><br />
-		<a href="https://www.khronos.org/gltf">glTF</a> (GL Transmission Format) is an open format
-		specification for efficient delivery and loading of 3D content. Assets may be provided either
-		in JSON (.gltf) or binary (.glb) format. External files store textures (.jpg, .png, ...) and
-		additional binary data (.bin). A glTF asset may deliver one or more scenes, including meshes,
-		materials, textures, shaders, skins, skeletons, animations, lights, and/or cameras. Morph target
-		animations are not yet finalized in the
-		<a href="https://github.com/KhronosGroup/glTF/tree/master/specification">glTF specification</a>.
+		<a href="https://www.khronos.org/gltf">glTF</a> (GL Transmission Format) is an
+		<a href="https://github.com/KhronosGroup/glTF/tree/master/specification/2.0">open format specification</a>
+		for efficient delivery and loading of 3D content. Assets may be provided either in JSON (.gltf)
+		or binary (.glb) format. External files store textures (.jpg, .png, ...) and additional binary
+		data (.bin). A glTF asset may deliver one or more scenes, including meshes, materials,
+		textures, shaders, skins, skeletons, morph targets, animations, lights, and/or cameras.
 		</div>
 
 		<h2>Extensions</h2>
@@ -31,17 +30,15 @@ <h2>Extensions</h2>
 
 		<ul>
 			<li>
-				<a target="_blank" href="https://github.com/KhronosGroup/glTF/blob/master/extensions/Khronos/KHR_binary_glTF">
-					KHR_binary_glTF
-				</a>
+				KHR_lights
 			</li>
 			<li>
 				<a target="_blank" href="https://github.com/KhronosGroup/glTF/tree/master/extensions/Khronos/KHR_materials_common">
 					KHR_materials_common
 				</a>
 			</li>
 			<li>
-				<a target="_blank" href="https://github.com/KhronosGroup/glTF/tree/2.0/extensions/Khronos/KHR_materials_pbrSpecularGlossiness">
+				<a target="_blank" href="https://github.com/KhronosGroup/glTF/tree/master/extensions/Khronos/KHR_materials_pbrSpecularGlossiness">
 					KHR_materials_pbrSpecularGlossiness
 				</a>
 			</li>