From 009925c4b642cb91c42bb1a2bf4861949e31bc55 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Tue, 13 Jul 2021 07:30:22 +0200 Subject: [PATCH] Rename result to output. --- source/external/threeconverter.js | 10 +++++----- source/external/threemodelloader.js | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/external/threeconverter.js b/source/external/threeconverter.js index 6df8854..0a501a2 100644 --- a/source/external/threeconverter.js +++ b/source/external/threeconverter.js @@ -6,7 +6,7 @@ OV.ModelToThreeConversionParams = class } }; -OV.ModelToThreeConversionResult = class +OV.ModelToThreeConversionOutput = class { constructor () { @@ -14,9 +14,9 @@ OV.ModelToThreeConversionResult = class } }; -OV.ConvertModelToThreeMeshes = function (model, params, result, callbacks) +OV.ConvertModelToThreeMeshes = function (model, params, output, callbacks) { - function CreateThreeMaterial (model, materialIndex, params, result) + function CreateThreeMaterial (model, materialIndex, params, output) { function SetTextureParameters (texture, threeTexture) { @@ -91,7 +91,7 @@ OV.ConvertModelToThreeMeshes = function (model, params, result, callbacks) }); if (material.isDefault) { - result.defaultMaterial = threeMaterial; + output.defaultMaterial = threeMaterial; } return threeMaterial; @@ -195,7 +195,7 @@ OV.ConvertModelToThreeMeshes = function (model, params, result, callbacks) let modelThreeMaterials = []; for (let materialIndex = 0; materialIndex < model.MaterialCount (); materialIndex++) { - let threeMaterial = CreateThreeMaterial (model, materialIndex, params, result); + let threeMaterial = CreateThreeMaterial (model, materialIndex, params, output); modelThreeMaterials.push (threeMaterial); } diff --git a/source/external/threemodelloader.js b/source/external/threemodelloader.js index c487277..36dc0bf 100644 --- a/source/external/threemodelloader.js +++ b/source/external/threemodelloader.js @@ -63,13 +63,13 @@ OV.ThreeModelLoader = class this.callbacks.onVisualizationStart (); let params = new OV.ModelToThreeConversionParams (); params.forceMediumpForMaterials = this.hasHighpDriverIssue; - let result = new OV.ModelToThreeConversionResult (); - OV.ConvertModelToThreeMeshes (importResult.model, params, result, { + let output = new OV.ModelToThreeConversionOutput (); + OV.ConvertModelToThreeMeshes (importResult.model, params, output, { onTextureLoaded : () => { this.callbacks.onTextureLoaded (); }, onModelLoaded : (meshes) => { - this.defaultMaterial = result.defaultMaterial; + this.defaultMaterial = output.defaultMaterial; this.callbacks.onModelFinished (importResult, meshes); this.inProgress = false; }