Request

Oulu-UCC · Nov 28, 2017 · 4319ec5 · 4319ec5
1 parent da5950f
commit 4319ec5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 27 deletions.
diff --git a/src/components/index.vue b/src/components/index.vue
@@ -1,16 +1,8 @@
 <template>
     <div class="row justify-content-center h-100">
-        <div class="col-7 align-self-center h-75">
+        <div class="col align-self-center h-75">
             <ModelViewComponent></ModelViewComponent>
         </div>
-        <div class="col-5">
-            <div class="h-50">
-                <ControlComponent></ControlComponent>
-            </div>
-            <div class="h-50">
-                <MapComponent></MapComponent>
-            </div>
-        </div>
     </div>
 </template>
 
@@ -20,8 +12,6 @@
 
 <script>
     import ModelViewComponent from "./model-view.vue";
-    import MapComponent from "./map.vue";
-    import ControlComponent from "./control.vue";
 
     export default {
       data() {
@@ -30,9 +20,7 @@
       computed: {},
       methods: {},
       components: {
-        ModelViewComponent: ModelViewComponent,
-        ControlComponent: ControlComponent,
-        MapComponent: MapComponent
+        ModelViewComponent: ModelViewComponent
       }
     };
 </script>
diff --git a/src/components/model-view.vue b/src/components/model-view.vue
@@ -29,7 +29,7 @@
         0.1,
         1000
       );
-      camera.position.set(20, 20, 20);
+      camera.position.set(20, 20, 40);
 
       var renderer = new THREE.WebGLRenderer({
         canvas: canvasElement,
@@ -46,21 +46,28 @@
       scene.add(sun);
 
       var controls = new THREE.OrbitControls(camera, renderer.domElement);
-      // enable animation loop when using damping or autorotation
-      //controls.enableDamping = true;
-      //controls.dampingFactor = 0.25;
       controls.enableZoom = true;
 
-      // Loading glTF object
-      var loader = new THREE.GLTFLoader();
+      var host = "http://live3dmodelservice.ubicomp.oulu.fi/aika";
+      var url = "/oulu/api/city/address?street=Aleksanterinkatu";
+      Axios.get(host + url)
+        .then(function(response) {
+          console.log(response.data);
 
-      // Load a glTF resource
-      loader.load(
-        "http://localhost:8003/oulu/block6/building_1/Building1_2.gltf",
-        function(gltf) {
-          scene.add(gltf.scene);
-        }
-      );
+          // Loading glTF object
+          var loader = new THREE.GLTFLoader();
+          var doc = response.data.data[1];
+          // Load a glTF resource
+          loader.load(
+            host + doc.resources[1].url,
+            function(gltf) {
+              scene.add(gltf.scene);
+            }
+          );
+        })
+        .catch(function(error) {
+          console.log(error);
+        });
 
       // Render scene
       function animate() {