首页 发现 帮助
登录
javascript
/
three.js
镜像自地址 https://github.com/tazdij/three.js.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

Renamed doc page and updated RGBELoader

Lewy Blue 8 年之前
父节点
0efedb991b
当前提交
fd46b300c4
共有 6 个文件被更改，包括 71 次插入 和 77 次删除
合并视图 显示文件统计
  1. 10 4
      build/three.js
  2. 9 3
      build/three.module.js
  3. 0 62
      docs/api/loaders/BinaryTextureLoader.html
  4. 47 2
      docs/api/loaders/DataTextureLoader.html
  5. 0 1
      docs/list.js
  6. 5 5
      examples/js/loaders/RGBELoader.js

+ 10 - 4
build/three.js
查看文件 

@@ -29364,8 +29364,7 @@
 
 	 * Abstract Base class to load generic binary textures formats (rgbe, hdr, ...)
 
 	 * Abstract Base class to load generic binary textures formats (rgbe, hdr, ...)
 
 	 */
 
 	 */
 
 
 
-	var DataTextureLoader = BinaryTextureLoader;
 
-	function BinaryTextureLoader( manager ) {
 
+	function DataTextureLoader( manager ) {
 
 
 
 		this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
 
 		this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
 
 
 
@@ -29374,7 +29373,7 @@
 
 
 
 	}
 
 	}
 
 
 
-	Object.assign( BinaryTextureLoader.prototype, {
 
+	Object.assign( DataTextureLoader.prototype, {
 
 
 
 		load: function ( url, onLoad, onProgress, onError ) {
 
 		load: function ( url, onLoad, onProgress, onError ) {
 
 
 
@@ -41837,6 +41836,13 @@
 
 
 
 	}
 
 	}
 
 
 
+	function BinaryTextureLoader( manager ) {
 
+
 
+		console.warn( 'THREE.BinaryTextureLoader has been renamed to THREE.DataTextureLoader.' );
 
+		return new DataTextureLoader( manager );
 
+
 
+	}
 
+
 
 	//
 
 	//
 
 
 
 	Object.assign( Box2.prototype, {
 
 	Object.assign( Box2.prototype, {
 
@@ -42959,7 +42965,6 @@
 
 	exports.DepthTexture = DepthTexture;
 
 	exports.DepthTexture = DepthTexture;
 
 	exports.Texture = Texture;
 
 	exports.Texture = Texture;
 
 	exports.CompressedTextureLoader = CompressedTextureLoader;
 
 	exports.CompressedTextureLoader = CompressedTextureLoader;
 
-	exports.BinaryTextureLoader = BinaryTextureLoader;
 
 	exports.DataTextureLoader = DataTextureLoader;
 
 	exports.DataTextureLoader = DataTextureLoader;
 
 	exports.CubeTextureLoader = CubeTextureLoader;
 
 	exports.CubeTextureLoader = CubeTextureLoader;
 
 	exports.TextureLoader = TextureLoader;
 
 	exports.TextureLoader = TextureLoader;
 
@@ -43303,6 +43308,7 @@
 
 	exports.EdgesHelper = EdgesHelper;
 
 	exports.EdgesHelper = EdgesHelper;
 
 	exports.WireframeHelper = WireframeHelper;
 
 	exports.WireframeHelper = WireframeHelper;
 
 	exports.XHRLoader = XHRLoader;
 
 	exports.XHRLoader = XHRLoader;
 
+	exports.BinaryTextureLoader = BinaryTextureLoader;
 
 	exports.GeometryUtils = GeometryUtils;
 
 	exports.GeometryUtils = GeometryUtils;
 
 	exports.ImageUtils = ImageUtils;
 
 	exports.ImageUtils = ImageUtils;
 
 	exports.Projector = Projector;
 
 	exports.Projector = Projector;

文件差异内容过多而无法显示
+ 9 - 3
build/three.module.js


+ 0 - 62
docs/api/loaders/BinaryTextureLoader.html
查看文件 

@@ -1,62 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<meta charset="utf-8" />
 
-		<base href="../../" />
 
-		<script src="list.js"></script>
 
-		<script src="page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="page.css" />
 
-	</head>
 
-	<body>
 
-		<h1>[name]</h1>
 
-
 
-		<div class="desc">
 
-		Abstract base class to load generic binary textures formats (rgbe, hdr, ...).
 
-		This uses the [page:FileLoader] internally for loading files.
 
-		</div>
 
-
 
-		<h2>Examples</h2>
 
-
 
-		<div>
 
-			See the [link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/RGBELoader.js RGBELoader]
 
-			for an example of a derived class.
 
-		</div>
 
-
 
-		<h2>Constructor</h2>
 
-
 
-		<h3>[name]( [page:LoadingManager manager] )</h3>
 
-		<div>
 
-		[page:LoadingManager manager] — The [page:LoadingManager loadingManager] for the loader to use.
 
-		Default is [page:LoadingManager THREE.DefaultLoadingManager].<br /><br />
 
-
 
-		Creates a new [name].
 
-		</div>
 
-
 
-
 
-		<h2>Properties</h2>
 
-
 
-		<h3>[property:LoadingManager manager]</h3>
 
-		<div>
 
-		The [page:LoadingManager loadingManager] the loader is using. Default is [page:DefaultLoadingManager].
 
-		</div>
 
-
 
-
 
-		<h2>Methods</h2>
 
-
 
-		<h3>[method:null load]( [page:String url], [page:Function onLoad], [page:Function onProgress], [page:Function onError] )</h3>
 
-		<div>
 
-		[page:String url] — the path or URL to the file. This can also be a
 
-			[link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].<br />
 
-		[page:Function onLoad] — Will be called when load completes. The argument will be the loaded texture.<br />
 
-		[page:Function onProgress] — Will be called while load progresses. The argument will be the XmlHttpRequest instance, that contain .[page:Integer total] and .[page:Integer loaded] bytes.<br />
 
-		[page:Function onError] — Will be called when load errors.<br />
 
-		</div>
 
-		<div>
 
-		Begin loading from url and pass the loaded texture to onLoad.
 
-		</div>
 
-
 
-		<h2>Source</h2>
 
-
 
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
-	</body>
 
-</html>

+ 47 - 2
docs/api/loaders/DataTextureLoader.html
查看文件 

@@ -10,9 +10,54 @@
 
 	<body>
 
 	<body>
 
 		<h1>[name]</h1>
 
 		<h1>[name]</h1>
 
 
 
-		<div class="desc">This is an alias for the [page:BinaryTextureLoader BinaryTextureLoader].
 
-			See that page for details.
 
+		<div class="desc">
 
+		Abstract base class to load generic binary textures formats (rgbe, hdr, ...).
 
+		This uses the [page:FileLoader] internally for loading files, and creates a new
 
+		[page:DataTexture].
 
 		</div>
 
 		</div>
 
 
 
+		<h2>Examples</h2>
 
+
 
+		<div>
 
+			See the [link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/RGBELoader.js RGBELoader]
 
+			for an example of a derived class.
 
+		</div>
 
+
 
+		<h2>Constructor</h2>
 
+
 
+		<h3>[name]( [page:LoadingManager manager] )</h3>
 
+		<div>
 
+		[page:LoadingManager manager] — The [page:LoadingManager loadingManager] for the loader to use.
 
+		Default is [page:LoadingManager THREE.DefaultLoadingManager].<br /><br />
 
+
 
+		Creates a new [name].
 
+		</div>
 
+
 
+
 
+		<h2>Properties</h2>
 
+
 
+		<h3>[property:LoadingManager manager]</h3>
 
+		<div>
 
+		The [page:LoadingManager loadingManager] the loader is using. Default is [page:DefaultLoadingManager].
 
+		</div>
 
+
 
+
 
+		<h2>Methods</h2>
 
+
 
+		<h3>[method:null load]( [page:String url], [page:Function onLoad], [page:Function onProgress], [page:Function onError] )</h3>
 
+		<div>
 
+		[page:String url] — the path or URL to the file. This can also be a
 
+			[link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].<br />
 
+		[page:Function onLoad] — Will be called when load completes. The argument will be the loaded texture.<br />
 
+		[page:Function onProgress] — Will be called while load progresses. The argument will be the XmlHttpRequest instance, that contain .[page:Integer total] and .[page:Integer loaded] bytes.<br />
 
+		[page:Function onError] — Will be called when load errors.<br />
 
+		</div>
 
+		<div>
 
+		Begin loading from url and pass the loaded texture to onLoad.
 
+		</div>
 
+
 
+		<h2>Source</h2>
 
+
 
+		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
 	</body>
 
 	</body>
 
 </html>
 
 </html>

+ 0 - 1
docs/list.js
查看文件 

@@ -196,7 +196,6 @@ var list = {
 
 		"Loaders": [
 
 		"Loaders": [
 
 			[ "AnimationLoader", "api/loaders/AnimationLoader" ],
 
 			[ "AnimationLoader", "api/loaders/AnimationLoader" ],
 
 			[ "AudioLoader", "api/loaders/AudioLoader" ],
 
 			[ "AudioLoader", "api/loaders/AudioLoader" ],
 
-			[ "BinaryTextureLoader", "api/loaders/BinaryTextureLoader" ],
 
 			[ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ],
 
 			[ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ],
 
 			[ "Cache", "api/loaders/Cache" ],
 
 			[ "Cache", "api/loaders/Cache" ],
 
 			[ "CompressedTextureLoader", "api/loaders/CompressedTextureLoader" ],
 
 			[ "CompressedTextureLoader", "api/loaders/CompressedTextureLoader" ],

+ 5 - 5
examples/js/loaders/RGBELoader.js
查看文件 

@@ -11,8 +11,8 @@ THREE.HDRLoader = THREE.RGBELoader = function ( manager ) {
 
 
 
 };
 
 };
 
 
 
-// extend THREE.BinaryTextureLoader
 
-THREE.RGBELoader.prototype = Object.create( THREE.BinaryTextureLoader.prototype );
 
+// extend THREE.DataTextureLoader
 
+THREE.RGBELoader.prototype = Object.create( THREE.DataTextureLoader.prototype );
 
 
 
 // adapted from http://www.graphics.cornell.edu/~bjw/rgbe.html
 
 // adapted from http://www.graphics.cornell.edu/~bjw/rgbe.html
 
 THREE.RGBELoader.prototype._parser = function( buffer ) {
 
 THREE.RGBELoader.prototype._parser = function( buffer ) {
 
@@ -112,16 +112,16 @@ THREE.RGBELoader.prototype._parser = function( buffer ) {
 
 
 
 					programtype: 'RGBE',              /* listed at beginning of file to identify it
 
 					programtype: 'RGBE',              /* listed at beginning of file to identify it
 
 													* after "#?".  defaults to "RGBE" */
 
 													* after "#?".  defaults to "RGBE" */
 
-														
+
 
 					format: '',                       /* RGBE format, default 32-bit_rle_rgbe */
 
 					format: '',                       /* RGBE format, default 32-bit_rle_rgbe */
 
 
 
 					gamma: 1.0,                       /* image has already been gamma corrected with
 
 					gamma: 1.0,                       /* image has already been gamma corrected with
 
 													* given gamma.  defaults to 1.0 (no correction) */
 
 													* given gamma.  defaults to 1.0 (no correction) */
 
-														
+
 
 					exposure: 1.0,                    /* a value of 1.0 in an image corresponds to
 
 					exposure: 1.0,                    /* a value of 1.0 in an image corresponds to
 
 													* <exposure> watts/steradian/m^2.
 
 													* <exposure> watts/steradian/m^2.
 
 													* defaults to 1.0 */
 
 													* defaults to 1.0 */
 
-														
+
 
 					width: 0, height: 0               /* image dimensions, width/height */
 
 					width: 0, height: 0               /* image dimensions, width/height */
 
 
 
 				}
 
 				}

部分文件因为文件数量过多而无法显示