From 84f70ec82e5dd1cd217d0b335fe7d47f59e0cb76 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Mon, 28 Jan 2019 11:05:34 -0800
Subject: [PATCH] geometry bugfixes
---
src/mol-geo/geometry/direct-volume/direct-volume.ts | 2 +-
src/mol-geo/geometry/lines/lines.ts | 2 +-
src/mol-geo/geometry/mesh/mesh.ts | 2 +-
src/mol-geo/geometry/points/points.ts | 2 +-
src/mol-geo/geometry/spheres/spheres.ts | 2 +-
src/mol-geo/geometry/text/text-builder.ts | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mol-geo/geometry/direct-volume/direct-volume.ts b/src/mol-geo/geometry/direct-volume/direct-volume.ts
index b53ec053f..47d89aad9 100644
--- a/src/mol-geo/geometry/direct-volume/direct-volume.ts
+++ b/src/mol-geo/geometry/direct-volume/direct-volume.ts
@@ -140,7 +140,7 @@ export namespace DirectVolume {
function createValuesSimple(directVolume: DirectVolume, props: Partial<PD.Values<Params>>, colorValue: Color, sizeValue: number, transform?: TransformData) {
const s = BaseGeometry.createSimple(colorValue, sizeValue, transform)
- const p = { ...PD.getDefaultValues(Params), props }
+ const p = { ...PD.getDefaultValues(Params), ...props }
return createValues(directVolume, s.transform, s.locationIterator, s.theme, p)
}
diff --git a/src/mol-geo/geometry/lines/lines.ts b/src/mol-geo/geometry/lines/lines.ts
index 8c5fa075d..2cf5d539f 100644
--- a/src/mol-geo/geometry/lines/lines.ts
+++ b/src/mol-geo/geometry/lines/lines.ts
@@ -146,7 +146,7 @@ export namespace Lines {
function createValuesSimple(lines: Lines, props: Partial<PD.Values<Params>>, colorValue: Color, sizeValue: number, transform?: TransformData) {
const s = BaseGeometry.createSimple(colorValue, sizeValue, transform)
- const p = { ...PD.getDefaultValues(Params), props }
+ const p = { ...PD.getDefaultValues(Params), ...props }
return createValues(lines, s.transform, s.locationIterator, s.theme, p)
}
diff --git a/src/mol-geo/geometry/mesh/mesh.ts b/src/mol-geo/geometry/mesh/mesh.ts
index 73bbb8145..e8431f261 100644
--- a/src/mol-geo/geometry/mesh/mesh.ts
+++ b/src/mol-geo/geometry/mesh/mesh.ts
@@ -396,7 +396,7 @@ export namespace Mesh {
function createValuesSimple(mesh: Mesh, props: Partial<PD.Values<Params>>, colorValue: Color, sizeValue: number, transform?: TransformData) {
const s = BaseGeometry.createSimple(colorValue, sizeValue, transform)
- const p = { ...PD.getDefaultValues(Params), props }
+ const p = { ...PD.getDefaultValues(Params), ...props }
return createValues(mesh, s.transform, s.locationIterator, s.theme, p)
}
diff --git a/src/mol-geo/geometry/points/points.ts b/src/mol-geo/geometry/points/points.ts
index 7818a17a0..ecfe127bf 100644
--- a/src/mol-geo/geometry/points/points.ts
+++ b/src/mol-geo/geometry/points/points.ts
@@ -110,7 +110,7 @@ export namespace Points {
function createValuesSimple(points: Points, props: Partial<PD.Values<Params>>, colorValue: Color, sizeValue: number, transform?: TransformData) {
const s = BaseGeometry.createSimple(colorValue, sizeValue, transform)
- const p = { ...PD.getDefaultValues(Params), props }
+ const p = { ...PD.getDefaultValues(Params), ...props }
return createValues(points, s.transform, s.locationIterator, s.theme, p)
}
diff --git a/src/mol-geo/geometry/spheres/spheres.ts b/src/mol-geo/geometry/spheres/spheres.ts
index bd90b3cc1..59c9f3521 100644
--- a/src/mol-geo/geometry/spheres/spheres.ts
+++ b/src/mol-geo/geometry/spheres/spheres.ts
@@ -110,7 +110,7 @@ export namespace Spheres {
function createValuesSimple(spheres: Spheres, props: Partial<PD.Values<Params>>, colorValue: Color, sizeValue: number, transform?: TransformData) {
const s = BaseGeometry.createSimple(colorValue, sizeValue, transform)
- const p = { ...PD.getDefaultValues(Params), props }
+ const p = { ...PD.getDefaultValues(Params), ...props }
return createValues(spheres, s.transform, s.locationIterator, s.theme, p)
}
diff --git a/src/mol-geo/geometry/text/text-builder.ts b/src/mol-geo/geometry/text/text-builder.ts
index d1bc6ff4b..739885239 100644
--- a/src/mol-geo/geometry/text/text-builder.ts
+++ b/src/mol-geo/geometry/text/text-builder.ts
@@ -123,7 +123,7 @@ export namespace TextBuilder {
charCount: centers.elementCount / 4,
fontTexture: text ? ValueCell.update(text.fontTexture, ft) : ValueCell.create(ft),
centerBuffer: text ? ValueCell.update(text.centerBuffer, cb) : ValueCell.create(cb),
- mappingBuffer: text ? ValueCell.update(text.centerBuffer, mb) : ValueCell.create(mb),
+ mappingBuffer: text ? ValueCell.update(text.mappingBuffer, mb) : ValueCell.create(mb),
indexBuffer: text ? ValueCell.update(text.indexBuffer, ib) : ValueCell.create(ib),
groupBuffer: text ? ValueCell.update(text.groupBuffer, gb) : ValueCell.create(gb),
tcoordBuffer: text ? ValueCell.update(text.tcoordBuffer, tb) : ValueCell.create(tb),
--
GitLab