diff --git a/typescript/packages/subsurface-viewer/src/layers/grid3d/fragment.fs.glsl.ts b/typescript/packages/subsurface-viewer/src/layers/grid3d/fragment.fs.glsl.ts index 9482c1617..e4036f114 100644 --- a/typescript/packages/subsurface-viewer/src/layers/grid3d/fragment.fs.glsl.ts +++ b/typescript/packages/subsurface-viewer/src/layers/grid3d/fragment.fs.glsl.ts @@ -56,8 +56,8 @@ void main(void) { } // Use normal lighting. This has no effect if "material" property is not set. - vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal); - gl_FragColor = vec4(lightColor, 1.0); + vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal); + gl_FragColor = vec4(lightColor, 1.0); DECKGL_FILTER_COLOR(gl_FragColor, geometry); } `; diff --git a/typescript/packages/subsurface-viewer/src/layers/grid3d/grid3dLayer.ts b/typescript/packages/subsurface-viewer/src/layers/grid3d/grid3dLayer.ts index 831018bdb..a4775fe45 100644 --- a/typescript/packages/subsurface-viewer/src/layers/grid3d/grid3dLayer.ts +++ b/typescript/packages/subsurface-viewer/src/layers/grid3d/grid3dLayer.ts @@ -1,7 +1,7 @@ import type { Color } from "@deck.gl/core/typed"; import { CompositeLayer } from "@deck.gl/core/typed"; -import type { Material } from "./privateLayer"; -import privateLayer from "./privateLayer"; +import type { Material } from "./privateGrid3dLayer"; +import privateLayer from "./privateGrid3dLayer"; import type { ExtendedLayerProps, colorMapFunctionType, diff --git a/typescript/packages/subsurface-viewer/src/layers/grid3d/privateLayer.ts b/typescript/packages/subsurface-viewer/src/layers/grid3d/privateGrid3dLayer.ts similarity index 100% rename from typescript/packages/subsurface-viewer/src/layers/grid3d/privateLayer.ts rename to typescript/packages/subsurface-viewer/src/layers/grid3d/privateGrid3dLayer.ts diff --git a/typescript/packages/subsurface-viewer/src/layers/grid3d/webworker.ts b/typescript/packages/subsurface-viewer/src/layers/grid3d/webworker.ts index 7c2d87436..027b4c4e4 100644 --- a/typescript/packages/subsurface-viewer/src/layers/grid3d/webworker.ts +++ b/typescript/packages/subsurface-viewer/src/layers/grid3d/webworker.ts @@ -1,4 +1,4 @@ -import type { MeshType, MeshTypeLines } from "./privateLayer"; +import type { MeshType, MeshTypeLines } from "./privateGrid3dLayer"; import type { WebWorkerParams } from "./grid3dLayer"; export function makeFullMesh(e: { data: WebWorkerParams }): void { diff --git a/typescript/packages/subsurface-viewer/src/layers/map/fragment.fs.glsl.ts b/typescript/packages/subsurface-viewer/src/layers/map/fragment.fs.glsl.ts index ad9056be3..2ddaa6d13 100644 --- a/typescript/packages/subsurface-viewer/src/layers/map/fragment.fs.glsl.ts +++ b/typescript/packages/subsurface-viewer/src/layers/map/fragment.fs.glsl.ts @@ -94,9 +94,8 @@ void main(void) { } // Use normal lighting. This has no effect if "material" property is not set. - vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal); + vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal); gl_FragColor = vec4(lightColor, 1.0); - DECKGL_FILTER_COLOR(gl_FragColor, geometry); } `;