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

Merge branch 'sidebar' of https://github.com/kovacsv/Online3DViewer into sidebar

Browse Source
This commit is contained in:
Agnes Gaschitz 2021-06-20 11:42:25 +02:00
commit eb55ec80a0
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
website/o3dv/sidebar.js
View File

@ -47,7 +47,9 @@ OV.Sidebar = class
let valueColumn = $('<td>').addClass ('ov_property_table_value').appendTo (row); let valueColumn = $('<td>').addClass ('ov_property_table_value').appendTo (row);
nameColum.html (property.name).attr ('title', property.name); nameColum.html (property.name).attr ('title', property.name);
let valueText = null; let valueText = null;
if (property.type === OV.PropertyType.Integer) { if (property.type === OV.PropertyType.Text) {
valueText = property.value;
} else if (property.type === OV.PropertyType.Integer) {
valueText = property.value.toLocaleString (); valueText = property.value.toLocaleString ();
} else if (property.type === OV.PropertyType.Percent) { } else if (property.type === OV.PropertyType.Percent) {
valueText = parseInt (property.value * 100, 10).toString () + '%'; valueText = parseInt (property.value * 100, 10).toString () + '%';
@ -79,9 +81,23 @@ OV.Sidebar = class
AddMaterialProperties (material) AddMaterialProperties (material)
{ {
function AddTextureMap (properties, name, map)
{
if (map === null || map.name === null) {
return;
}
let fileName = OV.GetFileName (map.name);
properties.push (new OV.Property (OV.PropertyType.Text, name, fileName));
}
let properties = []; let properties = [];
properties.push (new OV.Property (OV.PropertyType.Color, 'Color', material.diffuse)); properties.push (new OV.Property (OV.PropertyType.Color, 'Color', material.diffuse));
properties.push (new OV.Property (OV.PropertyType.Percent, 'Opacity', material.opacity)); properties.push (new OV.Property (OV.PropertyType.Percent, 'Opacity', material.opacity));
AddTextureMap (properties, 'Diffuse Map', material.diffuseMap);
AddTextureMap (properties, 'Specular Map', material.specularMap);
AddTextureMap (properties, 'Bump Map', material.bumpMap);
AddTextureMap (properties, 'Normal Map', material.normalMap);
AddTextureMap (properties, 'Emissive Map', material.emissiveMap);
this.AddProperties (properties); this.AddProperties (properties);
} }