diff --git a/README.md b/README.md index 176b553..7794eb2 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ The repository is separated into two parts. See more information in the [Develop - stl (text and binary) - ply (text and binary) - gltf (text and binary) +- 3dm (experimental) - off (text only) ### Export diff --git a/website/index.html b/website/index.html index 04a56a1..04911c9 100644 --- a/website/index.html +++ b/website/index.html @@ -127,12 +127,12 @@
Drag and drop your 3D models here.
- Supported formats: obj, 3ds, stl, ply, gltf, glb, off. + obj, 3ds, stl, ply, gltf, glb, 3dm, off
Or you can use the browse button above.
-
+
Example models:
logo diff --git a/website/info/index.html b/website/info/index.html index 33a567a..a377ab0 100644 --- a/website/info/index.html +++ b/website/info/index.html @@ -24,7 +24,7 @@

This is the user manual for the 3dviewer.net website. The website can open several 3D file formats and visualize the model in your browser. - Supported file formats: obj, 3ds, stl, ply, gltf, glb, and off. + Supported file formats: obj, 3ds, stl, ply, gltf, glb, 3dm, and off.

    @@ -112,6 +112,13 @@ ✓ version 2.0 + + 3dm + binary + ✓ + ✗ + experimental + off text diff --git a/website/o3dv/loader.js b/website/o3dv/loader.js index d84bd47..8442fbd 100644 --- a/website/o3dv/loader.js +++ b/website/o3dv/loader.js @@ -5,7 +5,7 @@ OV.InitModelLoader = function (modelLoader, callbacks) if (importError.code === OV.ImportErrorCode.NoImportableFile) { return OV.ShowMessageDialog ( 'Something went wrong', - 'No importable file found. You can open obj, 3ds, stl, ply, gltf, glb and off files.', + 'No importable file found. You can open obj, 3ds, stl, ply, gltf, glb, 3dm, and off files.', importError.message ); } else if (importError.code === OV.ImportErrorCode.ImportFailed) { diff --git a/website/o3dv/website.css b/website/o3dv/website.css index 49bbf73..497e786 100644 --- a/website/o3dv/website.css +++ b/website/o3dv/website.css @@ -718,7 +718,6 @@ div.intro div.intro_section { font-size: 16px; line-height: 20px; - margin: 20px 0px; } div.intro div.intro_big_text @@ -755,7 +754,7 @@ div.ov_progress div.intro div.intro_section { - margin: 20px 0px; + margin: 15px 0px; } }