Browse Source

Remove THREE.AudioBuffer and add back removed whitespace

Reece Lecrivain 9 years ago
parent
commit
c24a17b5a1
4 changed files with 24 additions and 55 deletions
  1. 20 20
      src/audio/Audio.js
  2. 0 30
      src/audio/AudioBuffer.js
  3. 4 4
      src/loaders/AudioLoader.js
  4. 0 1
      utils/build/includes/common.json

+ 20 - 20
src/audio/Audio.js

@@ -3,7 +3,7 @@
  * @author Reece Aaron Lecrivain / http://reecenotes.com/
  */
 
-THREE.Audio = function( listener ) {
+THREE.Audio = function ( listener ) {
 
 	THREE.Object3D.call( this );
 
@@ -31,19 +31,19 @@ THREE.Audio = function( listener ) {
 THREE.Audio.prototype = Object.create( THREE.Object3D.prototype );
 THREE.Audio.prototype.constructor = THREE.Audio;
 
-THREE.Audio.prototype.getOutput = function() {
+THREE.Audio.prototype.getOutput = function () {
 
 	return this.gain;
 
 };
 
-THREE.Audio.prototype.load = function( file ) {
+THREE.Audio.prototype.load = function ( file ) {
 
 	console.warn( 'THREE.Audio: .load has been deprecated. Please use THREE.AudioLoader.' );
 
 	var audioLoader = new THREE.AudioLoader( this.context );
 
-	audioLoader.load( file, function( buffer ) {
+	audioLoader.load( file, function ( buffer ) {
 		this.setBuffer( buffer );
 	});
 
@@ -51,7 +51,7 @@ THREE.Audio.prototype.load = function( file ) {
 
 };
 
-THREE.Audio.prototype.setNodeSource = function( audioNode ) {
+THREE.Audio.prototype.setNodeSource = function ( audioNode ) {
 
 	this.hasPlaybackControl = false;
 	this.sourceType = 'audioNode';
@@ -62,7 +62,7 @@ THREE.Audio.prototype.setNodeSource = function( audioNode ) {
 
 };
 
-THREE.Audio.prototype.setBuffer = function( audioBuffer ) {
+THREE.Audio.prototype.setBuffer = function ( audioBuffer ) {
 
 	var scope = this;
 
@@ -74,7 +74,7 @@ THREE.Audio.prototype.setBuffer = function( audioBuffer ) {
 
 };
 
-THREE.Audio.prototype.play = function() {
+THREE.Audio.prototype.play = function () {
 
 	if ( this.isPlaying === true ) {
 
@@ -106,7 +106,7 @@ THREE.Audio.prototype.play = function() {
 
 };
 
-THREE.Audio.prototype.pause = function() {
+THREE.Audio.prototype.pause = function () {
 
 	if ( this.hasPlaybackControl === false ) {
 
@@ -120,7 +120,7 @@ THREE.Audio.prototype.pause = function() {
 
 };
 
-THREE.Audio.prototype.stop = function() {
+THREE.Audio.prototype.stop = function () {
 
 	if ( this.hasPlaybackControl === false ) {
 
@@ -134,7 +134,7 @@ THREE.Audio.prototype.stop = function() {
 
 };
 
-THREE.Audio.prototype.connect = function() {
+THREE.Audio.prototype.connect = function () {
 
 	if ( this.filter !== null ) {
 
@@ -149,7 +149,7 @@ THREE.Audio.prototype.connect = function() {
 
 };
 
-THREE.Audio.prototype.disconnect = function() {
+THREE.Audio.prototype.disconnect = function () {
 
 	if ( this.filter !== null ) {
 
@@ -164,13 +164,13 @@ THREE.Audio.prototype.disconnect = function() {
 
 };
 
-THREE.Audio.prototype.getFilter = function() {
+THREE.Audio.prototype.getFilter = function () {
 
 	return this.filter;
 
 };
 
-THREE.Audio.prototype.setFilter = function( value ) {
+THREE.Audio.prototype.setFilter = function ( value ) {
 
 	if ( value === undefined ) value = null;
 
@@ -188,7 +188,7 @@ THREE.Audio.prototype.setFilter = function( value ) {
 
 };
 
-THREE.Audio.prototype.setPlaybackRate = function( value ) {
+THREE.Audio.prototype.setPlaybackRate = function ( value ) {
 
 	if ( this.hasPlaybackControl === false ) {
 
@@ -207,19 +207,19 @@ THREE.Audio.prototype.setPlaybackRate = function( value ) {
 
 };
 
-THREE.Audio.prototype.getPlaybackRate = function() {
+THREE.Audio.prototype.getPlaybackRate = function () {
 
 	return this.playbackRate;
 
 };
 
-THREE.Audio.prototype.onEnded = function() {
+THREE.Audio.prototype.onEnded = function () {
 
 	this.isPlaying = false;
 
 };
 
-THREE.Audio.prototype.setLoop = function( value ) {
+THREE.Audio.prototype.setLoop = function ( value ) {
 
 	if ( this.hasPlaybackControl === false ) {
 
@@ -232,7 +232,7 @@ THREE.Audio.prototype.setLoop = function( value ) {
 
 };
 
-THREE.Audio.prototype.getLoop = function() {
+THREE.Audio.prototype.getLoop = function () {
 
 	if ( this.hasPlaybackControl === false ) {
 
@@ -246,13 +246,13 @@ THREE.Audio.prototype.getLoop = function() {
 };
 
 
-THREE.Audio.prototype.setVolume = function( value ) {
+THREE.Audio.prototype.setVolume = function ( value ) {
 
 	this.gain.gain.value = value;
 
 };
 
-THREE.Audio.prototype.getVolume = function() {
+THREE.Audio.prototype.getVolume = function () {
 
 	return this.gain.gain.value;
 

+ 0 - 30
src/audio/AudioBuffer.js

@@ -1,30 +0,0 @@
-/**
- * @author mrdoob / http://mrdoob.com/
- * @author Reece Aaron Lecrivain / http://reecenotes.com/
- */
-
-THREE.AudioBuffer = function( context ) {
-
-	console.warn( 'THREE.AudioBuffer has been deprecated. Please use THREE.AudioLoader.' );
-
-	this.context = context;
-
-};
-
-THREE.AudioBuffer.prototype.load = function( file ) {
-
-	console.warn( 'THREE.AudioBuffer: .load has been deprecated. Please use THREE.AudioLoader.' );
-
-	var audioLoader = new THREE.AudioLoader( this.context );
-
-	audioLoader.load( file, function( buffer ) {
-		return buffer;
-	});
-
-};
-
-THREE.AudioBuffer.prototype.onReady = function( callback ) {
-
-	console.warn( 'THREE.AudioBuffer: .onReady has been deprecated. Please use THREE.AudioLoader.' );
-
-};

+ 4 - 4
src/loaders/AudioLoader.js

@@ -2,7 +2,7 @@
  * @author Reece Aaron Lecrivain / http://reecenotes.com/
  */
 
-THREE.AudioLoader = function( context, manager ) {
+THREE.AudioLoader = function ( context, manager ) {
 
 	this.context = ( context !== undefined ) ? context : new ( window.AudioContext || window.webkitAudioContext )();
 
@@ -14,15 +14,15 @@ THREE.AudioLoader.prototype = {
 
 	constructor: THREE.AudioLoader,
 
-	load: function( url, onLoad, onProgress, onError ) {
+	load: function ( url, onLoad, onProgress, onError ) {
 
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( this.manager );
 		loader.setResponseType( 'arraybuffer' );
-		loader.load( url, function( buffer ) {
+		loader.load( url, function ( buffer ) {
 
-			scope.context.decodeAudioData( buffer, function( audioBuffer ) {
+			scope.context.decodeAudioData( buffer, function ( audioBuffer ) {
 
 				onLoad( audioBuffer );
 

+ 0 - 1
utils/build/includes/common.json

@@ -53,7 +53,6 @@
 	"src/animation/tracks/VectorKeyframeTrack.js",
 	"src/audio/Audio.js",
 	"src/audio/AudioAnalyser.js",
-	"src/audio/AudioBuffer.js",
 	"src/audio/PositionalAudio.js",
 	"src/audio/AudioListener.js",
 	"src/cameras/Camera.js",