diff --git a/index.html b/index.html index 10e308d..d9bec67 100644 --- a/index.html +++ b/index.html @@ -207,7 +207,6 @@

Modelo API Samples

"View": [ //"local-model", "model-viewer", - "multi-model-viewer", "model-compare-viewer", "360-image-viewer", "360-multiple-images", @@ -224,8 +223,7 @@

Modelo API Samples

"dump-screen", "guid", "camera-manipulation", - "set-elements-color", - "set-elements-visiblity", + "set-elements-color-and-visibility", "change-elements-material", "switch-camera-type", "html-labels", diff --git a/samples/multi-model-viewer/index.html b/samples/multi-model-viewer/index.html deleted file mode 100644 index c62b0e4..0000000 --- a/samples/multi-model-viewer/index.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - Modelo API Sample (multi-model-viewer) - - - - - -
- -
-
- -
-
-
- - - - - diff --git a/samples/multi-model-viewer/index.js b/samples/multi-model-viewer/index.js deleted file mode 100644 index c6d3ece..0000000 --- a/samples/multi-model-viewer/index.js +++ /dev/null @@ -1,47 +0,0 @@ -var modelId1 = "j1mXXDrb"; -var appToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTUzLCJ1c2VybmFtZSI6Ik1vZGVsbyIsImlzUGVybWFuZW50Ijp0cnVlLCJpYXQiOjE1Njc1NjI0MTksImV4cCI6MzMxMDM1NjI0MTl9.EbW_cSPca4kWLedgNtfrGguog_o-3CCM5WhM7fFi0GA" - -Modelo.init({ endpoint: "https://build-portal.modeloapp.com", appToken }); - -var viewer1 = new Modelo.View.Viewer3D("model1"); -viewer1 - .loadModel(modelId1, progress => { - // second parameter is an optional progress callback - var c = document.getElementById("progress"); - c.innerHTML = "Loading: " + Math.round(progress * 100) + "%"; - }) - .then(() => { - // model loaded successfully - // add mouse to control camera. - viewer1.addInput(new Modelo.View.Input.Mouse(viewer1)); - // add keyboard callback. - var keyboard = new Modelo.View.Input.Keyboard(viewer1); - viewer1.addInput(keyboard); - keyboard.addKeyUpListener(keyboard => { - if (keyboard.key === 27) { - viewer1.destroy(); - } - }); - }); - -var modelId2 = "Vr4BBRYg"; -var viewer2 = new Modelo.View.Viewer3D("model2"); -viewer2 - .loadModel(modelId2, progress => { - // second parameter is an optional progress callback - var c = document.getElementById("progress"); - c.innerHTML = "Loading: " + Math.round(progress * 100) + "%"; - }) - .then(() => { - // model loaded successfully - // add mouse to control camera. - viewer2.addInput(new Modelo.View.Input.Mouse(viewer2)); - // add keyboard callback. - var keyboard = new Modelo.View.Input.Keyboard(viewer2); - viewer2.addInput(keyboard); - keyboard.addKeyUpListener(keyboard => { - if (keyboard.key === 27) { - viewer2.destroy(); - } - }); - }); diff --git a/samples/set-elements-color/index.html b/samples/set-elements-color-and-visibility/index.html similarity index 93% rename from samples/set-elements-color/index.html rename to samples/set-elements-color-and-visibility/index.html index 37b360f..8da553e 100644 --- a/samples/set-elements-color/index.html +++ b/samples/set-elements-color-and-visibility/index.html @@ -71,6 +71,8 @@ + +
diff --git a/samples/set-elements-color/index.js b/samples/set-elements-color-and-visibility/index.js similarity index 83% rename from samples/set-elements-color/index.js rename to samples/set-elements-color-and-visibility/index.js index 9ffb338..62499d5 100644 --- a/samples/set-elements-color/index.js +++ b/samples/set-elements-color-and-visibility/index.js @@ -1,5 +1,6 @@ var modelId = "q8ZjpB8a"; var appToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTUzLCJ1c2VybmFtZSI6Ik1vZGVsbyIsImlzUGVybWFuZW50Ijp0cnVlLCJpYXQiOjE1Njc1NjI0MTksImV4cCI6MzMxMDM1NjI0MTl9.EbW_cSPca4kWLedgNtfrGguog_o-3CCM5WhM7fFi0GA" // A sample app token +var HiddenElements = []; Modelo.init({ endpoint: "https://build-portal.modeloapp.com", appToken }); @@ -27,9 +28,9 @@ viewer.loadModel(modelId, updateProgress).then(() => { let elementNames = []; viewer.getEventEmitter().on("onElementSelected", elementNames1 => { // Restore the element's colors. - if (elementNames.length !== 0) { + /*if (elementNames.length !== 0) { viewer.getScene().setElementsColor(elementNames, null); - } + }*/ elementNames = elementNames1; if (elementNames1.length === 0) { @@ -42,6 +43,7 @@ viewer.loadModel(modelId, updateProgress).then(() => { document.getElementById("default").onclick = function() { viewer.getScene().setElementsColor(elementNames, null); }; + document.getElementById("red").onclick = function() { viewer.getScene().setElementsColor(elementNames, [1, 0, 0]); }; @@ -51,4 +53,13 @@ viewer.loadModel(modelId, updateProgress).then(() => { document.getElementById("blue").onclick = function() { viewer.getScene().setElementsColor(elementNames, [0, 0, 1]); }; + document.getElementById("hide").onclick = function() { + HiddenElements.push(elementNames); + viewer.getScene().setElementsVisibility(elementNames, false); + }; + document.getElementById("show").onclick = function() { + HiddenElements.forEach(element => { + viewer.getScene().setElementsVisibility(element, true); + }); + }; }); diff --git a/samples/set-elements-visiblity/index.html b/samples/set-elements-visiblity/index.html deleted file mode 100644 index ffd11eb..0000000 --- a/samples/set-elements-visiblity/index.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- -
-
- - - - - diff --git a/samples/set-elements-visiblity/index.js b/samples/set-elements-visiblity/index.js deleted file mode 100644 index 363ac9e..0000000 --- a/samples/set-elements-visiblity/index.js +++ /dev/null @@ -1,61 +0,0 @@ -var modelId = "q8ZjpB8a"; -var appToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTUzLCJ1c2VybmFtZSI6Ik1vZGVsbyIsImlzUGVybWFuZW50Ijp0cnVlLCJpYXQiOjE1Njc1NjI0MTksImV4cCI6MzMxMDM1NjI0MTl9.EbW_cSPca4kWLedgNtfrGguog_o-3CCM5WhM7fFi0GA" // A sample app token - -Modelo.init({ endpoint: "https://build-portal.modeloapp.com", appToken }); - -function updateProgress(progress) { - var c = document.getElementById("progress"); - c.innerHTML = "Loading: " + Math.round(progress * 100) + "%"; -} - -var viewer = new Modelo.View.Viewer3D("model", { isMobile: isMobile() }); - -viewer.addInput(new Modelo.View.Input.Mouse(viewer)); // Add mouse to control camera. -viewer.addInput(new Modelo.View.Input.Touch(viewer)); - -var selectElementTool = new Modelo.View.Tool.SelectElements(viewer); -viewer.addTool(selectElementTool); -selectElementTool.setEnabled(true); - -viewer.loadModel(modelId, updateProgress).then(() => { - // success - console.log("loading done"); - - var elements = []; - var names = viewer.getScene().getElementsNames(); - // Pick 7 random elements - for (let i = 0; i < 7; i++) { - var c = Math.round(Math.random() * 10000) % names.length; - elements.push(names[c]); - document.getElementById("l" + (i + 1)).innerHTML = names[c]; - } - - document.getElementById("e1").onchange = function() { - var checked = document.getElementById("e1").checked; - viewer.getScene().setElementsVisibility([elements[0]], checked); - }; - document.getElementById("e2").onchange = function() { - var checked = document.getElementById("e2").checked; - viewer.getScene().setElementsVisibility([elements[1]], checked); - }; - document.getElementById("e3").onchange = function() { - var checked = document.getElementById("e3").checked; - viewer.getScene().setElementsVisibility([elements[2]], checked); - }; - document.getElementById("e4").onchange = function() { - var checked = document.getElementById("e4").checked; - viewer.getScene().setElementsVisibility([elements[3]], checked); - }; - document.getElementById("e5").onchange = function() { - var checked = document.getElementById("e5").checked; - viewer.getScene().setElementsVisibility([elements[4]], checked); - }; - document.getElementById("e6").onchange = function() { - var checked = document.getElementById("e6").checked; - viewer.getScene().setElementsVisibility([elements[5]], checked); - }; - document.getElementById("e7").onchange = function() { - var checked = document.getElementById("e7").checked; - viewer.getScene().setElementsVisibility([elements[6]], checked); - }; -});