diff --git a/README.md b/README.md index ec728ed..46d2438 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,14 @@ Built using Vue, based on threejs. ## Install +This module requires the [Omeka-S-module-ArchiveRepertory] to be installed. + ``` cd ./modules -https://git.hangar.org/arcHIVE-tech/3Drenderer/archive/main.zip +https://git.hangar.org/arcHIVE-tech/3D-Renderer/archive/main.zip unzip main.zip -mv renderviewer/ Render3D ``` + ### Omeka global settings Add these to the `Allowed media types` @@ -23,7 +25,7 @@ application/json Add these to the `Allowed file extensions` ``` -gltf, bin, json +gltf, bin, json, obj, mtl ``` ## LISENCE @@ -36,4 +38,5 @@ The 3D render feature is imported from [Vue-3d-model]. [3D Renderer]: https://git.hangar.org/arcHIVE-tech/Render3D [Vue-3d-model]: https://github.com/hujiulong/vue-3d-model [Omeka S]: https://omeka.org/s +[Omeka-S-module-ArchiveRepertory]: https://gitlab.com/Daniel-KM/Omeka-S-module-ArchiveRepertory [MIT]: http://opensource.org/licenses/MIT diff --git a/asset/vendor/vue-3d-model/vue.js b/asset/vendor/vue/vue.js similarity index 100% rename from asset/vendor/vue-3d-model/vue.js rename to asset/vendor/vue/vue.js diff --git a/config/module.ini b/config/module.ini index 1cf5555..143433f 100644 --- a/config/module.ini +++ b/config/module.ini @@ -1,5 +1,5 @@ [info] -name = "Render3D" +name = "3D Renderer" description = "Renders 3D" tags = "" license = "MIT" diff --git a/src/Site/BlockLayout/Render3D.php b/src/Site/BlockLayout/Render3D.php index 2d01adb..4d20799 100644 --- a/src/Site/BlockLayout/Render3D.php +++ b/src/Site/BlockLayout/Render3D.php @@ -34,7 +34,7 @@ class Render3D extends AbstractBlockLayout } public function getLabel() { - return 'Render 3D'; + return '3D Renderer'; } public function form(PhpRenderer $view, diff --git a/view/common/block-layout/render-3d.phtml b/view/common/block-layout/render-3d.phtml index 9dc7714..e8cc5ac 100644 --- a/view/common/block-layout/render-3d.phtml +++ b/view/common/block-layout/render-3d.phtml @@ -1,8 +1,7 @@
headScript()->appendFile($this->assetUrl('vendor/vue-3d-model/vue.js', - 'Render3D')); + $this->headScript()->appendFile($this->assetUrl('vendor/vue/vue.js', 'Render3D')); $this->headScript()->appendFile($this->assetUrl('vendor/vue-3d-model/vue-3d-model.umd.js', 'Render3D')); if ($title !== false && $title !== "") { @@ -24,17 +23,36 @@ console.log()
+
+ @on-mousemove="onMouseMove" + >
- + +
+ + +
+ + +
+ + +
+ +