提交 d0960817 编写于 作者: M Mugen87

Merge branch 'dev' into quickhull

...@@ -66,7 +66,7 @@ THREE.DaydreamController = function () { ...@@ -66,7 +66,7 @@ THREE.DaydreamController = function () {
// angular velocity // angular velocity
if ( pose.angularVelocity !== null || ! angularVelocity.equals( pose.angularVelocity ) ) { if ( pose.angularVelocity !== null && ! angularVelocity.equals( pose.angularVelocity ) ) {
angularVelocity.fromArray( pose.angularVelocity ); angularVelocity.fromArray( pose.angularVelocity );
scope.dispatchEvent( { type: 'angularvelocitychanged', angularVelocity: angularVelocity } ); scope.dispatchEvent( { type: 'angularvelocitychanged', angularVelocity: angularVelocity } );
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<title>three.js webvr - daydream</title> <title>three.js webvr - daydream</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<!-- Origin Trial Token, feature = WebVR, origin = https://threejs.org, expires = 2017-03-13 --> <!-- Origin Trial Token, feature = WebVR, origin = https://threejs.org, expires = 2017-04-17 -->
<meta http-equiv="origin-trial" data-feature="WebVR" data-expires="2017-03-13" content="Any7HFKv+fkg+mBnJBBFIYyFbQgDyum3bNsVUXBInRDadbhafI6F0hXq/cStNqdi29167TYlkDuH/JE5ZZSI6gcAAABKeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJWUiIsImV4cGlyeSI6MTQ4OTQxNzU2OX0="> <meta http-equiv="origin-trial" data-feature="WebVR" data-expires="2017-04-17" content="Aj3fKurj0eOvRSbpJ0NaqkV/AE2Y2KJIepdCGWNmCB/iMgbDV/rhFn8zFu6c6zZZlRGZNR7Xv/BEX544EeqLuQAAAABKeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJWUiIsImV4cGlyeSI6MTQ5MjQ3MzYwMH0=">
<style> <style>
body { body {
font-family: Monospace; font-family: Monospace;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册