Dwinzo-Beta/Dwinzo_Demo
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main-dev' into main-demo

Browse Source
This commit is contained in:
Vishnu
2025-12-20 13:19:47 +05:30
parent da85c33266 06a742a520
commit 5818583473
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/components/SimulationDashboard/DashboardEditor.tsx
View File

@@ -89,6 +89,13 @@ const DashboardEditor: React.FC = () => {
const currentBlock = blocks.find((b) => b.blockUuid === selectedBlock); const currentBlock = blocks.find((b) => b.blockUuid === selectedBlock);
const currentElement = currentBlock?.elements.find((el) => el.elementUuid === selectedElement); const currentElement = currentBlock?.elements.find((el) => el.elementUuid === selectedElement);
useEffect(()=>{
if (!editMode) {
setSelectedBlock(null);
setSelectedElement(null);
}
},[editMode])
// Helper function to send updates to backend - only sends the specific block that changed // Helper function to send updates to backend - only sends the specific block that changed
const updateBackend = async (updatedBlock: Block) => { const updateBackend = async (updatedBlock: Block) => {
if (!projectId || !selectedVersion) return; if (!projectId || !selectedVersion) return;

2
app/src/modules/simulation/crane/instances/instance/pillarJibInstance.tsx
View File

@@ -93,11 +93,13 @@ function PillarJibInstance({ crane }: { readonly crane: CraneStatus }) {
if (!crane.isActive && crane.currentPhase === "init" && crane.currentMaterials.length > 0 && action.maxPickUpCount <= crane.currentMaterials.length) { if (!crane.isActive && crane.currentPhase === "init" && crane.currentMaterials.length > 0 && action.maxPickUpCount <= crane.currentMaterials.length) {
setCurrentPhase(crane.modelUuid, "init-pickup"); setCurrentPhase(crane.modelUuid, "init-pickup");
setCraneActive(crane.modelUuid, true);
} else if (crane.currentPhase === "picking" && crane.currentMaterials.length > 0 && action.maxPickUpCount <= crane.currentMaterials.length && !crane.isCarrying) { } else if (crane.currentPhase === "picking" && crane.currentMaterials.length > 0 && action.maxPickUpCount <= crane.currentMaterials.length && !crane.isCarrying) {
if (humanAsset?.animationState?.current === "working_standing" && humanAsset?.animationState?.isCompleted && humanId && humanAction && humanAction.actionType === "operator") { if (humanAsset?.animationState?.current === "working_standing" && humanAsset?.animationState?.isCompleted && humanId && humanAction && humanAction.actionType === "operator") {
setCurrentAnimation(humanId, "idle", true, true, true); setCurrentAnimation(humanId, "idle", true, true, true);
setIsCaryying(crane.modelUuid, true); setIsCaryying(crane.modelUuid, true);
setCurrentPhase(crane.modelUuid, "pickup-drop"); setCurrentPhase(crane.modelUuid, "pickup-drop");
setCraneActive(crane.modelUuid, true);
} else { } else {
setCurrentPhaseHuman(humanId, "hooking"); setCurrentPhaseHuman(humanId, "hooking");
setHumanActive(humanId, true); setHumanActive(humanId, true);