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

Rename ImportBuffers to ImporterFileAccessor.

Browse Source
This commit is contained in:
kovacsv 2021-11-19 08:00:32 +01:00
parent 33a8464321
commit 8fa45a8b95
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/import/importer.js
View File

@ -34,42 +34,41 @@ OV.ImportResult = class
}
};
OV.ImportBuffers = class
OV.ImporterFileAccessor = class
{
constructor (getBufferCallback)
{
this.getBufferCallback = getBufferCallback;
this.fileBuffers = {};
this.textureBuffers = {};
this.fileBuffers = new Map ();
this.textureBuffers = new Map ();
}
GetFileBuffer (filePath)
{
let fileName = OV.GetFileName (filePath);
let buffer = this.fileBuffers[fileName];
if (buffer === undefined) {
buffer = this.getBufferCallback (fileName);
this.fileBuffers[fileName] = buffer;
if (this.fileBuffers.has (fileName)) {
return this.fileBuffers.get (fileName);
}
let buffer = this.getBufferCallback (fileName);
this.fileBuffers.set (fileName, buffer);
return buffer;
}
GetTextureBuffer (filePath)
{
let fileName = OV.GetFileName (filePath);
let buffer = this.textureBuffers[fileName];
if (buffer === undefined) {
if (this.textureBuffers.has (fileName)) {
return this.textureBuffers.get (fileName);
}
let buffer = null;
let textureBuffer = this.getBufferCallback (fileName);
if (textureBuffer !== null) {
buffer = {
url : OV.CreateObjectUrl (textureBuffer),
buffer : textureBuffer
};
} else {
buffer = null;
}
this.textureBuffers[fileName] = buffer;
}
this.textureBuffers.set (fileName, buffer);
return buffer;
}
};
@ -176,7 +175,7 @@ OV.Importer = class
this.usedFiles.push (mainFile.file.name);
let importer = mainFile.importer;
let buffers = new OV.ImportBuffers ((fileName) => {
let fileAccessor = new OV.ImporterFileAccessor ((fileName) => {
let fileBuffer = null;
let file = this.fileList.FindFileByPath (fileName);
if (file === null || file.content === null) {
@ -196,10 +195,10 @@ OV.Importer = class
return material;
},
getFileBuffer : (filePath) => {
return buffers.GetFileBuffer (filePath);
return fileAccessor.GetFileBuffer (filePath);
},
getTextureBuffer : (filePath) => {
return buffers.GetTextureBuffer (filePath);
return fileAccessor.GetTextureBuffer (filePath);
},
onSuccess : () => {
let result = new OV.ImportResult ();

6
test/utils/testfiles.js
View File

@ -48,7 +48,7 @@ module.exports =
{
let content = testUtils.GetArrayBufferFileContent (folder, fileName);
var extension = OV.GetFileExtension (fileName);
let buffers = new OV.ImportBuffers (function (filePath) {
let fileAccessor = new OV.ImporterFileAccessor (function (filePath) {
let fileContent = testUtils.GetArrayBufferFileContent (folder, filePath);
return fileContent;
});
@ -58,10 +58,10 @@ module.exports =
return material;
},
getFileBuffer : function (filePath) {
return buffers.GetFileBuffer (filePath);
return fileAccessor.GetFileBuffer (filePath);
},
getTextureBuffer : function (filePath) {
return buffers.GetTextureBuffer (filePath);
return fileAccessor.GetTextureBuffer (filePath);
},
onSuccess : function () {
let model = importer.GetModel ();