Начало Каталог Помощ
Вход
javascript
/
three.js
огледало от https://github.com/tazdij/three.js.git
2
0
Разклонения 0
Файлове Задачи 0 Уики
Преглед на файлове

Merge pull request #10393 from looeee/BinaryTextureLoader/Deprecate

Deprecated BinaryTextureLoader in favour of DataTextureLoader
Mr.doob преди 8 години
родител
cc8c356847 27b566ecbc
ревизия
309dd0b10a
променени са 8 файла, в които са добавени 66 реда и са изтрити 75 реда
Обединен изглед Покажи статистика за разликите
  1. 2 0
      docs/api/deprecated/DeprecatedList.html
  2. 0 62
      docs/api/loaders/BinaryTextureLoader.html
  3. 47 2
      docs/api/loaders/DataTextureLoader.html
  4. 0 1
      docs/list.js
  5. 5 5
      examples/js/loaders/RGBELoader.js
  6. 8 0
      src/Three.Legacy.js
  7. 1 1
      src/Three.js
  8. 3 4
      src/loaders/DataTextureLoader.js

+ 2 - 0
docs/api/deprecated/DeprecatedList.html
Целия файл 

@@ -34,6 +34,8 @@
 
 		<h3>[page:AudioAnalyser]</h3>
 
 		<h3>[page:AudioAnalyser]</h3>
 
 		<div>AudioAnalyser.getData() has been renamed to [page:AudioAnalyser.getFrequencyData]().</div>
 
 		<div>AudioAnalyser.getData() has been renamed to [page:AudioAnalyser.getFrequencyData]().</div>
 
 
 
+		<h3>[page:BinaryTextureLoader]</h3>
 
+		<div>BinaryTextureLoader has been renamed to [page:DataTextureLoader].</div>

+ 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
Целия файл 

@@ -195,7 +195,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 */
 
 
 
 				}
 
 				}

+ 8 - 0
src/Three.Legacy.js
Целия файл 

@@ -35,6 +35,7 @@ import { Light } from './lights/Light.js';
 
 import { FileLoader } from './loaders/FileLoader.js';
 
 import { FileLoader } from './loaders/FileLoader.js';
 
 import { AudioLoader } from './loaders/AudioLoader.js';
 
 import { AudioLoader } from './loaders/AudioLoader.js';
 
 import { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
 
 import { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
 
+import { DataTextureLoader } from './loaders/DataTextureLoader.js';
 
 import { TextureLoader } from './loaders/TextureLoader.js';
 
 import { TextureLoader } from './loaders/TextureLoader.js';
 
 import { Material } from './materials/Material.js';
 
 import { Material } from './materials/Material.js';
 
 import { LineBasicMaterial } from './materials/LineBasicMaterial.js';
 
 import { LineBasicMaterial } from './materials/LineBasicMaterial.js';
 
@@ -269,6 +270,13 @@ export function XHRLoader( manager ) {
 
 
 
 }
 
 }
 
 
 
+export 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, {

+ 1 - 1
src/Three.js
Целия файл 

@@ -32,7 +32,7 @@ export { Texture } from './textures/Texture.js';
 
 export * from './geometries/Geometries.js';
 
 export * from './geometries/Geometries.js';
 
 export * from './materials/Materials.js';
 
 export * from './materials/Materials.js';
 
 export { CompressedTextureLoader } from './loaders/CompressedTextureLoader.js';
 
 export { CompressedTextureLoader } from './loaders/CompressedTextureLoader.js';
 
-export { BinaryTextureLoader, DataTextureLoader } from './loaders/BinaryTextureLoader.js';
 
+export { DataTextureLoader } from './loaders/DataTextureLoader.js';
 
 export { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
 
 export { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
 
 export { TextureLoader } from './loaders/TextureLoader.js';
 
 export { TextureLoader } from './loaders/TextureLoader.js';
 
 export { ObjectLoader } from './loaders/ObjectLoader.js';
 
 export { ObjectLoader } from './loaders/ObjectLoader.js';

+ 3 - 4
src/loaders/BinaryTextureLoader.js → src/loaders/DataTextureLoader.js
Целия файл 

@@ -9,8 +9,7 @@ import { DefaultLoadingManager } from './LoadingManager';
 
  * 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;
 
 
 
@@ -19,7 +18,7 @@ function BinaryTextureLoader( manager ) {
 
 
 
 }
 
 }
 
 
 
-Object.assign( BinaryTextureLoader.prototype, {
 
+Object.assign( DataTextureLoader.prototype, {
 
 
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
 
 
@@ -93,4 +92,4 @@ Object.assign( BinaryTextureLoader.prototype, {
 
 } );
 
 } );
 
 
 
 
 
-export { BinaryTextureLoader, DataTextureLoader };
 
+export { DataTextureLoader };