Skip to content

Commit 559aeb1

Browse files
authored
refactor(engine): move files and folders (#94)
1 parent 9fb992a commit 559aeb1

38 files changed

+150
-145
lines changed

package-lock.json

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/editors/model/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Import Third-party Dependencies
22
import {
33
Actor,
4-
Components,
4+
Camera3DControls,
55
ModelRenderer
66
} from "@jolly-pixel/engine";
77
import { Player, loadPlayer } from "@jolly-pixel/runtime";
@@ -23,7 +23,7 @@ function initRuntime() {
2323

2424
const { camera } = new Actor(gameInstance, { name: "camera" })
2525
.registerComponentAndGet(
26-
Components.Camera3DControls,
26+
Camera3DControls,
2727
{ speed: 0.25, rotationSpeed: 0.50 }
2828
);
2929

packages/editors/voxel-map/src/VoxelRenderer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as THREE from "three";
33
import {
44
ActorComponent,
55
Actor,
6-
Components,
6+
Camera3DControls,
77
createViewHelper
88
} from "@jolly-pixel/engine";
99

@@ -46,7 +46,7 @@ export class VoxelRenderer extends ActorComponent {
4646
this.ratio = ratio;
4747
const behavior = this.actor.gameInstance.scene.tree
4848
.getActor(cameraActorName)
49-
?.getBehavior(Components.Camera3DControls);
49+
?.getBehavior(Camera3DControls);
5050
if (!behavior) {
5151
throw new Error(`Unable to fetch camera behavior from actor with name <${cameraActorName}>`);
5252
}

packages/editors/voxel-map/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Import Third-party Dependencies
22
import {
33
Actor,
4-
Components
4+
Camera3DControls
55
} from "@jolly-pixel/engine";
66
import { Player, loadPlayer } from "@jolly-pixel/runtime";
77
import { TreeView } from "@jolly-pixel/fs-tree/tree-view";
@@ -25,7 +25,7 @@ function initRuntime() {
2525
const { gameInstance } = runtime;
2626

2727
new Actor(gameInstance, { name: "camera" })
28-
.registerComponent(Components.Camera3DControls, { speed: 8, rotationSpeed: 1 }, (component) => {
28+
.registerComponent(Camera3DControls, { speed: 8, rotationSpeed: 1 }, (component) => {
2929
component.camera.position.set(200, 200, 400);
3030
component.camera.lookAt(0, 0, 0);
3131
});

packages/engine/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,8 @@
2525
"picomatch": "^4.0.3",
2626
"reflect-metadata": "^0.2.2",
2727
"three": "^0.180.0"
28+
},
29+
"devDependencies": {
30+
"@types/picomatch": "^4.0.2"
2831
}
2932
}
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
import * as THREE from "three";
33

44
// Import Internal Dependencies
5-
import { type GameInstance } from "./systems/GameInstance.js";
6-
import { type Component } from "./ActorComponent.js";
5+
import { type GameInstance } from "../systems/GameInstance.js";
76
import { ActorTree } from "./ActorTree.js";
8-
import { Behavior } from "./Behavior.js";
97
import { Transform } from "./Transform.js";
8+
import type { Behavior } from "../components/script/Behavior.js";
9+
import type {
10+
Component
11+
} from "../components/types.js";
1012

1113
type ComponentConstructor = new (actor: Actor, ...args: any[]) => Component;
1214

packages/engine/src/ActorComponent.ts renamed to packages/engine/src/actor/ActorComponent.ts

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,18 @@
11
// Import Internal Dependencies
22
import { Actor } from "./Actor.js";
3-
4-
export type ComponentType =
5-
| "ScriptBehavior"
6-
| "Camera"
7-
| "VoxelRenderer"
8-
| "SpriteRenderer"
9-
| "ModelRenderer"
10-
| "TiledMapRenderer"
11-
| "TextRenderer"
12-
| (string & {});
13-
14-
export interface Component {
15-
actor: Actor;
16-
typeName: ComponentType;
17-
18-
awake?(): void;
19-
start?(): void;
20-
update?(deltaTime: number): void;
21-
destroy(): void;
22-
}
3+
import type {
4+
Component,
5+
FreeComponentEnum
6+
} from "../components/types.js";
237

248
export interface ActorComponentOptions {
259
actor: Actor;
26-
typeName: ComponentType;
10+
typeName: FreeComponentEnum;
2711
}
2812

2913
export class ActorComponent implements Component {
3014
actor: Actor;
31-
typeName: ComponentType;
15+
typeName: FreeComponentEnum;
3216

3317
pendingForDestruction = false;
3418

packages/engine/src/actor/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export * from "./Actor.js";
2+
export * from "./ActorComponent.js";
3+
export * from "./ActorTree.js";

0 commit comments

Comments
 (0)