diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..722d5e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode diff --git a/README.md b/README.md index 4537564..0efbd04 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,18 @@ This sample is part of the [Learn Forge](http://learnforge.autodesk.io) tutorials. +# Live Demo + +https://autodesk-forge.github.io/learn.forge.viewmodels/ ([Demo Screencast](https://tiny.cc/dbgmmz)) + ### Languages The `master` branch contains the client-side UI: `html`, `js` and `css` files. To download the project for each language, please use: - [Nodejs](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/nodejs) -- [.NET](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/net) +- [.NET Framework](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/net) +- [.NET Core](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/netcore) - [Go](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/go) - [PHP](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/php) -- [Java](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/java) \ No newline at end of file +- [Java](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/java) +- [Serverless Live Demo](//github.com/Autodesk-Forge/learn.forge.viewmodels/tree/gh-pages) diff --git a/img/GitHub-Mark-32px.png b/img/GitHub-Mark-32px.png new file mode 100644 index 0000000..8b25551 Binary files /dev/null and b/img/GitHub-Mark-32px.png differ diff --git a/img/GitHub-Mark-Light-32px.png b/img/GitHub-Mark-Light-32px.png new file mode 100644 index 0000000..628da97 Binary files /dev/null and b/img/GitHub-Mark-Light-32px.png differ diff --git a/img/favicon.ico b/img/favicon.ico new file mode 100644 index 0000000..b99f321 Binary files /dev/null and b/img/favicon.ico differ diff --git a/index.html b/index.html index 08f2ecd..e229b42 100644 --- a/index.html +++ b/index.html @@ -4,15 +4,16 @@ Autodesk Forge Tutorial + - - - - + + + + - - + + @@ -23,13 +24,20 @@ @@ -68,9 +76,12 @@
- For demonstration purpouses, objects (files) + For demonstration purposes, objects (files) are NOT automatically translated. After you upload, right click on - the object and select "Translate". + the object and select "Translate". Note: Technically your bucket name is required to be globally unique across + the entire platform - to keep things simple with this tutorial your client ID will be prepended by default to + your bucket name and in turn masked by the UI so you only have to make sure your bucket name is unique within + your current Forge app.
diff --git a/js/ForgeTree.js b/js/ForgeTree.js index ad627be..33d22bc 100644 --- a/js/ForgeTree.js +++ b/js/ForgeTree.js @@ -1,4 +1,22 @@ -$(document).ready(function () { +///////////////////////////////////////////////////////////////////// +// Copyright (c) Autodesk, Inc. All rights reserved +// Written by Forge Partner Development +// +// Permission to use, copy, modify, and distribute this software in +// object code form for any purpose and without fee is hereby granted, +// provided that the above copyright notice appears in all copies and +// that both that copyright notice and the limited warranty and +// restricted rights notice below appear in all supporting +// documentation. +// +// AUTODESK PROVIDES THIS PROGRAM "AS IS" AND WITH ALL FAULTS. +// AUTODESK SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTY OF +// MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE. AUTODESK, INC. +// DOES NOT WARRANT THAT THE OPERATION OF THE PROGRAM WILL BE +// UNINTERRUPTED OR ERROR FREE. +///////////////////////////////////////////////////////////////////// + +$(document).ready(function () { prepareAppBucketTree(); $('#refreshBuckets').click(function () { $('#appBuckets').jstree(true).refresh(); @@ -11,11 +29,44 @@ $('#createBucketModal').on('shown.bs.modal', function () { $("#newBucketKey").focus(); }) + + $('#hiddenUploadField').change(function () { + var node = $('#appBuckets').jstree(true).get_selected(true)[0]; + var _this = this; + if (_this.files.length == 0) return; + var file = _this.files[0]; + switch (node.type) { + case 'bucket': + var formData = new FormData(); + formData.append('fileToUpload', file); + formData.append('bucketKey', node.id); + + $.ajax({ + url: '/api/forge/oss/objects', + data: formData, + processData: false, + contentType: false, + type: 'POST', + success: function (data) { + $('#appBuckets').jstree(true).refresh_node(node); + _this.value = ''; + } + }); + break; + } + }); }); function createNewBucket() { var bucketKey = $('#newBucketKey').val(); var policyKey = $('#newBucketPolicyKey').val(); + + const regex = /^[\-_.a-z0-9]{3,128}$/g; + if (!bucketKey.match(regex)) { + alert('The bucket name can only contain characters -_.a-z0-9 and it must be between 3 and 128 characters long.'); + return; + } + jQuery.post({ url: '/api/forge/oss/buckets', contentType: 'application/json', @@ -72,7 +123,7 @@ function prepareAppBucketTree() { url: 'https://developer.api.autodesk.com/modelderivative/v2/designdata/' + urn + '/manifest', headers: { 'Authorization': 'Bearer ' + access_token }, success: function (res) { - if (res.status === 'success') launchViewer(urn); + if (res.progress === 'success' || res.progress === 'complete') launchViewer(urn); else $("#forgeViewer").html('The translation job still running: ' + res.progress + '. Please try again in a moment.'); }, error: function (err) { @@ -96,8 +147,7 @@ function autodeskCustomMenu(autodeskNode) { uploadFile: { label: "Upload file", action: function () { - var treeNode = $('#appBuckets').jstree(true).get_selected(true)[0]; - uploadFile(treeNode); + uploadFile(); }, icon: 'glyphicon glyphicon-cloud-upload' } @@ -120,30 +170,8 @@ function autodeskCustomMenu(autodeskNode) { return items; } -function uploadFile(node) { +function uploadFile() { $('#hiddenUploadField').click(); - $('#hiddenUploadField').change(function () { - if (this.files.length == 0) return; - var file = this.files[0]; - switch (node.type) { - case 'bucket': - var formData = new FormData(); - formData.append('fileToUpload', file); - formData.append('bucketKey', node.id); - - $.ajax({ - url: '/api/forge/oss/objects', - data: formData, - processData: false, - contentType: false, - type: 'POST', - success: function (data) { - $('#appBuckets').jstree(true).refresh_node(node); - } - }); - break; - } - }); } function translateObject(node) { diff --git a/js/ForgeViewer.js b/js/ForgeViewer.js index 02c3c64..7152812 100644 --- a/js/ForgeViewer.js +++ b/js/ForgeViewer.js @@ -1,49 +1,34 @@ -var viewerApp; +var viewer; function launchViewer(urn) { var options = { env: 'AutodeskProduction', - getAccessToken: getForgeToken + getAccessToken: getForgeToken, }; - var documentId = 'urn:' + urn; - Autodesk.Viewing.Initializer(options, function onInitialized() { - viewerApp = new Autodesk.Viewing.ViewingApplication('forgeViewer'); - viewerApp.registerViewer(viewerApp.k3D, Autodesk.Viewing.Private.GuiViewer3D); - viewerApp.loadDocument(documentId, onDocumentLoadSuccess, onDocumentLoadFailure); + + Autodesk.Viewing.Initializer(options, () => { + viewer = new Autodesk.Viewing.GuiViewer3D(document.getElementById('forgeViewer')); + viewer.start(); + var documentId = 'urn:' + urn; + Autodesk.Viewing.Document.load(documentId, onDocumentLoadSuccess, onDocumentLoadFailure); }); } function onDocumentLoadSuccess(doc) { - // We could still make use of Document.getSubItemsWithProperties() - // However, when using a ViewingApplication, we have access to the **bubble** attribute, - // which references the root node of a graph that wraps each object from the Manifest JSON. - var viewables = viewerApp.bubble.search({ 'type': 'geometry' }); - if (viewables.length === 0) { - console.error('Document contains no viewables.'); - return; - } - - // Choose any of the avialble viewables - viewerApp.selectItem(viewables[0].data, onItemLoadSuccess, onItemLoadFail); -} - -function onDocumentLoadFailure(viewerErrorCode) { - console.error('onDocumentLoadFailure() - errorCode:' + viewerErrorCode); -} - -function onItemLoadSuccess(viewer, item) { - // item loaded, any custom action? + var viewables = doc.getRoot().getDefaultGeometry(); + viewer.loadDocumentNode(doc, viewables).then(i => { + // documented loaded, any action? + }); } -function onItemLoadFail(errorCode) { - console.error('onItemLoadFail() - errorCode:' + errorCode); +function onDocumentLoadFailure(viewerErrorCode, viewerErrorMsg) { + console.error('onDocumentLoadFailure() - errorCode:' + viewerErrorCode + '\n- errorMessage:' + viewerErrorMsg); } function getForgeToken(callback) { - jQuery.ajax({ - url: '/api/forge/oauth/token', - success: function (res) { - callback(res.access_token, res.expires_in) - } + fetch('/api/forge/oauth/token').then(res => { + res.json().then(data => { + callback(data.access_token, data.expires_in); + }); }); -} \ No newline at end of file +}