Create missing variable and list monitors before setting visibility

adazem009 · adazem009 · commit 082f4812c0dd · 2024-09-16T11:58:19.000+02:00
diff --git a/src/blocks/listblocks.cpp b/src/blocks/listblocks.cpp
@@ -142,19 +142,23 @@ void ListBlocks::compileHideList(Compiler *compiler)
         compiler->addFunctionCall(&hideList);
 }
 
-void ListBlocks::setListVisible(std::shared_ptr<List> list, bool visible)
+void ListBlocks::setListVisible(std::shared_ptr<List> list, bool visible, IEngine *engine)
 {
     if (list) {
-        assert(list->monitor());
-        list->monitor()->setVisible(visible);
+        Monitor *monitor = list->monitor();
+
+        if (!monitor)
+            monitor = engine->createListMonitor(list, "data_listcontents", "LIST", LIST);
+
+        monitor->setVisible(visible);
     }
 }
 
 unsigned int ListBlocks::showGlobalList(VirtualMachine *vm)
 {
     if (Stage *target = vm->engine()->stage()) {
         int index = target->findListById(vm->getInput(0, 1)->toString());
-        setListVisible(target->listAt(index), true);
+        setListVisible(target->listAt(index), true, vm->engine());
     }
 
     return 1;
@@ -166,10 +170,10 @@ unsigned int ListBlocks::showList(VirtualMachine *vm)
         if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {
             Sprite *sprite = static_cast<Sprite *>(target)->cloneSprite(); // use clone root list
             int index = sprite->findListById(vm->getInput(0, 1)->toString());
-            setListVisible(sprite->listAt(index), true);
+            setListVisible(sprite->listAt(index), true, vm->engine());
         } else {
             int index = target->findListById(vm->getInput(0, 1)->toString());
-            setListVisible(target->listAt(index), true);
+            setListVisible(target->listAt(index), true, vm->engine());
         }
     }
 
@@ -180,7 +184,7 @@ unsigned int ListBlocks::hideGlobalList(VirtualMachine *vm)
 {
     if (Stage *target = vm->engine()->stage()) {
         int index = target->findListById(vm->getInput(0, 1)->toString());
-        setListVisible(target->listAt(index), false);
+        setListVisible(target->listAt(index), false, vm->engine());
     }
 
     return 1;
@@ -192,10 +196,10 @@ unsigned int ListBlocks::hideList(VirtualMachine *vm)
         if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {
             Sprite *sprite = static_cast<Sprite *>(target)->cloneSprite(); // use clone root list
             int index = sprite->findListById(vm->getInput(0, 1)->toString());
-            setListVisible(sprite->listAt(index), false);
+            setListVisible(sprite->listAt(index), false, vm->engine());
         } else {
             int index = target->findListById(vm->getInput(0, 1)->toString());
-            setListVisible(target->listAt(index), false);
+            setListVisible(target->listAt(index), false, vm->engine());
         }
     }
 
diff --git a/src/blocks/listblocks.h b/src/blocks/listblocks.h
@@ -43,7 +43,7 @@ class ListBlocks : public IBlockSection
         static void compileShowList(Compiler *compiler);
         static void compileHideList(Compiler *compiler);
 
-        static void setListVisible(std::shared_ptr<List> list, bool visible);
+        static void setListVisible(std::shared_ptr<List> list, bool visible, IEngine *engine);
 
         static unsigned int showGlobalList(VirtualMachine *vm);
         static unsigned int showList(VirtualMachine *vm);
diff --git a/src/blocks/variableblocks.cpp b/src/blocks/variableblocks.cpp
@@ -88,19 +88,23 @@ void VariableBlocks::compileHideVariable(Compiler *compiler)
         compiler->addFunctionCall(&hideVariable);
 }
 
-void VariableBlocks::setVarVisible(std::shared_ptr<Variable> var, bool visible)
+void VariableBlocks::setVarVisible(std::shared_ptr<Variable> var, bool visible, IEngine *engine)
 {
     if (var) {
-        assert(var->monitor());
-        var->monitor()->setVisible(visible);
+        Monitor *monitor = var->monitor();
+
+        if (!monitor)
+            monitor = engine->createVariableMonitor(var, "data_variable", "VARIABLE", VARIABLE);
+
+        monitor->setVisible(visible);
     }
 }
 
 unsigned int VariableBlocks::showGlobalVariable(VirtualMachine *vm)
 {
     if (Stage *target = vm->engine()->stage()) {
         int index = target->findVariableById(vm->getInput(0, 1)->toString());
-        setVarVisible(target->variableAt(index), true);
+        setVarVisible(target->variableAt(index), true, vm->engine());
     }
 
     return 1;
@@ -112,10 +116,10 @@ unsigned int VariableBlocks::showVariable(VirtualMachine *vm)
         if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {
             Sprite *sprite = static_cast<Sprite *>(target)->cloneSprite(); // use clone root variable
             int index = sprite->findVariableById(vm->getInput(0, 1)->toString());
-            setVarVisible(sprite->variableAt(index), true);
+            setVarVisible(sprite->variableAt(index), true, vm->engine());
         } else {
             int index = target->findVariableById(vm->getInput(0, 1)->toString());
-            setVarVisible(target->variableAt(index), true);
+            setVarVisible(target->variableAt(index), true, vm->engine());
         }
     }
 
@@ -126,7 +130,7 @@ unsigned int VariableBlocks::hideGlobalVariable(VirtualMachine *vm)
 {
     if (Stage *target = vm->engine()->stage()) {
         int index = target->findVariableById(vm->getInput(0, 1)->toString());
-        setVarVisible(target->variableAt(index), false);
+        setVarVisible(target->variableAt(index), false, vm->engine());
     }
 
     return 1;
@@ -138,10 +142,10 @@ unsigned int VariableBlocks::hideVariable(VirtualMachine *vm)
         if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {
             Sprite *sprite = static_cast<Sprite *>(target)->cloneSprite(); // use clone root variable
             int index = sprite->findVariableById(vm->getInput(0, 1)->toString());
-            setVarVisible(sprite->variableAt(index), false);
+            setVarVisible(sprite->variableAt(index), false, vm->engine());
         } else {
             int index = target->findVariableById(vm->getInput(0, 1)->toString());
-            setVarVisible(target->variableAt(index), false);
+            setVarVisible(target->variableAt(index), false, vm->engine());
         }
     }
 
diff --git a/src/blocks/variableblocks.h b/src/blocks/variableblocks.h
@@ -34,7 +34,7 @@ class VariableBlocks : public IBlockSection
         static void compileShowVariable(Compiler *compiler);
         static void compileHideVariable(Compiler *compiler);
 
-        static void setVarVisible(std::shared_ptr<Variable> var, bool visible);
+        static void setVarVisible(std::shared_ptr<Variable> var, bool visible, IEngine *engine);
 
         static unsigned int showGlobalVariable(VirtualMachine *vm);
         static unsigned int showVariable(VirtualMachine *vm);

Original file line number	Diff line number	Diff line change
`@@ -142,19 +142,23 @@ void ListBlocks::compileHideList(Compiler *compiler)`
`142`	`142`	`compiler->addFunctionCall(&hideList);`
`143`	`143`	`}`
`144`	`144`
`145`		`-void ListBlocks::setListVisible(std::shared_ptr<List> list, bool visible)`
	`145`	`+void ListBlocks::setListVisible(std::shared_ptr<List> list, bool visible, IEngine *engine)`
`146`	`146`	`{`
`147`	`147`	`if (list) {`
`148`		`- assert(list->monitor());`
`149`		`- list->monitor()->setVisible(visible);`
	`148`	`+ Monitor *monitor = list->monitor();`
	`149`	`+`
	`150`	`+ if (!monitor)`
	`151`	`+ monitor = engine->createListMonitor(list, "data_listcontents", "LIST", LIST);`
	`152`	`+`
	`153`	`+ monitor->setVisible(visible);`
`150`	`154`	`}`
`151`	`155`	`}`
`152`	`156`
`153`	`157`	`unsigned int ListBlocks::showGlobalList(VirtualMachine *vm)`
`154`	`158`	`{`
`155`	`159`	`if (Stage *target = vm->engine()->stage()) {`
`156`	`160`	`int index = target->findListById(vm->getInput(0, 1)->toString());`
`157`		`- setListVisible(target->listAt(index), true);`
	`161`	`+ setListVisible(target->listAt(index), true, vm->engine());`
`158`	`162`	`}`
`159`	`163`
`160`	`164`	`return 1;`
`@@ -166,10 +170,10 @@ unsigned int ListBlocks::showList(VirtualMachine *vm)`
`166`	`170`	`if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {`
`167`	`171`	`Sprite sprite = static_cast<Sprite >(target)->cloneSprite(); // use clone root list`
`168`	`172`	`int index = sprite->findListById(vm->getInput(0, 1)->toString());`
`169`		`- setListVisible(sprite->listAt(index), true);`
	`173`	`+ setListVisible(sprite->listAt(index), true, vm->engine());`
`170`	`174`	`} else {`
`171`	`175`	`int index = target->findListById(vm->getInput(0, 1)->toString());`
`172`		`- setListVisible(target->listAt(index), true);`
	`176`	`+ setListVisible(target->listAt(index), true, vm->engine());`
`173`	`177`	`}`
`174`	`178`	`}`
`175`	`179`
`@@ -180,7 +184,7 @@ unsigned int ListBlocks::hideGlobalList(VirtualMachine *vm)`
`180`	`184`	`{`
`181`	`185`	`if (Stage *target = vm->engine()->stage()) {`
`182`	`186`	`int index = target->findListById(vm->getInput(0, 1)->toString());`
`183`		`- setListVisible(target->listAt(index), false);`
	`187`	`+ setListVisible(target->listAt(index), false, vm->engine());`
`184`	`188`	`}`
`185`	`189`
`186`	`190`	`return 1;`
`@@ -192,10 +196,10 @@ unsigned int ListBlocks::hideList(VirtualMachine *vm)`
`192`	`196`	`if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {`
`193`	`197`	`Sprite sprite = static_cast<Sprite >(target)->cloneSprite(); // use clone root list`
`194`	`198`	`int index = sprite->findListById(vm->getInput(0, 1)->toString());`
`195`		`- setListVisible(sprite->listAt(index), false);`
	`199`	`+ setListVisible(sprite->listAt(index), false, vm->engine());`
`196`	`200`	`} else {`
`197`	`201`	`int index = target->findListById(vm->getInput(0, 1)->toString());`
`198`		`- setListVisible(target->listAt(index), false);`
	`202`	`+ setListVisible(target->listAt(index), false, vm->engine());`
`199`	`203`	`}`
`200`	`204`	`}`
`201`	`205`
Original file line number	Diff line number	Diff line change
`@@ -88,19 +88,23 @@ void VariableBlocks::compileHideVariable(Compiler *compiler)`
`88`	`88`	`compiler->addFunctionCall(&hideVariable);`
`89`	`89`	`}`
`90`	`90`
`91`		`-void VariableBlocks::setVarVisible(std::shared_ptr<Variable> var, bool visible)`
	`91`	`+void VariableBlocks::setVarVisible(std::shared_ptr<Variable> var, bool visible, IEngine *engine)`
`92`	`92`	`{`
`93`	`93`	`if (var) {`
`94`		`- assert(var->monitor());`
`95`		`- var->monitor()->setVisible(visible);`
	`94`	`+ Monitor *monitor = var->monitor();`
	`95`	`+`
	`96`	`+ if (!monitor)`
	`97`	`+ monitor = engine->createVariableMonitor(var, "data_variable", "VARIABLE", VARIABLE);`
	`98`	`+`
	`99`	`+ monitor->setVisible(visible);`
`96`	`100`	`}`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`unsigned int VariableBlocks::showGlobalVariable(VirtualMachine *vm)`
`100`	`104`	`{`
`101`	`105`	`if (Stage *target = vm->engine()->stage()) {`
`102`	`106`	`int index = target->findVariableById(vm->getInput(0, 1)->toString());`
`103`		`- setVarVisible(target->variableAt(index), true);`
	`107`	`+ setVarVisible(target->variableAt(index), true, vm->engine());`
`104`	`108`	`}`
`105`	`109`
`106`	`110`	`return 1;`
`@@ -112,10 +116,10 @@ unsigned int VariableBlocks::showVariable(VirtualMachine *vm)`
`112`	`116`	`if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {`
`113`	`117`	`Sprite sprite = static_cast<Sprite >(target)->cloneSprite(); // use clone root variable`
`114`	`118`	`int index = sprite->findVariableById(vm->getInput(0, 1)->toString());`
`115`		`- setVarVisible(sprite->variableAt(index), true);`
	`119`	`+ setVarVisible(sprite->variableAt(index), true, vm->engine());`
`116`	`120`	`} else {`
`117`	`121`	`int index = target->findVariableById(vm->getInput(0, 1)->toString());`
`118`		`- setVarVisible(target->variableAt(index), true);`
	`122`	`+ setVarVisible(target->variableAt(index), true, vm->engine());`
`119`	`123`	`}`
`120`	`124`	`}`
`121`	`125`
`@@ -126,7 +130,7 @@ unsigned int VariableBlocks::hideGlobalVariable(VirtualMachine *vm)`
`126`	`130`	`{`
`127`	`131`	`if (Stage *target = vm->engine()->stage()) {`
`128`	`132`	`int index = target->findVariableById(vm->getInput(0, 1)->toString());`
`129`		`- setVarVisible(target->variableAt(index), false);`
	`133`	`+ setVarVisible(target->variableAt(index), false, vm->engine());`
`130`	`134`	`}`
`131`	`135`
`132`	`136`	`return 1;`
`@@ -138,10 +142,10 @@ unsigned int VariableBlocks::hideVariable(VirtualMachine *vm)`
`138`	`142`	`if (!target->isStage() && static_cast<Sprite *>(target)->isClone()) {`
`139`	`143`	`Sprite sprite = static_cast<Sprite >(target)->cloneSprite(); // use clone root variable`
`140`	`144`	`int index = sprite->findVariableById(vm->getInput(0, 1)->toString());`
`141`		`- setVarVisible(sprite->variableAt(index), false);`
	`145`	`+ setVarVisible(sprite->variableAt(index), false, vm->engine());`
`142`	`146`	`} else {`
`143`	`147`	`int index = target->findVariableById(vm->getInput(0, 1)->toString());`
`144`		`- setVarVisible(target->variableAt(index), false);`
	`148`	`+ setVarVisible(target->variableAt(index), false, vm->engine());`
`145`	`149`	`}`
`146`	`150`	`}`
`147`	`151`