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

Merge branch 'dev'

Browse Source
This commit is contained in:
Viktor Kovacs 2021-04-04 12:51:03 +02:00
commit 022f173126
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "online-3d-viewer",
"description": "Online 3D Viewer",
"version": "0.7.5",
"version": "0.7.6",
"repository": "github:kovacsv/Online3DViewer",
"license": "MIT",
"devDependencies": {

34
website/o3dv/dialogs.js
View File

@ -287,6 +287,18 @@ OV.ShowExportDialog = function (model)
OV.ShowEmbeddingDialog = function (importer, camera)
{
function GetEmbeddingCode (files, camera, useCameraCheck)
{
let embeddingCode = '';
embeddingCode += '<iframe';
embeddingCode += ' width="640" height="480"';
embeddingCode += ' style="border:1px solid #eeeeee;"';
let hashParameters = OV.CreateUrlParameters (files, useCameraCheck.get (0).checked ? camera : null);
embeddingCode += ' src="https://3dviewer.net/embed.html#' + hashParameters + '">';
embeddingCode += '</iframe>';
return embeddingCode;
}
if (!importer.IsOnlyFileSource (OV.FileSource.Url)) {
return OV.ShowMessageDialog (
'Embedding Failed',
@ -312,25 +324,27 @@ OV.ShowEmbeddingDialog = function (importer, camera)
}
}
]);
let text = 'Here is the code for embedding.';
let text = 'Embedding options:';
$('<div>').html (text).addClass ('ov_dialog_section').appendTo (contentDiv);
let optionsSection = $('<div>').addClass ('ov_dialog_section').appendTo (contentDiv);
let useCameraLine = $('<div>').appendTo (optionsSection);
let useCamera = $('<input>').attr ('type', 'checkbox').attr ('checked', 'true').appendTo (useCameraLine);
$('<span>').html ('Use current camera position').appendTo (useCameraLine);
useCamera.change (function () {
let newEmbeddingCode = GetEmbeddingCode (modelFiles, camera, useCamera);
urlsTextArea.val (newEmbeddingCode);
});
let embeddingCode = '';
embeddingCode += '<iframe';
embeddingCode += ' width="640" height="480"';
embeddingCode += ' style="border:1px solid #eeeeee;"';
let hashParameters = OV.CreateUrlParameters (modelFiles, camera);
embeddingCode += ' src="https://3dviewer.net/embed.html#' + hashParameters + '">';
embeddingCode += '</iframe>';
let embeddingCode = GetEmbeddingCode (modelFiles, camera, useCamera);
urlsTextArea.val (embeddingCode);
urlsTextArea.appendTo (contentDiv);
let copyToClipboardText = 'copy to clipboard';
let copiedToClipboardText = 'successfully copied';
let innerButtonContainer = $('<div>').addClass ('ov_dialog_inner_buttons').appendTo (contentDiv);
let copyButton = $('<div>').addClass ('ov_dialog_inner_button').html (copyToClipboardText).appendTo (innerButtonContainer);
copyButton.click (function () {
OV.CopyToClipboard (embeddingCode);
OV.CopyToClipboard (urlsTextArea.val ());
copyButton.fadeOut (200, function () {
copyButton.html (copiedToClipboardText).fadeIn (200);
setTimeout (function () {