Skip to content

Commit

Permalink
Fix linting warnings (#75)
Browse files Browse the repository at this point in the history
  • Loading branch information
Abbondanzo committed Dec 4, 2019
1 parent d67de56 commit 1359ecb
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 35 deletions.
32 changes: 17 additions & 15 deletions src/builders/SceneBuilder.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { Cache, LoadingManager, Scene } from 'three'
import { RocketAssetManager, RocketConfig, TextureFormat } from "rl-loadout-lib"
import { Cache, LoadingManager, Scene } from "three"
import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader"
import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader"

import GameFieldAssets from '../loaders/scenes/GameFieldAssets'
import SceneManager from '../managers/SceneManager'
import { buildBall } from './ball/buildBall'
import { buildPlayfield } from './field/buildPlayfield'
import { addLighting } from './scene/addLighting'
import { ExtendedPlayer } from '../models/ReplayMetadata';
import { loadRlLoadout } from '../loaders/storage/loadRlLoadout';
import { RocketAssetManager, RocketConfig, TextureFormat } from 'rl-loadout-lib';
import { buildRocketLoadoutGroup } from './player/buildRocketLoadoutScene';
import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
import GameFieldAssets from "../loaders/scenes/GameFieldAssets"
import { loadRlLoadout } from "../loaders/storage/loadRlLoadout"
import SceneManager from "../managers/SceneManager"
import { ExtendedPlayer } from "../models/ReplayMetadata"
import { buildBall } from "./ball/buildBall"
import { buildPlayfield } from "./field/buildPlayfield"
import { buildRocketLoadoutGroup } from "./player/buildRocketLoadoutScene"
import { addLighting } from "./scene/addLighting"

/**
* @description The sole purpose of this function is to initialize and tie together all of the
Expand All @@ -34,17 +34,19 @@ const defaultSceneBuilder = async (

const gltfLoader = new GLTFLoader()
const dracoLoader = new DRACOLoader()
dracoLoader.setDecoderPath('/draco/')
dracoLoader.setDecoderPath("/draco/")
gltfLoader.setDRACOLoader(dracoLoader)

const config = new RocketConfig({
gltfLoader,
loadingManager,
textureFormat: TextureFormat.PNG,
useCompressedModels: true
useCompressedModels: true,
})
const manager = new RocketAssetManager(config)
const bodyPromises = playerInfo.map(player => loadRlLoadout(manager, player, defaultLoadouts))
const bodyPromises = playerInfo.map(player =>
loadRlLoadout(manager, player, defaultLoadouts)
)

await GameFieldAssets.load()
const bodies = await Promise.all(bodyPromises)
Expand Down
18 changes: 11 additions & 7 deletions src/builders/player/buildRocketLoadoutScene.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { BodyModel } from 'rl-loadout-lib';
import { ExtendedPlayer } from '../../models/ReplayMetadata';
import { getCarName, getGroupName } from '../utils/playerNameGetters';
import { Group, Scene } from 'three';
import { generateSprite } from './generateSprite';
import PlayerManager from '../../managers/models/PlayerManager';
import { BodyModel } from "rl-loadout-lib"
import { Group, Scene } from "three"

export function buildRocketLoadoutGroup(scene: Scene, {body, player}: { body: BodyModel; player: ExtendedPlayer }) {
import PlayerManager from "../../managers/models/PlayerManager"
import { ExtendedPlayer } from "../../models/ReplayMetadata"
import { getCarName, getGroupName } from "../utils/playerNameGetters"
import { generateSprite } from "./generateSprite"

export const buildRocketLoadoutGroup = (
scene: Scene,
{ body, player }: { body: BodyModel; player: ExtendedPlayer }
) => {
body.scene.name = getCarName(player.name)

// Build sprite and camera container (for position)
Expand Down
4 changes: 2 additions & 2 deletions src/loaders/operators/loadObject.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LoadingManager } from "three"
import { GLTF, GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader"
import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader"
import { GLTF, GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader"

export const loadObject = (path: string, loadingManager?: LoadingManager) => {
return new Promise(
Expand All @@ -10,7 +10,7 @@ export const loadObject = (path: string, loadingManager?: LoadingManager) => {
) => {
const gltfLoader = new GLTFLoader(loadingManager)
const dracoLoader = new DRACOLoader()
dracoLoader.setDecoderPath('/draco/')
dracoLoader.setDecoderPath("/draco/")
gltfLoader.setDRACOLoader(dracoLoader)
gltfLoader.load(
path,
Expand Down
33 changes: 25 additions & 8 deletions src/loaders/storage/loadRlLoadout.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
import { createPaintConfig, RocketAssetManager, BodyModel, WheelsModel, Body, Wheel, Decal } from 'rl-loadout-lib'
import { ExtendedPlayer } from '../../models/ReplayMetadata'
import { Mesh, MeshPhongMaterial, MeshStandardMaterial } from 'three'
import {
Body,
BodyModel,
createPaintConfig,
Decal,
RocketAssetManager,
Wheel,
WheelsModel,
} from "rl-loadout-lib"
import { Mesh, MeshPhongMaterial, MeshStandardMaterial } from "three"

export async function loadRlLoadout(manager: RocketAssetManager, player: ExtendedPlayer, defaultLoadout?: boolean):
Promise<{ body: BodyModel; player: ExtendedPlayer }> {
import { ExtendedPlayer } from "../../models/ReplayMetadata"

export const loadRlLoadout = async (
manager: RocketAssetManager,
player: ExtendedPlayer,
defaultLoadout?: boolean
): Promise<{ body: BodyModel; player: ExtendedPlayer }> => {
let body: BodyModel
let wheels: WheelsModel

Expand All @@ -24,9 +36,14 @@ export async function loadRlLoadout(manager: RocketAssetManager, player: Extende
player.loadout.antennaPaint
)

const bodyTask = manager.loadBody(player.loadout.car, paintConfig, Body.DEFAULT)
const bodyTask = manager.loadBody(
player.loadout.car,
paintConfig,
Body.DEFAULT
)

// TODO use the default wheel for now, there aren't a lot of wheels in rocket-loadout yet, and not yet fully supported
// TODO use the default wheel for now, there aren't a lot of wheels in rocket-loadout yet,
// and not yet fully supported
wheels = new WheelsModel(Wheel.DEFAULT, paintConfig, manager.config)

await wheels.load()
Expand Down Expand Up @@ -59,5 +76,5 @@ export async function loadRlLoadout(manager: RocketAssetManager, player: Extende
}
})

return {player, body}
return { player, body }
}
9 changes: 6 additions & 3 deletions src/viewer/clients/loadBuilderFromReplay.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { loadReplay } from "./loadReplay"
import { GameManager } from "../../managers/GameManager"
import FPSClock from "../../utils/FPSClock"
import { loadReplay } from "./loadReplay"

export const loadBuilderFromReplay = async (replayId: string, defaultLoadouts: boolean = false) => {
export const loadBuilderFromReplay = async (
replayId: string,
defaultLoadouts: boolean = false
) => {
return loadReplay(replayId).then(([replayData, replayMetadata]) => {
return GameManager.builder({
replayData,
replayMetadata,
clock: FPSClock.convertReplayToClock(replayData),
defaultLoadouts
defaultLoadouts,
})
})
}

0 comments on commit 1359ecb

Please sign in to comment.