Эх сурвалжийг харах

[ts][webgl] Added support for WebGL2. Closes #1500.

badlogic 6 жил өмнө
parent
commit
4913926e3b

+ 3 - 3
spine-ts/build/spine-all.js

@@ -1515,14 +1515,14 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
+							timelineBlend = blend;
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 									continue;
 									continue;
-								blend = spine.MixBlend.setup;
+								timelineBlend = spine.MixBlend.setup;
 							}
 							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
-							timelineBlend = blend;
 							alpha = alphaMix;
 							alpha = alphaMix;
 							break;
 							break;
 						case AnimationState.FIRST:
 						case AnimationState.FIRST:
@@ -10945,7 +10945,7 @@ var spine;
 				this.restorables = new Array();
 				this.restorables = new Array();
 				if (canvasOrContext instanceof HTMLCanvasElement) {
 				if (canvasOrContext instanceof HTMLCanvasElement) {
 					var canvas_1 = canvasOrContext;
 					var canvas_1 = canvasOrContext;
-					this.gl = (canvas_1.getContext("webgl", contextConfig) || canvas_1.getContext("experimental-webgl", contextConfig));
+					this.gl = (canvas_1.getContext("webgl2", contextConfig)) || (canvas_1.getContext("webgl", contextConfig) || canvas_1.getContext("experimental-webgl", contextConfig));
 					this.canvas = canvas_1;
 					this.canvas = canvas_1;
 					canvas_1.addEventListener("webglcontextlost", function (e) {
 					canvas_1.addEventListener("webglcontextlost", function (e) {
 						var event = e;
 						var event = e;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 2 - 2
spine-ts/build/spine-canvas.js

@@ -1515,14 +1515,14 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
+							timelineBlend = blend;
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 									continue;
 									continue;
-								blend = spine.MixBlend.setup;
+								timelineBlend = spine.MixBlend.setup;
 							}
 							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
-							timelineBlend = blend;
 							alpha = alphaMix;
 							alpha = alphaMix;
 							break;
 							break;
 						case AnimationState.FIRST:
 						case AnimationState.FIRST:

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 2 - 2
spine-ts/build/spine-core.js

@@ -1515,14 +1515,14 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
+							timelineBlend = blend;
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 									continue;
 									continue;
-								blend = spine.MixBlend.setup;
+								timelineBlend = spine.MixBlend.setup;
 							}
 							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
-							timelineBlend = blend;
 							alpha = alphaMix;
 							alpha = alphaMix;
 							break;
 							break;
 						case AnimationState.FIRST:
 						case AnimationState.FIRST:

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 3 - 3
spine-ts/build/spine-player.js

@@ -1515,14 +1515,14 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
+							timelineBlend = blend;
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 									continue;
 									continue;
-								blend = spine.MixBlend.setup;
+								timelineBlend = spine.MixBlend.setup;
 							}
 							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
-							timelineBlend = blend;
 							alpha = alphaMix;
 							alpha = alphaMix;
 							break;
 							break;
 						case AnimationState.FIRST:
 						case AnimationState.FIRST:
@@ -10677,7 +10677,7 @@ var spine;
 				this.restorables = new Array();
 				this.restorables = new Array();
 				if (canvasOrContext instanceof HTMLCanvasElement) {
 				if (canvasOrContext instanceof HTMLCanvasElement) {
 					var canvas = canvasOrContext;
 					var canvas = canvasOrContext;
-					this.gl = (canvas.getContext("webgl", contextConfig) || canvas.getContext("experimental-webgl", contextConfig));
+					this.gl = (canvas.getContext("webgl2", contextConfig)) || (canvas.getContext("webgl", contextConfig) || canvas.getContext("experimental-webgl", contextConfig));
 					this.canvas = canvas;
 					this.canvas = canvas;
 					canvas.addEventListener("webglcontextlost", function (e) {
 					canvas.addEventListener("webglcontextlost", function (e) {
 						var event = e;
 						var event = e;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-player.js.map


+ 2 - 2
spine-ts/build/spine-threejs.js

@@ -1515,14 +1515,14 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
+							timelineBlend = blend;
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 									continue;
 									continue;
-								blend = spine.MixBlend.setup;
+								timelineBlend = spine.MixBlend.setup;
 							}
 							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
-							timelineBlend = blend;
 							alpha = alphaMix;
 							alpha = alphaMix;
 							break;
 							break;
 						case AnimationState.FIRST:
 						case AnimationState.FIRST:

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 3 - 3
spine-ts/build/spine-webgl.js

@@ -1515,14 +1515,14 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
+							timelineBlend = blend;
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
 									continue;
 									continue;
-								blend = spine.MixBlend.setup;
+								timelineBlend = spine.MixBlend.setup;
 							}
 							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
-							timelineBlend = blend;
 							alpha = alphaMix;
 							alpha = alphaMix;
 							break;
 							break;
 						case AnimationState.FIRST:
 						case AnimationState.FIRST:
@@ -10677,7 +10677,7 @@ var spine;
 				this.restorables = new Array();
 				this.restorables = new Array();
 				if (canvasOrContext instanceof HTMLCanvasElement) {
 				if (canvasOrContext instanceof HTMLCanvasElement) {
 					var canvas = canvasOrContext;
 					var canvas = canvasOrContext;
-					this.gl = (canvas.getContext("webgl", contextConfig) || canvas.getContext("experimental-webgl", contextConfig));
+					this.gl = (canvas.getContext("webgl2", contextConfig)) || (canvas.getContext("webgl", contextConfig) || canvas.getContext("experimental-webgl", contextConfig));
 					this.canvas = canvas;
 					this.canvas = canvas;
 					canvas.addEventListener("webglcontextlost", function (e) {
 					canvas.addEventListener("webglcontextlost", function (e) {
 						var event = e;
 						var event = e;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 1 - 1
spine-ts/webgl/src/WebGL.ts

@@ -36,7 +36,7 @@ module spine.webgl {
 		constructor(canvasOrContext: HTMLCanvasElement | WebGLRenderingContext, contextConfig: any = { alpha: "true" }) {
 		constructor(canvasOrContext: HTMLCanvasElement | WebGLRenderingContext, contextConfig: any = { alpha: "true" }) {
 			if (canvasOrContext instanceof HTMLCanvasElement) {
 			if (canvasOrContext instanceof HTMLCanvasElement) {
 				let canvas = canvasOrContext;
 				let canvas = canvasOrContext;
-				this.gl = <WebGLRenderingContext> (canvas.getContext("webgl", contextConfig) || canvas.getContext("experimental-webgl", contextConfig));
+				this.gl = <WebGLRenderingContext> (canvas.getContext("webgl2", contextConfig)) || (canvas.getContext("webgl", contextConfig) || canvas.getContext("experimental-webgl", contextConfig));
 				this.canvas = canvas;
 				this.canvas = canvas;
 				canvas.addEventListener("webglcontextlost", (e: any) => {
 				canvas.addEventListener("webglcontextlost", (e: any) => {
 					let event = <WebGLContextEvent>e;
 					let event = <WebGLContextEvent>e;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно