提交 f7263aa3 编写于 作者: D Don McCurdy

[glTF] Move/rename all the glTF2 things.

上级 97bb4625
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<h2>Extensions</h2> <h2>Extensions</h2>
<div> <div>
GLTF2Loader supports the following glTF extensions: GLTFLoader supports the following glTF extensions:
</div> </div>
<ul> <ul>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<code> <code>
// Instantiate a loader // Instantiate a loader
var loader = new THREE.GLTF2Loader(); var loader = new THREE.GLTFLoader();
// Load a glTF resource // Load a glTF resource
loader.load( 'models/gltf/duck/duck.gltf', function ( gltf ) { loader.load( 'models/gltf/duck/duck.gltf', function ( gltf ) {
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
} ); } );
</code> </code>
[example:webgl_loader_gltf2] [example:webgl_loader_gltf]
<h2>Constructor</h2> <h2>Constructor</h2>
...@@ -115,6 +115,6 @@ ...@@ -115,6 +115,6 @@
<h2>Source</h2> <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> </body>
</html> </html>
...@@ -341,7 +341,7 @@ var list = { ...@@ -341,7 +341,7 @@ var list = {
"Loaders": { "Loaders": {
"BabylonLoader": "examples/loaders/BabylonLoader", "BabylonLoader": "examples/loaders/BabylonLoader",
"ColladaLoader": "examples/loaders/ColladaLoader", "ColladaLoader": "examples/loaders/ColladaLoader",
"GLTF2Loader": "examples/loaders/GLTF2Loader", "GLTFLoader": "examples/loaders/GLTFLoader",
"MTLLoader": "examples/loaders/MTLLoader", "MTLLoader": "examples/loaders/MTLLoader",
"OBJLoader": "examples/loaders/OBJLoader", "OBJLoader": "examples/loaders/OBJLoader",
"OBJLoader2": "examples/loaders/OBJLoader2", "OBJLoader2": "examples/loaders/OBJLoader2",
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<li>[page:ObjectLoader THREE.ObjectLoader]</li> <li>[page:ObjectLoader THREE.ObjectLoader]</li>
<li>THREE.BVHLoader</li> <li>THREE.BVHLoader</li>
<li>THREE.FBXLoader</li> <li>THREE.FBXLoader</li>
<li>[page:GLTF2Loader THREE.GLTF2Loader]</li> <li>[page:GLTFLoader THREE.GLTFLoader]</li>
<li>THREE.MMDLoader</li> <li>THREE.MMDLoader</li>
<li>THREE.SEA3DLoader</li> <li>THREE.SEA3DLoader</li>
</ul> </ul>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<script src="../examples/js/loaders/BabylonLoader.js"></script> <script src="../examples/js/loaders/BabylonLoader.js"></script>
<script src="../examples/js/loaders/ColladaLoader2.js"></script> <script src="../examples/js/loaders/ColladaLoader2.js"></script>
<script src="../examples/js/loaders/FBXLoader.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/KMZLoader.js"></script>
<script src="../examples/js/loaders/MD2Loader.js"></script> <script src="../examples/js/loaders/MD2Loader.js"></script>
<script src="../examples/js/loaders/OBJLoader.js"></script> <script src="../examples/js/loaders/OBJLoader.js"></script>
......
...@@ -176,7 +176,7 @@ var Loader = function ( editor ) { ...@@ -176,7 +176,7 @@ var Loader = function ( editor ) {
var contents = event.target.result; var contents = event.target.result;
var loader = new THREE.GLTF2Loader(); var loader = new THREE.GLTFLoader();
loader.parse( contents, '', function ( result ) { loader.parse( contents, '', function ( result ) {
result.scene.name = filename; result.scene.name = filename;
......
...@@ -18,7 +18,7 @@ var files = { ...@@ -18,7 +18,7 @@ var files = {
"webgl_effects_parallaxbarrier", "webgl_effects_parallaxbarrier",
"webgl_effects_peppersghost", "webgl_effects_peppersghost",
"webgl_effects_stereo", "webgl_effects_stereo",
"webgl_exporter_gltf2", "webgl_exporter_gltf",
"webgl_exporter_obj", "webgl_exporter_obj",
"webgl_geometries", "webgl_geometries",
"webgl_geometries2", "webgl_geometries2",
...@@ -92,7 +92,7 @@ var files = { ...@@ -92,7 +92,7 @@ var files = {
"webgl_loader_ctm_materials", "webgl_loader_ctm_materials",
"webgl_loader_draco", "webgl_loader_draco",
"webgl_loader_fbx", "webgl_loader_fbx",
"webgl_loader_gltf2", "webgl_loader_gltf",
"webgl_loader_imagebitmap", "webgl_loader_imagebitmap",
"webgl_loader_json_blender", "webgl_loader_json_blender",
"webgl_loader_json_claraio", "webgl_loader_json_claraio",
......
...@@ -233,7 +233,7 @@ THREE.GLTFExporter.prototype = { ...@@ -233,7 +233,7 @@ THREE.GLTFExporter.prototype = {
} else { } else {
throw new Error( 'THREE.GLTF2Exporter: Unsupported bufferAttribute component type.' ); throw new Error( 'THREE.GLTFExporter: Unsupported bufferAttribute component type.' );
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</head> </head>
<body> <body>
<div id="info"> <div id="info">
GLTF2 Exporter<br/> GLTF Exporter<br/>
<button id="export_scene">Export Scene1</button> <button id="export_scene">Export Scene1</button>
<button id="export_scenes">Export Scene1 and Scene 2</button> <button id="export_scenes">Export Scene1 and Scene 2</button>
<button id="export_object">Export Sphere</button> <button id="export_object">Export Sphere</button>
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</div> </div>
<script src="../build/three.js"></script> <script src="../build/three.js"></script>
<script src="js/controls/OrbitControls.js"></script> <script src="js/controls/OrbitControls.js"></script>
<script src="js/loaders/GLTF2Loader.js"></script> <script src="js/loaders/GLTFLoader.js"></script>
<script> <script>
var orbitControls = null; var orbitControls = null;
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
scene.add(ground); scene.add(ground);
} }
loader = new THREE.GLTF2Loader(); loader = new THREE.GLTFLoader();
for (var i = 0; i < extensionSelect.children.length; i++) { for (var i = 0; i < extensionSelect.children.length; i++) {
var child = extensionSelect.children[i]; var child = extensionSelect.children[i];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册