Add combo input into parameter

2022-04-08 21:46:33 +08:00
parent cb2501f1f0
commit 3026c463bd
10 changed files with 181 additions and 218 deletions
@@ -24,38 +24,10 @@ class BoundaryConstraint extends Behavior<IBoundaryConstraintBehaviorParameter,
    public override category: string = "$Physics";

 	public override parameterOption = {
-		range: {
-			type: "LR",
-			name: "$range"
-		},
-		strength: {
-			type: "number",
-			name: "$Strength",
-			defaultValue: 1,
-            numberMin: 0,
-            numberStep: .1
-		}
+		range: { type: "LR", name: "$range" },
+		strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 }
 	};

-    public override terms: Record<string, Record<string, string>> = {
-        "$Title": {
-            "ZH_CN": "边界约束",
-            "EN_US": "Boundary constraint"
-        },
-		"$range": {
-			"ZH_CN": "约束范围",
-			"EN_US": "Constraint range"
-		},
-		"$Strength": {
-			"ZH_CN": "约束强度系数",
-			"EN_US": "Restraint strength coefficient"
-		},
-        "$Intro": {
-            "ZH_CN": "个体越出边界后将主动返回",
-            "EN_US": "Individuals will return actively after crossing the border"
-        }
-    };
-
    public effect(individual: Individual, group: Group, model: Model, t: number): void {
        let rangeList: Range[] = this.parameter.range.objects;

@@ -99,6 +71,25 @@ class BoundaryConstraint extends Behavior<IBoundaryConstraintBehaviorParameter,
 			fz * this.parameter.strength
 		);
    }
+
+	public override terms: Record<string, Record<string, string>> = {
+        "$Title": {
+            "ZH_CN": "边界约束",
+            "EN_US": "Boundary constraint"
+        },
+		"$range": {
+			"ZH_CN": "约束范围",
+			"EN_US": "Constraint range"
+		},
+		"$Strength": {
+			"ZH_CN": "约束强度系数",
+			"EN_US": "Restraint strength coefficient"
+		},
+        "$Intro": {
+            "ZH_CN": "个体越出边界后将主动返回",
+            "EN_US": "Individuals will return actively after crossing the border"
+        }
+    };
 }

 export { BoundaryConstraint };
@@ -25,37 +25,36 @@ class Brownian extends Behavior<IBrownianBehaviorParameter, IBrownianBehaviorEve
 	public override category: string = "$Physics";

 	public override parameterOption = {
-		maxFrequency: {
-			type: "number",
-			name: "$Max.Frequency",
-			defaultValue: 5,
-			numberStep: .1,
-			numberMin: 0
-		},
-		minFrequency: {
-			type: "number",
-			name: "$Min.Frequency",
-			defaultValue: 0,
-			numberStep: .1,
-			numberMin: 0
-		},
-		maxStrength: {
-			type: "number",
-			name: "$Max.Strength",
-			defaultValue: 10,
-			numberStep: .01,
-			numberMin: 0
-		},
-		minStrength: {
-			type: "number",
-			name: "$Min.Strength",
-			defaultValue: 0,
-			numberStep: .01,
-			numberMin: 0
-		}
+		maxFrequency: { type: "number", name: "$Max.Frequency", defaultValue: 5, numberStep: .1, numberMin: 0 },
+		minFrequency: { type: "number", name: "$Min.Frequency", defaultValue: 0, numberStep: .1, numberMin: 0 },
+		maxStrength: { type: "number", name: "$Max.Strength", defaultValue: 10, numberStep: .01, numberMin: 0 },
+		minStrength: { type: "number", name: "$Min.Strength", defaultValue: 0, numberStep: .01, numberMin: 0 }
 	};

-    public override terms: Record<string, Record<string, string>> = {
+	public effect(individual: Individual, group: Group, model: Model, t: number): void {
+
+		const {maxFrequency, minFrequency, maxStrength, minStrength} = this.parameter;
+
+		let nextTime = individual.getData("Brownian.nextTime") ?? 
+		minFrequency +  Math.random() * (maxFrequency - minFrequency);
+		let currentTime = individual.getData("Brownian.currentTime") ?? 0;
+		
+		currentTime += t;
+		if (currentTime > nextTime) {
+			individual.applyForce(
+				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
+				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
+				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength)
+			);
+			nextTime = minFrequency +  Math.random() * (maxFrequency - minFrequency);
+			currentTime = 0;
+		}
+
+		individual.setData("Brownian.nextTime", nextTime);
+		individual.setData("Brownian.currentTime", currentTime);
+	}
+
+	public override terms: Record<string, Record<string, string>> = {
        "$Title": {
            "ZH_CN": "布朗运动",
            "EN_US": "Brownian motion"
@@ -81,29 +80,6 @@ class Brownian extends Behavior<IBrownianBehaviorParameter, IBrownianBehaviorEve
            "EN_US": "Minimum strength"
        }
    };
-
-	public effect(individual: Individual, group: Group, model: Model, t: number): void {
-
-		const {maxFrequency, minFrequency, maxStrength, minStrength} = this.parameter;
-
-		let nextTime = individual.getData("Brownian.nextTime") ?? 
-		minFrequency +  Math.random() * (maxFrequency - minFrequency);
-		let currentTime = individual.getData("Brownian.currentTime") ?? 0;
-		
-		currentTime += t;
-		if (currentTime > nextTime) {
-			individual.applyForce(
-				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
-				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength),
-				minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength)
-			);
-			nextTime = minFrequency +  Math.random() * (maxFrequency - minFrequency);
-			currentTime = 0;
-		}
-
-		individual.setData("Brownian.nextTime", nextTime);
-		individual.setData("Brownian.currentTime", currentTime);
-	}
 }

 export { Brownian };
@@ -25,67 +25,12 @@ class Dynamics extends Behavior<IDynamicsBehaviorParameter, IDynamicsBehaviorEve
 	public override category: string = "$Physics";

 	public override parameterOption = {
-		mass: {
-			name: "$Mass",
-			type: "number",
-			defaultValue: 1,
-			numberStep: .01,
-			numberMin: .001
-		},
-		maxAcceleration: {
-			name: "$Max.Acceleration",
-			type: "number",
-			defaultValue: 5,
-			numberStep: .1,
-			numberMin: 0
-		},
-		maxVelocity: {
-			name: "$Max.Velocity",
-			type: "number",
-			defaultValue: 10,
-			numberStep: .1,
-			numberMin: 0
-		},
-		resistance: {
-			name: "$Resistance",
-			type: "number",
-			defaultValue: 0.5,
-			numberStep: .1,
-			numberMin: 0
-		}
+		mass: { name: "$Mass", type: "number", defaultValue: 1, numberStep: .01, numberMin: .001 },
+		maxAcceleration: { name: "$Max.Acceleration", type: "number", defaultValue: 5, numberStep: .1, numberMin: 0 },
+		maxVelocity: { name: "$Max.Velocity", type: "number", defaultValue: 10, numberStep: .1, numberMin: 0 },
+		resistance: { name: "$Resistance", type: "number", defaultValue: 0.5, numberStep: .1, numberMin: 0 }
 	};

-    public override terms: Record<string, Record<string, string>> = {
-        "$Title": {
-            "ZH_CN": "动力学",
-            "EN_US": "Dynamics"
-        },
-        "$Intro": {
-            "ZH_CN": "一切可以运动物体的必要行为，执行物理法则。",
-            "EN_US": "All necessary behaviors that can move objects and implement the laws of physics."
-        },
-		"$Mass": {
-			"ZH_CN": "质量 (Kg)",
-            "EN_US": "Mass (Kg)"
-		},
-		"$Max.Acceleration": {
-			"ZH_CN": "最大加速度 (m/s²)",
-            "EN_US": "Maximum acceleration (m/s²)"
-		},
-		"$Max.Velocity": {
-			"ZH_CN": "最大速度 (m/s)",
-            "EN_US": "Maximum velocity (m/s)"
-		},
-		"$Resistance": {
-			"ZH_CN": "阻力系数",
-			"EN_US": "Resistance coefficient"
-		},
-		"$Physics": {
-			"ZH_CN": "物理",
-            "EN_US": "Physics"
-		}
-    };
-
 	public override finalEffect(individual: Individual, group: Group, model: Model, t: number): void {

 		// 计算当前速度
@@ -139,6 +84,37 @@ class Dynamics extends Behavior<IDynamicsBehaviorParameter, IDynamicsBehaviorEve
 		individual.force[1] = 0;
 		individual.force[2] = 0;
 	};
+	
+    public override terms: Record<string, Record<string, string>> = {
+        "$Title": {
+            "ZH_CN": "动力学",
+            "EN_US": "Dynamics"
+        },
+        "$Intro": {
+            "ZH_CN": "一切可以运动物体的必要行为，执行物理法则。",
+            "EN_US": "All necessary behaviors that can move objects and implement the laws of physics."
+        },
+		"$Mass": {
+			"ZH_CN": "质量 (Kg)",
+            "EN_US": "Mass (Kg)"
+		},
+		"$Max.Acceleration": {
+			"ZH_CN": "最大加速度 (m/s²)",
+            "EN_US": "Maximum acceleration (m/s²)"
+		},
+		"$Max.Velocity": {
+			"ZH_CN": "最大速度 (m/s)",
+            "EN_US": "Maximum velocity (m/s)"
+		},
+		"$Resistance": {
+			"ZH_CN": "阻力系数",
+			"EN_US": "Resistance coefficient"
+		},
+		"$Physics": {
+			"ZH_CN": "物理",
+            "EN_US": "Physics"
+		}
+    };
 }

 export { Dynamics };
@@ -31,62 +31,24 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve
    public override category: string = "$Category";

    public override parameterOption = {
-        testNumber: {
-            name: "$Test",
-            type: "number",
-            defaultValue: 1,
-            numberMax: 10,
-            numberMin: 0,
-            numberStep: 1
-        },
-        testString: {
-            name: "$Test",
-            type: "string",
-            defaultValue: "default",
-            maxLength: 12
-        },
-        testColor: {
-            name: "$Test",
-            type: "color",
-            defaultValue: [.5, .1, 1],
-            colorNormal: true
-        },
-        testOption: {
-            name: "$Test",
-            type: "option"
-        },
-        testBoolean: {
-            name: "$Test",
-            type: "boolean",
-            defaultValue: false,
-            iconName: "Send"
-        },
-        testR: {
-            name: "$Test",
-            type: "R"
-        },
-        testG: {
-            name: "$Test",
-            type: "G"
-        },
-        testLR: {
-            name: "$Test",
-            type: "LR"
-        },
-        testLG: {
-            name: "$Test",
-            type: "LG"
-        },
-        testVec: {
-            name: "$Test",
-            type: "vec",
-            defaultValue: [1, 2, 3],
-            numberMax: 10,
-            numberMin: 0,
-            numberStep: 1
-        }
+        testNumber: { name: "$Test", type: "number", defaultValue: 1, numberMax: 10, numberMin: 0, numberStep: 1 },
+        testString: { name: "$Test", type: "string", defaultValue: "default", maxLength: 12 },
+        testColor: { name: "$Test", type: "color", defaultValue: [.5, .1, 1], colorNormal: true },
+        testOption: { name: "$Test", type: "option", defaultValue: "T", allOption: [
+            { key: "P", name: "$Test"}, { key: "T", name: "$Title"}
+        ]},
+        testBoolean: { name: "$Test", type: "boolean", defaultValue: false, iconName: "Send" },
+        testR: { name: "$Test", type: "R" },
+        testG: { name: "$Test", type: "G" },
+        testLR: { name: "$Test", type: "LR" },
+        testLG: { name: "$Test", type: "LG" },
+        testVec: { name: "$Test", type: "vec", defaultValue: [1, 2, 3], numberMax: 10, numberMin: 0, numberStep: 1 }
    };

+    public effect(individual: Individual, group: Group, model: Model, t: number): void {
+        
+    }
+
    public override terms: Record<string, Record<string, string>> = {
        "$Title": {
            "ZH_CN": "行为",
@@ -99,12 +61,12 @@ class Template extends Behavior<ITemplateBehaviorParameter, ITemplateBehaviorEve
        "$Test": {
            "ZH_CN": "测试参数",
            "EN_US": "Test Parameter"
+        },
+        "$Category": {
+            "ZH_CN": "测序模板",
+            "EN_US": "Test template"
        }
    };
-
-    public effect(individual: Individual, group: Group, model: Model, t: number): void {
-        
-    }
 }

 export { Template };