sunyu
/
live2demo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15 from Live2D/feature/fix_text_decode 

Fix text decode.
translate
Takuya Ito 2018-11-02 14:15:54 +09:00 committed by GitHub
parent cbc4e22e54 2fb80b46e8
commit b2b7dc3e72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Framework/utils/cubismjson.ts
View File

@ -22,6 +22,7 @@ export namespace Live2DCubismFramework
const CSM_JSON_ERROR_TYPE_MISMATCH: string = "Error: type mismatch";
const CSM_JSON_ERROR_INDEX_OF_BOUNDS: string = "Error: index out of bounds";
/**
* パースしたJSONエレメントの要素の基底クラス。
*/
@ -307,27 +308,17 @@ export namespace Live2DCubismFramework
return this._root;
}
/**
* UnicodeのバイナリをStringに変換・長い文字のスライスバージョン
*/
public LongArrayBufferToString(buffer: ArrayBuffer, len: number) : string
{
let tmp: string[] = [];
for (let p: number = 0; p < buffer.byteLength; p += len)
{
tmp.push(this.ArrayBufferToString(buffer.slice(p, p + len)));
}
return tmp.join("");
}
/**
* UnicodeのバイナリをStringに変換
*
* @param buffer 変換するバイナリデータ
* @return 変換後の文字列
*/
public ArrayBufferToString( buffer: ArrayBuffer ): string
public arrayBufferToString(buffer: ArrayBuffer): string
{
// 8ビット変換
return String.fromCharCode.apply("", new Uint8Array(buffer));
let encodedString: string = String.fromCharCode.apply(null, new Uint8Array(buffer));
let decodedString: string = decodeURIComponent(escape(encodedString));
return decodedString;
}
/**
@ -340,7 +331,7 @@ export namespace Live2DCubismFramework
public parseBytes(buffer: ArrayBuffer, size: number): boolean
{
let endPos: number[] = new Array(1); // 参照渡しにするため配列
let decodeBuffer: string = this.LongArrayBufferToString(buffer, 1024);
let decodeBuffer: string = this.arrayBufferToString(buffer);
this._root = this.parseValue(decodeBuffer, size, 0, endPos);
if(this._error)