@antv/l7-layers 2.9.19 → 2.9.22-alpha.0

package/es/citybuliding/models/build.js

@@ -1,11 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -13,32 +11,24 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { rgb2arr } from '@antv/l7-utils';
-import BaseModel from '../../core/BaseModel';
-import { PolygonExtrudeTriangulation } from '../../core/triangulation';
+import BaseModel from "../../core/BaseModel";
+import { PolygonExtrudeTriangulation } from "../../core/triangulation";
+
+/* babel-plugin-inline-import '../shaders/build_frag.glsl' */
 var buildFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];\nuniform float u_near : 0;\nuniform float u_far : 1;\nvarying vec4 v_Color;\nvarying vec2 v_texCoord;\nuniform float u_Zoom : 1;\nuniform float u_time;\n\nuniform float u_circleSweep;\nuniform float u_cityMinSize;\nuniform vec3 u_circleSweepColor;\nuniform float u_circleSweepSpeed;\n\nvarying float v_worldDis;\n\n#pragma include \"picking\"\n\nvec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {\n    float s = step(hot, n);\n    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);\n\n    return mix(darkColor, color, s);\n}\nfloat random (vec2 st) {\n    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);\n}\n\nfloat LinearizeDepth()\n{\n    float z = gl_FragCoord.z * 2.0 - 1.0;\n    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));\n}\n\nvec3 fog(vec3 color, vec3 fogColor, float depth){\n    float fogFactor=clamp(depth,0.0,1.0);\n    vec3 output_color=mix(fogColor,color,fogFactor);\n    return output_color;\n}\n\nfloat sdRect(vec2 p, vec2 sz) {\n  vec2 d = abs(p) - sz;\n  float outside = length(max(d, 0.));\n  float inside = min(max(d.x, d.y), 0.);\n  return outside + inside;\n}\n\nvoid main() {\n  gl_FragColor = v_Color;\n  vec3 baseColor = u_baseColor.xyz;\n  vec3 brightColor = u_brightColor.xyz;\n  vec3 windowColor = u_windowColor.xyz;\n  float targetColId = 5.;\n  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;\n  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);\n  if(v_texCoord.x < 0.) { //\u9876\u90E8\u989C\u8272\n       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);\n       gl_FragColor = vec4( foggedColor, v_Color.w);\n  }else { // \u4FA7\u9762\u989C\u8272\n        vec2 st = v_texCoord;\n        vec2  UvScale = v_texCoord;\n        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));\n        float tStart = 0.25 * tStep;\n        float tEnd = 0.75 * tStep;\n        float u = mod(UvScale.x, tStep);\n        float v = mod(UvScale.y, tStep);\n        float ux = floor(UvScale.x/tStep);\n        float uy = floor(UvScale.y/tStep);\n        float n = random(vec2(ux,uy));\n        float lightP = u_time;\n        float head = 1.0- step(0.005,st.y);\n        /*step3*/\n        // \u5C06\u7A97\u6237\u989C\u8272\u548C\u5899\u9762\u989C\u8272\u533A\u522B\u5F00\u6765\n        float sU = step(tStart, u) - step(tEnd, u);\n        float sV = step(tStart, v) - step(tEnd, v);\n        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));\n        float dist = sdRect(vec2(u,v), windowSize);\n        float s = sU * sV;\n\n        float curColId = floor(UvScale.x / tStep);\n        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);\n\n        float mLightP = mod(lightP, 2.);\n        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);\n        if(ux == targetColId){\n            n =0.;\n        }\n        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );\n        float hot = smoothstep(1.0,0.0,timeP);\n        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);\n        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);\n        float sFinal = s * sCol * sRow;\n        color += mix(baseColor, brightColor, sFinal*n);\n        if (st.y<0.01){\n        color = baseColor;\n         }\n        if(head ==1.0) { // \u9876\u90E8\u4EAE\u7EBF\n            color = brightColor;\n        }\n        color = color * v_Color.rgb;\n\n        vec3 foggedColor = fog(color,fogColor,depth);\n\n        gl_FragColor = vec4(foggedColor,1.0);\n  }\n\n\n  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {\n    float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);\n    gl_FragColor.rgb += r * r * u_circleSweepColor;\n  }\n   \n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
+/* babel-plugin-inline-import '../shaders/build_vert.glsl' */
 var buildVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nuniform mat4 u_ModelMatrix;\n\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\nvarying vec4 v_Color;\nuniform mat4 u_Mvp;\n\nuniform float u_circleSweep;\nuniform vec2 u_cityCenter;\n\nvarying float v_worldDis;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n   v_texCoord = a_Uv;\n\n  if(u_circleSweep > 0.0) {\n     vec2 lnglatscale = vec2(0.0);\n    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {\n      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);\n    }\n    v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);\n  }\n \n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  float lightWeight = calc_lighting(pos);\n  // v_Color = a_Color;\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  setPickingColor(a_PickingColor);\n}\n";
 
-var CityBuildModel = function (_BaseModel) {
+var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(CityBuildModel, _BaseModel);
 
   var _super = _createSuper(CityBuildModel);
 
   function CityBuildModel() {
-    var _this;
-
     _classCallCheck(this, CityBuildModel);
 
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "cityCenter", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "cityMinSize", void 0);
-
-    return _this;
+    return _super.apply(this, arguments);
   }
 
   _createClass(CityBuildModel, [{
@@ -80,6 +70,7 @@ var CityBuildModel = function (_BaseModel) {
   }, {
     key: "calCityGeo",
     value: function calCityGeo() {
+      // @ts-ignore
       var _this$layer$getSource = _slicedToArray(this.layer.getSource().extent, 4),
           minLng = _this$layer$getSource[0],
           minLat = _this$layer$getSource[1],
@@ -87,8 +78,11 @@ var CityBuildModel = function (_BaseModel) {
           maxLat = _this$layer$getSource[3];
 
       if (this.mapService.version === 'GAODE2.x') {
-        this.cityCenter = this.mapService.lngLatToCoord([(maxLng + minLng) / 2, (maxLat + minLat) / 2]);
-        var l1 = this.mapService.lngLatToCoord([maxLng, maxLat]);
+        // @ts-ignore
+        this.cityCenter = this.mapService.lngLatToCoord([(maxLng + minLng) / 2, (maxLat + minLat) / 2]); // @ts-ignore
+
+        var l1 = this.mapService.lngLatToCoord([maxLng, maxLat]); // @ts-ignore
+
         var l2 = this.mapService.lngLatToCoord([minLng, minLat]);
         this.cityMinSize = Math.sqrt(Math.pow(l1[0] - l2[0], 2) + Math.pow(l1[1] - l2[1], 2)) / 4;
       } else {
@@ -130,12 +124,14 @@ var CityBuildModel = function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
+      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'normal',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -152,6 +148,7 @@ var CityBuildModel = function (_BaseModel) {
         descriptor: {
           name: 'a_Size',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -170,6 +167,7 @@ var CityBuildModel = function (_BaseModel) {
         descriptor: {
           name: 'a_Uv',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -187,5 +185,4 @@ var CityBuildModel = function (_BaseModel) {
   return CityBuildModel;
 }(BaseModel);
 
-export { CityBuildModel as default };
-//# sourceMappingURL=build.js.map
+export { CityBuildModel as default };

package/es/citybuliding/shaders/build_frag.glsl

@@ -0,0 +1,117 @@
+uniform float u_opacity: 1.0;
+uniform vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];
+uniform vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];
+uniform vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];
+uniform float u_near : 0;
+uniform float u_far : 1;
+varying vec4 v_Color;
+varying vec2 v_texCoord;
+uniform float u_Zoom : 1;
+uniform float u_time;
+
+uniform float u_circleSweep;
+uniform float u_cityMinSize;
+uniform vec3 u_circleSweepColor;
+uniform float u_circleSweepSpeed;
+
+varying float v_worldDis;
+
+#pragma include "picking"
+
+vec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {
+    float s = step(hot, n);
+    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);
+
+    return mix(darkColor, color, s);
+}
+float random (vec2 st) {
+    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);
+}
+
+float LinearizeDepth()
+{
+    float z = gl_FragCoord.z * 2.0 - 1.0;
+    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));
+}
+
+vec3 fog(vec3 color, vec3 fogColor, float depth){
+    float fogFactor=clamp(depth,0.0,1.0);
+    vec3 output_color=mix(fogColor,color,fogFactor);
+    return output_color;
+}
+
+float sdRect(vec2 p, vec2 sz) {
+  vec2 d = abs(p) - sz;
+  float outside = length(max(d, 0.));
+  float inside = min(max(d.x, d.y), 0.);
+  return outside + inside;
+}
+
+void main() {
+  gl_FragColor = v_Color;
+  vec3 baseColor = u_baseColor.xyz;
+  vec3 brightColor = u_brightColor.xyz;
+  vec3 windowColor = u_windowColor.xyz;
+  float targetColId = 5.;
+  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;
+  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);
+  if(v_texCoord.x < 0.) { //顶部颜色
+       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);
+       gl_FragColor = vec4( foggedColor, v_Color.w);
+  }else { // 侧面颜色
+        vec2 st = v_texCoord;
+        vec2  UvScale = v_texCoord;
+        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));
+        float tStart = 0.25 * tStep;
+        float tEnd = 0.75 * tStep;
+        float u = mod(UvScale.x, tStep);
+        float v = mod(UvScale.y, tStep);
+        float ux = floor(UvScale.x/tStep);
+        float uy = floor(UvScale.y/tStep);
+        float n = random(vec2(ux,uy));
+        float lightP = u_time;
+        float head = 1.0- step(0.005,st.y);
+        /*step3*/
+        // 将窗户颜色和墙面颜色区别开来
+        float sU = step(tStart, u) - step(tEnd, u);
+        float sV = step(tStart, v) - step(tEnd, v);
+        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));
+        float dist = sdRect(vec2(u,v), windowSize);
+        float s = sU * sV;
+
+        float curColId = floor(UvScale.x / tStep);
+        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);
+
+        float mLightP = mod(lightP, 2.);
+        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);
+        if(ux == targetColId){
+            n =0.;
+        }
+        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );
+        float hot = smoothstep(1.0,0.0,timeP);
+        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);
+        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);
+        float sFinal = s * sCol * sRow;
+        color += mix(baseColor, brightColor, sFinal*n);
+        if (st.y<0.01){
+        color = baseColor;
+         }
+        if(head ==1.0) { // 顶部亮线
+            color = brightColor;
+        }
+        color = color * v_Color.rgb;
+
+        vec3 foggedColor = fog(color,fogColor,depth);
+
+        gl_FragColor = vec4(foggedColor,1.0);
+  }
+
+
+  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {
+    float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);
+    gl_FragColor.rgb += r * r * u_circleSweepColor;
+  }
+   
+  gl_FragColor.a *= u_opacity;
+  gl_FragColor = filterColor(gl_FragColor);
+}

package/es/citybuliding/shaders/build_vert.glsl

@@ -0,0 +1,54 @@
+precision highp float;
+
+#define ambientRatio 0.5
+#define diffuseRatio 0.3
+#define specularRatio 0.2
+
+attribute vec4 a_Color;
+attribute vec3 a_Position;
+attribute vec3 a_Normal;
+attribute float a_Size;
+uniform mat4 u_ModelMatrix;
+
+attribute vec2 a_Uv;
+varying vec2 v_texCoord;
+
+varying vec4 v_Color;
+uniform mat4 u_Mvp;
+
+uniform float u_circleSweep;
+uniform vec2 u_cityCenter;
+
+varying float v_worldDis;
+
+#pragma include "projection"
+#pragma include "light"
+#pragma include "picking"
+
+
+void main() {
+  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);
+  vec4 project_pos = project_position(pos);
+
+   v_texCoord = a_Uv;
+
+  if(u_circleSweep > 0.0) {
+     vec2 lnglatscale = vec2(0.0);
+    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {
+      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);
+    }
+    v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);
+  }
+ 
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+  }
+
+  float lightWeight = calc_lighting(pos);
+  // v_Color = a_Color;
+  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);
+
+  setPickingColor(a_PickingColor);
+}