Resizing.

Work on text stuff.
Work on tweens.
Beginning audio support.

Js/Common.js

@@ -1,33 +1,46 @@
 'use strict';
 
-var rootUrl = `${window.location.protocol}//${window.location.host}/`;
+let rootUrl = `${window.location.protocol}//${window.location.host}/`;
+const screenRatio = 9/16;
 
 class commonFunctions {	
 	static getFileText(file) {
 		return new Promise((resolve, reject) => {
-			fetch(file)
-			.then((success) => {
-				success.text()
-				.then((text) => {
-					resolve(text);
+			try
+			{
+				fetch(file)
+				.then((success) => {
+					if(success.status !== 200) { reject(success); return; }
+					success.text()
+					.then((text) => {
+						resolve(text);
+					});
+				}, (failure) => {
+					reject(failure);
 				});
-			}, (failure) => {
-				reject(failure);
-			});
+			} catch(error) {
+				reject(error);
+			}
 		});
 	}
 	
 	static getFileJson(file) {
 		return new Promise((resolve, reject) => {
-			fetch(file)
-			.then((success) => {
-				success.json()
-				.then((json) => {
-					resolve(json);
+			try
+			{
+				fetch(file)
+				.then((success) => {
+					if(success.status !== 200) { reject(success); return; }
+					success.json()
+					.then((json) => {
+						resolve(json);
+					});
+				}, (failure) => {
+					reject(failure);
 				});
-			}, (failure) => {
-				reject(failure);
-			});
+			} catch(error) {
+				reject(error);
+			}
 		});
 	}
 	
@@ -40,15 +53,41 @@ class commonFunctions {
 			let split = line.split('\t');
 			let newEntry = {};
 			for(let i = 0; i < split.length; ++i) {
-				let x = split[i];
+				let x = split[i].trim();
 				newEntry[headers[i]] = x;
 			}
 			return newEntry;
 		}
 	}
 	
-	static lerp(start, end, t) {
+	static lerp(start, end, t, type = "linear") {
+		switch(type) {
+			default:
+			case "linear":
+				break;
+			case "sin":
+				t = t * (Math.PI / 2);
+				t = Math.sin(t);
+				break;
+			case "fullsin":
+				t = t * Math.PI;
+				t = Math.sin(t);
+				break;
+			case "fullwait":
+				t = -(Math.pow((2*t-1), 4)) + 1;
+				break;
+			case "square":
+				t = Math.pow(t, 2);
+				break;
+			case "exp":
+				t = Math.pow(t, 1/4);
+				break;
+			case "sqrt":
+				t = Math.sqrt(t);
+				break;
+		}
 		return (1 - t) * start + t * end;
+		//-(2*x-1)^4 +1
 	}
 	
 	static getColorFromName(name) {
@@ -64,10 +103,52 @@ class commonFunctions {
 	
 	static convertUtageTextTags(text) {
 		text = text.replace(/<speed.*?>|<\/speed>/g, "");
-		text = text.replace("\\n", "<br/>")
+		text = text.replace(/\\n/g, "<br/>")
+		//rewrite ruby tags to normal html format
+		let rubyMatches = text.match(/<ruby=.*?<\/ruby>/g);
+		if(rubyMatches) {
+			for(let i = 0; i < rubyMatches.length; ++i) {
+				let m = rubyMatches[i];
+				let rText = '';
+				let innerText = '';
+				let startR = false;
+				let startI = false;
+				for(let j = 0; j < m.length; ++j) {
+					if(m[j] === '<' && j !== 0) { startI = false; }
+					if(startI) { 
+						innerText+= m[j];
+					}
+					if(m[j] === '>') { startR = false; startI = true; }
+					if(startR) {
+						rText += m[j];
+					}
+					if(m[j] === '=') { startR = true; }
+				}
+				text = text.replace(m, `<ruby>${innerText}<rt>${rText}</rt></ruby>`);
+			}
+		}
 		return text;
 	}
 	
+	static getNewResolution(baseRes, screenWidth, screenHeight, minusHeight) {
+		let retval = { width: 0, height: 0 };
+		if(screenWidth >= screenHeight) {
+			let newPer = (screenHeight - (minusHeight || 0)) / baseRes.height;
+			retval.height = baseRes.height * newPer;
+			retval.width = baseRes.width * newPer;
+			if(retval.width > screenWidth) {
+				newPer = screenWidth / baseRes.width;
+				retval.height = baseRes.height * newPer;
+				retval.width = baseRes.width * newPer;
+			}
+		} else if (screenHeight > screenWidth) {
+			let newPer = screenWidth / baseRes.width;
+			retval.height = baseRes.height * newPer;
+			retval.width = baseRes.width * newPer;
+		}
+		return retval;
+	}
+	
 	static getAnchorFromCharPivot(pivot) {
 		let x = 0.5;
 		let y = 0.5;
@@ -77,9 +158,60 @@ class commonFunctions {
 				x = Number(p.substring(2));
 			} else if(p.startsWith("y=")) {
 				y = Number(p.substring(2));
+				//The y pivot from utage is based from the bottom so it needs to be flipped
 				y = 1 - y;
 			}
 		}
 		return {x, y};
 	}
+	
+	static getPropertiesFromTweenCommand(props) {
+		var retval = {};
+		let indexX = props.indexOf("x=");
+		if(indexX !== -1) {
+			retval.x = "";
+			for(let i = indexX + 2; i < props.length; ++i) {
+				if(props[i] == " ") { break; }
+				retval.x += props[i];
+			}
+			retval.x = Number(retval.x);
+		}
+		let indexY = props.indexOf("y=");
+		if(indexY !== -1) {
+			retval.y = "";
+			for(let i = indexY+ 2; i < props.length; ++i) {
+				if(props[i] == " ") { break; }
+				retval.y += props[i];
+			}
+			retval.y = -Number(retval.y);
+		}
+		let indexT = props.indexOf("time=");
+		if(indexT !== -1) {
+			retval.time = "";
+			for(let i = indexT + 5; i < props.length; ++i) {
+				if(props[i] == " ") { break; }
+				retval.time += props[i];
+			}
+			retval.time = Number(retval.time) * 1000;
+		}
+		let indexD = props.indexOf("delay=");
+		if(indexD !== -1) {
+			retval.delay = "";
+			for(let i = indexD + 6; i < props.length; ++i) {
+				if(props[i] == " ") { break; }
+				retval.delay += props[i];
+			}
+			retval.delay = Number(retval.delay) * 1000;
+		}
+		let indexA = props.indexOf("alpha=");
+		if(indexA !== -1) {
+			retval.alpha = "";
+			for(let i = indexA + 6; i < props.length; ++i) {
+				if(props[i] == " ") { break; }
+				retval.alpha += props[i];
+			}
+			retval.alpha = Number(retval.alpha);
+		}
+		return retval;
+	}
 }