From ace4c353a3fc7bd6f4fa0c39fdf50ef3592ecdc7 Mon Sep 17 00:00:00 2001 From: Martin Valigursky Date: Fri, 7 Oct 2022 16:38:17 +0100 Subject: [PATCH] Moved /shape folder to /core/shape --- src/{ => core}/shape/bounding-box.js | 6 +++--- src/{ => core}/shape/bounding-sphere.js | 4 ++-- src/{ => core}/shape/frustum.js | 6 +++--- src/{ => core}/shape/oriented-box.js | 6 +++--- src/{ => core}/shape/plane.js | 2 +- src/{ => core}/shape/ray.js | 4 ++-- src/deprecated/deprecated.js | 8 ++++---- src/framework/components/camera/component.js | 2 +- .../components/element/element-drag-helper.js | 4 ++-- src/framework/components/element/text-element.js | 2 +- src/framework/components/model/component.js | 2 +- src/framework/components/model/system.js | 2 +- src/framework/components/render/component.js | 2 +- src/framework/components/render/system.js | 2 +- src/index.js | 12 ++++++------ src/input/element-input.js | 2 +- src/resources/parser/glb-parser.js | 2 +- src/resources/parser/json-model.js | 2 +- .../parser/material/json-standard-material.js | 2 +- src/scene/batching/batch-manager.js | 2 +- src/scene/batching/batch.js | 2 +- src/scene/camera.js | 2 +- src/scene/lighting/world-clusters.js | 2 +- src/scene/lightmapper/bake-light.js | 4 ++-- src/scene/lightmapper/lightmapper.js | 2 +- src/scene/materials/standard-material.js | 2 +- src/scene/mesh-instance.js | 4 ++-- src/scene/mesh.js | 2 +- src/scene/morph-target.js | 2 +- src/scene/morph.js | 2 +- src/scene/particle-system/particle-emitter.js | 2 +- src/scene/renderer/forward-renderer.js | 2 +- src/scene/renderer/shadow-renderer.js | 4 ++-- src/scene/renderer/static-meshes.js | 4 ++-- src/xr/xr-hit-test.js | 2 +- src/xr/xr-input-source.js | 2 +- 36 files changed, 57 insertions(+), 57 deletions(-) rename src/{ => core}/shape/bounding-box.js (98%) rename src/{ => core}/shape/bounding-sphere.js (97%) rename src/{ => core}/shape/frustum.js (97%) rename src/{ => core}/shape/oriented-box.js (96%) rename src/{ => core}/shape/plane.js (97%) rename src/{ => core}/shape/ray.js (95%) diff --git a/src/shape/bounding-box.js b/src/core/shape/bounding-box.js similarity index 98% rename from src/shape/bounding-box.js rename to src/core/shape/bounding-box.js index 22d0eba10fb..02befa38739 100644 --- a/src/shape/bounding-box.js +++ b/src/core/shape/bounding-box.js @@ -1,7 +1,7 @@ -import { Debug } from '../core/debug.js'; -import { Vec3 } from '../core/math/vec3.js'; +import { Debug } from '../debug.js'; +import { Vec3 } from '../math/vec3.js'; -/** @typedef {import('../core/math/mat4.js').Mat4} Mat4 */ +/** @typedef {import('../math/mat4.js').Mat4} Mat4 */ /** @typedef {import('./bounding-sphere.js').BoundingSphere} BoundingSphere */ /** @typedef {import('./ray.js').Ray} Ray */ diff --git a/src/shape/bounding-sphere.js b/src/core/shape/bounding-sphere.js similarity index 97% rename from src/shape/bounding-sphere.js rename to src/core/shape/bounding-sphere.js index 0fa252677f2..9d5fda7fa9e 100644 --- a/src/shape/bounding-sphere.js +++ b/src/core/shape/bounding-sphere.js @@ -1,5 +1,5 @@ -import { Debug } from '../core/debug.js'; -import { Vec3 } from '../core/math/vec3.js'; +import { Debug } from '../debug.js'; +import { Vec3 } from '../math/vec3.js'; /** @typedef {import('./ray.js').Ray} Ray */ diff --git a/src/shape/frustum.js b/src/core/shape/frustum.js similarity index 97% rename from src/shape/frustum.js rename to src/core/shape/frustum.js index 6f7f7c27bfe..d4b85d1df76 100644 --- a/src/shape/frustum.js +++ b/src/core/shape/frustum.js @@ -1,7 +1,7 @@ -import { Vec3 } from '../core/math/vec3.js'; -import { PROJECTION_PERSPECTIVE } from '../scene/constants.js'; +import { Vec3 } from '../math/vec3.js'; +import { PROJECTION_PERSPECTIVE } from '../../scene/constants.js'; -/** @typedef {import('../core/math/mat4.js').Mat4} Mat4 */ +/** @typedef {import('../math/mat4.js').Mat4} Mat4 */ /** @typedef {import('./bounding-sphere.js').BoundingSphere} BoundingSphere */ const _frustumPoints = [new Vec3(), new Vec3(), new Vec3(), new Vec3(), new Vec3(), new Vec3(), new Vec3(), new Vec3()]; diff --git a/src/shape/oriented-box.js b/src/core/shape/oriented-box.js similarity index 96% rename from src/shape/oriented-box.js rename to src/core/shape/oriented-box.js index 79c61c2627f..ee2b1c8b150 100644 --- a/src/shape/oriented-box.js +++ b/src/core/shape/oriented-box.js @@ -1,6 +1,6 @@ -import { Debug } from '../core/debug.js'; -import { Mat4 } from '../core/math/mat4.js'; -import { Vec3 } from '../core/math/vec3.js'; +import { Debug } from '../debug.js'; +import { Mat4 } from '../math/mat4.js'; +import { Vec3 } from '../math/vec3.js'; import { BoundingBox } from './bounding-box.js'; import { BoundingSphere } from './bounding-sphere.js'; diff --git a/src/shape/plane.js b/src/core/shape/plane.js similarity index 97% rename from src/shape/plane.js rename to src/core/shape/plane.js index 307913e0b5b..d2b5b9a8c91 100644 --- a/src/shape/plane.js +++ b/src/core/shape/plane.js @@ -1,4 +1,4 @@ -import { Vec3 } from '../core/math/vec3.js'; +import { Vec3 } from '../math/vec3.js'; /** @typedef {import('./ray.js').Ray} Ray */ diff --git a/src/shape/ray.js b/src/core/shape/ray.js similarity index 95% rename from src/shape/ray.js rename to src/core/shape/ray.js index 44e024a469e..c371228d0b7 100644 --- a/src/shape/ray.js +++ b/src/core/shape/ray.js @@ -1,5 +1,5 @@ -import { Debug } from '../core/debug.js'; -import { Vec3 } from '../core/math/vec3.js'; +import { Debug } from '../debug.js'; +import { Vec3 } from '../math/vec3.js'; /** * An infinite ray. diff --git a/src/deprecated/deprecated.js b/src/deprecated/deprecated.js index 908b951bbfe..6069bff7b28 100644 --- a/src/deprecated/deprecated.js +++ b/src/deprecated/deprecated.js @@ -10,10 +10,10 @@ import { Vec2 } from '../core/math/vec2.js'; import { Vec3 } from '../core/math/vec3.js'; import { Vec4 } from '../core/math/vec4.js'; -import { BoundingBox } from '../shape/bounding-box.js'; -import { BoundingSphere } from '../shape/bounding-sphere.js'; -import { Frustum } from '../shape/frustum.js'; -import { Plane } from '../shape/plane.js'; +import { BoundingBox } from '../core/shape/bounding-box.js'; +import { BoundingSphere } from '../core/shape/bounding-sphere.js'; +import { Frustum } from '../core/shape/frustum.js'; +import { Plane } from '../core/shape/plane.js'; import { ADDRESS_CLAMP_TO_EDGE, ADDRESS_MIRRORED_REPEAT, ADDRESS_REPEAT, diff --git a/src/framework/components/camera/component.js b/src/framework/components/camera/component.js index ad6a4d79cdf..12538f4d9df 100644 --- a/src/framework/components/camera/component.js +++ b/src/framework/components/camera/component.js @@ -12,7 +12,7 @@ import { Debug } from '../../../core/debug.js'; /** @typedef {import('../../../core/math/vec3.js').Vec3} Vec3 */ /** @typedef {import('../../../core/math/vec4.js').Vec4} Vec4 */ /** @typedef {import('../../../scene/layer.js').Layer} Layer */ -/** @typedef {import('../../../shape/frustum.js').Frustum} Frustum */ +/** @typedef {import('../../../core/shape/frustum.js').Frustum} Frustum */ /** @typedef {import('../../../xr/xr-manager.js').XrErrorCallback} XrErrorCallback */ /** @typedef {import('../../entity.js').Entity} Entity */ /** @typedef {import('./system.js').CameraComponentSystem} CameraComponentSystem */ diff --git a/src/framework/components/element/element-drag-helper.js b/src/framework/components/element/element-drag-helper.js index aa632dd05d6..a796489e6a2 100644 --- a/src/framework/components/element/element-drag-helper.js +++ b/src/framework/components/element/element-drag-helper.js @@ -6,8 +6,8 @@ import { Vec2 } from '../../../core/math/vec2.js'; import { Vec3 } from '../../../core/math/vec3.js'; import { ElementComponent } from './component.js'; -import { Ray } from '../../../shape/ray.js'; -import { Plane } from '../../../shape/plane.js'; +import { Ray } from '../../../core/shape/ray.js'; +import { Plane } from '../../../core/shape/plane.js'; /** @typedef {import('../../../input/element-input').ElementTouchEvent} ElementTouchEvent */ diff --git a/src/framework/components/element/text-element.js b/src/framework/components/element/text-element.js index 783bc3ff476..eaabe2bdd73 100644 --- a/src/framework/components/element/text-element.js +++ b/src/framework/components/element/text-element.js @@ -5,7 +5,7 @@ import { math } from '../../../core/math/math.js'; import { Color } from '../../../core/math/color.js'; import { Vec2 } from '../../../core/math/vec2.js'; -import { BoundingBox } from '../../../shape/bounding-box.js'; +import { BoundingBox } from '../../../core/shape/bounding-box.js'; import { SEMANTIC_POSITION, SEMANTIC_TEXCOORD0, SEMANTIC_COLOR, SEMANTIC_ATTR8, SEMANTIC_ATTR9, TYPE_FLOAT32 } from '../../../graphics/constants.js'; import { VertexIterator } from '../../../graphics/vertex-iterator.js'; diff --git a/src/framework/components/model/component.js b/src/framework/components/model/component.js index 0e984e69647..c1ce3e84a45 100644 --- a/src/framework/components/model/component.js +++ b/src/framework/components/model/component.js @@ -14,7 +14,7 @@ import { Component } from '../component.js'; /** @typedef {import('../../../scene/composition/layer-composition.js').LayerComposition} LayerComposition */ /** @typedef {import('../../../scene/materials/material.js').Material} Material */ -/** @typedef {import('../../../shape/bounding-box.js').BoundingBox} BoundingBox */ +/** @typedef {import('../../../core/shape/bounding-box.js').BoundingBox} BoundingBox */ /** @typedef {import('../../entity.js').Entity} Entity */ /** @typedef {import('./system.js').ModelComponentSystem} ModelComponentSystem */ diff --git a/src/framework/components/model/system.js b/src/framework/components/model/system.js index 497666f83b4..6417df360c1 100644 --- a/src/framework/components/model/system.js +++ b/src/framework/components/model/system.js @@ -2,7 +2,7 @@ import { extend } from '../../../core/core.js'; import { Vec3 } from '../../../core/math/vec3.js'; -import { BoundingBox } from '../../../shape/bounding-box.js'; +import { BoundingBox } from '../../../core/shape/bounding-box.js'; import { getDefaultMaterial } from '../../../scene/materials/default-material.js'; diff --git a/src/framework/components/render/component.js b/src/framework/components/render/component.js index 5311592aa2e..8ce7e4cbbab 100644 --- a/src/framework/components/render/component.js +++ b/src/framework/components/render/component.js @@ -14,7 +14,7 @@ import { Component } from '../component.js'; import { EntityReference } from '../../utils/entity-reference.js'; /** @typedef {import('../../../scene/materials/material.js').Material} Material */ -/** @typedef {import('../../../shape/bounding-box.js').BoundingBox} BoundingBox */ +/** @typedef {import('../../../core/shape/bounding-box.js').BoundingBox} BoundingBox */ /** @typedef {import('../../entity.js').Entity} Entity */ /** @typedef {import('./system.js').RenderComponentSystem} RenderComponentSystem */ diff --git a/src/framework/components/render/system.js b/src/framework/components/render/system.js index dbc20fc9dca..62cda6425fd 100644 --- a/src/framework/components/render/system.js +++ b/src/framework/components/render/system.js @@ -1,6 +1,6 @@ import { Vec3 } from '../../../core/math/vec3.js'; -import { BoundingBox } from '../../../shape/bounding-box.js'; +import { BoundingBox } from '../../../core/shape/bounding-box.js'; import { getDefaultMaterial } from '../../../scene/materials/default-material.js'; diff --git a/src/index.js b/src/index.js index c5957713867..792cad8a98e 100644 --- a/src/index.js +++ b/src/index.js @@ -48,12 +48,12 @@ export { Vec3 } from './core/math/vec3.js'; export { Vec4 } from './core/math/vec4.js'; // SHAPE -export { BoundingBox } from './shape/bounding-box.js'; -export { BoundingSphere } from './shape/bounding-sphere.js'; -export { Frustum } from './shape/frustum.js'; -export { OrientedBox } from './shape/oriented-box.js'; -export { Plane } from './shape/plane.js'; -export { Ray } from './shape/ray.js'; +export { BoundingBox } from './core/shape/bounding-box.js'; +export { BoundingSphere } from './core/shape/bounding-sphere.js'; +export { Frustum } from './core/shape/frustum.js'; +export { OrientedBox } from './core/shape/oriented-box.js'; +export { Plane } from './core/shape/plane.js'; +export { Ray } from './core/shape/ray.js'; // GRAPHICS export * from './graphics/constants.js'; diff --git a/src/input/element-input.js b/src/input/element-input.js index 5a8c4ea5fee..44fd301f5c3 100644 --- a/src/input/element-input.js +++ b/src/input/element-input.js @@ -3,7 +3,7 @@ import { platform } from '../core/platform.js'; import { Vec3 } from '../core/math/vec3.js'; import { Vec4 } from '../core/math/vec4.js'; -import { Ray } from '../shape/ray.js'; +import { Ray } from '../core/shape/ray.js'; import { getApplication } from '../framework/globals.js'; diff --git a/src/resources/parser/glb-parser.js b/src/resources/parser/glb-parser.js index 6b93954f035..c551d65c7e1 100644 --- a/src/resources/parser/glb-parser.js +++ b/src/resources/parser/glb-parser.js @@ -9,7 +9,7 @@ import { Vec2 } from '../../core/math/vec2.js'; import { Vec3 } from '../../core/math/vec3.js'; import { Color } from '../../core/math/color.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; import { typedArrayTypes, typedArrayTypesByteSize, diff --git a/src/resources/parser/json-model.js b/src/resources/parser/json-model.js index 32777df5a89..ad3d8737750 100644 --- a/src/resources/parser/json-model.js +++ b/src/resources/parser/json-model.js @@ -3,7 +3,7 @@ import { Debug } from '../../core/debug.js'; import { Mat4 } from '../../core/math/mat4.js'; import { Vec3 } from '../../core/math/vec3.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; import { INDEXFORMAT_UINT16, INDEXFORMAT_UINT32, diff --git a/src/resources/parser/material/json-standard-material.js b/src/resources/parser/material/json-standard-material.js index ceb16668e0a..24a35fd8b09 100644 --- a/src/resources/parser/material/json-standard-material.js +++ b/src/resources/parser/material/json-standard-material.js @@ -4,7 +4,7 @@ import { Vec3 } from '../../../core/math/vec3.js'; import { Texture } from '../../../graphics/texture.js'; -import { BoundingBox } from '../../../shape/bounding-box.js'; +import { BoundingBox } from '../../../core/shape/bounding-box.js'; import { SPECULAR_BLINN, SPECULAR_PHONG } from '../../../scene/constants.js'; diff --git a/src/scene/batching/batch-manager.js b/src/scene/batching/batch-manager.js index cc88b716498..341eee3f0ff 100644 --- a/src/scene/batching/batch-manager.js +++ b/src/scene/batching/batch-manager.js @@ -4,7 +4,7 @@ import { Debug } from '../../core/debug.js'; import { Vec3 } from '../../core/math/vec3.js'; import { Mat3 } from '../../core/math/mat3.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; import { PRIMITIVE_TRIANGLES, PRIMITIVE_TRIFAN, diff --git a/src/scene/batching/batch.js b/src/scene/batching/batch.js index 7c3af355324..4b454bf1186 100644 --- a/src/scene/batching/batch.js +++ b/src/scene/batching/batch.js @@ -1,4 +1,4 @@ -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; /** @typedef {import('../mesh-instance.js').MeshInstance} MeshInstance */ diff --git a/src/scene/camera.js b/src/scene/camera.js index 550be6065dd..d7b94c4ba00 100644 --- a/src/scene/camera.js +++ b/src/scene/camera.js @@ -4,7 +4,7 @@ import { Vec3 } from '../core/math/vec3.js'; import { Vec4 } from '../core/math/vec4.js'; import { math } from '../core/math/math.js'; -import { Frustum } from '../shape/frustum.js'; +import { Frustum } from '../core/shape/frustum.js'; import { ASPECT_AUTO, PROJECTION_PERSPECTIVE, diff --git a/src/scene/lighting/world-clusters.js b/src/scene/lighting/world-clusters.js index 2cbbacef07c..675a89e363e 100644 --- a/src/scene/lighting/world-clusters.js +++ b/src/scene/lighting/world-clusters.js @@ -1,6 +1,6 @@ import { Vec3 } from '../../core/math/vec3.js'; import { math } from '../../core/math/math.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; import { PIXELFORMAT_R8_G8_B8_A8 } from '../../graphics/constants.js'; import { LIGHTTYPE_DIRECTIONAL, MASK_AFFECT_DYNAMIC, MASK_AFFECT_LIGHTMAPPED } from '../constants.js'; import { LightsBuffer } from './lights-buffer.js'; diff --git a/src/scene/lightmapper/bake-light.js b/src/scene/lightmapper/bake-light.js index f73807a2363..84b905c5742 100644 --- a/src/scene/lightmapper/bake-light.js +++ b/src/scene/lightmapper/bake-light.js @@ -1,5 +1,5 @@ -import { BoundingBox } from '../../shape/bounding-box.js'; -import { BoundingSphere } from '../../shape/bounding-sphere.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; +import { BoundingSphere } from '../../core/shape/bounding-sphere.js'; import { LIGHTTYPE_DIRECTIONAL } from '../constants.js'; const tempSphere = new BoundingSphere(); diff --git a/src/scene/lightmapper/lightmapper.js b/src/scene/lightmapper/lightmapper.js index 1fd35dc3b82..a5f5601c076 100644 --- a/src/scene/lightmapper/lightmapper.js +++ b/src/scene/lightmapper/lightmapper.js @@ -5,7 +5,7 @@ import { math } from '../../core/math/math.js'; import { Color } from '../../core/math/color.js'; import { Vec3 } from '../../core/math/vec3.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; import { ADDRESS_CLAMP_TO_EDGE, diff --git a/src/scene/materials/standard-material.js b/src/scene/materials/standard-material.js index 224be54bca9..129557e5cca 100644 --- a/src/scene/materials/standard-material.js +++ b/src/scene/materials/standard-material.js @@ -25,7 +25,7 @@ import { getProgramLibrary } from '../../graphics/get-program-library.js'; import { standardMaterialCubemapParameters, standardMaterialTextureParameters } from './standard-material-parameters.js'; /** @typedef {import('../../graphics/texture.js').Texture} Texture */ -/** @typedef {import('../../shape/bounding-box.js').BoundingBox} BoundingBox */ +/** @typedef {import('../../core/shape/bounding-box.js').BoundingBox} BoundingBox */ // properties that get created on a standard material const _props = {}; diff --git a/src/scene/mesh-instance.js b/src/scene/mesh-instance.js index 54ad7b98931..b66385e4be8 100644 --- a/src/scene/mesh-instance.js +++ b/src/scene/mesh-instance.js @@ -1,7 +1,7 @@ import { Debug } from '../core/debug.js'; -import { BoundingBox } from '../shape/bounding-box.js'; -import { BoundingSphere } from '../shape/bounding-sphere.js'; +import { BoundingBox } from '../core/shape/bounding-box.js'; +import { BoundingSphere } from '../core/shape/bounding-sphere.js'; import { BindGroup } from '../graphics/bind-group.js'; import { UniformBuffer } from '../graphics/uniform-buffer.js'; diff --git a/src/scene/mesh.js b/src/scene/mesh.js index 0c7825b1907..b5bbbb154aa 100644 --- a/src/scene/mesh.js +++ b/src/scene/mesh.js @@ -2,7 +2,7 @@ import { Debug } from '../core/debug.js'; import { RefCountedObject } from '../core/ref-counted-object.js'; import { Vec3 } from '../core/math/vec3.js'; -import { BoundingBox } from '../shape/bounding-box.js'; +import { BoundingBox } from '../core/shape/bounding-box.js'; import { BUFFER_DYNAMIC, BUFFER_STATIC, diff --git a/src/scene/morph-target.js b/src/scene/morph-target.js index 2096e72e901..52e855cb591 100644 --- a/src/scene/morph-target.js +++ b/src/scene/morph-target.js @@ -1,5 +1,5 @@ import { Debug } from '../core/debug.js'; -import { BoundingBox } from '../shape/bounding-box.js'; +import { BoundingBox } from '../core/shape/bounding-box.js'; import { BUFFER_STATIC, SEMANTIC_ATTR0, TYPE_FLOAT32 } from '../graphics/constants.js'; import { VertexBuffer } from '../graphics/vertex-buffer.js'; diff --git a/src/scene/morph.js b/src/scene/morph.js index be334eb3f8d..99ccf0cb15c 100644 --- a/src/scene/morph.js +++ b/src/scene/morph.js @@ -2,7 +2,7 @@ import { Debug } from '../core/debug.js'; import { RefCountedObject } from '../core/ref-counted-object.js'; import { Vec3 } from '../core/math/vec3.js'; import { FloatPacking } from '../core/math/float-packing.js'; -import { BoundingBox } from '../shape/bounding-box.js'; +import { BoundingBox } from '../core/shape/bounding-box.js'; import { Texture } from '../graphics/texture.js'; import { VertexBuffer } from '../graphics/vertex-buffer.js'; import { VertexFormat } from '../graphics/vertex-format.js'; diff --git a/src/scene/particle-system/particle-emitter.js b/src/scene/particle-system/particle-emitter.js index c8d0271cde7..057516a7778 100644 --- a/src/scene/particle-system/particle-emitter.js +++ b/src/scene/particle-system/particle-emitter.js @@ -6,7 +6,7 @@ import { Mat4 } from '../../core/math/mat4.js'; import { Quat } from '../../core/math/quat.js'; import { Vec3 } from '../../core/math/vec3.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; import { Curve } from '../../core/math/curve.js'; import { CurveSet } from '../../core/math/curve-set.js'; diff --git a/src/scene/renderer/forward-renderer.js b/src/scene/renderer/forward-renderer.js index f9a13a61333..29942ef342f 100644 --- a/src/scene/renderer/forward-renderer.js +++ b/src/scene/renderer/forward-renderer.js @@ -6,7 +6,7 @@ import { Mat4 } from '../../core/math/mat4.js'; import { Vec3 } from '../../core/math/vec3.js'; import { Color } from '../../core/math/color.js'; -import { BoundingSphere } from '../../shape/bounding-sphere.js'; +import { BoundingSphere } from '../../core/shape/bounding-sphere.js'; import { CLEARFLAG_COLOR, CLEARFLAG_DEPTH, CLEARFLAG_STENCIL, diff --git a/src/scene/renderer/shadow-renderer.js b/src/scene/renderer/shadow-renderer.js index 1d178d579d8..ae526155f78 100644 --- a/src/scene/renderer/shadow-renderer.js +++ b/src/scene/renderer/shadow-renderer.js @@ -6,7 +6,7 @@ import { Vec4 } from '../../core/math/vec4.js'; import { Mat4 } from '../../core/math/mat4.js'; import { Color } from '../../core/math/color.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; import { BLUR_GAUSSIAN, @@ -25,7 +25,7 @@ import { createShaderFromCode } from '../../graphics/program-lib/utils.js'; import { DebugGraphics } from '../../graphics/debug-graphics.js'; import { ShadowMap } from './shadow-map.js'; import { ShadowMapCache } from './shadow-map-cache.js'; -import { Frustum } from '../../shape/frustum.js'; +import { Frustum } from '../../core/shape/frustum.js'; import { ShaderPass } from '../shader-pass.js'; /** @typedef {import('../mesh-instance.js').MeshInstance} MeshInstance */ diff --git a/src/scene/renderer/static-meshes.js b/src/scene/renderer/static-meshes.js index 77e02fecf5c..6338192b36f 100644 --- a/src/scene/renderer/static-meshes.js +++ b/src/scene/renderer/static-meshes.js @@ -2,8 +2,8 @@ import { now } from '../../core/time.js'; import { Vec3 } from '../../core/math/vec3.js'; import { Mat4 } from '../../core/math/mat4.js'; -import { BoundingBox } from '../../shape/bounding-box.js'; -import { BoundingSphere } from '../../shape/bounding-sphere.js'; +import { BoundingBox } from '../../core/shape/bounding-box.js'; +import { BoundingSphere } from '../../core/shape/bounding-sphere.js'; import { PRIMITIVE_TRIANGLES, SEMANTIC_POSITION } from '../../graphics/constants.js'; import { IndexBuffer } from '../../graphics/index-buffer.js'; diff --git a/src/xr/xr-hit-test.js b/src/xr/xr-hit-test.js index ecfa7169059..6782abc9725 100644 --- a/src/xr/xr-hit-test.js +++ b/src/xr/xr-hit-test.js @@ -5,7 +5,7 @@ import { XRSPACE_VIEWER, XRTYPE_AR } from './constants.js'; import { XrHitTestSource } from './xr-hit-test-source.js'; /** @typedef {import('./xr-manager.js').XrManager} XrManager */ -/** @typedef {import('../shape/ray.js').Ray} Ray */ +/** @typedef {import('../core/shape/ray.js').Ray} Ray */ /** * Callback used by {@link XrHitTest#start} and {@link XrHitTest#startForInputSource}. diff --git a/src/xr/xr-input-source.js b/src/xr/xr-input-source.js index bb6d5f7d147..933462bd6a4 100644 --- a/src/xr/xr-input-source.js +++ b/src/xr/xr-input-source.js @@ -4,7 +4,7 @@ import { Mat4 } from '../core/math/mat4.js'; import { Quat } from '../core/math/quat.js'; import { Vec3 } from '../core/math/vec3.js'; -import { Ray } from '../shape/ray.js'; +import { Ray } from '../core/shape/ray.js'; import { XrHand } from './xr-hand.js';