Doni/ModelHandle
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into three_importer

Browse Source
This commit is contained in:
kovacsv 2021-08-06 22:18:18 +02:00
commit 4d0e4a0bd6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/import/importergltf.js
View File

@ -776,18 +776,6 @@ OV.ImporterGltf = class extends OV.ImporterBase
ImportTexture (gltf, gltfTextureRef)
{
function GetTextureFileExtension (mimeType)
{
if (mimeType === undefined || mimeType === null) {
return '';
}
let mimeParts = mimeType.split ('/');
if (mimeParts.length === 0) {
return '';
}
return '.' + mimeParts[mimeParts.length - 1];
}
if (gltfTextureRef === undefined || gltfTextureRef === null) {
return null;
}
@ -808,7 +796,7 @@ OV.ImporterGltf = class extends OV.ImporterBase
if (gltfImage.uri !== undefined) {
let base64Buffer = OV.Base64DataURIToArrayBuffer (gltfImage.uri);
if (base64Buffer !== null) {
textureParams.name = 'Embedded_' + textureIndexString + GetTextureFileExtension (base64Buffer.mimeType);
textureParams.name = 'Embedded_' + textureIndexString + '.' + OV.GetFileExtensionFromMimeType (base64Buffer.mimeType);
textureParams.url = OV.CreateObjectUrlWithMimeType (base64Buffer.buffer, base64Buffer.mimeType);
textureParams.buffer = base64Buffer.buffer;
} else {

12
source/io/bufferutils.js
View File

@ -61,6 +61,18 @@ OV.Base64DataURIToArrayBuffer = function (uri)
};
};
OV.GetFileExtensionFromMimeType = function (mimeType)
{
if (mimeType === undefined || mimeType === null) {
return '';
}
let mimeParts = mimeType.split ('/');
if (mimeParts.length === 0) {
return '';
}
return mimeParts[mimeParts.length - 1];
};
OV.CreateObjectUrl = function (content)
{
let blob = new Blob ([content]);