Merge remote-tracking branch 'upstream/main' into 832-Remove-vpMatrix…

…-from-model-unifroms
rendajs · Apr 11, 2024 · 7eb08f5 · 7eb08f5
2 parents 76386b8 + 5a1b966
commit 7eb08f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,10 +89,11 @@ jobs:
         run: deno task test test/unit --coverage
 
       - name: Codecov
-        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+        uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
         with:
           files: .coverage/cov.lcov
           flags: unittests
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   e2e-tests:
     runs-on: ubuntu-latest

diff --git a/studio/src/propertiesWindowContent/PropertiesWindowContentEntity.js b/studio/src/propertiesWindowContent/PropertiesWindowContentEntity.js
@@ -26,17 +26,6 @@ export class PropertiesWindowContentEntity extends PropertiesWindowContent {
 
 		const entitySection = this.treeView.addCollapsable("Entity");
 
-		this.editingModeGui = entitySection.addItem({
-			type: "buttonSelector",
-			guiOpts: {
-				label: "Editing mode",
-				items: ["global", "instance"],
-			},
-		});
-		this.editingModeGui.onValueChange(() => {
-			this.updateTransformationValues();
-		});
-
 		this.positionProperty = entitySection.addItem({
 			type: "vec3",
 			guiOpts: {
@@ -47,11 +36,7 @@ export class PropertiesWindowContentEntity extends PropertiesWindowContent {
 			if (changeEvent.trigger != "user") return;
 			if (!this.currentSelection) return;
 			for (const { entity } of this.currentSelection) {
-				if (this.editingModeGui.value == "global") {
-					entity.pos = changeEvent.value;
-				} else if (this.editingModeGui.value == "instance") {
-					throw new Error("Not implemented");
-				}
+				entity.pos = changeEvent.value;
 				this.studioInstance.projectManager.assetManager?.entityAssetManager.updateEntityTransform(entity, this);
 			}
 		});
@@ -66,11 +51,7 @@ export class PropertiesWindowContentEntity extends PropertiesWindowContent {
 			if (changeEvent.trigger != "user") return;
 			if (!this.currentSelection) return;
 			for (const { entity } of this.currentSelection) {
-				if (this.editingModeGui.value == "global") {
-					entity.rot.setFromAxisAngle(changeEvent.value);
-				} else if (this.editingModeGui.value == "instance") {
-					throw new Error("Not implemented");
-				}
+				entity.rot.setFromAxisAngle(changeEvent.value);
 				this.studioInstance.projectManager.assetManager?.entityAssetManager.updateEntityTransform(entity, this);
 			}
 		});
@@ -85,11 +66,7 @@ export class PropertiesWindowContentEntity extends PropertiesWindowContent {
 			if (changeEvent.trigger != "user") return;
 			if (!this.currentSelection) return;
 			for (const { entity } of this.currentSelection) {
-				if (this.editingModeGui.value == "global") {
-					entity.scale = changeEvent.value;
-				} else if (this.editingModeGui.value == "instance") {
-					throw new Error("Not implemented");
-				}
+				entity.scale = changeEvent.value;
 				this.studioInstance.projectManager.assetManager?.entityAssetManager.updateEntityTransform(entity, this);
 			}
 		});
@@ -178,14 +155,10 @@ export class PropertiesWindowContentEntity extends PropertiesWindowContent {
 		if (!this.currentSelection) return;
 
 		// todo: support multiple selections
-		if (this.editingModeGui.value == "global") {
-			const entity = this.currentSelection[0].entity;
-			this.positionProperty.setValue(entity.pos);
-			this.rotationProperty.setValue(entity.rot.toAxisAngle());
-			this.scaleProperty.setValue(entity.scale);
-		} else if (this.editingModeGui.value == "instance") {
-			throw new Error("Not implemented");
-		}
+		const entity = this.currentSelection[0].entity;
+		this.positionProperty.setValue(entity.pos);
+		this.rotationProperty.setValue(entity.rot.toAxisAngle());
+		this.scaleProperty.setValue(entity.scale);
 	}
 
 	refreshComponents() {