Browse Source

removed unused color/size attribute buffer

Alexander Rose 6 years ago
parent
commit
1a2bd1d339

+ 1 - 4
src/mol-geo/geometry/color-data.ts

@@ -17,7 +17,6 @@ export type ColorType = 'uniform' | 'instance' | 'group' | 'groupInstance'
 
 export type ColorData = {
     uColor: ValueCell<Vec3>,
-    aColor: ValueCell<Float32Array>,
     tColor: ValueCell<TextureImage<Uint8Array>>,
     uColorTexDim: ValueCell<Vec2>,
     dColorType: ValueCell<string>,
@@ -42,8 +41,7 @@ export function createValueColor(value: Color, colorData?: ColorData): ColorData
     } else {
         return {
             uColor: ValueCell.create(Color.toRgbNormalized(value) as Vec3),
-            aColor: ValueCell.create(new Float32Array(0)),
-            tColor: ValueCell.create({ array: new Uint8Array(3), width: 1, height: 1 }),
+            tColor: ValueCell.create({ disabled: true, array: new Uint8Array(3), width: 1, height: 1 }),
             uColorTexDim: ValueCell.create(Vec2.create(1, 1)),
             dColorType: ValueCell.create('uniform'),
         }
@@ -66,7 +64,6 @@ export function createTextureColor(colors: TextureImage<Uint8Array>, type: Color
     } else {
         return {
             uColor: ValueCell.create(Vec3.zero()),
-            aColor: ValueCell.create(new Float32Array(0)),
             tColor: ValueCell.create(colors),
             uColorTexDim: ValueCell.create(Vec2.create(colors.width, colors.height)),
             dColorType: ValueCell.create(type),

+ 0 - 3
src/mol-geo/geometry/size-data.ts

@@ -16,7 +16,6 @@ export type SizeType = 'uniform' | 'instance' | 'group' | 'groupInstance'
 
 export type SizeData = {
     uSize: ValueCell<number>,
-    aSize: ValueCell<Float32Array>,
     tSize: ValueCell<TextureImage<Uint8Array>>,
     uSizeTexDim: ValueCell<Vec2>,
     dSizeType: ValueCell<string>,
@@ -51,7 +50,6 @@ export function createValueSize(value: number, sizeData?: SizeData): SizeData {
     } else {
         return {
             uSize: ValueCell.create(value),
-            aSize: ValueCell.create(new Float32Array(0)),
             ...createEmptySizeTexture(),
             dSizeType: ValueCell.create('uniform'),
         }
@@ -74,7 +72,6 @@ export function createTextureSize(sizes: TextureImage<Uint8Array>, type: SizeTyp
     } else {
         return {
             uSize: ValueCell.create(0),
-            aSize: ValueCell.create(new Float32Array(0)),
             tSize: ValueCell.create(sizes),
             uSizeTexDim: ValueCell.create(Vec2.create(sizes.width, sizes.height)),
             dSizeType: ValueCell.create(type),

+ 0 - 1
src/mol-gl/renderable/direct-volume.ts

@@ -12,7 +12,6 @@ import { DirectVolumeShaderCode } from '../shader-code';
 import { ValueCell } from 'mol-util';
 
 export const DirectVolumeSchema = {
-    aColor: AttributeSpec('float32', 3, 0), // TODO not used, just for type checking
     uColor: UniformSpec('v3'),
     uColorTexDim: UniformSpec('v2'),
     tColor: TextureSpec('image-uint8', 'rgb', 'ubyte', 'nearest'),

+ 0 - 2
src/mol-gl/renderable/schema.ts

@@ -163,7 +163,6 @@ export type InternalSchema = typeof InternalSchema
 export type InternalValues = { [k in keyof InternalSchema]: ValueCell<any> }
 
 export const ColorSchema = {
-    aColor: AttributeSpec('float32', 3, 0),
     uColor: UniformSpec('v3'),
     uColorTexDim: UniformSpec('v2'),
     tColor: TextureSpec('image-uint8', 'rgb', 'ubyte', 'nearest'),
@@ -173,7 +172,6 @@ export type ColorSchema = typeof ColorSchema
 export type ColorValues = Values<ColorSchema>
 
 export const SizeSchema = {
-    aSize: AttributeSpec('float32', 1, 0),
     uSize: UniformSpec('f'),
     uSizeTexDim: UniformSpec('v2'),
     tSize: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'),