Moves contexts

swapkats · Jul 8, 2020 · 7df0948 · 7df0948
1 parent cb8d7ec
commit 7df0948
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/app/cameraContext.ts → app/contexts/cameraContext.ts b/app/cameraContext.ts → app/contexts/cameraContext.ts
diff --git a/app/rendererContext.ts → app/contexts/rendererContext.ts b/app/rendererContext.ts → app/contexts/rendererContext.ts
diff --git a/app/sceneContext.ts → app/contexts/sceneContext.ts b/app/sceneContext.ts → app/contexts/sceneContext.ts
diff --git a/app/elements/three-camera.ts b/app/elements/three-camera.ts
@@ -2,14 +2,15 @@ import {
   LitElement, html, css, customElement, property,
 } from 'lit-element';
 import { PerspectiveCamera } from 'three';
-import cameraContext from '../cameraContext';
+import cameraContext from '../contexts/cameraContext';
 
 @customElement('three-camera')
 export default class ThreeCamera extends LitElement {
   constructor() {
     super();
     const camera = new PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000);
     camera.position.z = 5;
+    camera.lookAt(0, 0, 0);
     cameraContext.setCamera(camera);
   }
 }
diff --git a/app/elements/three-controls.ts b/app/elements/three-controls.ts
@@ -2,14 +2,16 @@ import {
   LitElement, html, css, customElement, property,
 } from 'lit-element';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import cameraContext from '../cameraContext';
-import rendererContext from '../rendererContext';
+import { TransformControls } from 'three/examples/jsm/controls/TransformControls';
+import cameraContext from '../contexts/cameraContext';
+import rendererContext from '../contexts/rendererContext';
 
 @customElement('three-controls')
 export default class ThreeControls extends LitElement {
   firstUpdated() {
     super.firstUpdated();
-    const controls = new OrbitControls(cameraContext.useCamera(), rendererContext.useRenderer().domElement);
-    controls.update();
+    // let controls = new OrbitControls(cameraContext.useCamera(), rendererContext.useRenderer().domElement);
+    // controls.update();
+    let control = new TransformControls( cameraContext.useCamera(), rendererContext.useRenderer().domElement );
   }
 }
diff --git a/app/elements/three-renderer.ts b/app/elements/three-renderer.ts
@@ -2,9 +2,9 @@ import {
   LitElement, html, css, customElement, property, internalProperty,
 } from 'lit-element';
 import { WebGLRenderer, Scene, Camera } from 'three';
-import sceneContext from '../sceneContext';
-import cameraContext from '../cameraContext';
-import rendererContext from '../rendererContext';
+import sceneContext from '../contexts/sceneContext';
+import cameraContext from '../contexts/cameraContext';
+import rendererContext from '../contexts/rendererContext';
 
 @customElement('three-renderer')
 export default class ThreeRenderer extends LitElement {

diff --git a/app/elements/three-scene.ts b/app/elements/three-scene.ts
@@ -2,7 +2,7 @@ import {
   LitElement, html, css, customElement, property, internalProperty,
 } from 'lit-element';
 import { WebGLRenderer, Scene } from 'three';
-import sceneContext from '../sceneContext';
+import sceneContext from '../contexts/sceneContext';
 
 @customElement('three-scene')
 class ThreeScene extends LitElement {

diff --git a/app/elements/three-text.ts b/app/elements/three-text.ts
@@ -4,7 +4,7 @@ import {
 // @ts-ignore
 import { LitElement, customElement, property } from 'lit-element';
 import fontJson from './fonts/helvetiker_regular.typeface.json';
-import sceneContext from '../sceneContext';
+import sceneContext from '../contexts/sceneContext';
 
 const font = new Font(fontJson);