From b9c7a2fab118aac3fb3975b5d54f7c1e3865ea86 Mon Sep 17 00:00:00 2001
From: Rob Evans <rob@irrelon.com>
Date: Mon, 25 Mar 2024 14:47:04 +0000
Subject: [PATCH] Moved audio to components folder

---
 src/engine/{ => components}/audio/IgeAudioControl.ts  |  0
 .../{ => components}/audio/IgeAudioController.ts      |  2 +-
 src/engine/{ => components}/audio/IgeAudioEntity.ts   |  2 +-
 src/engine/{ => components}/audio/IgeAudioSource.ts   |  2 +-
 .../{ => components}/audio/IgeSmartAudioSource.ts     |  0
 src/engine/core/Ige.ts                                | 11 ++---------
 src/export/exports.ts                                 | 10 +++++-----
 7 files changed, 10 insertions(+), 17 deletions(-)
 rename src/engine/{ => components}/audio/IgeAudioControl.ts (100%)
 rename src/engine/{ => components}/audio/IgeAudioController.ts (98%)
 rename src/engine/{ => components}/audio/IgeAudioEntity.ts (98%)
 rename src/engine/{ => components}/audio/IgeAudioSource.ts (98%)
 rename src/engine/{ => components}/audio/IgeSmartAudioSource.ts (100%)

diff --git a/src/engine/audio/IgeAudioControl.ts b/src/engine/components/audio/IgeAudioControl.ts
similarity index 100%
rename from src/engine/audio/IgeAudioControl.ts
rename to src/engine/components/audio/IgeAudioControl.ts
diff --git a/src/engine/audio/IgeAudioController.ts b/src/engine/components/audio/IgeAudioController.ts
similarity index 98%
rename from src/engine/audio/IgeAudioController.ts
rename to src/engine/components/audio/IgeAudioController.ts
index 2a0078589..0670d0136 100644
--- a/src/engine/audio/IgeAudioController.ts
+++ b/src/engine/components/audio/IgeAudioController.ts
@@ -1,4 +1,4 @@
-import type { IgeAudioSource } from "@/engine/audio/IgeAudioSource";
+import type { IgeAudioSource } from "@/engine/components/audio/IgeAudioSource";
 import { IgeAssetRegister } from "@/engine/core/IgeAssetRegister";
 import { isClient } from "@/engine/utils/clientServer";
 
diff --git a/src/engine/audio/IgeAudioEntity.ts b/src/engine/components/audio/IgeAudioEntity.ts
similarity index 98%
rename from src/engine/audio/IgeAudioEntity.ts
rename to src/engine/components/audio/IgeAudioEntity.ts
index 79aab160b..d310d9c2b 100644
--- a/src/engine/audio/IgeAudioEntity.ts
+++ b/src/engine/components/audio/IgeAudioEntity.ts
@@ -1,4 +1,4 @@
-import { IgeAudioControl } from "@/engine/audio/IgeAudioControl";
+import { IgeAudioControl } from "@/engine/components/audio/IgeAudioControl";
 import { IgeEntity } from "@/engine/core/IgeEntity";
 import { ige } from "@/engine/instance";
 import { isClient } from "@/engine/utils/clientServer";
diff --git a/src/engine/audio/IgeAudioSource.ts b/src/engine/components/audio/IgeAudioSource.ts
similarity index 98%
rename from src/engine/audio/IgeAudioSource.ts
rename to src/engine/components/audio/IgeAudioSource.ts
index 31b7032ea..e519b6730 100644
--- a/src/engine/audio/IgeAudioSource.ts
+++ b/src/engine/components/audio/IgeAudioSource.ts
@@ -1,4 +1,4 @@
-import type { IgeSmartAudioSource } from "@/engine/audio/IgeSmartAudioSource";
+import type { IgeSmartAudioSource } from "@/engine/components/audio/IgeSmartAudioSource";
 import { IgeAsset } from "@/engine/core/IgeAsset";
 import { ige } from "@/engine/instance";
 import { isServer } from "@/engine/utils/clientServer";
diff --git a/src/engine/audio/IgeSmartAudioSource.ts b/src/engine/components/audio/IgeSmartAudioSource.ts
similarity index 100%
rename from src/engine/audio/IgeSmartAudioSource.ts
rename to src/engine/components/audio/IgeSmartAudioSource.ts
diff --git a/src/engine/core/Ige.ts b/src/engine/core/Ige.ts
index 2052f5bac..70d77fba0 100644
--- a/src/engine/core/Ige.ts
+++ b/src/engine/core/Ige.ts
@@ -1,4 +1,4 @@
-import type { IgeAudioController } from "@/engine/audio/IgeAudioController";
+import type { IgeAudioController } from "@/engine/components/audio/IgeAudioController";
 import { IgeInputComponent } from "@/engine/components/IgeInputComponent";
 import type { IgeBox2dController } from "@/engine/components/physics/box2d/IgeBox2dController";
 import { igeConfig } from "@/engine/core/config";
@@ -68,10 +68,6 @@ export class Ige implements IgeIsReadyPromise {
 	_pointerOverVp?: IgeViewport;
 	_pointerPos: IgePoint3d = new IgePoint3d(); // Could probably be just {x: number, y: number}
 
-	constructor () {
-
-	}
-
 	init () {
 		// Output our header
 		console.log("-----------------------------------------");
@@ -83,9 +79,6 @@ export class Ige implements IgeIsReadyPromise {
 		this.uses("engine");
 		this.uses("input");
 		this.uses("time");
-
-		//this.dependencies.markAsSatisfied("engine");
-		//this.dependencies.markAsSatisfied("box2d");
 	}
 
 	uses (moduleName: string) {
@@ -133,7 +126,7 @@ export class Ige implements IgeIsReadyPromise {
 				if (isClient && !isWorker) {
 					this.dependencies.add(
 						"audio",
-						import("../audio/IgeAudioController.js").then(({ IgeAudioController: Module }) => {
+						import("@/engine/components/audio/IgeAudioController.js").then(({ IgeAudioController: Module }) => {
 							this.audio = new Module();
 						})
 					);
diff --git a/src/export/exports.ts b/src/export/exports.ts
index 73099674e..5124f84a8 100644
--- a/src/export/exports.ts
+++ b/src/export/exports.ts
@@ -125,7 +125,7 @@ export * from "../engine/core/IgeArrayRegister";
 export * from "../engine/core/IgeQuest";
 export * from "../engine/core/IgeGenericPathFinder";
 export * from "../engine/core/IgeCanvas";
-export * from "../engine/audio/IgeAudioController";
+export * from "@/engine/components/audio/IgeAudioController";
 export * from "../engine/network/client/IgeNetIoClient";
 export * from "../engine/network/server/IgeNetIoSocket";
 export * from "../engine/network/server/IgeNetIoServer";
@@ -238,10 +238,10 @@ export * from "../engine/components/IgeInputComponent";
 export * from "../engine/components/IgeGamePadComponent";
 export * from "../engine/components/IgeEntityManagerComponent";
 
-export * from "../engine/audio/IgeSmartAudioSource";
-export * from "../engine/audio/IgeAudioSource";
-export * from "../engine/audio/IgeAudioControl";
-export * from "../engine/audio/IgeAudioEntity";
+export * from "@/engine/components/audio/IgeSmartAudioSource";
+export * from "@/engine/components/audio/IgeAudioSource";
+export * from "@/engine/components/audio/IgeAudioControl";
+export * from "@/engine/components/audio/IgeAudioEntity";
 
 //////////////////////////////////////////////////////////////////////
 // UI Element Classes