From a06c2912fb33d9cbd62890feef060be518bba24d Mon Sep 17 00:00:00 2001 From: Jeremy Stewart Date: Thu, 3 Mar 2016 17:47:29 -0500 Subject: [PATCH] appears to be working --- Field_Cuts_6_SCORE.xcodeproj/project.pbxproj | 158 +++++++++++------- .../UserInterfaceState.xcuserstate | Bin 32028 -> 15742 bytes .../xcdebugger/Breakpoints_v2.xcbkptlist | 5 - addons.make | 1 + src/fc_scoreManager.cpp | 34 ++++ src/fc_scoreManager.hpp | 48 ++++-- 6 files changed, 161 insertions(+), 85 deletions(-) delete mode 100644 Field_Cuts_6_SCORE.xcodeproj/xcuserdata/blindelephants.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist diff --git a/Field_Cuts_6_SCORE.xcodeproj/project.pbxproj b/Field_Cuts_6_SCORE.xcodeproj/project.pbxproj index f28423a..1203a8f 100644 --- a/Field_Cuts_6_SCORE.xcodeproj/project.pbxproj +++ b/Field_Cuts_6_SCORE.xcodeproj/project.pbxproj @@ -8,8 +8,11 @@ /* Begin PBXBuildFile section */ 0546D1A38E13BD319CC9755B /* OscReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BF3AA0D4FAA89D0F8A0E545 /* OscReceivedElements.cpp */; }; + 07DEC423BCE0C805DAD76CD4 /* fc_conditionStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37EB426B820D16A63FBA5997 /* fc_conditionStream.cpp */; }; 125506CD3E5F428AAFE5CC65 /* ofxTCPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */; }; + 13DCCEF9F5990CFFEE535C6C /* fc_deviceAccelParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1FC90D6D01BA771CD8D2CAC /* fc_deviceAccelParser.cpp */; }; 1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; }; + 2E1E1FDF603A9C3C2EEDA12C /* fc_device.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CC015E810DF1A60C01AB823 /* fc_device.cpp */; }; 483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78D67A00EB899FAC09430597 /* ofxLabel.cpp */; }; 4ADB88E2FB52E76A471065DE /* ofxOscParameterSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0AED834CE4DEC5260AF302A2 /* ofxOscParameterSync.cpp */; }; 510CAFE035E576A4E1502D52 /* UdpSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6DEF695B88BA5FAACEAA937 /* UdpSocket.cpp */; }; @@ -18,38 +21,36 @@ 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; }; 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; 5D067CF087427621DD1E64B8 /* ofxAnimatableFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C9E4AC6CF4626BA74F7E994 /* ofxAnimatableFloat.cpp */; }; - 603328B71C824D4D005D84A0 /* fc_performer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 603328B51C824D4D005D84A0 /* fc_performer.cpp */; }; - 604BD2021C837E86009FFDBA /* fc_conditionStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 604BD2001C837E86009FFDBA /* fc_conditionStream.cpp */; }; - 60613A3B1C82A21D004BA026 /* fc_scoreManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60613A391C82A21D004BA026 /* fc_scoreManager.cpp */; }; - 60D69F351C7F8A21007C6A58 /* fc_device.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60D69F331C7F8A21007C6A58 /* fc_device.cpp */; }; - 60D69F391C7FB569007C6A58 /* fc_deviceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60D69F371C7FB569007C6A58 /* fc_deviceManager.cpp */; }; - 60D69F3C1C7FB5E1007C6A58 /* fc_deviceAccelParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60D69F3A1C7FB5E1007C6A58 /* fc_deviceAccelParser.cpp */; }; - 60D69F431C7FBD28007C6A58 /* fc_condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60D69F411C7FBD28007C6A58 /* fc_condition.cpp */; }; - 60D69F461C7FBF5D007C6A58 /* fc_conditionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60D69F441C7FBF5D007C6A58 /* fc_conditionManager.cpp */; }; 62545D179C94265CA1389D4A /* OscOutboundPacketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63A47AC60FFAFC3BF093EC0F /* OscOutboundPacketStream.cpp */; }; 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; }; 640279EE111671BD026CB013 /* ofxOscReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2FAC65C491D4231379F3298 /* ofxOscReceiver.cpp */; }; 66CA411C5A9664E27326BF36 /* ofxTCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */; }; + 678E1FEE419F308328EBA260 /* fc_performer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2520703613959890638EE79 /* fc_performer.cpp */; }; 67FE4C7B15C2F0478C8126C2 /* NetworkingUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B361208CD4107E479F04E7B /* NetworkingUtils.cpp */; }; 72A929D3561B8232A182ABFC /* ofxOscBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65EEFA3DA3526E9CDD9C21F9 /* ofxOscBundle.cpp */; }; 74D31933EE82E12834DB3B06 /* ofxAnimatableOfColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777D89F9EECAC3FE2405D5D1 /* ofxAnimatableOfColor.cpp */; }; 837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */; }; 856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9604B925D32EE39065747725 /* ofxBaseGui.cpp */; }; + 85F76A21B05A0C2ED9F3C488 /* fc_scoreManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9C09CB198F97C1C552C51F2 /* fc_scoreManager.cpp */; }; 879A251454401BC0B6E4F238 /* OscTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9BFFBBF4CC43DEE890B3C3E /* OscTypes.cpp */; }; 8F5205AEF8861EF234F0651A /* ofxOscSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81967292BFC87A0144BD32C6 /* ofxOscSender.cpp */; }; + 92E439F0B3D4B3B55CAD3200 /* fc_condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 958890B4714B12ABBDDBD119 /* fc_condition.cpp */; }; 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B40EDA85BEB63E46785BC29 /* tinyxml.cpp */; }; 960D20B191346612D5C05A6A /* ofxTCPClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF88F02779DD820913ACEA06 /* ofxTCPClient.cpp */; }; 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; }; + 9D71328B02F2B4277D1504DC /* fc_conditionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61BDD8373C182A58446BF660 /* fc_conditionManager.cpp */; }; ADE367465D2A8EBAD4C7A8D9 /* IpEndpointName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD194746185E2DA11468377 /* IpEndpointName.cpp */; }; B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; }; B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */; }; BC054B7D3B48B395B1D87F2E /* ofxAnimatableOfPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 904CD301F7BB14F91235B2E8 /* ofxAnimatableOfPoint.cpp */; }; C4782ECC372420ACE0615B74 /* OscPrintReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8881B3C8C0A1C45F042E7A /* OscPrintReceivedElements.cpp */; }; + DC189F33B444420BC0E737BB /* ofxGaussian.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93D1684E6D5D9EE2D7ABA573 /* ofxGaussian.cpp */; }; E2564CF7DDB3713772BB682E /* ofxUDPManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */; }; E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; }; E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; }; E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */; }; F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */; }; + F36DDF78FE836A55651CCB8F /* fc_deviceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113FA9269CC78459240D49AA /* fc_deviceManager.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -87,7 +88,9 @@ 029684CF678F70F6D3537A29 /* OscOutboundPacketStream.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = OscOutboundPacketStream.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscOutboundPacketStream.h; sourceTree = SOURCE_ROOT; }; 0A1DAC09F322AE313A40706D /* ofxToggle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxToggle.h; path = ../../../addons/ofxGui/src/ofxToggle.h; sourceTree = SOURCE_ROOT; }; 0AED834CE4DEC5260AF302A2 /* ofxOscParameterSync.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxOscParameterSync.cpp; path = ../../../addons/ofxOsc/src/ofxOscParameterSync.cpp; sourceTree = SOURCE_ROOT; }; + 113FA9269CC78459240D49AA /* fc_deviceManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_deviceManager.cpp; path = src/fc_deviceManager.cpp; sourceTree = SOURCE_ROOT; }; 15F2C6477A769C03A56D1401 /* ofxSlider.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSlider.cpp; path = ../../../addons/ofxGui/src/ofxSlider.cpp; sourceTree = SOURCE_ROOT; }; + 164E8E771031C3EB591B18B6 /* fc_conditionStream.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_conditionStream.hpp; path = src/fc_conditionStream.hpp; sourceTree = SOURCE_ROOT; }; 17E65988300FBD9AAA2CD0CA /* ofxGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxGui.h; path = ../../../addons/ofxGui/src/ofxGui.h; sourceTree = SOURCE_ROOT; }; 1C085E327DAB912CFA2A443D /* ofxTCPServer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxTCPServer.cpp; path = ../../../addons/ofxNetwork/src/ofxTCPServer.cpp; sourceTree = SOURCE_ROOT; }; 1C0DA2561397A7DE0246858B /* ofxGuiGroup.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxGuiGroup.h; path = ../../../addons/ofxGui/src/ofxGuiGroup.h; sourceTree = SOURCE_ROOT; }; @@ -103,34 +106,26 @@ 30841703B7AC8487D16FB4AA /* ofxTCPServer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxTCPServer.h; path = ../../../addons/ofxNetwork/src/ofxTCPServer.h; sourceTree = SOURCE_ROOT; }; 35BB9BB90DBABFD3B39F8DB6 /* ofxUDPManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxUDPManager.cpp; path = ../../../addons/ofxNetwork/src/ofxUDPManager.cpp; sourceTree = SOURCE_ROOT; }; 36B9B6CD565C4C6A5BE96680 /* ofxAnimatable.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxAnimatable.h; path = ../../../addons/ofxAnimatable/src/ofxAnimatable.h; sourceTree = SOURCE_ROOT; }; + 37EB426B820D16A63FBA5997 /* fc_conditionStream.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_conditionStream.cpp; path = src/fc_conditionStream.cpp; sourceTree = SOURCE_ROOT; }; + 3A068C274D12B691CB92B1EC /* fc_deviceManager.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_deviceManager.hpp; path = src/fc_deviceManager.hpp; sourceTree = SOURCE_ROOT; }; 3B361208CD4107E479F04E7B /* NetworkingUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = NetworkingUtils.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/posix/NetworkingUtils.cpp; sourceTree = SOURCE_ROOT; }; 444657A12E59D0ED86981498 /* TimerListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = TimerListener.h; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/TimerListener.h; sourceTree = SOURCE_ROOT; }; + 46E502455EE5ABA84C8133E7 /* fc_condition.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_condition.hpp; path = src/fc_condition.hpp; sourceTree = SOURCE_ROOT; }; 48974F980F51769171D0B2F5 /* IpEndpointName.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = IpEndpointName.h; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.h; sourceTree = SOURCE_ROOT; }; + 4C3DAD4293E408FCBFC79808 /* fc_device.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_device.hpp; path = src/fc_device.hpp; sourceTree = SOURCE_ROOT; }; 4E95FB446A9C9C6F0DE12D75 /* OscPrintReceivedElements.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = OscPrintReceivedElements.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscPrintReceivedElements.h; sourceTree = SOURCE_ROOT; }; 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxXmlSettings.cpp; path = ../../../addons/ofxXmlSettings/src/ofxXmlSettings.cpp; sourceTree = SOURCE_ROOT; }; 52AFA1F08C420992CAAAE648 /* ofxSlider.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSlider.h; path = ../../../addons/ofxGui/src/ofxSlider.h; sourceTree = SOURCE_ROOT; }; + 546965F911B8F090DF90B18E /* ofxGaussian.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxGaussian.h; path = ../../../addons/ofxGaussian/src/ofxGaussian.h; sourceTree = SOURCE_ROOT; }; 5A6936A5770BEB310F3826AD /* ofxAnimatableOfColor.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxAnimatableOfColor.h; path = ../../../addons/ofxAnimatable/src/ofxAnimatableOfColor.h; sourceTree = SOURCE_ROOT; }; 5FCA34E402E9C3A0C48F9FA9 /* ofxAnimatableOfPoint.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxAnimatableOfPoint.h; path = ../../../addons/ofxAnimatable/src/ofxAnimatableOfPoint.h; sourceTree = SOURCE_ROOT; }; - 603328B51C824D4D005D84A0 /* fc_performer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_performer.cpp; sourceTree = ""; }; - 603328B61C824D4D005D84A0 /* fc_performer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_performer.hpp; sourceTree = ""; }; - 604BD2001C837E86009FFDBA /* fc_conditionStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_conditionStream.cpp; sourceTree = ""; }; - 604BD2011C837E86009FFDBA /* fc_conditionStream.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_conditionStream.hpp; sourceTree = ""; }; - 60613A391C82A21D004BA026 /* fc_scoreManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_scoreManager.cpp; sourceTree = ""; }; - 60613A3A1C82A21D004BA026 /* fc_scoreManager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_scoreManager.hpp; sourceTree = ""; }; - 60D69F331C7F8A21007C6A58 /* fc_device.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_device.cpp; sourceTree = ""; }; - 60D69F341C7F8A21007C6A58 /* fc_device.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_device.hpp; sourceTree = ""; }; - 60D69F371C7FB569007C6A58 /* fc_deviceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_deviceManager.cpp; sourceTree = ""; }; - 60D69F381C7FB569007C6A58 /* fc_deviceManager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_deviceManager.hpp; sourceTree = ""; }; - 60D69F3A1C7FB5E1007C6A58 /* fc_deviceAccelParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_deviceAccelParser.cpp; sourceTree = ""; }; - 60D69F3B1C7FB5E1007C6A58 /* fc_deviceAccelParser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_deviceAccelParser.hpp; sourceTree = ""; }; - 60D69F411C7FBD28007C6A58 /* fc_condition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_condition.cpp; sourceTree = ""; }; - 60D69F421C7FBD28007C6A58 /* fc_condition.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_condition.hpp; sourceTree = ""; }; - 60D69F441C7FBF5D007C6A58 /* fc_conditionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fc_conditionManager.cpp; sourceTree = ""; }; - 60D69F451C7FBF5D007C6A58 /* fc_conditionManager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fc_conditionManager.hpp; sourceTree = ""; }; + 61BDD8373C182A58446BF660 /* fc_conditionManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_conditionManager.cpp; path = src/fc_conditionManager.cpp; sourceTree = SOURCE_ROOT; }; 63A47AC60FFAFC3BF093EC0F /* OscOutboundPacketStream.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = OscOutboundPacketStream.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscOutboundPacketStream.cpp; sourceTree = SOURCE_ROOT; }; 65EEFA3DA3526E9CDD9C21F9 /* ofxOscBundle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxOscBundle.cpp; path = ../../../addons/ofxOsc/src/ofxOscBundle.cpp; sourceTree = SOURCE_ROOT; }; + 68D57C65B14692F8262B084A /* fc_performer.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_performer.hpp; path = src/fc_performer.hpp; sourceTree = SOURCE_ROOT; }; 6B65E6930994CC4B2D2B8B33 /* OscPacketListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = OscPacketListener.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscPacketListener.h; sourceTree = SOURCE_ROOT; }; 6C6A6CF2AD309C3B58922071 /* ofxAnimatableFloat.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxAnimatableFloat.h; path = ../../../addons/ofxAnimatable/src/ofxAnimatableFloat.h; sourceTree = SOURCE_ROOT; }; + 6F2B6CF0CA8EFE510056086A /* fc_deviceAccelParser.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_deviceAccelParser.hpp; path = src/fc_deviceAccelParser.hpp; sourceTree = SOURCE_ROOT; }; 7689F8A0F3D0B7635A8C3104 /* ofxOscArg.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxOscArg.h; path = ../../../addons/ofxOsc/src/ofxOscArg.h; sourceTree = SOURCE_ROOT; }; 777D89F9EECAC3FE2405D5D1 /* ofxAnimatableOfColor.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxAnimatableOfColor.cpp; path = ../../../addons/ofxAnimatable/src/ofxAnimatableOfColor.cpp; sourceTree = SOURCE_ROOT; }; 78D67A00EB899FAC09430597 /* ofxLabel.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxLabel.cpp; path = ../../../addons/ofxGui/src/ofxLabel.cpp; sourceTree = SOURCE_ROOT; }; @@ -143,9 +138,14 @@ 8C75AFC8774A62495DD53464 /* ofxOscReceiver.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxOscReceiver.h; path = ../../../addons/ofxOsc/src/ofxOscReceiver.h; sourceTree = SOURCE_ROOT; }; 904CD301F7BB14F91235B2E8 /* ofxAnimatableOfPoint.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxAnimatableOfPoint.cpp; path = ../../../addons/ofxAnimatable/src/ofxAnimatableOfPoint.cpp; sourceTree = SOURCE_ROOT; }; 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxToggle.cpp; path = ../../../addons/ofxGui/src/ofxToggle.cpp; sourceTree = SOURCE_ROOT; }; + 93D1684E6D5D9EE2D7ABA573 /* ofxGaussian.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxGaussian.cpp; path = ../../../addons/ofxGaussian/src/ofxGaussian.cpp; sourceTree = SOURCE_ROOT; }; + 958890B4714B12ABBDDBD119 /* fc_condition.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_condition.cpp; path = src/fc_condition.cpp; sourceTree = SOURCE_ROOT; }; 9604B925D32EE39065747725 /* ofxBaseGui.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxBaseGui.cpp; path = ../../../addons/ofxGui/src/ofxBaseGui.cpp; sourceTree = SOURCE_ROOT; }; + 97BAE7101477FA4DFF487906 /* fc_conditionManager.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_conditionManager.hpp; path = src/fc_conditionManager.hpp; sourceTree = SOURCE_ROOT; }; 9BF3AA0D4FAA89D0F8A0E545 /* OscReceivedElements.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = OscReceivedElements.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscReceivedElements.cpp; sourceTree = SOURCE_ROOT; }; + 9CC015E810DF1A60C01AB823 /* fc_device.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_device.cpp; path = src/fc_device.cpp; sourceTree = SOURCE_ROOT; }; 9F7986DC4EB05E75FCE2C777 /* ofxOscSender.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxOscSender.h; path = ../../../addons/ofxOsc/src/ofxOscSender.h; sourceTree = SOURCE_ROOT; }; + A2520703613959890638EE79 /* fc_performer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_performer.cpp; path = src/fc_performer.cpp; sourceTree = SOURCE_ROOT; }; A2AAA8CA403479E6FCDF920E /* OscHostEndianness.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = OscHostEndianness.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscHostEndianness.h; sourceTree = SOURCE_ROOT; }; ADD194746185E2DA11468377 /* IpEndpointName.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = IpEndpointName.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.cpp; sourceTree = SOURCE_ROOT; }; AE335EB4709BFD4671EEAC84 /* MessageMappingOscPacketListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = MessageMappingOscPacketListener.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/MessageMappingOscPacketListener.h; sourceTree = SOURCE_ROOT; }; @@ -160,6 +160,7 @@ C70D8946940288799E82131E /* ofxSliderGroup.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSliderGroup.h; path = ../../../addons/ofxGui/src/ofxSliderGroup.h; sourceTree = SOURCE_ROOT; }; C88333E71C9457E441C33474 /* ofxButton.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxButton.cpp; path = ../../../addons/ofxGui/src/ofxButton.cpp; sourceTree = SOURCE_ROOT; }; C8C9B823D7872F9CBF03A813 /* ofxTCPClient.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxTCPClient.h; path = ../../../addons/ofxNetwork/src/ofxTCPClient.h; sourceTree = SOURCE_ROOT; }; + D2C62F9AE06B0D14A9690CBA /* fc_scoreManager.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = fc_scoreManager.hpp; path = src/fc_scoreManager.hpp; sourceTree = SOURCE_ROOT; }; D9BFFBBF4CC43DEE890B3C3E /* OscTypes.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = OscTypes.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscTypes.cpp; sourceTree = SOURCE_ROOT; }; DF49D76C45D5DB505A234880 /* ofxOscMessage.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxOscMessage.cpp; path = ../../../addons/ofxOsc/src/ofxOscMessage.cpp; sourceTree = SOURCE_ROOT; }; E112B3AEBEA2C091BF2B40AE /* ofxPanel.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxPanel.cpp; path = ../../../addons/ofxGui/src/ofxPanel.cpp; sourceTree = SOURCE_ROOT; }; @@ -172,7 +173,9 @@ E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; }; E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = ""; }; E6DEF695B88BA5FAACEAA937 /* UdpSocket.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = UdpSocket.cpp; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/posix/UdpSocket.cpp; sourceTree = SOURCE_ROOT; }; + E9C09CB198F97C1C552C51F2 /* fc_scoreManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_scoreManager.cpp; path = src/fc_scoreManager.cpp; sourceTree = SOURCE_ROOT; }; ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxGuiGroup.cpp; path = ../../../addons/ofxGui/src/ofxGuiGroup.cpp; sourceTree = SOURCE_ROOT; }; + F1FC90D6D01BA771CD8D2CAC /* fc_deviceAccelParser.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = fc_deviceAccelParser.cpp; path = src/fc_deviceAccelParser.cpp; sourceTree = SOURCE_ROOT; }; F399B91E98DC31CDA6DDACB4 /* ofxTCPManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxTCPManager.cpp; path = ../../../addons/ofxNetwork/src/ofxTCPManager.cpp; sourceTree = SOURCE_ROOT; }; F4F5B6B8BA2BD52C646ED908 /* OscException.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = OscException.h; path = ../../../addons/ofxOsc/libs/oscpack/src/osc/OscException.h; sourceTree = SOURCE_ROOT; }; F66993296A3AEEC70FD444F5 /* ofxNetwork.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxNetwork.h; path = ../../../addons/ofxNetwork/src/ofxNetwork.h; sourceTree = SOURCE_ROOT; }; @@ -262,48 +265,48 @@ name = ofxGui; sourceTree = ""; }; - 603328B41C824D40005D84A0 /* performer_management */ = { + 60A47C321C852640002A5898 /* conditionManagement */ = { isa = PBXGroup; children = ( - 603328B51C824D4D005D84A0 /* fc_performer.cpp */, - 603328B61C824D4D005D84A0 /* fc_performer.hpp */, - ); - name = performer_management; + 958890B4714B12ABBDDBD119 /* fc_condition.cpp */, + 46E502455EE5ABA84C8133E7 /* fc_condition.hpp */, + 61BDD8373C182A58446BF660 /* fc_conditionManager.cpp */, + 97BAE7101477FA4DFF487906 /* fc_conditionManager.hpp */, + 37EB426B820D16A63FBA5997 /* fc_conditionStream.cpp */, + 164E8E771031C3EB591B18B6 /* fc_conditionStream.hpp */, + ); + name = conditionManagement; sourceTree = ""; }; - 60613A381C82A1E8004BA026 /* score_management */ = { + 60A47C331C85264A002A5898 /* deviceManagement */ = { isa = PBXGroup; children = ( - 60613A391C82A21D004BA026 /* fc_scoreManager.cpp */, - 60613A3A1C82A21D004BA026 /* fc_scoreManager.hpp */, - ); - name = score_management; + 9CC015E810DF1A60C01AB823 /* fc_device.cpp */, + 4C3DAD4293E408FCBFC79808 /* fc_device.hpp */, + F1FC90D6D01BA771CD8D2CAC /* fc_deviceAccelParser.cpp */, + 6F2B6CF0CA8EFE510056086A /* fc_deviceAccelParser.hpp */, + 113FA9269CC78459240D49AA /* fc_deviceManager.cpp */, + 3A068C274D12B691CB92B1EC /* fc_deviceManager.hpp */, + ); + name = deviceManagement; sourceTree = ""; }; - 60D69F3E1C7FBCE2007C6A58 /* device_management */ = { + 60A47C341C852652002A5898 /* performerManagement */ = { isa = PBXGroup; children = ( - 60D69F371C7FB569007C6A58 /* fc_deviceManager.cpp */, - 60D69F381C7FB569007C6A58 /* fc_deviceManager.hpp */, - 60D69F331C7F8A21007C6A58 /* fc_device.cpp */, - 60D69F341C7F8A21007C6A58 /* fc_device.hpp */, - 60D69F3A1C7FB5E1007C6A58 /* fc_deviceAccelParser.cpp */, - 60D69F3B1C7FB5E1007C6A58 /* fc_deviceAccelParser.hpp */, - ); - name = device_management; + A2520703613959890638EE79 /* fc_performer.cpp */, + 68D57C65B14692F8262B084A /* fc_performer.hpp */, + ); + name = performerManagement; sourceTree = ""; }; - 60D69F401C7FBD15007C6A58 /* condition_management */ = { + 60A47C351C85265B002A5898 /* scoreControl */ = { isa = PBXGroup; children = ( - 60D69F411C7FBD28007C6A58 /* fc_condition.cpp */, - 60D69F421C7FBD28007C6A58 /* fc_condition.hpp */, - 60D69F441C7FBF5D007C6A58 /* fc_conditionManager.cpp */, - 60D69F451C7FBF5D007C6A58 /* fc_conditionManager.hpp */, - 604BD2001C837E86009FFDBA /* fc_conditionStream.cpp */, - 604BD2011C837E86009FFDBA /* fc_conditionStream.hpp */, - ); - name = condition_management; + E9C09CB198F97C1C552C51F2 /* fc_scoreManager.cpp */, + D2C62F9AE06B0D14A9690CBA /* fc_scoreManager.hpp */, + ); + name = scoreControl; sourceTree = ""; }; 641362CA659FAFEE4E81001B /* posix */ = { @@ -342,6 +345,15 @@ name = src; sourceTree = ""; }; + 723654376EFB66366A233535 /* src */ = { + isa = PBXGroup; + children = ( + 93D1684E6D5D9EE2D7ABA573 /* ofxGaussian.cpp */, + 546965F911B8F090DF90B18E /* ofxGaussian.h */, + ); + name = src; + sourceTree = ""; + }; 86D2677079A3AF4A5A88E29A /* oscpack */ = { isa = PBXGroup; children = ( @@ -401,6 +413,7 @@ isa = PBXGroup; children = ( 8D83D7AC476703EBECC1932D /* ofxAnimatable */, + C9A5DC7CEB5BEF0318201EA0 /* ofxGaussian */, 480A780D8D0308AE4A368801 /* ofxGui */, 18240ECCE4076FB0833A8578 /* ofxNetwork */, E6053AB7FEC63D5F83825B88 /* ofxOsc */, @@ -428,6 +441,14 @@ name = src; sourceTree = ""; }; + C9A5DC7CEB5BEF0318201EA0 /* ofxGaussian */ = { + isa = PBXGroup; + children = ( + 723654376EFB66366A233535 /* src */, + ); + name = ofxGaussian; + sourceTree = ""; + }; D27B2221A225CA523C019676 /* src */ = { isa = PBXGroup; children = ( @@ -464,10 +485,10 @@ E4B69E1D0A3A1BDC003C02F2 /* main.cpp */, E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */, E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */, - 60D69F3E1C7FBCE2007C6A58 /* device_management */, - 60D69F401C7FBD15007C6A58 /* condition_management */, - 603328B41C824D40005D84A0 /* performer_management */, - 60613A381C82A1E8004BA026 /* score_management */, + 60A47C321C852640002A5898 /* conditionManagement */, + 60A47C331C85264A002A5898 /* deviceManagement */, + 60A47C341C852652002A5898 /* performerManagement */, + 60A47C351C85265B002A5898 /* scoreControl */, ); path = src; sourceTree = SOURCE_ROOT; @@ -607,16 +628,22 @@ files = ( E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */, E4B69E210A3A1BDC003C02F2 /* ofApp.cpp in Sources */, + 92E439F0B3D4B3B55CAD3200 /* fc_condition.cpp in Sources */, + 9D71328B02F2B4277D1504DC /* fc_conditionManager.cpp in Sources */, + 07DEC423BCE0C805DAD76CD4 /* fc_conditionStream.cpp in Sources */, + 2E1E1FDF603A9C3C2EEDA12C /* fc_device.cpp in Sources */, + 13DCCEF9F5990CFFEE535C6C /* fc_deviceAccelParser.cpp in Sources */, + F36DDF78FE836A55651CCB8F /* fc_deviceManager.cpp in Sources */, + 678E1FEE419F308328EBA260 /* fc_performer.cpp in Sources */, + 85F76A21B05A0C2ED9F3C488 /* fc_scoreManager.cpp in Sources */, 52C77060FBB9307AEFDAE8C6 /* ofxAnimatable.cpp in Sources */, 5D067CF087427621DD1E64B8 /* ofxAnimatableFloat.cpp in Sources */, - 60D69F391C7FB569007C6A58 /* fc_deviceManager.cpp in Sources */, 74D31933EE82E12834DB3B06 /* ofxAnimatableOfColor.cpp in Sources */, BC054B7D3B48B395B1D87F2E /* ofxAnimatableOfPoint.cpp in Sources */, + DC189F33B444420BC0E737BB /* ofxGaussian.cpp in Sources */, 856AA354D08AB4B323081444 /* ofxBaseGui.cpp in Sources */, 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */, B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */, - 60D69F431C7FBD28007C6A58 /* fc_condition.cpp in Sources */, - 603328B71C824D4D005D84A0 /* fc_performer.cpp in Sources */, 483908258D00B98B4BE69F07 /* ofxLabel.cpp in Sources */, F285EB3169F1566CA3D93C20 /* ofxPanel.cpp in Sources */, 837220E80EB56CD44AD27F2A /* ofxSlider.cpp in Sources */, @@ -629,20 +656,15 @@ 72A929D3561B8232A182ABFC /* ofxOscBundle.cpp in Sources */, 5864AD82E20F15536D054EA3 /* ofxOscMessage.cpp in Sources */, 4ADB88E2FB52E76A471065DE /* ofxOscParameterSync.cpp in Sources */, - 60613A3B1C82A21D004BA026 /* fc_scoreManager.cpp in Sources */, 640279EE111671BD026CB013 /* ofxOscReceiver.cpp in Sources */, 8F5205AEF8861EF234F0651A /* ofxOscSender.cpp in Sources */, ADE367465D2A8EBAD4C7A8D9 /* IpEndpointName.cpp in Sources */, - 604BD2021C837E86009FFDBA /* fc_conditionStream.cpp in Sources */, 67FE4C7B15C2F0478C8126C2 /* NetworkingUtils.cpp in Sources */, 510CAFE035E576A4E1502D52 /* UdpSocket.cpp in Sources */, 62545D179C94265CA1389D4A /* OscOutboundPacketStream.cpp in Sources */, - 60D69F3C1C7FB5E1007C6A58 /* fc_deviceAccelParser.cpp in Sources */, C4782ECC372420ACE0615B74 /* OscPrintReceivedElements.cpp in Sources */, 0546D1A38E13BD319CC9755B /* OscReceivedElements.cpp in Sources */, 879A251454401BC0B6E4F238 /* OscTypes.cpp in Sources */, - 60D69F461C7FBF5D007C6A58 /* fc_conditionManager.cpp in Sources */, - 60D69F351C7F8A21007C6A58 /* fc_device.cpp in Sources */, 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */, 933A2227713C720CEFF80FD9 /* tinyxml.cpp in Sources */, 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */, @@ -682,7 +704,9 @@ GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", + src, ../../../addons/ofxAnimatable/src, + ../../../addons/ofxGaussian/src, ../../../addons/ofxGui/src, ../../../addons/ofxNetwork/src, ../../../addons/ofxOsc/libs, @@ -728,7 +752,9 @@ GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", + src, ../../../addons/ofxAnimatable/src, + ../../../addons/ofxGaussian/src, ../../../addons/ofxGui/src, ../../../addons/ofxNetwork/src, ../../../addons/ofxOsc/libs, @@ -767,7 +793,9 @@ GCC_MODEL_TUNING = NONE; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", + src, ../../../addons/ofxAnimatable/src, + ../../../addons/ofxGaussian/src, ../../../addons/ofxGui/src, ../../../addons/ofxNetwork/src, ../../../addons/ofxOsc/libs, @@ -806,7 +834,9 @@ GCC_MODEL_TUNING = NONE; HEADER_SEARCH_PATHS = ( "$(OF_CORE_HEADERS)", + src, ../../../addons/ofxAnimatable/src, + ../../../addons/ofxGaussian/src, ../../../addons/ofxGui/src, ../../../addons/ofxNetwork/src, ../../../addons/ofxOsc/libs, diff --git a/Field_Cuts_6_SCORE.xcodeproj/project.xcworkspace/xcuserdata/blindelephants.xcuserdatad/UserInterfaceState.xcuserstate b/Field_Cuts_6_SCORE.xcodeproj/project.xcworkspace/xcuserdata/blindelephants.xcuserdatad/UserInterfaceState.xcuserstate index d64eaaa3a8be472f2ccc4db82d27ac0858b0c401..7b8c77fee72008509d04d1d489d158d3cff6be1d 100644 GIT binary patch literal 15742 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 Vd4do65W@(cq5|PF^4IzO{{#4md#V5c literal 32028 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 - - diff --git a/addons.make b/addons.make index 6515805..d6f7f15 100644 --- a/addons.make +++ b/addons.make @@ -1,4 +1,5 @@ ofxAnimatable +ofxGaussian ofxGui ofxNetwork ofxOsc diff --git a/src/fc_scoreManager.cpp b/src/fc_scoreManager.cpp index b72ea5f..0c92f47 100644 --- a/src/fc_scoreManager.cpp +++ b/src/fc_scoreManager.cpp @@ -21,6 +21,7 @@ fc_scoreManager::fc_scoreManager() { c.triggerAtTime = currentTime; int _t = (int)ofRandom(3); + if(_t == 0) { c.targetName = MEG; } else if(_t == 1) { @@ -44,6 +45,9 @@ fc_scoreManager::fc_scoreManager() { } else if(_sd == 1){ c.sourceDevice = PACK; } + + + } } @@ -66,4 +70,34 @@ void fc_scoreManager::draw(float _x, float _y, float _w, float _h) { ofDrawRectangle(_x, _y, ofMap(scoreTimer, 0, scoreLength, 0, _w), _h); font.drawString(ofToString(scoreTimer) + " / " + ofToString(scoreLength), _x + 8, _y + _h + 16); +} + +void fc_scoreManager::addConditionInOrder(conditionEvent _c) { + if(conditionEvents.size() == 0) { + conditionEvents.push_back(_c); + } else if(_c.triggerAtTime > conditionEvents[conditionEvents.size()-1].triggerAtTime) { + conditionEvents.push_back(_c); + } else { + for(int i = 0 ; i < conditionEvents.size() ; i ++ ) { + if(_c.triggerAtTime > conditionEvents[i].triggerAtTime) { + conditionEvents.insert(conditionEvents.begin() + (i + 1), _c); + break; + } + } + } +} + +void fc_scoreManager::addTriggerLimitingEventInOrder(triggerLimitingEvent _t) { + if(triggerLimitingEvents.size() == 0) { + triggerLimitingEvents.push_back(_t); + } else if(_t.triggerAtTime > triggerLimitingEvents[triggerLimitingEvents.size() - 1].triggerAtTime) { + triggerLimitingEvents.push_back(_t); + } else { + for(int i = 0 ; i < triggerLimitingEvents.size() ; i ++ ) { + if(_t.triggerAtTime > triggerLimitingEvents[i].triggerAtTime) { + triggerLimitingEvents.insert(triggerLimitingEvents.begin() + (i + 1), _t); + break; + } + } + } } \ No newline at end of file diff --git a/src/fc_scoreManager.hpp b/src/fc_scoreManager.hpp index a963da6..d5d5473 100644 --- a/src/fc_scoreManager.hpp +++ b/src/fc_scoreManager.hpp @@ -10,6 +10,8 @@ #define fc_scoreManager_hpp #include "ofMain.h" +#include "ofxGaussian.h" + #include "fc_condition.hpp" #include "fc_performer.hpp" @@ -17,24 +19,9 @@ enum DeviceType { WRIST, PACK }; + class fc_scoreManager { public: - fc_scoreManager(); - - void toggleRun(); - void update(); - void draw(float _x, float _y, float _w, float _h); - - void makeConditionEventRandom(); - void makeConditionEventRandomAbs(); - void makeConditionEventRandomDel(); - - -private: - bool runScore; - float scoreTimer = 0; - float scoreLength = 60 * 35; - ofTrueTypeFont font; struct conditionEvent { float triggerAtTime; @@ -55,8 +42,37 @@ class fc_scoreManager { float setRecovery; }; + fc_scoreManager(); + + void toggleRun(); + void update(); + void draw(float _x, float _y, float _w, float _h); + +// void makeConditionEventRandom(); +// void makeConditionEventRandomAbs(); +// void makeConditionEventRandomDel(); +// +// void addConditionEventToScore(conditionEvent _c); +// void addTriggerLimitingEventToScore(triggerLimitingEvent _t); + + void addConditionInOrder(conditionEvent _c); + void addTriggerLimitingEventInOrder(triggerLimitingEvent _t); + + +private: + bool runScore; + float scoreTimer = 0; + float scoreLength = 60 * 35; + ofTrueTypeFont font; + + + + struct + vector < conditionEvent > conditionEvents; vector < triggerLimitingEvent > triggerLimitingEvents; + + }; #endif /* fc_scoreManager_hpp */