Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

[glTF] Move/rename all the glTF2 things.

Don McCurdy 8 years ago
parent
97bb46255d
commit
f7263aa3e4
10 changed files with 14 additions and 14 deletions
Split View Show Diff Stats
  1. 4 4
      docs/examples/loaders/GLTFLoader.html
  2. 1 1
      docs/list.js
  3. 1 1
      docs/manual/introduction/Animation-system.html
  4. 1 1
      editor/index.html
  5. 1 1
      editor/js/Loader.js
  6. 2 2
      examples/files.js
  7. 1 1
      examples/js/exporters/GLTFExporter.js
  8. 0 0
      examples/js/loaders/GLTFLoader.js
  9. 1 1
      examples/webgl_exporter_gltf.html
  10. 2 2
      examples/webgl_loader_gltf2.html

+ 4 - 4
docs/examples/loaders/GLTF2Loader.html → docs/examples/loaders/GLTFLoader.html
View File 

@@ -25,7 +25,7 @@
 
 		<h2>Extensions</h2>
 
 
 		<div>
 
-		GLTF2Loader supports the following glTF extensions:
 
+		GLTFLoader supports the following glTF extensions:
 
 		</div>
 
 
 		<ul>
 
@@ -49,7 +49,7 @@
 
 
 		<code>
 
 		// Instantiate a loader
 
-		var loader = new THREE.GLTF2Loader();
 
+		var loader = new THREE.GLTFLoader();
 
 
 		// Load a glTF resource
 
 		loader.load( 'models/gltf/duck/duck.gltf', function ( gltf ) {
 
@@ -62,7 +62,7 @@
 
 		} );
 
 		</code>
 
 
-		[example:webgl_loader_gltf2]
 
+		[example:webgl_loader_gltf]
 
 
 		<h2>Constructor</h2>
 
 
@@ -115,6 +115,6 @@
 
 
 		<h2>Source</h2>
 
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/GLTF2Loader.js examples/js/loaders/GLTF2Loader.js]
 
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/GLTFLoader.js examples/js/loaders/GLTFLoader.js]
 
 	</body>
 
 </html>

+ 1 - 1
docs/list.js
View File 

@@ -341,7 +341,7 @@ var list = {
 
 		"Loaders": {
 
 			"BabylonLoader": "examples/loaders/BabylonLoader",
 
 			"ColladaLoader": "examples/loaders/ColladaLoader",
 
-			"GLTF2Loader": "examples/loaders/GLTF2Loader",
 
+			"GLTFLoader": "examples/loaders/GLTFLoader",
 
 			"MTLLoader": "examples/loaders/MTLLoader",
 
 			"OBJLoader": "examples/loaders/OBJLoader",
 
 			"OBJLoader2": "examples/loaders/OBJLoader2",

+ 1 - 1
docs/manual/introduction/Animation-system.html
View File 

@@ -111,7 +111,7 @@
 
 				<li>[page:ObjectLoader THREE.ObjectLoader]</li>
 
 				<li>THREE.BVHLoader</li>
 
 				<li>THREE.FBXLoader</li>
 
-				<li>[page:GLTF2Loader THREE.GLTF2Loader]</li>
 
+				<li>[page:GLTFLoader THREE.GLTFLoader]</li>
 
 				<li>THREE.MMDLoader</li>
 
 				<li>THREE.SEA3DLoader</li>
 
 			</ul>

+ 1 - 1
editor/index.html
View File 

@@ -23,7 +23,7 @@
 
 		<script src="../examples/js/loaders/BabylonLoader.js"></script>
 
 		<script src="../examples/js/loaders/ColladaLoader2.js"></script>
 
 		<script src="../examples/js/loaders/FBXLoader.js"></script>
 
-		<script src="../examples/js/loaders/GLTF2Loader.js"></script>
 
+		<script src="../examples/js/loaders/GLTFLoader.js"></script>
 
 		<script src="../examples/js/loaders/KMZLoader.js"></script>
 
 		<script src="../examples/js/loaders/MD2Loader.js"></script>
 
 		<script src="../examples/js/loaders/OBJLoader.js"></script>

+ 1 - 1
editor/js/Loader.js
View File 

@@ -176,7 +176,7 @@ var Loader = function ( editor ) {
 
 
 					var contents = event.target.result;
 
 
-					var loader = new THREE.GLTF2Loader();
 
+					var loader = new THREE.GLTFLoader();
 
 					loader.parse( contents, '', function ( result ) {
 
 
 						result.scene.name = filename;

+ 2 - 2
examples/files.js
View File 

@@ -18,7 +18,7 @@ var files = {
 
 		"webgl_effects_parallaxbarrier",
 
 		"webgl_effects_peppersghost",
 
 		"webgl_effects_stereo",
 
-		"webgl_exporter_gltf2",
 
+		"webgl_exporter_gltf",
 
 		"webgl_exporter_obj",
 
 		"webgl_geometries",
 
 		"webgl_geometries2",
 
@@ -92,7 +92,7 @@ var files = {
 
 		"webgl_loader_ctm_materials",
 
 		"webgl_loader_draco",
 
 		"webgl_loader_fbx",
 
-		"webgl_loader_gltf2",
 
+		"webgl_loader_gltf",
 
 		"webgl_loader_imagebitmap",
 
 		"webgl_loader_json_blender",
 
 		"webgl_loader_json_claraio",

+ 1 - 1
examples/js/exporters/GLTFExporter.js
View File 

@@ -233,7 +233,7 @@ THREE.GLTFExporter.prototype = {
 
 
 			} else {
 
 
-				throw new Error( 'THREE.GLTF2Exporter: Unsupported bufferAttribute component type.' );
 
+				throw new Error( 'THREE.GLTFExporter: Unsupported bufferAttribute component type.' );
 
 
 			}

+ 0 - 0
examples/js/loaders/GLTF2Loader.js → examples/js/loaders/GLTFLoader.js
View File


+ 1 - 1
examples/webgl_exporter_gltf2.html → examples/webgl_exporter_gltf.html
View File 

@@ -22,7 +22,7 @@
 
 	</head>
 
 	<body>
 
 		<div id="info">
 
-			GLTF2 Exporter<br/>
 
+			GLTF Exporter<br/>
 
 			<button id="export_scene">Export Scene1</button>
 
 			<button id="export_scenes">Export Scene1 and Scene 2</button>
 
 			<button id="export_object">Export Sphere</button>

+ 2 - 2
examples/webgl_loader_gltf2.html
View File 

@@ -96,7 +96,7 @@
 
 	</div>
 
 		<script src="../build/three.js"></script>
 
 		<script src="js/controls/OrbitControls.js"></script>
 
-		<script src="js/loaders/GLTF2Loader.js"></script>
 
+		<script src="js/loaders/GLTFLoader.js"></script>
 
 
 		<script>
 
 			var orbitControls = null;
 
@@ -202,7 +202,7 @@
 
 					scene.add(ground);
 
 				}
 
 
-				loader = new THREE.GLTF2Loader();
 
+				loader = new THREE.GLTFLoader();
 
 
 				for (var i = 0; i < extensionSelect.children.length; i++) {
 
 					var child = extensionSelect.children[i];