Alexander Rose 6 лет назад
Родитель
Сommit
84f70ec82e

+ 1 - 1
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)
     }
 

+ 1 - 1
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)
     }
 

+ 1 - 1
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)
     }
 

+ 1 - 1
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)
     }
 

+ 1 - 1
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)
     }
 

+ 1 - 1
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),