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

Remove callbacks from exporter.

Browse Source
This commit is contained in:
Viktor Kovacs 2021-03-28 14:10:42 +02:00
parent c15e7ff3b4
commit 4a3649e8f1
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/export/exporter.js
View File

@ -11,13 +11,13 @@ OV.Exporter = class
];
}
Export (model, format, extension, callbacks)
Export (model, format, extension)
{
let files = [];
for (let i = 0; i < this.exporters.length; i++) {
let exporter = this.exporters[i];
if (exporter.CanExport (format, extension)) {
exporter.Export (model, format, files, callbacks);
exporter.Export (model, format, files);
break;
}
}

5
source/export/exporterbase.js
View File

@ -42,7 +42,7 @@ OV.ExporterBase = class
{
constructor ()
{
this.callbacks = null;
}
CanExport (format, extension)
@ -50,9 +50,8 @@ OV.ExporterBase = class
return false;
}
Export (model, format, files, callbacks)
Export (model, format, files)
{
this.callbacks = callbacks;
this.ExportContent (model, format, files);
}

2
source/export/exportergltf.js
View File

@ -95,7 +95,7 @@ OV.ExporterGltf = class extends OV.ExporterBase
let bufferViewIndex = mainJson.bufferViews.length;
textureIndex = mainJson.textures.length;
fileNameToIndex[fileName] = textureIndex;
let textureBuffer = obj.callbacks.getTextureBuffer (texture.name);
let textureBuffer = texture.buffer;
textureBuffers.push (textureBuffer);
mainJson.buffers.push ({
byteLength : textureBuffer.byteLength

20
test/tests/exporter_test.js
View File

@ -67,7 +67,7 @@ describe ('Exporter', function () {
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Text, 'obj', null);
let result = exporter.Export (model, OV.FileFormat.Text, 'obj');
assert.strictEqual (result.length, 5);
let mtlFile = result[0];
@ -137,7 +137,7 @@ f 4//4 8//4 6//4
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Text, 'stl', null);
let result = exporter.Export (model, OV.FileFormat.Text, 'stl');
assert.strictEqual (result.length, 1);
let stlFile = result[0];
@ -181,7 +181,7 @@ endsolid Model
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Binary, 'stl', null);
let result = exporter.Export (model, OV.FileFormat.Binary, 'stl');
assert.strictEqual (result.length, 1);
let stlFile = result[0];
@ -204,7 +204,7 @@ endsolid Model
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Text, 'off', null);
let result = exporter.Export (model, OV.FileFormat.Text, 'off');
assert.strictEqual (result.length, 1);
let offFile = result[0];
@ -232,7 +232,7 @@ endsolid Model
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Text, 'ply', null);
let result = exporter.Export (model, OV.FileFormat.Text, 'ply');
assert.strictEqual (result.length, 1);
let plyFile = result[0];
@ -267,7 +267,7 @@ end_header
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Binary, 'ply', null);
let result = exporter.Export (model, OV.FileFormat.Binary, 'ply');
assert.strictEqual (result.length, 1);
let plyFile = result[0];
@ -290,7 +290,7 @@ end_header
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Text, 'gltf', null);
let result = exporter.Export (model, OV.FileFormat.Text, 'gltf');
assert.strictEqual (result.length, 3);
let gltfFile = result[0];
@ -334,11 +334,7 @@ end_header
let model = CreateTestModel ();
let exporter = new OV.Exporter ();
let result = exporter.Export (model, OV.FileFormat.Binary, 'glb', {
getTextureBuffer : function (name) {
return new ArrayBuffer (4);
}
});
let result = exporter.Export (model, OV.FileFormat.Binary, 'glb');
assert.strictEqual (result.length, 1);
let glbFile = result[0];

2
website/o3dv/dialogs.js
View File

@ -252,7 +252,7 @@ OV.ShowExportDialog = function (model)
taskRunner.Run (1, {
runTask : function (index, ready) {
let exporter = new OV.Exporter ();
let files = exporter.Export (model, selectedFormat.format, selectedFormat.extension, null);
let files = exporter.Export (model, selectedFormat.format, selectedFormat.extension);
fileList.empty ();
for (let i = 0; i < files.length; i++) {
let file = files[i];