Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
查找文件 普通视图历史永久链接Permalink
webgl_loader_json_objconverter.html 8.1 KB
Newer Older
M
Updated HTML of the rest of the examples.  
Mr.doob 已提交
1 
<!doctype html>
U
Added OBJ -> Three.js converter.  
unknown 已提交
2 3 
<html lang="en">
	<head>
M
All examples now use RequestAnimationFrame.js (pheww!)  
Mr.doob 已提交
4 
		<title>three.js webgl - io - OBJ converter</title>
U
Added OBJ -> Three.js converter.  
unknown 已提交
5 
		<meta charset="utf-8">
M
Updated HTML of the rest of the examples.  
Mr.doob 已提交
6 7 
		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
		<style>
U
Added OBJ -> Three.js converter.  
unknown 已提交
8 
			body {
A
Added male model to OBJ converter example.  
alteredq 已提交
9 
				background:#fff;
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
10 
				padding:0;
A
Added male model to OBJ converter example.  
alteredq 已提交
11 12 
				margin:0;
				overflow:hidden;
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
13 14 
				font-family:georgia;
				text-align:center;
U
Added OBJ -> Three.js converter.  
unknown 已提交
15 
			}
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
16 17 
			h1 { }
			a { color:skyblue }
A
Fixed stats widget appearance issues that appeared with recent Chrome updates.  
alteredq 已提交
18 
			canvas { pointer-events:none; z-index:10; }
A
Removed unused custom logging code from examples.  
alteredq 已提交
19
M
Merging with @alteredq's branch.  
Mr.doob 已提交
20 
			#d { text-align:center; margin:1em 0 -9.2em 0; z-index:0; position:relative; display:block }
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
21 22 
			.button { background:#000; color:#fff; padding:0.2em 0.5em; cursor:pointer }
			.inactive { background:#999; color:#eee }
U
Added OBJ -> Three.js converter.  
unknown 已提交
23 24 
		</style>
	</head>
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
25
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
26 27 28 29 30 31 32 33 
	<body>
		<div id="d">
			<h1>OBJ to Three.js converter test</h1>

			<span id="rcanvas" class="button inactive">2d canvas renderer</span>
			<span id="rwebgl" class="button">WebGL renderer</span>
			<br/>
A
Transplanted simple hierarchy system from WebGLRenderer2 into WebGLRenderer.  
alteredq 已提交
34 
			<p>Models by <a href="http://sketchup.google.com/3dwarehouse/details?mid=2c6fd128fca34052adc5f5b98d513da1">Reallusion</a>
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
35 36 
			<a href="http://sketchup.google.com/3dwarehouse/details?mid=f526cc4abf7cb68d76cab47c765b7255">iClone</a>.
		</div>
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
37
M
More examples clean up.  
Mr.doob 已提交
38 
		<script src="../build/Three.js"></script>
A
Fixed remaining extras/geometries, GeometryUtils and few examples.  
alteredq 已提交
39
M
More examples clean up.  
Mr.doob 已提交
40 41 
		<script src="js/Detector.js"></script>
		<script src="js/Stats.js"></script>
U
Added OBJ -> Three.js converter.  
unknown 已提交
42
M
More examples clean up.  
Mr.doob 已提交
43 
		<script>
U
Added OBJ -> Three.js converter.  
unknown 已提交
44 45 46 

			var SCREEN_WIDTH = window.innerWidth;
			var SCREEN_HEIGHT = window.innerHeight;
A
Added male model to OBJ converter example.  
alteredq 已提交
47 
			var FLOOR = -250;
U
Added OBJ -> Three.js converter.  
unknown 已提交
48
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
49 
			var container,stats;
U
Added OBJ -> Three.js converter.  
unknown 已提交
50
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
51 
			var camera, scene;
U
Added OBJ -> Three.js converter.  
unknown 已提交
52 53 54 55 
			var canvasRenderer, webglRenderer;

			var mesh, zmesh, geometry;
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
56 57 58 59 
			var mouseX = 0, mouseY = 0;

			var windowHalfX = window.innerWidth / 2;
			var windowHalfY = window.innerHeight / 2;
U
Added OBJ -> Three.js converter.  
unknown 已提交
60
M
Fixed some examples.  
Mr.doob 已提交
61 
			var render_canvas = 1, render_gl = 1;
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
62 
			var has_gl = 0;
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
63
A
Updated the rest of examples.  
alteredq 已提交
64 65 
			var bcanvas = document.getElementById( "rcanvas" );
			var bwebgl = document.getElementById( "rwebgl" );
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
66
A
Updated the rest of examples.  
alteredq 已提交
67 
			document.addEventListener( 'mousemove', onDocumentMouseMove, false );
U
Added OBJ -> Three.js converter.  
unknown 已提交
68 69 

			init();
M
All examples now use RequestAnimationFrame.js (pheww!)  
Mr.doob 已提交
70 
			animate();
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
71
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
72 73 74 
			render_canvas = !has_gl;
			bwebgl.style.display = has_gl ? "inline" : "none";
			bcanvas.className = render_canvas ? "button" : "button inactive";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
75
U
Added OBJ -> Three.js converter.  
unknown 已提交
76 77 
			function init() {
A
Updated the rest of examples.  
alteredq 已提交
78 79 
				container = document.createElement( 'div' );
				document.body.appendChild( container );
U
Added OBJ -> Three.js converter.  
unknown 已提交
80
A
Updated the rest of examples.  
alteredq 已提交
81 
				camera = new THREE.PerspectiveCamera( 75, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 100000 );
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
82 
				camera.position.z = 500;
U
Added OBJ -> Three.js converter.  
unknown 已提交
83 84 

				scene = new THREE.Scene();
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
85
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
86 
				// GROUND
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
87
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
88 89 90 91 92 93 94 95 96 97 98 99 100 
				var x = document.createElement( "canvas" );
				var xc = x.getContext("2d");
				x.width = x.height = 128;
				xc.fillStyle = "#fff";
				xc.fillRect(0, 0, 128, 128);
				xc.fillStyle = "#000";
				xc.fillRect(0, 0, 64, 64);
				xc.fillStyle = "#999";
				xc.fillRect(32, 32, 32, 32);
				xc.fillStyle = "#000";
				xc.fillRect(64, 64, 64, 64);
				xc.fillStyle = "#555";
				xc.fillRect(96, 96, 32, 32);
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
101
M
* Simplified THREE.Color.  
Mr.doob 已提交
102 
				var xm = new THREE.MeshBasicMaterial( { map: new THREE.Texture( x, new THREE.UVMapping(), THREE.RepeatWrapping, THREE.RepeatWrapping ) } );
A
Textures are now updateable.  
alteredq 已提交
103 
				xm.map.needsUpdate = true;
A
Added handling of texture repeat and offset to WebGLRenderer.  
alteredq 已提交
104 
				xm.map.repeat.set( 10, 10 );
M
Added namespace to all the objects that missed it (geometries, uniforms, etc)  
Mr.doob 已提交
105
M
Updated all examples so they use the renamed geometry classes.  
Mr.doob 已提交
106 
				geometry = new THREE.PlaneGeometry( 100, 100, 15, 10 );
A
Extended Blender exporter to support mesh merging and export of all / selected...  
alteredq 已提交
107
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
108 
				mesh = new THREE.Mesh( geometry, xm );
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
109 110 111 
				mesh.position.set( 0, FLOOR, 0 );
				mesh.rotation.x = Math.PI/2;
				mesh.scale.set( 10, 10, 10 );
A
Added support for "doubleSided" mesh property to WebGLRenderer.  
alteredq 已提交
112 
				mesh.doubleSided = true;
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
113 
				scene.add( mesh );
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
114
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
115 
				// SPHERES
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
116
A
Refactored OBJ converter demo not to have separate materials per each sphere.  
alteredq 已提交
117 
				var material_spheres = new THREE.MeshLambertMaterial( { color: 0xdddddd } ),
M
Updated all examples so they use the renamed geometry classes.  
Mr.doob 已提交
118 
					sphere = new THREE.SphereGeometry( 100, 16, 8 );
A
Added handling of texture repeat and offset to WebGLRenderer.  
alteredq 已提交
119
A
Trying to hack around shared texture trouble in mixed renderer examples.  
alteredq 已提交
120 121 
				for ( var i = 0; i < 10; i ++ ) {
A
Refactored OBJ converter demo not to have separate materials per each sphere.  
alteredq 已提交
122 
					mesh = new THREE.Mesh( sphere, material_spheres );
A
Updated the rest of examples.  
alteredq 已提交
123
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
124 125 126 
					mesh.position.x = 500 * ( Math.random() - 0.5 );
					mesh.position.y = 300 * ( Math.random() - 0 ) + FLOOR;
					mesh.position.z = 100 * ( Math.random() - 1 );
A
Updated the rest of examples.  
alteredq 已提交
127
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
128 
					mesh.scale.x = mesh.scale.y = mesh.scale.z = 0.25 * ( Math.random() + 0.5 );
A
Updated the rest of examples.  
alteredq 已提交
129
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
130 
					scene.add( mesh );
A
Trying to hack around shared texture trouble in mixed renderer examples.  
alteredq 已提交
131
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
132 
				}
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
133
U
Added OBJ -> Three.js converter.  
unknown 已提交
134 135 136 137 

				// LIGHTS

				var ambient = new THREE.AmbientLight( 0x221100 );
M
Updated examples with the new `.add`/`.remove` methods.  
Mr.doob 已提交
138 
				scene.add( ambient );
U
Added OBJ -> Three.js converter.  
unknown 已提交
139 140 

				var directionalLight = new THREE.DirectionalLight( 0xffeedd );
A
Updated the rest of examples.  
alteredq 已提交
141 
				directionalLight.position.set( 0, -70, 100 ).normalize();
M
Updated examples with the new `.add`/`.remove` methods.  
Mr.doob 已提交
142 
				scene.add( directionalLight );
U
Added OBJ -> Three.js converter.  
unknown 已提交
143
A
Updated the rest of examples.  
alteredq 已提交
144 
				// RENDERER
U
Added OBJ -> Three.js converter.  
unknown 已提交
145
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
146 
				if ( render_gl ) {
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
147
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
148 
					try {
A
Updated the rest of examples.  
alteredq 已提交
149
A
Moved MeshPhongMaterial onto common shader builder machinery, ubershader is no more.  
alteredq 已提交
150 
						webglRenderer = new THREE.WebGLRenderer();
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
151 
						webglRenderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
A
Fixed stats widget appearance issues that appeared with recent Chrome updates.  
alteredq 已提交
152 
						webglRenderer.domElement.style.position = "relative";
A
Updated the rest of examples.  
alteredq 已提交
153
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
154 
						container.appendChild( webglRenderer.domElement );
A
Updated the rest of examples.  
alteredq 已提交
155
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
156 
						has_gl = 1;
A
Updated the rest of examples.  
alteredq 已提交
157
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
158 159 160 
					}
					catch (e) {
					}
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
161
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
162 163 
				}
M
Fixed some examples.  
Mr.doob 已提交
164 
				if ( render_canvas ) {
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
165
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
166 167 168 
					canvasRenderer = new THREE.CanvasRenderer();
					canvasRenderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
					container.appendChild( canvasRenderer.domElement );
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
169
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
170 
				}
U
Added OBJ -> Three.js converter.  
unknown 已提交
171
A
Updated the rest of examples.  
alteredq 已提交
172 173 
				// STATS
U
Added OBJ -> Three.js converter.  
unknown 已提交
174 175 176 
				stats = new Stats();
				stats.domElement.style.position = 'absolute';
				stats.domElement.style.top = '0px';
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
177 
				stats.domElement.style.zIndex = 100;
U
Added OBJ -> Three.js converter.  
unknown 已提交
178 
				container.appendChild( stats.domElement );
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
179
A
Updated the rest of examples.  
alteredq 已提交
180 181 
				//
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
182 183 
				bcanvas.addEventListener("click", toggleCanvas, false);
				bwebgl.addEventListener("click", toggleWebGL, false);
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
184
A
Made more examples working.  
alteredq 已提交
185 
				//var loader = new THREE.BinaryLoader(),
A
More fixes related to new model format changes.  
alteredq 已提交
186 
				var loader = new THREE.JSONLoader(),
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
187 188 
					callbackMale   = function( geometry ) { createScene( geometry,  90, FLOOR, 50, 105 ) },
					callbackFemale = function( geometry ) { createScene( geometry, -80, FLOOR, 50, 0 ) };
M
All examples now use RequestAnimationFrame.js (pheww!)  
Mr.doob 已提交
189
M
Merging with @alteredq's experimental branches.  
Mr.doob 已提交
190 191 
				loader.load( "obj/male02/Male02_slim.js", callbackMale );
				loader.load( "obj/female02/Female02_slim.js", callbackFemale );
M
All examples now use RequestAnimationFrame.js (pheww!)  
Mr.doob 已提交
192
M
Merging with @alteredq's experimental branches.  
Mr.doob 已提交
193 194 
				//loader.load( "obj/male02/Male02_bin.js", callbackMale );
				//loader.load( "obj/female02/Female02_bin.js", callbackFemale );
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
195 196 

			}
U
Added OBJ -> Three.js converter.  
unknown 已提交
197
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
198 
			function createScene( geometry, x, y, z, b ) {
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
199
A
Refactored OBJ converter demo not to have separate materials per each sphere.  
alteredq 已提交
200 
				zmesh = new THREE.Mesh( geometry, new THREE.MeshFaceMaterial() );
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
201 202 203 
				zmesh.position.set( x, y, z );
				zmesh.scale.set( 3, 3, 3 );
				scene.add( zmesh );
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
204
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
205 
				createMaterialsPalette( geometry.materials, 100, b );
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
206
U
Added OBJ -> Three.js converter.  
unknown 已提交
207 208 
			}
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
209 
			function createMaterialsPalette( materials, size, bottom ) {
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
210
M
Added namespace to all the objects that missed it (geometries, uniforms, etc)  
Mr.doob 已提交
211 
				for ( var i = 0; i < materials.length; i ++ ) {
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
212
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
213 
					// material
A
Trying to hack around shared texture trouble in mixed renderer examples.  
alteredq 已提交
214
M
Updated all examples so they use the renamed geometry classes.  
Mr.doob 已提交
215 
					mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), materials[i] );
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
216 217 218 219 
					mesh.position.x = i * (size + 5) - ( ( materials.length - 1 )* ( size + 5 )/2);
					mesh.position.y = FLOOR + size/2 + bottom;
					mesh.position.z = -100;
					mesh.doubleSided = true;
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
220 
					scene.add( mesh );
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
221
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
222 
					// number
A
Trying to hack around shared texture trouble in mixed renderer examples.  
alteredq 已提交
223
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
224 
					var x = document.createElement( "canvas" );
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
225 
					var xc = x.getContext( "2d" );
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
226 227 228 229 230 
					x.width = x.height = 128;
					xc.shadowColor = "#000";
					xc.shadowBlur = 7;
					xc.fillStyle = "orange";
					xc.font = "50pt arial bold";
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
231 
					xc.fillText( i, 10, 64 );
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
232
A
Extended Blender exporter to support mesh merging and export of all / selected...  
alteredq 已提交
233 
					var xm = new THREE.MeshBasicMaterial( { map: new THREE.Texture( x ), transparent: true } );
A
Textures are now updateable.  
alteredq 已提交
234 
					xm.map.needsUpdate = true;
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
235
M
Updated all examples so they use the renamed geometry classes.  
Mr.doob 已提交
236 
					mesh = new THREE.Mesh( new THREE.PlaneGeometry( size, size ), xm );
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
237 
					mesh.position.x = i * ( size + 5 ) - ( ( materials.length - 1 )* ( size + 5 )/2);
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
238 239 240 
					mesh.position.y = FLOOR + size/2 + bottom;
					mesh.position.z = -99;
					mesh.doubleSided = true;
A
Some more Math.PI instead of magic numbers.  
alteredq 已提交
241 
					scene.add( mesh );
A
Trying to hack around shared texture trouble in mixed renderer examples.  
alteredq 已提交
242
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
243 
				}
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
244
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
245 
			}
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
246
U
Added OBJ -> Three.js converter.  
unknown 已提交
247 248 249 250 251 252 253 
			function onDocumentMouseMove(event) {

				mouseX = ( event.clientX - windowHalfX );
				mouseY = ( event.clientY - windowHalfY );

			}
M
All examples now use RequestAnimationFrame.js (pheww!)  
Mr.doob 已提交
254 255 256 257 258 259 260 261 262 263 264 265 
			//

			function animate() {

				requestAnimationFrame( animate );

				render();
				stats.update();

			}

			function render() {
U
Added OBJ -> Three.js converter.  
unknown 已提交
266 267 268 269 

				camera.position.x += ( mouseX - camera.position.x ) * .05;
				camera.position.y += ( - mouseY - camera.position.y ) * .05;
A
Updated the rest of examples.  
alteredq 已提交
270 271 
				camera.lookAt( scene.position );
U
Added OBJ -> Three.js converter.  
unknown 已提交
272 
				if ( render_gl && has_gl ) webglRenderer.render( scene, camera );
A
Trying to hack around shared texture trouble in mixed renderer examples.  
alteredq 已提交
273 
				if ( render_canvas ) canvasRenderer.render( scene, camera );
U
Added OBJ -> Three.js converter.  
unknown 已提交
274 275 276 

			}
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
277 
			function toggleCanvas() {
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
278
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
279 280 
				render_canvas = !render_canvas;
				bcanvas.className = render_canvas ? "button" : "button inactive";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
281
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
282 283 
				render_gl = !render_canvas;
				bwebgl.className = render_gl ? "button" : "button inactive";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
284
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
285 286 
				if( has_gl )
					webglRenderer.domElement.style.display = render_gl ? "block" : "none";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
287
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
288 
				canvasRenderer.domElement.style.display = render_canvas ? "block" : "none";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
289
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
290 
			}
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
291
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
292 
			function toggleWebGL() {
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
293
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
294 295 
				render_gl = !render_gl;
				bwebgl.className = render_gl ? "button" : "button inactive";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
296
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
297 298 
				render_canvas = !render_gl;
				bcanvas.className = render_canvas ? "button" : "button inactive";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
299
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
300 301 
				if( has_gl )
					webglRenderer.domElement.style.display = render_gl ? "block" : "none";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
302
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
303 
				canvasRenderer.domElement.style.display = render_canvas ? "block" : "none";
M
`texture.loaded = true` → `texture.image.loaded = true`  
Mr.doob 已提交
304
A
Added Loader class providing both asynchronous JS and web worker based loading of models.  
alteredq 已提交
305 
			}
U
Added OBJ -> Three.js converter.  
unknown 已提交
306 307 308 309 
		</script>

	</body>
</html>