Revert "Moved PROJECTION_*** constants from /scene to /core/shape (#4735

)"

This reverts commit 8b93e82.

src/core/shape/frustum.js

@@ -1,5 +1,5 @@
 import { Vec3 } from '../math/vec3.js';
-import { PROJECTION_PERSPECTIVE } from './constants.js';
+import { PROJECTION_PERSPECTIVE } from '../../scene/constants.js';
 
 /** @typedef {import('../math/mat4.js').Mat4} Mat4 */
 /** @typedef {import('./bounding-sphere.js').BoundingSphere} BoundingSphere */

src/deprecated/deprecated.js

@@ -10,7 +10,6 @@ import { Vec2 } from '../core/math/vec2.js';
 import { Vec3 } from '../core/math/vec3.js';
 import { Vec4 } from '../core/math/vec4.js';
 
-import { PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE } from '../core/shape/constants.js';
 import { BoundingBox } from '../core/shape/bounding-box.js';
 import { BoundingSphere } from '../core/shape/bounding-sphere.js';
 import { Frustum } from '../core/shape/frustum.js';
@@ -53,7 +52,7 @@ import { VertexBuffer } from '../platform/graphics/vertex-buffer.js';
 import { VertexFormat } from '../platform/graphics/vertex-format.js';
 import { VertexIterator } from '../platform/graphics/vertex-iterator.js';
 
-import { LAYERID_IMMEDIATE, LINEBATCH_OVERLAY, LAYERID_WORLD } from '../scene/constants.js';
+import { PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE, LAYERID_IMMEDIATE, LINEBATCH_OVERLAY, LAYERID_WORLD } from '../scene/constants.js';
 import { calculateTangents, createBox, createCapsule, createCone, createCylinder, createMesh, createPlane, createSphere, createTorus } from '../scene/procedural.js';
 import { partitionSkin } from '../scene/skin-partition.js';
 import { BasicMaterial } from '../scene/materials/basic-material.js';

src/framework/lightmapper/lightmapper.js

@@ -6,9 +6,6 @@ import { Color } from '../../core/math/color.js';
 import { Vec3 } from '../../core/math/vec3.js';
 
 import { BoundingBox } from '../../core/shape/bounding-box.js';
-import {
-    PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE
-} from '../../core/shape/constants.js';
 
 import {
     ADDRESS_CLAMP_TO_EDGE,
@@ -41,6 +38,7 @@ import {
     BAKE_COLORDIR,
     FOG_NONE,
     LIGHTTYPE_DIRECTIONAL, LIGHTTYPE_OMNI, LIGHTTYPE_SPOT,
+    PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE,
     SHADER_FORWARDHDR,
     SHADERDEF_DIRLM, SHADERDEF_LM, SHADERDEF_LMAMBIENT,
     MASK_BAKE, MASK_AFFECT_LIGHTMAPPED,

src/framework/parsers/glb-parser.js

@@ -10,9 +10,6 @@ import { Vec3 } from '../../core/math/vec3.js';
 import { Color } from '../../core/math/color.js';
 
 import { BoundingBox } from '../../core/shape/bounding-box.js';
-import {
-    PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE
-} from '../../core/shape/constants.js';
 
 import {
     typedArrayTypes, typedArrayTypesByteSize,
@@ -33,6 +30,7 @@ import { VertexFormat } from '../../platform/graphics/vertex-format.js';
 
 import {
     BLEND_NONE, BLEND_NORMAL, LIGHTFALLOFF_INVERSESQUARED,
+    PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE,
     ASPECT_MANUAL, ASPECT_AUTO, SPECOCC_AO
 } from '../../scene/constants.js';
 

src/index.js

@@ -45,7 +45,6 @@ export { Vec3 } from './core/math/vec3.js';
 export { Vec4 } from './core/math/vec4.js';
 
 // CORE / SHAPE
-export * from './core/shape/constants.js';
 export { BoundingBox } from './core/shape/bounding-box.js';
 export { BoundingSphere } from './core/shape/bounding-sphere.js';
 export { Frustum } from './core/shape/frustum.js';

src/scene/camera.js

@@ -5,10 +5,9 @@ import { Vec4 } from '../core/math/vec4.js';
 import { math } from '../core/math/math.js';
 
 import { Frustum } from '../core/shape/frustum.js';
-import { PROJECTION_PERSPECTIVE } from '../core/shape/constants.js';
 
 import {
-    ASPECT_AUTO,
+    ASPECT_AUTO, PROJECTION_PERSPECTIVE,
     LAYERID_WORLD, LAYERID_DEPTH, LAYERID_SKYBOX, LAYERID_UI, LAYERID_IMMEDIATE
 } from './constants.js';
 

src/scene/constants.js

@@ -385,6 +385,20 @@ export const PARTICLEORIENTATION_WORLD = 1;
  */
 export const PARTICLEORIENTATION_EMITTER = 2;
 
+/**
+ * A perspective camera projection where the frustum shape is essentially pyramidal.
+ *
+ * @type {number}
+ */
+export const PROJECTION_PERSPECTIVE = 0;
+
+/**
+ * An orthographic camera projection where the frustum shape is essentially a cuboid.
+ *
+ * @type {number}
+ */
+export const PROJECTION_ORTHOGRAPHIC = 1;
+
 /**
  * Render mesh instance as solid geometry.
  *

src/scene/renderer/forward-renderer.js

@@ -7,7 +7,6 @@ import { Vec3 } from '../../core/math/vec3.js';
 import { Color } from '../../core/math/color.js';
 
 import { BoundingSphere } from '../../core/shape/bounding-sphere.js';
-import { PROJECTION_ORTHOGRAPHIC } from '../../core/shape/constants.js';
 
 import {
     CLEARFLAG_COLOR, CLEARFLAG_DEPTH, CLEARFLAG_STENCIL,
@@ -35,7 +34,7 @@ import {
     MASK_AFFECT_LIGHTMAPPED, MASK_AFFECT_DYNAMIC, MASK_BAKE,
     SHADOWUPDATE_NONE,
     SORTKEY_DEPTH, SORTKEY_FORWARD,
-    VIEW_CENTER, SHADOWUPDATE_THISFRAME, LAYERID_DEPTH
+    VIEW_CENTER, SHADOWUPDATE_THISFRAME, LAYERID_DEPTH, PROJECTION_ORTHOGRAPHIC
 } from '../constants.js';
 import { Material } from '../materials/material.js';
 import { LightTextureAtlas } from '../lighting/light-texture-atlas.js';

src/scene/renderer/light-camera.js

@@ -2,8 +2,7 @@ import { Quat } from '../../core/math/quat.js';
 import { Vec3 } from '../../core/math/vec3.js';
 import { Mat4 } from '../../core/math/mat4.js';
 
-import { PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE } from '../../core/shape/constants.js';
-import { ASPECT_MANUAL, LIGHTTYPE_DIRECTIONAL, LIGHTTYPE_OMNI, LIGHTTYPE_SPOT } from '../constants.js';
+import { ASPECT_MANUAL, LIGHTTYPE_DIRECTIONAL, LIGHTTYPE_OMNI, LIGHTTYPE_SPOT, PROJECTION_ORTHOGRAPHIC, PROJECTION_PERSPECTIVE } from '../constants.js';
 import { Camera } from '../camera.js';
 import { GraphNode } from '../graph-node.js';