From e8e8870b633dd73edd4908b53e363c4c1a193720 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Fri, 14 Sep 2018 14:31:15 -0700
Subject: [PATCH] fixed inadvertedly shared array for color textures
---
src/mol-geo/geometry/color-data.ts | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/mol-geo/geometry/color-data.ts b/src/mol-geo/geometry/color-data.ts
index f7fad73f2..ee1a32c79 100644
--- a/src/mol-geo/geometry/color-data.ts
+++ b/src/mol-geo/geometry/color-data.ts
@@ -34,14 +34,6 @@ export function createColors(ctx: RuntimeContext, locationIt: LocationIterator,
}
}
-const emptyColorTexture = { array: new Uint8Array(3), width: 1, height: 1 }
-function createEmptyColorTexture() {
- return {
- tColor: ValueCell.create(emptyColorTexture),
- uColorTexDim: ValueCell.create(Vec2.create(1, 1))
- }
-}
-
export function createValueColor(value: Color, colorData?: ColorData): ColorData {
if (colorData) {
ValueCell.update(colorData.uColor, Color.toRgbNormalized(value) as Vec3)
@@ -53,7 +45,8 @@ export function createValueColor(value: Color, colorData?: ColorData): ColorData
return {
uColor: ValueCell.create(Color.toRgbNormalized(value) as Vec3),
aColor: ValueCell.create(new Float32Array(0)),
- ...createEmptyColorTexture(),
+ tColor: ValueCell.create({ array: new Uint8Array(3), width: 1, height: 1 }),
+ uColorTexDim: ValueCell.create(Vec2.create(1, 1)),
dColorType: ValueCell.create('uniform'),
}
}
@@ -85,7 +78,7 @@ export function createTextureColor(colors: TextureImage, type: ColorType, colorD
/** Creates color texture with color for each instance/unit */
export async function createInstanceColor(ctx: RuntimeContext, locationIt: LocationIterator, color: LocationColor, colorData?: ColorData): Promise<ColorData> {
- const { instanceCount} = locationIt
+ const { instanceCount } = locationIt
const colors = colorData && colorData.tColor.ref.value.array.length >= instanceCount * 3 ? colorData.tColor.ref.value : createTextureImage(instanceCount, 3)
let i = 0
while (locationIt.hasNext) {
--
GitLab