Merge pull request #16824 from gero3/AWDLoaderLGTM

AWDLoader: Fix LGTM Errors

Author: mrdoob

examples/js/loaders/AWDLoader.js

@@ -49,6 +49,8 @@ THREE.AWDLoader = ( function () {
 
 		this.id = 0;
 		this.data = null;
+		this.namespace = 0;
+		this.flags = 0;
 
 	}
 
@@ -167,7 +169,7 @@ THREE.AWDLoader = ( function () {
 		parseNextBlock: function () {
 
 			var assetData,
-				ns, type, len, block,
+				block,
 				blockId = this.readU32(),
 				ns = this.readU8(),
 				type = this.readU8(),
@@ -233,6 +235,8 @@ THREE.AWDLoader = ( function () {
 			this._blocks[ blockId ] = block = new Block();
 			block.data = assetData;
 			block.id = blockId;
+			block.namespace = ns;
+			block.flags = flags;
 
 
 		},
@@ -401,7 +405,8 @@ THREE.AWDLoader = ( function () {
 
 			while ( methods_parsed < num_methods ) {
 
-				var method_type = this.readU16();
+				// read method_type before
+				this.readU16();
 				this.parseProperties( null );
 				this.parseUserAttributes();
 
@@ -455,6 +460,8 @@ THREE.AWDLoader = ( function () {
 				console.log( url );
 
 				asset = this.loadTexture( url );
+				asset.userData = {};
+				asset.userData.name = name;
 
 			} else {
 				// embed texture not supported
@@ -487,8 +494,9 @@ THREE.AWDLoader = ( function () {
 		parseSkeleton: function () {
 
 			// Array<Bone>
-			var name = this.readUTF(),
-				num_joints = this.readU16(),
+			//
+			this.readUTF();
+			var	num_joints = this.readU16(),
 				skeleton = [],
 				joints_parsed = 0;
 

examples/jsm/loaders/AWDLoader.js

@@ -63,6 +63,8 @@ var AWDLoader = ( function () {
 
 		this.id = 0;
 		this.data = null;
+		this.namespace = 0;
+		this.flags = 0;
 
 	}
 
@@ -181,7 +183,7 @@ var AWDLoader = ( function () {
 		parseNextBlock: function () {
 
 			var assetData,
-				ns, type, len, block,
+				block,
 				blockId = this.readU32(),
 				ns = this.readU8(),
 				type = this.readU8(),
@@ -247,6 +249,8 @@ var AWDLoader = ( function () {
 			this._blocks[ blockId ] = block = new Block();
 			block.data = assetData;
 			block.id = blockId;
+			block.namespace = ns;
+			block.flags = flags;
 
 
 		},
@@ -415,7 +419,8 @@ var AWDLoader = ( function () {
 
 			while ( methods_parsed < num_methods ) {
 
-				var method_type = this.readU16();
+				// read method_type before 
+				this.readU16();
 				this.parseProperties( null );
 				this.parseUserAttributes();
 
@@ -468,7 +473,9 @@ var AWDLoader = ( function () {
 				var url = this.readUTFBytes( data_len );
 				console.log( url );
 
-				asset = this.loadTexture( url );
+				asset = this.loadTexture(url);
+				asset.userData = {};
+				asset.userData.name = name;
 
 			} else {
 				// embed texture not supported
@@ -501,8 +508,9 @@ var AWDLoader = ( function () {
 		parseSkeleton: function () {
 
 			// Array<Bone>
-			var name = this.readUTF(),
-				num_joints = this.readU16(),
+			//
+			this.readUTF();
+			var	num_joints = this.readU16(),
 				skeleton = [],
 				joints_parsed = 0;