@antv/l7-renderer
Advanced tools
Comparing version 2.0.0-beta.15 to 2.0.0-beta.16
@@ -6,2 +6,10 @@ # Change Log | ||
# [2.0.0-beta.16](https://github.com/antvis/L7/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2019-11-29) | ||
**Note:** Version bump only for package @antv/l7-renderer | ||
# [2.0.0-beta.15](https://github.com/antvis/L7/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2019-11-29) | ||
@@ -8,0 +16,0 @@ |
import _isTypedArray from "lodash/isTypedArray"; | ||
import _isPlainObject from "lodash/isPlainObject"; | ||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } | ||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } | ||
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } | ||
import { gl } from '@antv/l7-core'; | ||
@@ -74,11 +81,8 @@ import { blendEquationMap, blendFuncMap, cullFaceMap, depthFuncMap, primitiveMap, stencilFuncMap, stencilOpMap } from './constants'; | ||
addUniforms(uniforms) { | ||
this.uniforms = { ...this.uniforms, | ||
...this.extractUniforms(uniforms) | ||
}; | ||
this.uniforms = _objectSpread({}, this.uniforms, {}, this.extractUniforms(uniforms)); | ||
} | ||
draw(options) { | ||
const uniforms = { ...this.uniforms, | ||
...this.extractUniforms(options.uniforms || {}) | ||
}; | ||
const uniforms = _objectSpread({}, this.uniforms, {}, this.extractUniforms(options.uniforms || {})); | ||
const reglDrawProps = {}; | ||
@@ -165,5 +169,5 @@ Object.keys(uniforms).forEach(uniformName => { | ||
mask, | ||
func: { ...func, | ||
func: _objectSpread({}, func, { | ||
cmp: stencilFuncMap[func.cmp] | ||
}, | ||
}), | ||
opFront: { | ||
@@ -170,0 +174,0 @@ fail: stencilOpMap[opFront.fail], |
@@ -18,2 +18,8 @@ "use strict"; | ||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } | ||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } | ||
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } | ||
class ReglModel { | ||
@@ -88,11 +94,8 @@ constructor(reGl, options) { | ||
addUniforms(uniforms) { | ||
this.uniforms = { ...this.uniforms, | ||
...this.extractUniforms(uniforms) | ||
}; | ||
this.uniforms = _objectSpread({}, this.uniforms, {}, this.extractUniforms(uniforms)); | ||
} | ||
draw(options) { | ||
const uniforms = { ...this.uniforms, | ||
...this.extractUniforms(options.uniforms || {}) | ||
}; | ||
const uniforms = _objectSpread({}, this.uniforms, {}, this.extractUniforms(options.uniforms || {})); | ||
const reglDrawProps = {}; | ||
@@ -179,5 +182,5 @@ Object.keys(uniforms).forEach(uniformName => { | ||
mask, | ||
func: { ...func, | ||
func: _objectSpread({}, func, { | ||
cmp: _constants.stencilFuncMap[func.cmp] | ||
}, | ||
}), | ||
opFront: { | ||
@@ -184,0 +187,0 @@ fail: _constants.stencilOpMap[opFront.fail], |
{ | ||
"name": "@antv/l7-renderer", | ||
"version": "2.0.0-beta.15", | ||
"version": "2.0.0-beta.16", | ||
"description": "", | ||
@@ -25,3 +25,3 @@ "main": "lib/index.js", | ||
"dependencies": { | ||
"@antv/l7-core": "^2.0.0-beta.15", | ||
"@antv/l7-core": "^2.0.0-beta.16", | ||
"gl": "^4.4.0", | ||
@@ -34,3 +34,3 @@ "inversify": "^5.0.1", | ||
}, | ||
"gitHead": "a21759211ce52abb20383981a9f2dcec58e9672d", | ||
"gitHead": "6f61c9aafb7705ce64f6329c1c33c6138356eb47", | ||
"publishConfig": { | ||
@@ -37,0 +37,0 @@ "access": "public" |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
151245
1582
Updated@antv/l7-core@^2.0.0-beta.16