2.4.0 rebuild

layabox · Jan 11, 2020 · cf6bace · cf6bace
1 parent 91697dd
commit cf6bace
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 131 deletions.
diff --git a/build/as/jslibs/laya.core.js b/build/as/jslibs/laya.core.js
@@ -10501,13 +10501,13 @@ window.Laya= (function (exports) {
         Render.isConchApp = (window.conch != null);
         if (Render.isConchApp) {
             Render.supportWebGLPlusCulling = false;
-            Render.supportWebGLPlusAnimation = true;
-            Render.supportWebGLPlusRendering = true;
+            Render.supportWebGLPlusAnimation = false;
+            Render.supportWebGLPlusRendering = false;
         }
         else if (window.qq != null && window.qq.webglPlus != null) {
             Render.supportWebGLPlusCulling = false;
-            Render.supportWebGLPlusAnimation = true;
-            Render.supportWebGLPlusRendering = true;
+            Render.supportWebGLPlusAnimation = false;
+            Render.supportWebGLPlusRendering = false;
         }
     }
 
@@ -22196,10 +22196,12 @@ window.Laya= (function (exports) {
             if (Laya.isNativeRender_enable)
                 return;
             Laya.isNativeRender_enable = true;
-            Shader.prototype.uploadTexture2D = function (value) {
-                var gl = LayaGL.instance;
-                gl.bindTexture(gl.TEXTURE_2D, value);
-            };
+            if (Render.supportWebGLPlusRendering) {
+                Shader.prototype.uploadTexture2D = function (value) {
+                    var gl = LayaGL.instance;
+                    gl.bindTexture(gl.TEXTURE_2D, value);
+                };
+            }
             RenderState2D.width = Browser.window.innerWidth;
             RenderState2D.height = Browser.window.innerHeight;
             Browser.measureText = function (txt, font) {

diff --git a/build/as/jslibs/laya.d3.js b/build/as/jslibs/laya.d3.js
@@ -603,12 +603,6 @@
 	        return this._keyFrames[index];
 	    }
 	}
-	if (window.conch && window.conchKeyframeNode) {
-	    KeyframeNode = window.conchKeyframeNode;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    KeyframeNode = window.qq.webglPlus.conchKeyframeNode;
-	}
 
 	class AnimationEvent {
 	    constructor() {
@@ -641,12 +635,6 @@
 	        destKeyFrame.value = this.value;
 	    }
 	}
-	if (window.conch && window.conchFloatKeyframe) {
-	    FloatKeyframe = window.conchFloatKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    FloatKeyframe = window.qq.webglPlus.conchFloatKeyframe;
-	}
 
 	class Matrix3x3 {
 	    constructor() {
@@ -1295,12 +1283,6 @@
 	        this.value.cloneTo(destKeyFarme.value);
 	    }
 	}
-	if (window.conch && window.conchFloatArrayKeyframe) {
-	    QuaternionKeyframe = window.conchFloatArrayKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    QuaternionKeyframe = window.qq.webglPlus.conchFloatArrayKeyframe;
-	}
 
 	class Vector3Keyframe extends Keyframe {
 	    constructor() {
@@ -1317,12 +1299,6 @@
 	        this.value.cloneTo(destKeyFarme.value);
 	    }
 	}
-	if (window.conch && window.conchFloatArrayKeyframe) {
-	    Vector3Keyframe = window.conchFloatArrayKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    Vector3Keyframe = window.qq.webglPlus.conchFloatArrayKeyframe;
-	}
 
 	class AnimationClipParser03 {
 	    static READ_DATA() {
@@ -1906,12 +1882,6 @@
 	        this._nodes[index] = node;
 	    }
 	}
-	if (window.conch && window.conchKeyframeNodeList) {
-	    KeyframeNodeList = window.conchKeyframeNodeList;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    KeyframeNodeList = window.qq.webglPlus.conchKeyframeNodeList;
-	}
 
 	class TextureGenerator {
 	    constructor() {

diff --git a/build/js/libs/laya.core.js b/build/js/libs/laya.core.js
@@ -10501,13 +10501,13 @@ window.Laya= (function (exports) {
         Render.isConchApp = (window.conch != null);
         if (Render.isConchApp) {
             Render.supportWebGLPlusCulling = false;
-            Render.supportWebGLPlusAnimation = true;
-            Render.supportWebGLPlusRendering = true;
+            Render.supportWebGLPlusAnimation = false;
+            Render.supportWebGLPlusRendering = false;
         }
         else if (window.qq != null && window.qq.webglPlus != null) {
             Render.supportWebGLPlusCulling = false;
-            Render.supportWebGLPlusAnimation = true;
-            Render.supportWebGLPlusRendering = true;
+            Render.supportWebGLPlusAnimation = false;
+            Render.supportWebGLPlusRendering = false;
         }
     }
 
@@ -22196,10 +22196,12 @@ window.Laya= (function (exports) {
             if (Laya.isNativeRender_enable)
                 return;
             Laya.isNativeRender_enable = true;
-            Shader.prototype.uploadTexture2D = function (value) {
-                var gl = LayaGL.instance;
-                gl.bindTexture(gl.TEXTURE_2D, value);
-            };
+            if (Render.supportWebGLPlusRendering) {
+                Shader.prototype.uploadTexture2D = function (value) {
+                    var gl = LayaGL.instance;
+                    gl.bindTexture(gl.TEXTURE_2D, value);
+                };
+            }
             RenderState2D.width = Browser.window.innerWidth;
             RenderState2D.height = Browser.window.innerHeight;
             Browser.measureText = function (txt, font) {

diff --git a/build/js/libs/laya.d3.js b/build/js/libs/laya.d3.js
@@ -603,12 +603,6 @@
 	        return this._keyFrames[index];
 	    }
 	}
-	if (window.conch && window.conchKeyframeNode) {
-	    KeyframeNode = window.conchKeyframeNode;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    KeyframeNode = window.qq.webglPlus.conchKeyframeNode;
-	}
 
 	class AnimationEvent {
 	    constructor() {
@@ -641,12 +635,6 @@
 	        destKeyFrame.value = this.value;
 	    }
 	}
-	if (window.conch && window.conchFloatKeyframe) {
-	    FloatKeyframe = window.conchFloatKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    FloatKeyframe = window.qq.webglPlus.conchFloatKeyframe;
-	}
 
 	class Matrix3x3 {
 	    constructor() {
@@ -1295,12 +1283,6 @@
 	        this.value.cloneTo(destKeyFarme.value);
 	    }
 	}
-	if (window.conch && window.conchFloatArrayKeyframe) {
-	    QuaternionKeyframe = window.conchFloatArrayKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    QuaternionKeyframe = window.qq.webglPlus.conchFloatArrayKeyframe;
-	}
 
 	class Vector3Keyframe extends Keyframe {
 	    constructor() {
@@ -1317,12 +1299,6 @@
 	        this.value.cloneTo(destKeyFarme.value);
 	    }
 	}
-	if (window.conch && window.conchFloatArrayKeyframe) {
-	    Vector3Keyframe = window.conchFloatArrayKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    Vector3Keyframe = window.qq.webglPlus.conchFloatArrayKeyframe;
-	}
 
 	class AnimationClipParser03 {
 	    static READ_DATA() {
@@ -1906,12 +1882,6 @@
 	        this._nodes[index] = node;
 	    }
 	}
-	if (window.conch && window.conchKeyframeNodeList) {
-	    KeyframeNodeList = window.conchKeyframeNodeList;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    KeyframeNodeList = window.qq.webglPlus.conchKeyframeNodeList;
-	}
 
 	class TextureGenerator {
 	    constructor() {

diff --git a/build/ts/libs/laya.core.js b/build/ts/libs/laya.core.js
@@ -10501,13 +10501,13 @@ window.Laya= (function (exports) {
         Render.isConchApp = (window.conch != null);
         if (Render.isConchApp) {
             Render.supportWebGLPlusCulling = false;
-            Render.supportWebGLPlusAnimation = true;
-            Render.supportWebGLPlusRendering = true;
+            Render.supportWebGLPlusAnimation = false;
+            Render.supportWebGLPlusRendering = false;
         }
         else if (window.qq != null && window.qq.webglPlus != null) {
             Render.supportWebGLPlusCulling = false;
-            Render.supportWebGLPlusAnimation = true;
-            Render.supportWebGLPlusRendering = true;
+            Render.supportWebGLPlusAnimation = false;
+            Render.supportWebGLPlusRendering = false;
         }
     }
 
@@ -22196,10 +22196,12 @@ window.Laya= (function (exports) {
             if (Laya.isNativeRender_enable)
                 return;
             Laya.isNativeRender_enable = true;
-            Shader.prototype.uploadTexture2D = function (value) {
-                var gl = LayaGL.instance;
-                gl.bindTexture(gl.TEXTURE_2D, value);
-            };
+            if (Render.supportWebGLPlusRendering) {
+                Shader.prototype.uploadTexture2D = function (value) {
+                    var gl = LayaGL.instance;
+                    gl.bindTexture(gl.TEXTURE_2D, value);
+                };
+            }
             RenderState2D.width = Browser.window.innerWidth;
             RenderState2D.height = Browser.window.innerHeight;
             Browser.measureText = function (txt, font) {

diff --git a/build/ts/libs/laya.d3.js b/build/ts/libs/laya.d3.js
@@ -603,12 +603,6 @@
 	        return this._keyFrames[index];
 	    }
 	}
-	if (window.conch && window.conchKeyframeNode) {
-	    KeyframeNode = window.conchKeyframeNode;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    KeyframeNode = window.qq.webglPlus.conchKeyframeNode;
-	}
 
 	class AnimationEvent {
 	    constructor() {
@@ -641,12 +635,6 @@
 	        destKeyFrame.value = this.value;
 	    }
 	}
-	if (window.conch && window.conchFloatKeyframe) {
-	    FloatKeyframe = window.conchFloatKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    FloatKeyframe = window.qq.webglPlus.conchFloatKeyframe;
-	}
 
 	class Matrix3x3 {
 	    constructor() {
@@ -1295,12 +1283,6 @@
 	        this.value.cloneTo(destKeyFarme.value);
 	    }
 	}
-	if (window.conch && window.conchFloatArrayKeyframe) {
-	    QuaternionKeyframe = window.conchFloatArrayKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    QuaternionKeyframe = window.qq.webglPlus.conchFloatArrayKeyframe;
-	}
 
 	class Vector3Keyframe extends Keyframe {
 	    constructor() {
@@ -1317,12 +1299,6 @@
 	        this.value.cloneTo(destKeyFarme.value);
 	    }
 	}
-	if (window.conch && window.conchFloatArrayKeyframe) {
-	    Vector3Keyframe = window.conchFloatArrayKeyframe;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    Vector3Keyframe = window.qq.webglPlus.conchFloatArrayKeyframe;
-	}
 
 	class AnimationClipParser03 {
 	    static READ_DATA() {
@@ -1906,12 +1882,6 @@
 	        this._nodes[index] = node;
 	    }
 	}
-	if (window.conch && window.conchKeyframeNodeList) {
-	    KeyframeNodeList = window.conchKeyframeNodeList;
-	}
-	if (window.qq && window.qq.webglPlus) {
-	    KeyframeNodeList = window.qq.webglPlus.conchKeyframeNodeList;
-	}
 
 	class TextureGenerator {
 	    constructor() {

diff --git a/build/ts_new/libs/Laya.ts b/build/ts_new/libs/Laya.ts
@@ -324,9 +324,11 @@ export class Laya {
 		if (Laya.isNativeRender_enable)
 			return;
 		Laya.isNativeRender_enable = true;
-		Shader.prototype.uploadTexture2D = function (value: any): void {
-			var gl: WebGLRenderingContext = LayaGL.instance;
-			gl.bindTexture(gl.TEXTURE_2D, (<WebGLTexture>value));
+		if (Render.supportWebGLPlusRendering) {
+			Shader.prototype.uploadTexture2D = function (value: any): void {
+				var gl: WebGLRenderingContext = LayaGL.instance;
+				gl.bindTexture(gl.TEXTURE_2D, (<WebGLTexture>value));
+			}
 		}
 		RenderState2D.width = Browser.window.innerWidth;
 		RenderState2D.height = Browser.window.innerHeight;

diff --git a/build/ts_new/libs/laya/d3/animation/KeyframeNode.ts b/build/ts_new/libs/laya/d3/animation/KeyframeNode.ts
@@ -122,11 +122,11 @@ export class KeyframeNode {
 }
 
 // native
-if ((window as any).conch && (window as any).conchKeyframeNode) {
+/*if ((window as any).conch && (window as any).conchKeyframeNode) {
 	//@ts-ignore
 	KeyframeNode = (window as any).conchKeyframeNode;
 }
 if ((window as any).qq && (window as any).qq.webglPlus) {
 	//@ts-ignore
 	KeyframeNode = (window as any).qq.webglPlus.conchKeyframeNode;
-}
+}*/
diff --git a/build/ts_new/libs/laya/d3/animation/KeyframeNodeList.ts b/build/ts_new/libs/laya/d3/animation/KeyframeNodeList.ts
@@ -46,11 +46,11 @@ export class KeyframeNodeList {
 }
 
 // native
-if ((window as any).conch && (window as any).conchKeyframeNodeList) {
+/*if ((window as any).conch && (window as any).conchKeyframeNodeList) {
 	//@ts-ignore
 	KeyframeNodeList = (window as any).conchKeyframeNodeList;
 }
 if ((window as any).qq && (window as any).qq.webglPlus) {
 	//@ts-ignore
 	KeyframeNodeList = (window as any).qq.webglPlus.conchKeyframeNodeList;
-}
+}*/
diff --git a/build/ts_new/libs/laya/d3/core/FloatKeyframe.ts b/build/ts_new/libs/laya/d3/core/FloatKeyframe.ts
@@ -29,14 +29,14 @@ export class FloatKeyframe extends Keyframe {
 }
 
 // native
-if ((window as any).conch && (window as any).conchFloatKeyframe) {
+/*if ((window as any).conch && (window as any).conchFloatKeyframe) {
 	//@ts-ignore
 	FloatKeyframe = (window as any).conchFloatKeyframe;
 }
 if ((window as any).qq && (window as any).qq.webglPlus) {
 	//@ts-ignore
 	FloatKeyframe = (window as any).qq.webglPlus.conchFloatKeyframe;
-}
+}*/
 
 
 
diff --git a/build/ts_new/libs/laya/d3/core/QuaternionKeyframe.ts b/build/ts_new/libs/laya/d3/core/QuaternionKeyframe.ts
@@ -33,12 +33,12 @@ export class QuaternionKeyframe extends Keyframe {
 }
 
 // native
-if ((window as any).conch && (window as any).conchFloatArrayKeyframe) {
+/*if ((window as any).conch && (window as any).conchFloatArrayKeyframe) {
 	//@ts-ignore
 	QuaternionKeyframe = (window as any).conchFloatArrayKeyframe;
 }
 if ((window as any).qq && (window as any).qq.webglPlus) {
 	//@ts-ignore
 	QuaternionKeyframe = (window as any).qq.webglPlus.conchFloatArrayKeyframe;
-}
+}*/
 
diff --git a/build/ts_new/libs/laya/d3/core/Vector3Keyframe.ts b/build/ts_new/libs/laya/d3/core/Vector3Keyframe.ts
@@ -32,11 +32,11 @@ export class Vector3Keyframe extends Keyframe {
 }
 
 // native
-if ((window as any).conch && (window as any).conchFloatArrayKeyframe) {
+/*if ((window as any).conch && (window as any).conchFloatArrayKeyframe) {
 	//@ts-ignore
 	Vector3Keyframe = (window as any).conchFloatArrayKeyframe;
 }
 if ((window as any).qq && (window as any).qq.webglPlus) {
 	//@ts-ignore
 	Vector3Keyframe = (window as any).qq.webglPlus.conchFloatArrayKeyframe;
-}
+}*/