diff --git a/source/import/importer.js b/source/import/importer.js
index 5f3e33c..592f843 100644
--- a/source/import/importer.js
+++ b/source/import/importer.js
@@ -184,9 +184,6 @@ OV.ImportSettings = class
constructor ()
{
this.defaultColor = new OV.Color (200, 200, 200);
- this.edgesColor = new OV.Color (0, 0, 0);
- this.showEdges = false;
- this.edgesAngle = 15;
}
};
diff --git a/source/viewer/domviewer.js b/source/viewer/domviewer.js
index f677809..1f3f88d 100644
--- a/source/viewer/domviewer.js
+++ b/source/viewer/domviewer.js
@@ -74,17 +74,7 @@ OV.Init3DViewerElements = function ()
settings.defaultColor = color;
}
}
-
- let edgeColor = element.getAttribute ('edge');
- if (edgeColor) {
- let color = OV.ParameterConverter.StringToColor (edgeColor);
- if (color !== null) {
- settings.showEdges = true;
- settings.edgesColor = color;
- }
- }
- viewer.UpdateSettings (settings);
loader.LoadFromUrlList (modelUrls, settings);
return {
element: element,
diff --git a/source/viewer/viewer.js b/source/viewer/viewer.js
index dab23cf..a964e0c 100644
--- a/source/viewer/viewer.js
+++ b/source/viewer/viewer.js
@@ -86,17 +86,9 @@ OV.Viewer = class
this.navigation = null;
this.upVector = null;
this.settings = {
- animationSteps : 40,
- showEdges : false,
- edgesAngle : 15,
- edgesColor : new OV.Color (0, 0, 0),
+ animationSteps : 40
};
}
-
- UpdateSettings (settings)
- {
- this.settings = Object.assign ({ animationSteps: 40 }, settings);
- }
Init (canvas)
{
@@ -244,11 +236,6 @@ OV.Viewer = class
for (let i = 0; i < meshes.length; i++) {
let mesh = meshes[i];
this.scene.add (mesh);
- if (this.settings.showEdges) {
- let edges = new THREE.EdgesGeometry (mesh.geometry, this.settings.edgesAngle);
- let lines = new THREE.LineSegments (edges, new THREE.LineBasicMaterial ( { color: '#' + OV.ColorToHexString (this.settings.edgesColor) }));
- this.scene.add (lines);
- }
}
this.Render ();
}
@@ -364,7 +351,7 @@ OV.Viewer = class
{
for (let i = this.scene.children.length - 1; i >= 0; i--) {
let object = this.scene.children[i];
- if (object.isMesh || object.type === 'LineSegments') {
+ if (object.isMesh) {
object.geometry.dispose ();
this.scene.remove (object);
}
diff --git a/website/assets/images/toolbar/settings.svg b/website/assets/images/toolbar/settings.svg
index 7496b83..a0d09e9 100644
--- a/website/assets/images/toolbar/settings.svg
+++ b/website/assets/images/toolbar/settings.svg
@@ -1,51 +1 @@
-
-
+
\ No newline at end of file
diff --git a/website/o3dv/dialogs.js b/website/o3dv/dialogs.js
index ad686f9..426c1b7 100644
--- a/website/o3dv/dialogs.js
+++ b/website/o3dv/dialogs.js
@@ -1,7 +1,6 @@
OV.FeatureSet =
{
- SetDefaultColor : true,
- SetShowEdge : true,
+ SetDefaultColor : false
};
OV.ShowMessageDialog = function (title, message, subMessage)
@@ -226,10 +225,7 @@ OV.ShowSharingDialog = function (importer, importSettings, camera)
OV.ShowSettingsDialog = function (importSettings, onOk)
{
let dialogSettings = {
- defaultColor : importSettings.defaultColor,
- edgesColor : importSettings.edgesColor,
- showEdges : importSettings.showEdges,
- edgesAngle : importSettings.edgesAngle,
+ defaultColor : importSettings.defaultColor
};
let dialog = new OV.ButtonDialog ();
let contentDiv = dialog.Init ('Settings', [
@@ -259,39 +255,6 @@ OV.ShowSettingsDialog = function (importSettings, onOk)
let colorStr = colorInput.val ().substr (1);
dialogSettings.defaultColor = OV.HexStringToColor (colorStr);
});
-
- let showEdgeRow = $('
').addClass ('ov_dialog_table_row').appendTo (contentDiv);
- $('
').html ('Show Edges').addClass ('ov_dialog_table_row_name').appendTo (showEdgeRow);
- let seValueColumn = $('
').addClass ('ov_dialog_table_row_value').appendTo (showEdgeRow);
- let showEdgeInput = $('
').attr ('type', 'checkbox').addClass ('ov_dialog_checkradio').appendTo (seValueColumn);
- $('
').addClass ('ov_dialog_table_row_comment').html ('(Overlay edge on model)').appendTo (seValueColumn);
- showEdgeInput.attr ('checked', dialogSettings.showEdges);
- showEdgeInput.change (function () {
- dialogSettings.showEdges = showEdgeInput.prop ('checked');
- });
-
- let edgeColorRow = $('').addClass ('ov_dialog_table_row').appendTo (contentDiv);
- $('
').html ('Edges Color').addClass ('ov_dialog_table_row_name').appendTo (edgeColorRow);
- let ecValueColumn = $('
').addClass ('ov_dialog_table_row_value').appendTo (edgeColorRow);
- let edgeColorInput = $('
').attr ('type', 'color').addClass ('ov_dialog_color').appendTo (ecValueColumn);
- $('
').addClass ('ov_dialog_table_row_comment').html ('(For overlaid edges)').appendTo (ecValueColumn);
- edgeColorInput.val ('#' + OV.ColorToHexString (dialogSettings.edgesColor));
- edgeColorInput.change (function () {
- let colorStr = edgeColorInput.val ().substr (1);
- dialogSettings.edgesColor = OV.HexStringToColor (colorStr);
- });
-
- let edgeAngleRow = $('').addClass ('ov_dialog_table_row').appendTo (contentDiv);
- $('
').html ('Edges detection angle').addClass ('ov_dialog_table_row_name').appendTo (edgeAngleRow);
- let eaValueColumn = $('
').addClass ('ov_dialog_table_row_value').appendTo (edgeAngleRow);
- let edgeAngleInput = $('').attr ('type', 'text').addClass ('ov_dialog_inner_title').appendTo (eaValueColumn);
- $('').addClass ('ov_dialog_table_row_comment').html ('(Edge detection angle)').appendTo (eaValueColumn);
- edgeAngleInput.val (dialogSettings.edgesAngle);
- edgeAngleInput.change (function () {
- dialogSettings.edgesAngle = edgeAngleInput.val ();
- });
-
-
dialog.Show ();
return dialog;
};
diff --git a/website/o3dv/embed.js b/website/o3dv/embed.js
index bdbff11..474a7bc 100644
--- a/website/o3dv/embed.js
+++ b/website/o3dv/embed.js
@@ -24,8 +24,7 @@ OV.Embed = class
let color = this.hashHandler.GetColorFromHash ();
if (color !== null) {
settings.defaultColor = color;
- }
- this.viewer.UpdateSettings (settings);
+ }
this.modelLoader.LoadFromUrlList (urls, settings);
let hashParameters = OV.CreateModelUrlParameters (urls);
let websiteUrl = this.parameters.websiteLinkDiv.attr ('href') + '#' + hashParameters;
diff --git a/website/o3dv/website.js b/website/o3dv/website.js
index 969349c..2108949 100644
--- a/website/o3dv/website.js
+++ b/website/o3dv/website.js
@@ -21,7 +21,6 @@ OV.Website = class
{
let canvas = $('