|
@@ -67,12 +67,12 @@
|
|
scene = new THREE.Scene();
|
|
scene = new THREE.Scene();
|
|
scene.background = new THREE.Color( 0x222222 );
|
|
scene.background = new THREE.Color( 0x222222 );
|
|
|
|
|
|
- var userHead = new THREE.Group();
|
|
|
|
- userHead.position.set( 0, 1.6, 0 );
|
|
|
|
- scene.add( userHead );
|
|
|
|
|
|
+ var user = new THREE.Group();
|
|
|
|
+ user.position.set( 0, 1.6, 0 );
|
|
|
|
+ scene.add( user );
|
|
|
|
|
|
camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 );
|
|
camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 50 );
|
|
- userHead.add( camera );
|
|
|
|
|
|
+ user.add( camera );
|
|
|
|
|
|
var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 );
|
|
var geometry = new THREE.BoxGeometry( 0.5, 0.8, 0.5 );
|
|
var material = new THREE.MeshStandardMaterial( {
|
|
var material = new THREE.MeshStandardMaterial( {
|
|
@@ -143,13 +143,13 @@
|
|
controller1.standingMatrix = renderer.vr.getStandingMatrix();
|
|
controller1.standingMatrix = renderer.vr.getStandingMatrix();
|
|
controller1.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
|
|
controller1.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
|
|
controller1.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
|
|
controller1.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
|
|
- scene.add( controller1 );
|
|
|
|
|
|
+ user.add( controller1 );
|
|
|
|
|
|
controller2 = new THREE.PaintViveController( 1 );
|
|
controller2 = new THREE.PaintViveController( 1 );
|
|
controller2.standingMatrix = renderer.vr.getStandingMatrix();
|
|
controller2.standingMatrix = renderer.vr.getStandingMatrix();
|
|
controller2.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
|
|
controller2.userData.points = [ new THREE.Vector3(), new THREE.Vector3() ];
|
|
controller2.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
|
|
controller2.userData.matrices = [ new THREE.Matrix4(), new THREE.Matrix4() ];
|
|
- scene.add( controller2 );
|
|
|
|
|
|
+ user.add( controller2 );
|
|
|
|
|
|
var loader = new THREE.OBJLoader();
|
|
var loader = new THREE.OBJLoader();
|
|
loader.setPath( 'models/obj/vive-controller/' );
|
|
loader.setPath( 'models/obj/vive-controller/' );
|