From 89920e0b8ecb588f17fb0d17f6c090ccb49edd3f Mon Sep 17 00:00:00 2001 From: Ronja Date: Wed, 19 Feb 2020 23:12:18 +0100 Subject: [PATCH] move rendering systems --- .../src/Systems/{ => rendering}/DebugRenderSystem.ts | 6 +++--- .../src/Systems/{ => rendering}/PixiCleanupSystem.ts | 8 ++++---- Program/src/Systems/{ => rendering}/RenderSystem.ts | 2 +- Program/src/Systems/{ => rendering}/SpriteSystem.ts | 10 +++++----- Program/src/Systems/{ => rendering}/ZOrderSystem.ts | 6 +++--- Program/src/index.ts | 10 +++++----- 6 files changed, 21 insertions(+), 21 deletions(-) rename Program/src/Systems/{ => rendering}/DebugRenderSystem.ts (86%) rename Program/src/Systems/{ => rendering}/PixiCleanupSystem.ts (70%) rename Program/src/Systems/{ => rendering}/RenderSystem.ts (84%) rename Program/src/Systems/{ => rendering}/SpriteSystem.ts (79%) rename Program/src/Systems/{ => rendering}/ZOrderSystem.ts (82%) diff --git a/Program/src/Systems/DebugRenderSystem.ts b/Program/src/Systems/rendering/DebugRenderSystem.ts similarity index 86% rename from Program/src/Systems/DebugRenderSystem.ts rename to Program/src/Systems/rendering/DebugRenderSystem.ts index 892aee8..1650684 100644 --- a/Program/src/Systems/DebugRenderSystem.ts +++ b/Program/src/Systems/rendering/DebugRenderSystem.ts @@ -1,8 +1,8 @@ import { System, Entity, Not } from "ecsy" -import { DebugRect } from "../Components/rendering/debugRect"; -import { PixiRepresentation } from "../Components/rendering/pixiRepresentation"; +import { DebugRect } from "../../Components/rendering/debugRect"; +import { PixiRepresentation } from "../../Components/rendering/pixiRepresentation"; import { Graphics, DisplayObject } from "pixi.js"; -import globals from "../globals"; +import globals from "../../globals"; // MovableSystem export class DebugRenderSystem extends System { diff --git a/Program/src/Systems/PixiCleanupSystem.ts b/Program/src/Systems/rendering/PixiCleanupSystem.ts similarity index 70% rename from Program/src/Systems/PixiCleanupSystem.ts rename to Program/src/Systems/rendering/PixiCleanupSystem.ts index 198801d..184c321 100644 --- a/Program/src/Systems/PixiCleanupSystem.ts +++ b/Program/src/Systems/rendering/PixiCleanupSystem.ts @@ -1,8 +1,8 @@ -import { PixiRepresentation } from "../Components/rendering/pixiRepresentation"; +import { PixiRepresentation } from "../../Components/rendering/pixiRepresentation"; import { Not, Entity, System } from "ecsy"; -import { DebugRect } from "../Components/rendering/debugRect"; -import { SpriteRenderer } from "../Components/rendering/spriteRenderer"; -import globals from "../globals"; +import { DebugRect } from "../../Components/rendering/debugRect"; +import { SpriteRenderer } from "../../Components/rendering/spriteRenderer"; +import globals from "../../globals"; export class PixiCleanupSystem extends System { diff --git a/Program/src/Systems/RenderSystem.ts b/Program/src/Systems/rendering/RenderSystem.ts similarity index 84% rename from Program/src/Systems/RenderSystem.ts rename to Program/src/Systems/rendering/RenderSystem.ts index 30ce24e..d9a5539 100644 --- a/Program/src/Systems/RenderSystem.ts +++ b/Program/src/Systems/rendering/RenderSystem.ts @@ -1,5 +1,5 @@ import { System } from "ecsy" -import globals from "../globals"; +import globals from "../../globals"; // MovableSystem export class RenderSystem extends System { diff --git a/Program/src/Systems/SpriteSystem.ts b/Program/src/Systems/rendering/SpriteSystem.ts similarity index 79% rename from Program/src/Systems/SpriteSystem.ts rename to Program/src/Systems/rendering/SpriteSystem.ts index 52b4a14..e2a23c7 100644 --- a/Program/src/Systems/SpriteSystem.ts +++ b/Program/src/Systems/rendering/SpriteSystem.ts @@ -1,10 +1,10 @@ import { System, Entity } from "ecsy"; -import { Position } from "../Components/position"; -import { SpriteRenderer } from "../Components/rendering/spriteRenderer"; +import { Position } from "../../Components/position"; +import { SpriteRenderer } from "../../Components/rendering/spriteRenderer"; import { Sprite, DisplayObject } from "pixi.js"; -import { PixiRepresentation } from "../Components/rendering/pixiRepresentation"; -import { addOrSetComponent } from "../util"; -import globals from "../globals"; +import { PixiRepresentation } from "../../Components/rendering/pixiRepresentation"; +import { addOrSetComponent } from "../../util"; +import globals from "../../globals"; // MovableSystem export class SpriteSystem extends System { diff --git a/Program/src/Systems/ZOrderSystem.ts b/Program/src/Systems/rendering/ZOrderSystem.ts similarity index 82% rename from Program/src/Systems/ZOrderSystem.ts rename to Program/src/Systems/rendering/ZOrderSystem.ts index af6240f..1f908fa 100644 --- a/Program/src/Systems/ZOrderSystem.ts +++ b/Program/src/Systems/rendering/ZOrderSystem.ts @@ -1,7 +1,7 @@ -import { PixiRepresentation } from "../Components/rendering/pixiRepresentation"; +import { PixiRepresentation } from "../../Components/rendering/pixiRepresentation"; import { Entity, System } from "ecsy"; -import { Position } from "../Components/position"; -import { OrderZ } from "../Components/rendering/orderZ"; +import { Position } from "../../Components/position"; +import { OrderZ } from "../../Components/rendering/orderZ"; export class ZOrderSystem extends System { diff --git a/Program/src/index.ts b/Program/src/index.ts index bc79b20..e85f8ed 100644 --- a/Program/src/index.ts +++ b/Program/src/index.ts @@ -4,14 +4,14 @@ import { setup } from "./setup" import { loadResources } from "./Resources" import { DoorSystem } from "./Systems/DoorSystem" -import { SpriteSystem } from "./Systems/SpriteSystem" -import { RenderSystem } from "./Systems/RenderSystem" +import { SpriteSystem } from "./Systems/rendering/SpriteSystem" +import { RenderSystem } from "./Systems/rendering/RenderSystem" import { TestSystem } from "./Systems/TestSystem" import { AdventureReturnSystem } from "./Systems/AdventureReturnSystem" import { VisibleHumanSystem } from "./Systems/VisibleHumanSystem" -import { DebugRenderSystem } from "./Systems/DebugRenderSystem" -import { PixiCleanupSystem } from "./Systems/PixiCleanupSystem" -import { ZOrderSystem } from "./Systems/ZOrderSystem" +import { DebugRenderSystem } from "./Systems/rendering/DebugRenderSystem" +import { PixiCleanupSystem } from "./Systems/rendering/PixiCleanupSystem" +import { ZOrderSystem } from "./Systems/rendering/ZOrderSystem" import { PathWalkerSystem } from "./Systems/PathWalkerSystem" import { RandomWalkSystem } from "./Systems/RandomWalkSystem" import { World } from "ecsy"