From 50c78468faac3217376a126a91e1ad630cb17408 Mon Sep 17 00:00:00 2001
From: buttle <chris@gatopelao.org>
Date: Sun, 4 Apr 2021 18:55:10 +0200
Subject: [PATCH] adds obj and obj+mtl support

---
 README.md                                 |  9 +++++---
 asset/vendor/{vue-3d-model => vue}/vue.js |  0
 config/module.ini                         |  2 +-
 src/Site/BlockLayout/Render3D.php         |  2 +-
 view/common/block-layout/render-3d.phtml  | 26 +++++++++++++++++++----
 5 files changed, 30 insertions(+), 9 deletions(-)
 rename asset/vendor/{vue-3d-model => vue}/vue.js (100%)

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 @@
 <div class="3d-model-wrap" style="position:relative;">
 
 	<?php
-		$this->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(<?= json_encode($urls, JSON_UNESCAPED_SLASHES) ?>)
 	</style>
 
 	<div class="3d-model-wrap">
+
 	<?php if ($model_type == "gltf") { ?>
 		<div id="<?= $id ?>">
       <model-gltf
         src="<?= $urls[0]; ?>"
-        @on-mousemove="onMouseMove">
+        @on-mousemove="onMouseMove"
+			>
       </model-gltf>
     </div>
 	<?php } ?>
-	<?php if ($model_type == "obj") { ?>
 
+	<?php if ($model_type == "obj") { ?>
+		<div id="<?= $id ?>">
+			<model-obj
+				src="<?= $urls[0]; ?>"
+			>
+			</model-obj>
+		</div>
 	<?php } ?>
+
+	<?php if ($model_type == "obj+mtl") { ?>
+		<div id="<?= $id ?>">
+			<model-obj
+				src="<?= $urls[0]; ?>"
+				mtl="<?= $urls[1]; ?>"
+			>
+			</model-obj>
+		</div>
+	<?php } ?>
+	
 	</div>
 
 	<script>