Skip to content

Commit 6d94b81

Browse files
authored
Merge pull request #20626 from Mugen87/dev3
PLYLoader: Fix byte length computation of header.
2 parents b7f0ece + d40304b commit 6d94b81

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

examples/js/loaders/PLYLoader.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,15 @@ THREE.PLYLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
9090
if ( result !== null ) {
9191

9292
headerText = result[ 1 ];
93-
headerLength = result[ 0 ].length;
93+
headerLength = new Blob( [ result[ 0 ] ] ).size;
9494

9595
}
9696

9797
var header = {
9898
comments: [],
9999
elements: [],
100-
headerLength: headerLength
100+
headerLength: headerLength,
101+
objInfo: ''
101102
};
102103

103104
var lines = headerText.split( '\n' );
@@ -177,6 +178,12 @@ THREE.PLYLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
177178

178179
break;
179180

181+
case 'obj_info':
182+
183+
header.objInfo = line;
184+
185+
break;
186+
180187

181188
default:
182189

examples/jsm/loaders/PLYLoader.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,15 @@ PLYLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
9898
if ( result !== null ) {
9999

100100
headerText = result[ 1 ];
101-
headerLength = result[ 0 ].length;
101+
headerLength = new Blob( [ result[ 0 ] ] ).size;
102102

103103
}
104104

105105
var header = {
106106
comments: [],
107107
elements: [],
108-
headerLength: headerLength
108+
headerLength: headerLength,
109+
objInfo: ''
109110
};
110111

111112
var lines = headerText.split( '\n' );
@@ -185,6 +186,12 @@ PLYLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
185186

186187
break;
187188

189+
case 'obj_info':
190+
191+
header.objInfo = line;
192+
193+
break;
194+
188195

189196
default:
190197

0 commit comments

Comments
 (0)