Browse Source

[ts] Little more refactoring.

NathanSweet 9 years ago
parent
commit
7646c28f9d

+ 2 - 2
spine-ts/webgl/demos/ikconstraints.html → spine-ts/webgl/demos/ikconstraint.html

@@ -3,7 +3,7 @@
 <script src="../../build/spine-webgl.js"></script>
 <script src="../../build/spine-webgl.js"></script>
 <script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
 <script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
 <script src="utils.js"></script>
 <script src="utils.js"></script>
-<script src="ikconstraints.js"></script>
+<script src="ikconstraint.js"></script>
 <body>
 <body>
 
 
 <canvas id="ikdemo-canvas"></canvas>
 <canvas id="ikdemo-canvas"></canvas>
@@ -13,7 +13,7 @@
 
 
 <script>
 <script>
 spineDemos.loadSliders();
 spineDemos.loadSliders();
-ikConstraintsDemo(spineDemos.setupRendering);
+ikConstraintDemo(spineDemos.setupRendering);
 </script>
 </script>
 
 
 </body>
 </body>

+ 2 - 2
spine-ts/webgl/demos/ikconstraints.js → spine-ts/webgl/demos/ikconstraint.js

@@ -1,4 +1,4 @@
-var ikConstraintsDemo = function(loadingComplete, bgColor) {
+var ikConstraintDemo = function(loadingComplete, bgColor) {
 	var COLOR_INNER = new spine.Color(0.8, 0, 0, 0.5);
 	var COLOR_INNER = new spine.Color(0.8, 0, 0, 0.5);
 	var COLOR_OUTER = new spine.Color(0.8, 0, 0, 0.8);
 	var COLOR_OUTER = new spine.Color(0.8, 0, 0, 0.8);
 	var COLOR_INNER_SELECTED = new spine.Color(0.0, 0, 0.8, 0.5);
 	var COLOR_INNER_SELECTED = new spine.Color(0.0, 0, 0.8, 0.5);
@@ -13,7 +13,7 @@ var ikConstraintsDemo = function(loadingComplete, bgColor) {
 	var coords = new spine.webgl.Vector3(), temp = new spine.webgl.Vector3(), temp2 = new spine.Vector2(), temp3 = new spine.webgl.Vector3();	
 	var coords = new spine.webgl.Vector3(), temp = new spine.webgl.Vector3(), temp2 = new spine.Vector2(), temp3 = new spine.webgl.Vector3();	
 	var isPlaying = true;
 	var isPlaying = true;
 
 
-	var DEMO_NAME = "IkConstraintsDemo";
+	var DEMO_NAME = "IkConstraintDemo";
 
 
 	if (!bgColor) bgColor = new spine.Color(1, 1, 1, 1);	
 	if (!bgColor) bgColor = new spine.Color(1, 1, 1, 1);	
 
 

+ 24 - 0
spine-ts/webgl/demos/pathconstraint.html

@@ -0,0 +1,24 @@
+<html>
+<link rel="stylesheet" href="demos.css">
+<script src="../../build/spine-webgl.js"></script>
+<script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
+<script src="utils.js"></script>
+<script src="pathconstraint.js"></script>
+<body>
+
+<canvas id="pathconstraintdemo-canvas"></canvas>
+<center>
+<div style="position: fixed; top: 0; width: 100%">	
+	<div><input id="pathconstraintdemo-drawbones" type="checkbox"></input>Display bones &amp; path</div>
+	<input id="pathconstraintdemo-playbutton" type="button" value="Pause"></input>	
+	<div id="pathconstraintdemo-timeline" class="slider"></div>
+</div>
+</center>
+
+<script>	
+spineDemos.loadSliders();
+pathConstraintDemo(spineDemos.setupRendering);
+</script>
+
+</body>
+</html>

+ 6 - 6
spine-ts/webgl/demos/vine.js → spine-ts/webgl/demos/pathconstraint.js

@@ -1,4 +1,4 @@
-var vineDemo = function(loadingComplete, bgColor) {
+var pathConstraintDemo = function(loadingComplete, bgColor) {
 	var COLOR_INNER = new spine.Color(0.8, 0, 0, 0.5);
 	var COLOR_INNER = new spine.Color(0.8, 0, 0, 0.5);
 	var COLOR_OUTER = new spine.Color(0.8, 0, 0, 0.8);
 	var COLOR_OUTER = new spine.Color(0.8, 0, 0, 0.8);
 	var COLOR_INNER_SELECTED = new spine.Color(0.0, 0, 0.8, 0.5);
 	var COLOR_INNER_SELECTED = new spine.Color(0.0, 0, 0.8, 0.5);
@@ -13,12 +13,12 @@ var vineDemo = function(loadingComplete, bgColor) {
 	var coords = new spine.webgl.Vector3(), temp = new spine.webgl.Vector3(), temp2 = new spine.Vector2();
 	var coords = new spine.webgl.Vector3(), temp = new spine.webgl.Vector3(), temp2 = new spine.Vector2();
 	var playButton, timeLine, isPlaying = true, playTime = 0;
 	var playButton, timeLine, isPlaying = true, playTime = 0;
 
 
-	var DEMO_NAME = "vineDemo";
+	var DEMO_NAME = "PathConstraintDemo";
 
 
 	if (!bgColor) bgColor = new spine.Color(1, 1, 1, 1);
 	if (!bgColor) bgColor = new spine.Color(1, 1, 1, 1);
 
 
 	function init () {
 	function init () {
-		canvas = document.getElementById("vinedemo-canvas");
+		canvas = document.getElementById("pathconstraintdemo-canvas");
 		canvas.width = canvas.clientWidth; canvas.height = canvas.clientHeight;
 		canvas.width = canvas.clientWidth; canvas.height = canvas.clientHeight;
 		gl = canvas.getContext("webgl", { alpha: false }) || canvas.getContext("experimental-webgl", { alpha: false });	
 		gl = canvas.getContext("webgl", { alpha: false }) || canvas.getContext("experimental-webgl", { alpha: false });	
 
 
@@ -72,7 +72,7 @@ var vineDemo = function(loadingComplete, bgColor) {
 	}
 	}
 
 
 	function setupUI() {
 	function setupUI() {
-		playButton = $("#vinedemo-playbutton");
+		playButton = $("#pathconstraintdemo-playbutton");
 		var playButtonUpdate = function () {			
 		var playButtonUpdate = function () {			
 			isPlaying = !isPlaying;
 			isPlaying = !isPlaying;
 			if (isPlaying) {
 			if (isPlaying) {
@@ -86,7 +86,7 @@ var vineDemo = function(loadingComplete, bgColor) {
 		playButton.click(playButtonUpdate);
 		playButton.click(playButtonUpdate);
 		playButton.addClass("pause");
 		playButton.addClass("pause");
 
 
-		timeLine = $("#vinedemo-timeline").data("slider");
+		timeLine = $("#pathconstraintdemo-timeline").data("slider");
 		timeLine.changed = function (percent) {
 		timeLine.changed = function (percent) {
 			if (isPlaying) playButton.click();
 			if (isPlaying) playButton.click();
 			if (!isPlaying) {
 			if (!isPlaying) {
@@ -101,7 +101,7 @@ var vineDemo = function(loadingComplete, bgColor) {
 
 
 		renderer.skeletonDebugRenderer.drawPaths = false;
 		renderer.skeletonDebugRenderer.drawPaths = false;
 		renderer.skeletonDebugRenderer.drawBones = false;
 		renderer.skeletonDebugRenderer.drawBones = false;
-		var checkbox = $("#vinedemo-drawbones");
+		var checkbox = $("#pathconstraintdemo-drawbones");
 		checkbox.change(function() {
 		checkbox.change(function() {
 			renderer.skeletonDebugRenderer.drawPaths = this.checked;
 			renderer.skeletonDebugRenderer.drawPaths = this.checked;
 			renderer.skeletonDebugRenderer.drawBones = this.checked;			
 			renderer.skeletonDebugRenderer.drawBones = this.checked;			

+ 0 - 24
spine-ts/webgl/demos/vine.html

@@ -1,24 +0,0 @@
-<html>
-<link rel="stylesheet" href="demos.css">
-<script src="../../build/spine-webgl.js"></script>
-<script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
-<script src="utils.js"></script>
-<script src="vine.js"></script>
-<body>
-
-<canvas id="vinedemo-canvas"></canvas>
-<center>
-<div style="position: fixed; top: 0; width: 100%">	
-	<div><input id="vinedemo-drawbones" type="checkbox"></input>Display bones &amp; path</div>
-	<input id="vinedemo-playbutton" type="button" value="Pause"></input>	
-	<div id="vinedemo-timeline" class="slider"></div>
-</div>
-</center>
-
-<script>	
-spineDemos.loadSliders();
-vineDemo(spineDemos.setupRendering);
-</script>
-
-</body>
-</html>