Skip to content

Commit

Permalink
feat: 🎸 Updating postinstall and testings
Browse files Browse the repository at this point in the history
  • Loading branch information
srepollock committed Sep 10, 2019
1 parent 7222a04 commit 0434896
Show file tree
Hide file tree
Showing 42 changed files with 70 additions and 58 deletions.
7 changes: 1 addition & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,7 @@
"allow-named-functions"
],
"ordered-imports": [
true,
{
"import-sources-order": "case-insensitive",
"module-source-path": "full",
"named-imports-order": "case-insensitive"
}
false
],
"quotemark": [
true,
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "de-logger"]
path = src/core/loggingsystem
path = sde-loggingsystem
url = https://github.com/srepollock/de-logger.git
25 changes: 23 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
"url": "https://github.com/srepollock/divine-engine/issues"
},
"homepage": "http://spollock.ca/divine-engine",
"dependencies": {},
"dependencies": {
"de-loggingsystem": "0.0.1"
},
"devDependencies": {
"@joseph184/rollup-plugin-node-builtins": "^2.1.4",
"@types/jest": "^24.0.15",
Expand Down Expand Up @@ -102,11 +104,9 @@
],
"coveragePathIgnorePatterns": [
"<rootDir>/node_modules/",
"<rootDir>/src/core/loggingsystem/",
"<rootDir>/src/core/messagesystem/"
],
"testPathIgnorePatterns": [
"<rootDir>/src/core/loggingsystem/test/.*(test|spec)\\.[jt]sx?$",
"<rootDir>/src/core/messagesystem/test/.*(test|spec)\\.[jt]sx?$"
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/aimovementbehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Vector2 } from "../math/vector2";
import { IBehaviourData } from "./ibehaviourdata";

Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/behaviourmanager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IBehaviour } from "./ibehaviour";
import { IBehaviourBuilder } from "./ibehaviourbuilder";

Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/enemybehaviour.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { AnimatedSpriteComponent } from "../components/animatedspritecomponent";
import { AnimatedSpriteComponentData } from "../components/animatedspritecomponentdata";
import { CollisionComponent } from "../components/collisioncomponent";
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { IMessageHandler } from "../core/messagesystem/imessagehandler";
import { Message } from "../core/messagesystem/message";
import { MessageType } from "../core/messagesystem/messagetype";
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/enemybehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Vector2 } from "../math/vector2";
import { IBehaviourData } from "./ibehaviourdata";

Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/flagbehaviour.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Entity } from "../core/entity";
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { IMessageHandler, Message, MessageType } from "../core/messagesystem";
import { CollisionData } from "../physicssystem/collisiondata";
import { ZoneManager } from "../zones/zonemanager";
Expand Down
3 changes: 1 addition & 2 deletions src/behaviours/flagbehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { Vector2 } from "../math/vector2";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IBehaviourData } from "./ibehaviourdata";

export class FlagBehaviourData implements IBehaviourData {
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/guibehaviour.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Entity } from "../core/entity";
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { IMessageHandler, Message, MessageType } from "../core/messagesystem";
import { ZoneManager } from "../zones";
import { Behaviour } from "./behaviour";
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/guibehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IBehaviourData } from "./ibehaviourdata";

export class GUIBehaviourData implements IBehaviourData {
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/guibuttonbehaviour.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IBehaviourData } from "./ibehaviourdata";

export class GUIButtonBehaviourData implements IBehaviourData {
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/guibuttonbehaviourdata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export class GUIButtonBehaviour extends Behaviour {
public zoneName: string;
constructor(data: GUIButtonBehaviourData) {
super(data);
this.zoneName = data.zoneName
this.zoneName = data.zoneName;
}
public update(delta: number): void {
super.update(delta);
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/keyboardbehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IBehaviourData } from "./ibehaviourdata";

export class KeyboardMovementBehaviourData implements IBehaviourData {
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/openingguibehaviour.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { log, LogLevel } from "../core/loggingsystem/src";
import { log, LogLevel } from "de-loggingsystem";
import { IMessageHandler, Message } from "../core/messagesystem";
import { ZoneManager } from "../zones";
import { Behaviour } from "./behaviour";
Expand Down
4 changes: 2 additions & 2 deletions src/behaviours/openingguibehaviourbuilder.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { OpeningGUIBehaviour } from "./openingguibehaviour";
import { OpeningGUIBehaviourData } from "./openingguibehaviourdata";
import { IBehaviour } from "./ibehaviour";
import { IBehaviourBuilder } from "./ibehaviourbuilder";
import { OpeningGUIBehaviour } from "./openingguibehaviour";
import { OpeningGUIBehaviourData } from "./openingguibehaviourdata";

export class OpeningGUIBehaviourBuilder implements IBehaviourBuilder {
public name!: string;
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/openingguibehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IBehaviourData } from "./ibehaviourdata";

export class OpeningGUIBehaviourData implements IBehaviourData {
Expand Down
4 changes: 2 additions & 2 deletions src/behaviours/playerbehaviour.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { CollisionComponent } from "../components";
import { AnimatedSpriteComponent } from "../components/animatedspritecomponent";
import { AnimatedSpriteComponentData } from "../components/animatedspritecomponentdata";
import { ErrorCode, log, LogLevel } from "../core/loggingsystem";
import { IMessageHandler } from "../core/messagesystem/imessagehandler";
import { Message } from "../core/messagesystem/message";
import { MessageType } from "../core/messagesystem/messagetype";
Expand All @@ -13,7 +14,6 @@ import { ZoneManager } from "../zones/zonemanager";
import { Behaviour } from "./behaviour";
import { EnemyBehaviour } from "./enemybehaviour";
import { PlayerBehaviourData } from "./playerbehaviourdata";
import { CollisionComponent } from "src/components";

export class PlayerBehaviour extends Behaviour implements IMessageHandler {
private _hitPoints: number = 3;
Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/playerbehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Vector2 } from "../math/vector2";
import { IBehaviourData } from "./ibehaviourdata";

Expand Down
2 changes: 1 addition & 1 deletion src/behaviours/rotationbehviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Vector3 } from "../math/vector3";
import { IBehaviourData } from "./ibehaviourdata";

Expand Down
4 changes: 2 additions & 2 deletions src/behaviours/soundbehaviour.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SoundBehaviourData } from "./soundbehaviourdata";
import { AudioManager } from "../soundsystem";
import { Behaviour } from "./behaviour";
import { AudioManager } from "src/soundsystem";
import { SoundBehaviourData } from "./soundbehaviourdata";
export class SoundBehaviour extends Behaviour {
private _soundName: string;
constructor(data: SoundBehaviourData) {
Expand Down
4 changes: 2 additions & 2 deletions src/behaviours/soundbehaviourdata.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IBehaviourData } from "./ibehaviourdata";

export class SoundBehaviourData implements IBehaviourData {
public name!: string;
public soundName!: string
public soundName!: string;
public setFromJson(json: any): void {
if (json.name === undefined) {
log(LogLevel.error, `Name must be defined in behaviour data.`, ErrorCode.NoName);
Expand Down
2 changes: 1 addition & 1 deletion src/components/animatedspritecomponentdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Vector3 } from "../math/vector3";
import { IComponentData } from "./icomponentdata";
import { SpriteComponentData } from "./spritecomponentdata";
Expand Down
2 changes: 1 addition & 1 deletion src/components/collisioncomponent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { log, LogLevel } from "../core/loggingsystem/src";
import { log, LogLevel } from "de-loggingsystem";
import { Vector2 } from "../math/vector2";
import { CollisionManager } from "../physicssystem/collisionmanager";
import { IShape2D } from "../rendersystem/ishape2d";
Expand Down
2 changes: 1 addition & 1 deletion src/components/collisioncomponentdata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Circle2D, IShape2D, Rectangle2D } from "../rendersystem";
import { IComponentData } from "./icomponentdata";

Expand Down
2 changes: 1 addition & 1 deletion src/components/componentmanager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IComponent } from "./icomponent";
import { IComponentBuilder } from "./icomponentbuilder";

Expand Down
2 changes: 1 addition & 1 deletion src/core/engine.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { AssetManager } from "../assets/assetmanager";
import { AIMovementBehaviourBuilder } from "../behaviours/aimovementbehaviourbuilder";
import { BehaviourManager } from "../behaviours/behaviourmanager";
Expand Down Expand Up @@ -28,7 +29,6 @@ import { MaterialManager } from "../rendersystem/materialmanager";
import { Sprite } from "../rendersystem/sprite";
import { AudioManager } from "../soundsystem/audiomanager";
import { ZoneManager } from "../zones/zonemanager";
import { ErrorCode, log, LogLevel } from "./loggingsystem/src";
import { MessageType } from "./messagesystem/messagetype";

export class Engine implements IMessageHandler {
Expand Down
2 changes: 1 addition & 1 deletion src/core/entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { IBehaviour } from "../behaviours/ibehaviour";
import { IComponent } from "../components/icomponent";
import { Transform } from "../core/transform";
import { guid } from "../helper/guid";
import { Message, IMessageHandler } from "./messagesystem";
import { Matrix4 } from "../math/matrix4";
import { Vector3 } from "../math/vector3";
import { Shader } from "../rendersystem/shader";
import { Scene } from "../scene/scene";
import { Message, IMessageHandler } from "./messagesystem";

export class Entity {
public transform: Transform = new Transform();
Expand Down
1 change: 0 additions & 1 deletion src/core/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export * from "./engine";
export * from "./entity";
export * from "./loggingsystem/src";
export * from "./material";
export * from "./texture";
export * from "./transform";
1 change: 0 additions & 1 deletion src/core/loggingsystem
Submodule loggingsystem deleted from bd8be1
2 changes: 1 addition & 1 deletion src/core/messagesystem/messagebus.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { log, LogLevel } from "../loggingsystem/src";
import { log, LogLevel } from "de-loggingsystem";
import { IMessageHandler } from "./imessagehandler";
import { Message } from "./message";
import { MessagePriority } from "./messagepriority";
Expand Down
2 changes: 1 addition & 1 deletion src/rendersystem/animatedsprite.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { log, LogLevel } from "de-loggingsystem";
import { AssetManager } from "../assets/assetmanager";
import { ImageAsset } from "../assets/imageasset";
import { log, LogLevel } from "../core/loggingsystem/src";
import { IMessageHandler } from "../core/messagesystem/imessagehandler";
import { Message } from "../core/messagesystem/message";
import { MessageType } from "../core/messagesystem/messagetype";
Expand Down
2 changes: 1 addition & 1 deletion src/rendersystem/circle2d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Vector2 } from "../math/vector2";
import { IShape2D } from "./ishape2d";
import { Rectangle2D } from "./rectangle2d";
Expand Down
2 changes: 1 addition & 1 deletion src/rendersystem/glbuffer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { AttributeInfo } from "./attributeinfo";
import { GLUtility } from "./glutility";

Expand Down
2 changes: 1 addition & 1 deletion src/rendersystem/glutility.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";

export class GLUtility {
public static gl: WebGLRenderingContext;
Expand Down
2 changes: 1 addition & 1 deletion src/rendersystem/rectangle2d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Vector2 } from "../math/vector2";
import { Circle2D } from "./circle2d";
import { IShape2D } from "./ishape2d";
Expand Down
2 changes: 1 addition & 1 deletion src/rendersystem/shader.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { GLUtility } from "./glutility";

export abstract class Shader {
Expand Down
2 changes: 1 addition & 1 deletion src/rendersystem/sprite.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { Material } from "../core/material";
import { Matrix4, } from "../math/matrix4";
import { Vector3 } from "../math/vector3";
Expand Down
7 changes: 3 additions & 4 deletions src/zones/zone.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { BehaviourManager } from "../behaviours/behaviourmanager";
import { ComponentManager } from "../components/componentmanager";
import { Entity } from "../core/entity";
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { guid } from "../helper";
import { CollisionManager } from "../physicssystem";
import { Shader } from "../rendersystem/shader";
import { Scene } from "../scene/scene";
import { AudioManager } from "../soundsystem";
import { ZoneState } from "./zonestate";
import { MessageBus, Message } from "src/core/messagesystem";
import { AudioManager } from "src/soundsystem";
import { CollisionManager } from "src/physicssystem";


export class Zone {
Expand Down
2 changes: 1 addition & 1 deletion src/zones/zonemanager.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AssetManager } from "../assets/assetmanager";
import { JsonAsset } from "../assets/jsonasset";
import { ErrorCode, log, LogLevel } from "../core/loggingsystem/src";
import { ErrorCode, log, LogLevel } from "de-loggingsystem";
import { IMessageHandler } from "../core/messagesystem/imessagehandler";
import { Message } from "../core/messagesystem/message";
import { Shader } from "../rendersystem/shader";
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
"src/**/*",
],
"exclude": [
"src/core/loggingsystem/test"
"sde-loggingsystem/test"
]
}

0 comments on commit 0434896

Please sign in to comment.