[map-sdk] 同步地图SDK 3.4.0.1

libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl

@@ -12,6 +12,9 @@ uniform bool isPcf; //是否聚光灯
 uniform bool isWave; //流光效果
 uniform sampler2D texId;
 uniform sampler2DShadow depthTex; //深度纹理
+uniform sampler2D texId2;
+uniform bool isMixTex2;
+uniform float texId2Fac;
 uniform bool isRenderSignalLine; //信号线
 uniform float signalLineTime; //信号线时间
 uniform float signalLineCnt; //信号线时间
@@ -126,7 +129,12 @@ bool isInScreen(vec4 p){ //是否在包围盒[(0,0)-(1,1)]内
 }
 
 void setZebra(){
-    vec4  c = texture(texId, _uv);
+    vec4  c = vec4(0.0);
+    if(!isMixTex2){
+        c = texture(texId,_uv);
+    }else{
+        c = mix(texture(texId,_uv),texture(texId2,_uv),texId2Fac);
+    }
     fragColor = vec4(c.rgb, step(0.8,c.a));
 }
 void setColor(){
@@ -137,7 +145,11 @@ void setTex(){
         if(_uv.y<0.0 || _uv.y>1.0)
                 discard;
     }
-    fragColor = texture(texId,_uv);
+    if(!isMixTex2){
+        fragColor = texture(texId,_uv);
+    }else{
+        fragColor = mix(texture(texId,_uv),texture(texId2,_uv),texId2Fac);
+    }
 }
 float getShadowOffset(float x, float y)
 {

libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl

@@ -49,6 +49,10 @@ vec4 changeColorMethod(vec4 texColor){
                 }
             }else
                 retColor = texColor; //s0
+        }else if(_changeColorCmd==5.0){
+                retColor = mix(texColor,replacedColor,_changeColorRatio);
+        }else if(_changeColorCmd==6.0){
+            retColor = mix(texColor,replacedColor,1.0-_changeColorRatio);
         }else if(_changeColorRatio==0.0){
             if(_changeColorCmd==1.0)
                 retColor = mix(texColor,replacedColor,0.5);

libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl

@@ -169,4 +169,5 @@ void main()
 
     gl_Position =  projMat*viewMat*modelMat * pos;
     ndc = gl_Position;
+    gl_PointSize = (1.0-gl_Position.z/gl_Position.w)*70.0;
 }