add mario and luigi models

onready · Jan 8, 2019 · 1dc473e · 1dc473e
1 parent 2d12972
commit 1dc473e
Show file tree

Hide file tree

Showing 47 changed files with 6,368 additions and 3 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+save-exact=true
diff --git a/HIRO.jpg → markers/HIRO.jpg b/HIRO.jpg → markers/HIRO.jpg
diff --git a/markers/kanji.png b/markers/kanji.png
diff --git a/public/index.html b/public/index.html
@@ -2,18 +2,32 @@
 <html>
 
 <head>
-  <link rel="stylesheet" type="text/css" href='styles.css' />
+  <link rel="stylesheet" type="text/css" href="styles.css" />
 </head>
 
-<script src="https://aframe.io/releases/0.8.0/aframe.min.js"></script>
+<script src="https://aframe.io/releases/0.8.2/aframe.min.js"></script>
 <script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.6.2/aframe/build/aframe-ar.js"></script>
 
 <body>
   <a-scene embedded arjs="debugUIEnabled: false;">
+
+    <a-assets>
+      <a-asset-item id="mario-obj" src="model/mario/mario.obj"></a-asset-item>
+      <a-asset-item id="mario-mtl" src="model/mario/mario.mtl"></a-asset-item>
+      <a-asset-item id="luigi-obj" src="model/luigi/luigi.obj"></a-asset-item>
+      <a-asset-item id="luigi-mtl" src="model/luigi/luigi.mtl"></a-asset-item>
+    </a-assets>
+
+    <a-marker preset="kanji">
+      <a-entity obj-model="obj: #mario-obj; mtl: #mario-mtl" position="0 0 0" scale="0.3 0.3 0.3"></a-entity>
+    </a-marker>
+
     <a-marker preset="hiro">
-      <a-box position='0 0.5 0' material='color: blue;'></a-box>
+      <a-entity obj-model="obj: #luigi-obj; mtl: #luigi-mtl" position="0 0 0" scale="0.1 0.1 0.1"></a-entity>
     </a-marker>
+
     <a-entity camera></a-entity>
+
   </a-scene>
 </body>
 

diff --git a/public/model/luigi/1C25D020_c.png b/public/model/luigi/1C25D020_c.png
diff --git a/public/model/luigi/1C25D021_c.png b/public/model/luigi/1C25D021_c.png
diff --git a/public/model/luigi/285492E4_c.png b/public/model/luigi/285492E4_c.png
diff --git a/public/model/luigi/42F1695D_c.png b/public/model/luigi/42F1695D_c.png
diff --git a/public/model/luigi/luigi.mtl b/public/model/luigi/luigi.mtl
@@ -0,0 +1,38 @@
+# Material file for luigi.obj
+
+newmtl material_0
+	Ns 0
+	d 1
+	illum 2
+	Kd 1.0 1.0 1.0
+	Ks 0.0 0.0 0.0
+	Ka 0.0 0.0 0.0
+	map_Kd 1C25D020_c.png
+
+newmtl material_2
+	Ns 0
+	d 1
+	illum 2
+	Kd 1.0 1.0 1.0
+	Ks 0.0 0.0 0.0
+	Ka 0.2 0.2 0.2
+	map_Kd 285492E4_c.png
+
+newmtl material_3
+	Ns 0
+	d 1
+	illum 2
+	Kd 1.0 1.0 1.0
+	Ks 0.0 0.0 0.0
+	Ka 0.0 0.0 0.0
+	map_Kd 42F1695D_c.png
+
+newmtl material_4
+	Ns 0
+	d 1
+	illum 2
+	Kd 1.0 1.0 1.0
+	Ks 0.0 0.0 0.0
+	Ka 0.0 0.0 0.0
+	map_Kd 1C25D021_c.png
+