move types.ts into common

arx-tools · Dec 14, 2022 · 0f198b8 · 0f198b8
1 parent fb2feab
commit 0f198b8
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 14 deletions.
diff --git a/src/common/BinaryIO.ts b/src/common/BinaryIO.ts
@@ -1,7 +1,7 @@
 import { TextIO } from './TextIO'
 import { repeat } from './helpers'
 import { LITTLE_ENDIAN, TRUNCATE_ZERO_BYTES, KEEP_ZERO_BYTES, BYTE_OF_AN_UNKNOWN_CHAR } from './constants'
-import { ArxQuaternion, ArxRotation, ArxVector3 } from '../types'
+import { ArxQuaternion, ArxRotation, ArxVector3 } from './types'
 
 export class BinaryIO extends DataView {
   public position: number // TODO: make this private - this needs to be public because of TEA

diff --git a/src/common/Light.ts b/src/common/Light.ts
@@ -1,7 +1,7 @@
 import { BinaryIO } from './BinaryIO'
 import { ArxColor, Color } from './Color'
 import { repeat } from './helpers'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from './types'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/scene/Light.h#L80 */
 export enum ArxLightFlags {

diff --git a/src/types.ts → src/common/types.ts b/src/types.ts → src/common/types.ts
diff --git a/src/dlf/DlfHeader.ts b/src/dlf/DlfHeader.ts
@@ -2,7 +2,7 @@ import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { DANAE_VERSION } from '../common/constants'
 import { repeat } from '../common/helpers'
-import { ArxRotation, ArxVector3 } from '../types'
+import { ArxRotation, ArxVector3 } from '../common/types'
 import { ArxDLF } from './DLF'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/scene/LevelFormat.h#L58 */

diff --git a/src/dlf/Fog.ts b/src/dlf/Fog.ts
@@ -2,7 +2,7 @@ import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { ArxColor, Color } from '../common/Color'
 import { repeat } from '../common/helpers'
-import { ArxRotation, ArxVector3 } from '../types'
+import { ArxRotation, ArxVector3 } from '../common/types'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/scene/LevelFormat.h#L132 */
 export type ArxFog = {

diff --git a/src/dlf/InteactiveObject.ts b/src/dlf/InteactiveObject.ts
@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { repeat } from '../common/helpers'
-import { ArxRotation, ArxVector3 } from '../types'
+import { ArxRotation, ArxVector3 } from '../common/types'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/scene/LevelFormat.h#L193 */
 export type ArxInteractiveObject = {

diff --git a/src/dlf/PathHeader.ts b/src/dlf/PathHeader.ts
@@ -1,7 +1,7 @@
 import { BinaryIO } from '../common/BinaryIO'
 import { ArxColor, Color } from '../common/Color'
 import { repeat } from '../common/helpers'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 import { ArxPath } from './DLF'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/scene/LevelFormat.h#L150 */

diff --git a/src/dlf/Pathway.ts b/src/dlf/Pathway.ts
@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { repeat } from '../common/helpers'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/scene/LevelFormat.h#L168 */
 export type ArxPathway = {

diff --git a/src/fts/AnchorData.ts b/src/fts/AnchorData.ts
@@ -1,6 +1,6 @@
 import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 import { ArxAnchor } from './Anchor'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/graphics/data/FastSceneFormat.h#L117 */

diff --git a/src/fts/Polygon.ts b/src/fts/Polygon.ts
@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { ArxVertex, Vertex } from './Vertex'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 import { times } from '../common/helpers'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/graphics/data/FastSceneFormat.h#L81 */

diff --git a/src/fts/PortalPolygon.ts b/src/fts/PortalPolygon.ts
@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { times } from '../common/helpers'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 import { ArxTextureVertex, TextureVertex } from './TextureVertex'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/graphics/data/FastSceneFormat.h#L136 */

diff --git a/src/fts/RoomDistance.ts b/src/fts/RoomDistance.ts
@@ -1,6 +1,6 @@
 import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/graphics/data/FastSceneFormat.h#L130 */
 export type ArxRoomDistance = {

diff --git a/src/fts/SceneHeader.ts b/src/fts/SceneHeader.ts
@@ -2,7 +2,7 @@ import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { FTS_VERSION, MAP_DEPTH_IN_CELLS, MAP_WIDTH_IN_CELLS } from '../common/constants'
 import { maxAll, uniq } from '../common/helpers'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 import { ArxFTS } from './FTS'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/graphics/data/FastSceneFormat.h#L94 */

diff --git a/src/fts/TextureVertex.ts b/src/fts/TextureVertex.ts
@@ -1,7 +1,7 @@
 import { Buffer } from 'node:buffer'
 import { BinaryIO } from '../common/BinaryIO'
 import { ArxColor, Color } from '../common/Color'
-import { ArxVector3 } from '../types'
+import { ArxVector3 } from '../common/types'
 
 /** @see https://github.com/arx/ArxLibertatis/blob/1.2.1/src/graphics/GraphicsFormat.h#L82 */
 export type ArxTextureVertex = {

diff --git a/src/tea/TEA.ts b/src/tea/TEA.ts
@@ -4,7 +4,7 @@ import { BinaryIO } from '../common/BinaryIO'
 import { KEEP_ZERO_BYTES } from '../common/constants'
 import { ArxNewKeyFrame, NewKeyFrame } from './NewKeyFrame'
 import { ArxOldKeyFrame, OldKeyFrame } from './OldKeyFrame'
-import { ArxQuaternion, ArxVector3 } from '../types'
+import { ArxQuaternion, ArxVector3 } from '../common/types'
 
 export type ArxTEA = {
   header: Omit<ArxTeaHeader, 'numberOfKeyFrames' | 'numberOfGroups'>