remove unfinished dColorGridType support

src/mol-geo/geometry/color-data.ts

@@ -27,7 +27,6 @@ export type ColorData = {
     uColorGridTransform: ValueCell<Vec4>,
     dColorType: ValueCell<string>,
     dUsePalette: ValueCell<boolean>,
-    dColorGridType: ValueCell<string>,
 }
 
 export function createColors(locationIt: LocationIterator, positionIt: LocationIterator, colorTheme: ColorTheme<any>, colorData?: ColorData): ColorData {
@@ -103,7 +102,6 @@ export function createValueColor(value: Color, colorData?: ColorData): ColorData
             uColorGridTransform: ValueCell.create(Vec4.create(0, 0, 0, 1)),
             dColorType: ValueCell.create('uniform'),
             dUsePalette: ValueCell.create(false),
-            dColorGridType: ValueCell.create('2d'),
         };
     }
 }
@@ -132,7 +130,6 @@ export function createTextureColor(colors: TextureImage<Uint8Array>, type: Color
             uColorGridTransform: ValueCell.create(Vec4.create(0, 0, 0, 1)),
             dColorType: ValueCell.create(type),
             dUsePalette: ValueCell.create(false),
-            dColorGridType: ValueCell.create('2d'),
         };
     }
 }
@@ -225,7 +222,6 @@ export function createGridColor(grid: ColorVolume, type: ColorType, colorData?:
         ValueCell.update(colorData.uColorGridDim, Vec3.clone(dimension));
         ValueCell.update(colorData.uColorGridTransform, Vec4.clone(transform));
         ValueCell.updateIfChanged(colorData.dColorType, type);
-        ValueCell.updateIfChanged(colorData.dColorGridType, colors.getDepth() ? '3d' : '2d');
         return colorData;
     } else {
         return {
@@ -238,7 +234,6 @@ export function createGridColor(grid: ColorVolume, type: ColorType, colorData?:
             uColorGridTransform: ValueCell.create(Vec4.clone(transform)),
             dColorType: ValueCell.create(type),
             dUsePalette: ValueCell.create(false),
-            dColorGridType: ValueCell.create('2d'),
         };
     }
 }

src/mol-geo/geometry/mesh/color-smoothing.ts

@@ -159,7 +159,7 @@ interface ColorInterpolationInput {
     gridTransform: Vec4
 }
 
-function getTrilinearlyInterpolated(input: ColorInterpolationInput): TextureImage<Uint8Array> {
+export function getTrilinearlyInterpolated(input: ColorInterpolationInput): TextureImage<Uint8Array> {
     const { vertexCount, positionBuffer, transformBuffer, grid, gridDim, gridTexDim, gridTransform } = input;
 
     const isInstanceType = input.colorType.endsWith('Instance');

src/mol-gl/renderable/schema.ts

@@ -191,7 +191,6 @@ export const ColorSchema = {
     tColorGrid: TextureSpec('texture', 'rgb', 'ubyte', 'linear'),
     dColorType: DefineSpec('string', ['uniform', 'attribute', 'instance', 'group', 'groupInstance', 'vertex', 'vertexInstance', 'volume', 'volumeInstance']),
     dUsePalette: DefineSpec('boolean'),
-    dColorGridType: DefineSpec('string', ['2d', '3d']),
 } as const;
 export type ColorSchema = typeof ColorSchema
 export type ColorValues = Values<ColorSchema>

src/mol-gl/shader/chunks/color-vert-params.glsl.ts

@@ -14,7 +14,6 @@ export const color_vert_params = `
         uniform vec2 uColorTexDim;
         uniform vec3 uColorGridDim;
         uniform vec4 uColorGridTransform;
-        // TODO handle 3D
         uniform sampler2D tColorGrid;
     #endif
 

src/mol-repr/structure/visual/util/color.ts

@@ -72,7 +72,6 @@ export function applyMeshColorSmoothing(values: MeshValues, resolution: number,
         ValueCell.update(values.uColorTexDim, smoothingData.gridTexDim);
         ValueCell.update(values.uColorGridDim, smoothingData.gridDim);
         ValueCell.update(values.uColorGridTransform, smoothingData.gridTransform);
-        ValueCell.updateIfChanged(values.dColorGridType, '2d');
     } else if (smoothingData.kind === 'vertex') {
         ValueCell.updateIfChanged(values.dColorType, smoothingData.type);
         ValueCell.update(values.tColor, smoothingData.texture);
@@ -104,5 +103,4 @@ export function applyTextureMeshColorSmoothing(values: TextureMeshValues, resolu
     ValueCell.update(values.uColorTexDim, smoothingData.gridTexDim);
     ValueCell.update(values.uColorGridDim, smoothingData.gridDim);
     ValueCell.update(values.uColorGridTransform, smoothingData.gridTransform);
-    ValueCell.updateIfChanged(values.dColorGridType, '2d');
 }