resolve conflicts

examples/js/loaders/FBXLoader.js

@@ -186,13 +186,13 @@
 
 				// check whether the file name is used by another videoNode
 				// and if so keep a record of both ids as a duplicate pair [ id1, id2 ]
-				if ( videoNode.fileName in names ) {
+				if ( videoNode.FileName in names ) {
 
-					duplicates.push( [ id, names[ videoNode.fileName ] ] );
+					duplicates.push( [ id, names[ videoNode.FileName ] ] );
 
 				}
 
-				names[ videoNode.fileName ] = id;
+				names[ videoNode.FileName ] = id;
 
 				// raw image data is in videoNode.Content
 				if ( 'Content' in videoNode && videoNode.Content !== '' ) {
@@ -3118,7 +3118,7 @@
 
 		parseProperty: function ( reader ) {
 
-			var type = reader.getChar();
+			var type = reader.getString( 1 );
 
 			switch ( type ) {
 
@@ -3273,28 +3273,6 @@
 
 		},
 
-		getInt8: function () {
-
-			var value = this.dv.getInt8( this.offset );
-			this.offset += 1;
-			return value;
-
-		},
-
-		getInt8Array: function ( size ) {
-
-			var a = [];
-
-			for ( var i = 0; i < size; i ++ ) {
-
-				a.push( this.getInt8() );
-
-			}
-
-			return a;
-
-		},
-
 		getUint8: function () {
 
 			var value = this.dv.getUint8( this.offset );
@@ -3303,20 +3281,6 @@
 
 		},
 
-		getUint8Array: function ( size ) {
-
-			var a = [];
-
-			for ( var i = 0; i < size; i ++ ) {
-
-				a.push( this.getUint8() );
-
-			}
-
-			return a;
-
-		},
-
 		getInt16: function () {
 
 			var value = this.dv.getInt16( this.offset, this.littleEndian );
@@ -3325,42 +3289,6 @@
 
 		},
 
-		getInt16Array: function ( size ) {
-
-			var a = [];
-
-			for ( var i = 0; i < size; i ++ ) {
-
-				a.push( this.getInt16() );
-
-			}
-
-			return a;
-
-		},
-
-		getUint16: function () {
-
-			var value = this.dv.getUint16( this.offset, this.littleEndian );
-			this.offset += 2;
-			return value;
-
-		},
-
-		getUint16Array: function ( size ) {
-
-			var a = [];
-
-			for ( var i = 0; i < size; i ++ ) {
-
-				a.push( this.getUint16() );
-
-			}
-
-			return a;
-
-		},
-
 		getInt32: function () {
 
 			var value = this.dv.getInt32( this.offset, this.littleEndian );
@@ -3391,20 +3319,6 @@
 
 		},
 
-		getUint32Array: function ( size ) {
-
-			var a = [];
-
-			for ( var i = 0; i < size; i ++ ) {
-
-				a.push( this.getUint32() );
-
-			}
-
-			return a;
-
-		},
-
 		// JavaScript doesn't support 64-bit integer so calculate this here
 		// 1 << 32 will return 1 so using multiply operation instead here.
 		// There's a possibility that this method returns wrong value if the value
@@ -3479,20 +3393,6 @@
 
 		},
 
-		getUint64Array: function ( size ) {
-
-			var a = [];
-
-			for ( var i = 0; i < size; i ++ ) {
-
-				a.push( this.getUint64() );
-
-			}
-
-			return a;
-
-		},
-
 		getFloat32: function () {
 
 			var value = this.dv.getFloat32( this.offset, this.littleEndian );
@@ -3545,15 +3445,16 @@
 
 		},
 
-		getChar: function () {
+		getString: function ( size ) {
 
-			return String.fromCharCode( this.getUint8() );
+			var a = new Uint8Array( size );
 
-		},
+			for ( var i = 0; i < size; i ++ ) {
 
-		getString: function ( size ) {
+				a[ i ] = this.getUint8();
+
+			}
 
-			var a = new Uint8Array( this.getUint8Array( size ) );
 			var nullByte = a.indexOf( 0 );
 			if ( nullByte >= 0 ) a = a.slice( 0, nullByte );
 
@@ -3665,7 +3566,6 @@
 
 	}
 
-	// Converts ArrayBuffer to String.
 	function convertArrayBufferToString( buffer, from, to ) {
 
 		if ( from === undefined ) from = 0;