fix empty names and add sanitization of names

yaptide · Oct 6, 2023 · f3e5138 · f3e5138
1 parent 0d9952f
commit f3e5138
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/src/ThreeEditor/Simulation/Materials/MaterialManager.ts b/src/ThreeEditor/Simulation/Materials/MaterialManager.ts
@@ -43,10 +43,13 @@ export class MaterialManager extends THREE.Object3D implements SimulationPropert
 	private createMaterialPrefabs = () => {
 		const { editor } = this;
 		const editorMaterials = MATERIALS.reduce(
-			([prevMaterials, prevOptions], { name, icru, density }) => [
+			(
+				[prevMaterials, prevOptions],
+				{ name, sanitized_name: sanitizedName, icru, density }
+			) => [
 				{
 					...prevMaterials,
-					[icru]: new SimulationMaterial(editor, name, icru, density)
+					[icru]: new SimulationMaterial(editor, name, sanitizedName, icru, density)
 				},
 				{
 					...prevOptions,

diff --git a/src/ThreeEditor/Simulation/Materials/SimulationMaterial.test.ts b/src/ThreeEditor/Simulation/Materials/SimulationMaterial.test.ts
@@ -21,18 +21,19 @@ test('constructor default', () => {
 });
 
 test('constructor params', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	expect(material).toBeInstanceOf(SimulationMaterial);
 	expect(material.icru).toBe(1);
 	expect(material.density).toBe(2);
 	expect(material.name).toBe('test');
 });
 
 test('toJSON', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	expect(material.toJSON()).toEqual({
 		uuid: material.uuid,
 		name: 'test',
+		sanitizedName: 'test',
 		icru: 1,
 		density: 2
 	});
@@ -42,6 +43,7 @@ test('fromJSON', () => {
 	const material = SimulationMaterial.fromJSON(editor, {
 		uuid: 'testUuid',
 		name: 'test',
+		sanitizedName: 'test',
 		icru: 1,
 		density: 2
 	});
@@ -55,6 +57,7 @@ test('fromJSON', () => {
 	const material2 = SimulationMaterial.fromJSON(editor, {
 		uuid: 'testUuid',
 		name: 'test',
+		sanitizedName: 'test',
 		icru: 1,
 		density: 2,
 		customStoppingPower: true
@@ -69,7 +72,7 @@ test('fromJSON', () => {
 });
 
 test('clone', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	material.customStoppingPower = true;
 	const clone = material.clone();
 	expect(clone).toBeInstanceOf(SimulationMaterial);
@@ -81,7 +84,7 @@ test('clone', () => {
 });
 
 test('copy', () => {
-	const material = new SimulationMaterial(editor, 'test', 1, 2);
+	const material = new SimulationMaterial(editor, 'test', 'test', 1, 2);
 	material.customStoppingPower = true;
 	const copy = new SimulationMaterial(editor);
 	copy.copy(material);

diff --git a/src/ThreeEditor/Simulation/Materials/materials.ts b/src/ThreeEditor/Simulation/Materials/materials.ts
@@ -13,8 +13,8 @@ import re
 
 densities = []
 additional_materials = [
-	{ 'icru': 1000, 'name': 'VACUUM', 'density': 0 },
-	{ 'icru': 0, 'name': 'BLACK HOLE', 'density': 0 }
+	{ 'icru': 1000, 'name': 'VACUUM', 'sanitized_name': 'vacuum', 'density': 0 },
+	{ 'icru': 0, 'name': 'BLACK HOLE', 'sanitized_name': 'black_hole', 'density': 0 }
 ]
 with open('./src/shieldhit/microdhi/icru.f', 'r') as icru_file:
 	for line in icru_file.readlines()[494:565]:
@@ -26,7 +26,7 @@ with open('./src/shieldhit/microdhi/icru.f', 'r') as icru_file:
 			densities.extend(numbers)
 
 for material in additional_materials:
-	print(f"	{{ icru: {material['icru']}, name: '{material['name']}', density: {material['density']} }},")
+	print(f"	{{ icru: {material['icru']}, name: '{material['name']}', sanitized_name: '{material['sanitized_name']}', density: {material['density']} }},")
  
 for i, elem in enumerate(elements):
 	if i > 0 and i < 99:
@@ -52,8 +52,8 @@ with open('./doc/tex/UsersGuide/07_reftab.tex', 'r') as infile:
 */
 
 export const MATERIALS = [
-	{ icru: 1000, name: 'VACUUM', density: 0 },
-	{ icru: 0, name: 'BLACK HOLE', density: 0 },
+	{ icru: 1000, name: 'VACUUM', sanitized_name: 'vacuum', density: 0 },
+	{ icru: 0, name: 'BLACK HOLE', sanitized_name: 'black_hole', density: 0 },
 	{ icru: 1, name: 'HYDROGEN', sanitized_name: 'H', density: 8.3748e-5 },
 	{ icru: 2, name: 'HELIUM', sanitized_name: 'He', density: 0.000166322 },
 	{ icru: 3, name: 'LITHIUM', sanitized_name: 'Li', density: 0.534 },

diff --git a/src/ThreeEditor/components/Sidebar/properties/category/ObjectInfo.tsx b/src/ThreeEditor/components/Sidebar/properties/category/ObjectInfo.tsx
@@ -25,7 +25,12 @@ export function ObjectInfo(props: { editor: YaptideEditor; object: Object3D }) {
 						value={watchedObject.name}
 						onChange={value => {
 							editor.execute(
-								new SetValueCommand(editor, watchedObject.object, 'name', value)
+								new SetValueCommand(
+									editor,
+									watchedObject.object,
+									'name',
+									value.length > 0 ? value : watchedObject.type
+								)
 							);
 						}}
 					/>