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

Replace callbacks with color values.

Browse Source
This commit is contained in:
kovacsv 2023-10-16 21:55:17 +02:00
parent cba71f92fa
commit 4361240842
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/engine/import/importerbase.js
View File

@ -58,7 +58,7 @@ export class ImporterBase
} }
FinalizeModel (this.model, { FinalizeModel (this.model, {
getDefaultMaterialColor : this.callbacks.getDefaultMaterialColor defaultMaterialColor : this.callbacks.getDefaultMaterialColor ()
}); });
callbacks.onSuccess (); callbacks.onSuccess ();

14
source/engine/model/modelfinalization.js
View File

@ -9,12 +9,8 @@ class ModelFinalizer
constructor (params) constructor (params)
{ {
this.params = { this.params = {
getDefaultLineMaterialColor : () => { defaultLineMaterialColor : new RGBColor (0, 0, 0),
return new RGBColor (0, 0, 0); defaultMaterialColor : new RGBColor (0, 0, 0)
},
getDefaultMaterialColor : () => {
return new RGBColor (0, 0, 0);
}
}; };
CopyObjectAttributes (params, this.params); CopyObjectAttributes (params, this.params);
this.defaultLineMaterialIndex = null; this.defaultLineMaterialIndex = null;
@ -209,9 +205,8 @@ class ModelFinalizer
GetDefaultLineMaterialIndex (model) GetDefaultLineMaterialIndex (model)
{ {
if (this.defaultLineMaterialIndex === null) { if (this.defaultLineMaterialIndex === null) {
let defaultLineMaterialColor = this.params.getDefaultLineMaterialColor ();
let defaultMaterial = new LineMaterial (); let defaultMaterial = new LineMaterial ();
defaultMaterial.color = defaultLineMaterialColor; defaultMaterial.color = this.params.defaultLineMaterialColor;
defaultMaterial.isDefault = true; defaultMaterial.isDefault = true;
this.defaultLineMaterialIndex = model.AddMaterial (defaultMaterial); this.defaultLineMaterialIndex = model.AddMaterial (defaultMaterial);
} }
@ -221,9 +216,8 @@ class ModelFinalizer
GetDefaultMaterialIndex (model) GetDefaultMaterialIndex (model)
{ {
if (this.defaultMaterialIndex === null) { if (this.defaultMaterialIndex === null) {
let defaultMaterialColor = this.params.getDefaultMaterialColor ();
let defaultMaterial = new PhongMaterial (); let defaultMaterial = new PhongMaterial ();
defaultMaterial.color = defaultMaterialColor; defaultMaterial.color = this.params.defaultMaterialColor;
defaultMaterial.isDefault = true; defaultMaterial.isDefault = true;
this.defaultMaterialIndex = model.AddMaterial (defaultMaterial); this.defaultMaterialIndex = model.AddMaterial (defaultMaterial);
} }