updated look-at component; bug fix: make look-at work with orbit cont…

…rols
IdeaSpaceVR · Jul 5, 2019 · 1b9303b · 1b9303b
1 parent cdb956c
commit 1b9303b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 147 deletions.
diff --git a/js/isvr-model-center.js b/js/isvr-model-center.js
@@ -8,15 +8,18 @@ AFRAME.registerComponent('isvr-model-center', {
 
     init: function() {
 
+				var self = this;
+
         var offset = this.data.offset;
 
         var mdl = document.querySelector('#model');
 
+        var camera = document.querySelector('a-entity[camera]'); 
+
         if (mdl) {
 
             mdl.addEventListener('model-loaded', function() {
 
-                var camera = document.querySelector('a-entity[camera]'); 
                 var model = document.querySelector('#model');
 
 						 		var camera_wrapper = document.querySelector('#camera-wrapper');
@@ -56,6 +59,12 @@ AFRAME.registerComponent('isvr-model-center', {
 
     },
 
+
+		tick: function () {
+
+    		document.querySelector('#look-at').object3D.position.copy(document.querySelector('a-entity[camera]').getObject3D('camera').position);
+  	}
+
 });
 
 
diff --git a/js/kframe/aframe-look-at-component.js b/js/kframe/aframe-look-at-component.js
diff --git a/js/kframe/aframe-look-at-component.min.js b/js/kframe/aframe-look-at-component.min.js
diff --git a/js/kframe/LICENSE → js/superframe/LICENSE b/js/kframe/LICENSE → js/superframe/LICENSE
diff --git a/js/kframe/aframe-log-component.min.js → js/superframe/aframe-log-component.min.js b/js/kframe/aframe-log-component.min.js → js/superframe/aframe-log-component.min.js
diff --git a/js/superframe/aframe-look-at-component.min.js b/js/superframe/aframe-look-at-component.min.js
diff --git a/views/index.blade.php b/views/index.blade.php
@@ -31,7 +31,7 @@
 		<script src="{{ url($theme_dir . '/js/aframe-html-shader-component/aframe-html-shader.min.js') }}"></script>
     <script src="{{ url($theme_dir . '/js/aframe-extras/aframe-extras.loaders.min.js') }}"></script>
     <script src="{{ url($theme_dir . '/js/aframe-orbit-controls/aframe-orbit-controls.min.js') }}"></script>
-    <script src="{{ url($theme_dir . '/js/kframe/aframe-look-at-component.min.js') }}"></script>
+    <script src="{{ url($theme_dir . '/js/superframe/aframe-look-at-component.min.js') }}"></script>
     <script src="{{ url($theme_dir . '/js/isvr-vr-mode.js') }}"></script>
     <script src="{{ url($theme_dir . '/js/isvr-model-center.js') }}"></script>
 </head>

diff --git a/views/scene.blade.php b/views/scene.blade.php
@@ -101,6 +101,9 @@ class="ply-model"
             @endif
 
 
+						<a-entity id="look-at"></a-entity>
+
+
             @if (isset($content['model'][0]['attach-annotations']))
 
                 <a-entity 
@@ -113,7 +116,7 @@ class="ply-model"
                     @endphp
 
                     <a-entity 
-                        look-at="#camera"
+												look-at="#look-at"
                         scale="{{ (isset($content['model'][0]['hotspot-scale'])?$content['model'][0]['hotspot-scale']['#value']:'1 1 1') }}"
                         position="{{ $annotation['#position']['#x'] }} {{ $annotation['#position']['#y'] }} {{ $annotation['#position']['#z'] }}" 
                         rotation="{{ $annotation['#rotation']['#x'] }} {{ $annotation['#rotation']['#y'] }} {{ $annotation['#rotation']['#z'] }}">