feat: support IBL for terrain

reearth · Jun 28, 2023 · baad01d · baad01d
1 parent 4b79e9d
commit baad01d
Show file tree

Hide file tree

Showing 14 changed files with 935 additions and 9 deletions.
diff --git a/web/src/beta/lib/core/Map/types/index.ts b/web/src/beta/lib/core/Map/types/index.ts
@@ -249,9 +249,13 @@ export type TerrainProperty = {
   terrainCesiumIonAccessToken?: string;
   terrainCesiumIonUrl?: string;
   terrainUrl?: string;
+  terrainNormal?: boolean;
 };
 
 export type SceneProperty = {
+  debugs?: {
+    debugSphericalHarmonicCoefficients: boolean;
+  };
   default?: {
     camera?: Camera;
     allowEnterGround?: boolean;
@@ -293,6 +297,9 @@ export type SceneProperty = {
     brightness_shift?: number;
     hue_shift?: number;
     surturation_shift?: number;
+    sphericalHarmonicCoefficients?: { x: number; y: number; z: number }[];
+    globeShadowDarkness?: number;
+    globeImageBasedLighting?: boolean;
   };
   timeline?: {
     animation?: boolean;

diff --git a/web/src/beta/lib/core/engines/Cesium/Feature/Model/index.tsx b/web/src/beta/lib/core/engines/Cesium/Feature/Model/index.tsx
@@ -6,7 +6,7 @@ import { toColor } from "@reearth/beta/utils/value";
 
 import type { ModelAppearance } from "../../..";
 import { colorBlendMode, heightReference, shadowMode } from "../../common";
-import { NonPBRLightingShader } from "../../CustomShaders/NonPBRLightingShader";
+import { NonPBRLightingShader } from "../../Shaders/CustomShaders/NonPBRLightingShader";
 import {
   EntityExt,
   extractSimpleLayerData,

diff --git a/web/src/beta/lib/core/engines/Cesium/Feature/Tileset/index.tsx b/web/src/beta/lib/core/engines/Cesium/Feature/Tileset/index.tsx
@@ -3,7 +3,7 @@ import { Cesium3DTileset } from "resium";
 
 import type { Cesium3DTilesAppearance, ComputedLayer } from "../../..";
 import { colorBlendModeFor3DTile, shadowMode } from "../../common";
-import { NonPBRLightingShader } from "../../CustomShaders/NonPBRLightingShader";
+import { NonPBRLightingShader } from "../../Shaders/CustomShaders/NonPBRLightingShader";
 import Box from "../Box";
 import { type FeatureComponentConfig, type FeatureProps } from "../utils";
 

diff --git a/...ium/CustomShaders/NonPBRLightingShader.ts → ...ers/CustomShaders/NonPBRLightingShader.ts b/...ium/CustomShaders/NonPBRLightingShader.ts → ...ers/CustomShaders/NonPBRLightingShader.ts