Skip to content

Commit

Permalink
Move GameObject
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanBacon committed Jul 2, 2020
1 parent 7f720c5 commit dcb0fb3
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion client/src/Game/Game.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as THREE from "three";

import Settings from "../constants/Settings";
import { dispatch } from "../rematch/store";
import GameObject from "./engine/core/GameObject";
import GameObject from "./GameObject";
import Lighting from "./engine/entities/Lighting";
import PlatformObject from "./engine/entities/Platform";
import PlayerBall from "./engine/entities/PlayerBall";
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion client/src/Game/MenuObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { loadTextureAsync } from "expo-three";
import { Back, Expo as ExpoEase, TweenMax } from "gsap";
import * as THREE from "three";

import GameObject from "./engine/core/GameObject";
import GameObject from "./GameObject";
import FlatMaterial from "./engine/utils/FlatMaterial";
import MotionObserver from "./MotionObserver";

Expand Down
2 changes: 1 addition & 1 deletion client/src/Game/engine/entities/Gem.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CylinderGeometry, Mesh, MeshPhongMaterial } from "three";

import Colors from "../../../constants/Colors";
import GameObject from "../core/GameObject";
import GameObject from "../../GameObject";

let GemMaterial: MeshPhongMaterial = new MeshPhongMaterial({
color: Colors.blue,
Expand Down
4 changes: 2 additions & 2 deletions client/src/Game/engine/entities/Lighting.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { HemisphereLight, DirectionalLight } from 'three';
import { HemisphereLight, DirectionalLight } from "three";

import GameObject from '../core/GameObject';
import GameObject from "../../GameObject";

class Lighting extends GameObject {
get hemisphere() {
Expand Down
2 changes: 1 addition & 1 deletion client/src/Game/engine/entities/Platform.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TweenMax } from "gsap";

import { Color, Mesh, CylinderBufferGeometry, MeshPhongMaterial } from "three";
import GameObject from "../core/GameObject";
import GameObject from "../../GameObject";
import randomRange from "../utils/randomRange";
import Gem from "./Gem";
import Settings from "../../../constants/Settings";
Expand Down
2 changes: 1 addition & 1 deletion client/src/Game/engine/entities/PlayerBall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Power2 as Cubic, TweenMax } from "gsap";

import Colors from "../../../constants/Colors";
import Circle from "../../Circle";
import GameObject from "../core/GameObject";
import GameObject from "../../GameObject";
import Settings from "../../../constants/Settings";

const radius = 26.6666667 / 2;
Expand Down

0 comments on commit dcb0fb3

Please sign in to comment.