Skip to content

Commit c48ee80

Browse files
committed
fixed trigger, now it save state
1 parent 9e73229 commit c48ee80

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

src/objects/gui/moTrigger.cpp

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ moTrigger::moTrigger() : PatchObject("trigger"){
5050

5151
trigger = false;
5252

53+
loaded = false;
54+
5355
}
5456

5557
//--------------------------------------------------------------
@@ -58,6 +60,8 @@ void moTrigger::newObject(){
5860

5961
this->addInlet(VP_LINK_NUMERIC,"trigger");
6062
this->addOutlet(VP_LINK_NUMERIC,"trigger");
63+
64+
this->setCustomVar(static_cast<float>(trigger),"VALUE");
6165
}
6266

6367
//--------------------------------------------------------------
@@ -72,6 +76,7 @@ void moTrigger::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
7276

7377
//--------------------------------------------------------------
7478
void moTrigger::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects){
79+
unusedArgs(patchObjects);
7580

7681
if(this->inletsConnected[0]){
7782
if(*(float *)&_inletParams[0] < 1.0f){
@@ -83,10 +88,25 @@ void moTrigger::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjec
8388
}
8489
}
8590
*(float *)&_outletParams[0] = static_cast<float>(trigger);
91+
92+
if(!loaded){
93+
loaded = true;
94+
95+
trigger = static_cast<bool>(this->getCustomVar("VALUE"));
96+
if(trigger){
97+
currentColor = pressColor;
98+
}else{
99+
currentColor = releaseColor;
100+
}
101+
}
102+
103+
this->setCustomVar(static_cast<float>(trigger),"VALUE");
86104
}
87105

88106
//--------------------------------------------------------------
89107
void moTrigger::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
108+
unusedArgs(font,glRenderer);
109+
90110
ofSetColor(255);
91111

92112
}
@@ -119,6 +139,7 @@ void moTrigger::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
119139

120140
if (state == SmartButtonState_Released){
121141
trigger = !trigger;
142+
122143
if(trigger){
123144
currentColor = pressColor;
124145
}else{
@@ -139,7 +160,7 @@ void moTrigger::drawObjectNodeConfig(){
139160

140161
//--------------------------------------------------------------
141162
void moTrigger::removeObjectContent(bool removeFileFromData){
142-
163+
unusedArgs(removeFileFromData);
143164
}
144165

145166

src/objects/gui/moTrigger.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class moTrigger : public PatchObject {
5454
void removeObjectContent(bool removeFileFromData=false) override;
5555

5656
bool trigger;
57+
bool loaded;
5758

5859
ImVec4 currentColor;
5960
ImVec4 pressColor;

0 commit comments

Comments
 (0)