新增renderable组件render方法 去除mathhelper.minof/maxof

This commit is contained in:
yhh
2020-06-18 10:49:32 +08:00
parent 9c293979a4
commit 231276e39b
12 changed files with 162 additions and 68 deletions

View File

@@ -45,14 +45,6 @@ class MathHelper {
return value;
}
public static minOf(a: number, b: number, c: number, d: number){
return Math.min(a, Math.min(b, Math.min(c, d)));
}
public static maxOf(a: number, b: number, c: number, d: number){
return Math.max(a, Math.max(b, Math.max(c, d)));
}
public static pointOnCirlce(circleCenter: Vector2, radius: number, angleInDegrees: number){
let radians = MathHelper.toRadians(angleInDegrees);
return new Vector2(Math.cos(radians) * radians + circleCenter.x, Math.sin(radians) * radians + circleCenter.y);

View File

@@ -73,7 +73,7 @@ class Rectangle {
let dt = res.y - this.top;
let db = this.bottom - res.y;
let min = MathHelper.minOf(dl, dr, dt, db);
let min = Math.min(dl, dr, dt, db);
if (min == dt){
res.y = this.top;
edgeNormal.y = -1;
@@ -134,10 +134,10 @@ class Rectangle {
bottomLeft = Vector2.transform(bottomLeft, this._transformMat);
bottomRight = Vector2.transform(bottomRight, this._transformMat);
let minX = MathHelper.minOf(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);
let maxX = MathHelper.maxOf(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);
let minY = MathHelper.minOf(topLeft.y, bottomRight.y, topRight.y, bottomLeft.y);
let maxY = MathHelper.maxOf(topLeft.y, bottomRight.y, topRight.y, bottomLeft.y);
let minX = Math.min(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);
let maxX = Math.max(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);
let minY = Math.min(topLeft.y, bottomRight.y, topRight.y, bottomLeft.y);
let maxY = Math.max(topLeft.y, bottomRight.y, topRight.y, bottomLeft.y);
this.location = new Vector2(minX, minY);
this.width = maxX - minX;

View File

@@ -33,6 +33,11 @@ class Vector2 {
this.y = y ? y : this.x;
}
/**
*
* @param value1
* @param value2
*/
public static add(value1: Vector2, value2: Vector2){
let result: Vector2 = new Vector2(0, 0);
result.x = value1.x + value2.x;
@@ -40,6 +45,11 @@ class Vector2 {
return result;
}
/**
*
* @param value1
* @param value2
*/
public static divide(value1: Vector2, value2: Vector2){
let result: Vector2 = new Vector2(0, 0);
result.x = value1.x / value2.x;
@@ -47,6 +57,11 @@ class Vector2 {
return value1;
}
/**
*
* @param value1
* @param value2
*/
public static multiply(value1: Vector2, value2: Vector2){
let result: Vector2 = new Vector2(0, 0);
result.x = value1.x * value2.x;
@@ -54,6 +69,11 @@ class Vector2 {
return result;
}
/**
*
* @param value1
* @param value2
*/
public static subtract(value1: Vector2, value2: Vector2){
let result: Vector2 = new Vector2(0, 0);
result.x = value1.x - value2.x;
@@ -68,10 +88,16 @@ class Vector2 {
this.y *= val;
}
/** 返回它的长度 */
public length(){
return Math.sqrt((this.x * this.x) + (this.y * this.y));
}
/**
* 创建一个新的Vector2
* 它包含来自另一个向量的标准化值。
* @param value
*/
public static normalize(value: Vector2){
let val = 1 / Math.sqrt((value.x * value.x) + (value.y * value.y));
value.x *= val;
@@ -98,19 +124,39 @@ class Vector2 {
return (v1 * v1) + (v2 * v2);
}
/**
* 包含指定向量的线性插值
* @param value1 第一个向量
* @param value2 第二个向量
* @param amount 权重值(0.0到1.0之间)
*/
public static lerp(value1: Vector2, value2: Vector2, amount: number){
return new Vector2(MathHelper.lerp(value1.x, value2.x, amount), MathHelper.lerp(value1.y, value2.y, amount));
}
/**
*
* @param position
* @param matrix
*/
public static transform(position: Vector2, matrix: Matrix2D){
return new Vector2((position.x * matrix.m11) + (position.y * matrix.m21), (position.x * matrix.m12) + (position.y * matrix.m22));
}
/**
* 返回两个向量之间的距离
* @param value1
* @param value2
*/
public static distance(value1: Vector2, value2: Vector2){
let v1 = value1.x - value2.x, v2 = value1.y - value2.y;
return Math.sqrt((v1 * v1) + (v2 * v2));
}
/**
* 矢量反演的结果
* @param value
*/
public static negate(value: Vector2){
let result: Vector2 = new Vector2();
result.x = -value.x;