diff --git a/ofStereo2016/bin/data/Lights.xml b/ofStereo2016/bin/data/Lights.xml index ece5782..4d82746 100644 --- a/ofStereo2016/bin/data/Lights.xml +++ b/ofStereo2016/bin/data/Lights.xml @@ -1,5 +1,5 @@ - 0 + 1 79, 79, 79, 255 0, 0, 0, 255 diff --git a/ofStereo2016/bin/data/VoroEnd.xml b/ofStereo2016/bin/data/VoroEnd.xml index c0b43ed..5efae7d 100644 --- a/ofStereo2016/bin/data/VoroEnd.xml +++ b/ofStereo2016/bin/data/VoroEnd.xml @@ -22,6 +22,7 @@ 131.345, 0, 0 0 0 + 0 10 diff --git a/ofStereo2016/bin/data/VoroScenes.xml b/ofStereo2016/bin/data/VoroScenes.xml index 7177dfd..71ad960 100644 --- a/ofStereo2016/bin/data/VoroScenes.xml +++ b/ofStereo2016/bin/data/VoroScenes.xml @@ -1,10 +1,10 @@ - 0 + 1 0 156 - 13 - 0, 0, 0 + 55 + 0, -200, 400.699 1 0 1, 1, 1, 1 diff --git a/ofStereo2016/bin/data/openingScene.xml b/ofStereo2016/bin/data/openingScene.xml index d38d22b..dab6cec 100644 --- a/ofStereo2016/bin/data/openingScene.xml +++ b/ofStereo2016/bin/data/openingScene.xml @@ -1,5 +1,5 @@ - 1 + 0 0 0.5 20 @@ -15,4 +15,23 @@ 0 100 + + 0.01 + 20 + 20 + 100 + 1, 1, 1, 1 + 1, 1, 1, 1 + 200, 200, 200 + 20 + 0.02 + 10, 10 + 0 + 0 + + + <position>0, 250, 400</position> + <width>400</width> + <color>1, 1, 1, 1</color> + diff --git a/ofStereo2016/bin/data/roomScene.xml b/ofStereo2016/bin/data/roomScene.xml index 3861cea..a7f4578 100644 --- a/ofStereo2016/bin/data/roomScene.xml +++ b/ofStereo2016/bin/data/roomScene.xml @@ -1,5 +1,5 @@ - 1 + 0 0 <1>-0.2, 0, 0.5 diff --git a/ofStereo2016/bin/data/stereo.xml b/ofStereo2016/bin/data/stereo.xml index 19cf9c5..aa0df67 100644 --- a/ofStereo2016/bin/data/stereo.xml +++ b/ofStereo2016/bin/data/stereo.xml @@ -1,20 +1,17 @@ - 800, 500, 800 + 800, 500, 801.399 0 0 - 255, 255, 255, 255 + 21, 21, 21, 255 0 - 0 + 1 0 156 - 13 - 0, 0, 0 - 0, 17.7426, 0 - 1 - 0 + 55 + 0, -200, 400.699 1, 1, 1, 1 @@ -33,7 +30,7 @@ - 1 + 0 0 <1>-0.2, 0, 0.5 @@ -77,7 +74,7 @@ - 0 + 1 0 79, 79, 79, 255 @@ -140,21 +137,27 @@ - 1 + 0 0 - 0.5 - 20 - 204 - 100 - 1, 1, 1, 1 - 1, 1, 1, 1 - 200, 200, 200 - 28 - 100 - 3.06123, 100 - 0 - 0 - 0 + + 0.01 + 20 + 20 + 100 + 1, 1, 1, 1 + 1, 1, 1, 1 + 200, 200, 200 + 20 + 0.02 + 10, 10 + 0 + 0 + + + <position>0, 250, 400</position> + <width>400</width> + <color>1, 1, 1, 1</color> + 0 @@ -169,6 +172,16 @@ 0 0 + + 0 + 0 + + 0, 250, 400 + 30 + + 1, 1, 1, 1 + + 0 0 @@ -193,6 +206,7 @@ 131.345, 0, 0 0 0 + 0 10 @@ -210,7 +224,7 @@ 200 20 - 1.8462 + 2 1 0, 0, 0 @@ -235,7 +249,7 @@ 1 0, 0, 0 - 800, 800 + 800, 801.399 0, 0, 0 diff --git a/ofStereo2016/ofStereo2016.xcodeproj/project.pbxproj b/ofStereo2016/ofStereo2016.xcodeproj/project.pbxproj index c117012..1298db0 100644 --- a/ofStereo2016/ofStereo2016.xcodeproj/project.pbxproj +++ b/ofStereo2016/ofStereo2016.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 04461F041CB7EEC8004C391A /* VoroEnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04461F021CB7EEC8004C391A /* VoroEnd.cpp */; }; 0546D1A38E13BD319CC9755B /* OscReceivedElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BF3AA0D4FAA89D0F8A0E545 /* OscReceivedElements.cpp */; }; 08C23182D394C53F6ECE6CCC /* easing_terms_of_use.html in Sources */ = {isa = PBXBuildFile; fileRef = 528CB0EB22F0A199A5F479D5 /* easing_terms_of_use.html */; }; - 0B5CAD222FB56DA4C7B5D87C /* Triangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E26DD23976E64A6823E87A /* Triangle.cpp */; }; 1CD33E884D9E3358252E82A1 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 907C5B5E104864A2D3A25745 /* ofxToggle.cpp */; }; 23F8502AA1FA2B1390FE7A09 /* container.cc in Sources */ = {isa = PBXBuildFile; fileRef = EAC9298DDD680972AEAE50E5 /* container.cc */; }; 2864430EBD09CC04E64D9299 /* OrganicMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 867CD6868636875C8CEC6551 /* OrganicMaterial.cpp */; }; @@ -23,11 +22,9 @@ 510CAFE035E576A4E1502D52 /* UdpSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6DEF695B88BA5FAACEAA937 /* UdpSocket.cpp */; }; 570FE10C152F471768FFD2E0 /* unitcell.cc in Sources */ = {isa = PBXBuildFile; fileRef = 537006C05AFD6FF55BE22ED9 /* unitcell.cc */; }; 5864AD82E20F15536D054EA3 /* ofxOscMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF49D76C45D5DB505A234880 /* ofxOscMessage.cpp */; }; - 58F0E0515AAFF0F7132F38FB /* BoundBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 684D461CEBFB6BDE22F2E25E /* BoundBox.cpp */; }; 59A6F986FCCB12BF4CC1C865 /* container_prd.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6BE845441E9F6A7532197F35 /* container_prd.cc */; }; 5A4349E9754D6FA14C0F2A3A /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC5DA1C87211D4F6377DA719 /* tinyxmlparser.cpp */; }; 5CBB2AB3A60F65431D7B555D /* ofxButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C88333E71C9457E441C33474 /* ofxButton.cpp */; }; - 5D352DA5713A90C628CA8EBF /* LineSegment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEB243EBD0267C08845C16EE /* LineSegment.cpp */; }; 5E69B76917398C5AE95B2E17 /* c_loops.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8BE2E65981289F6D70EDA6C5 /* c_loops.cc */; }; 62545D179C94265CA1389D4A /* OscOutboundPacketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63A47AC60FFAFC3BF093EC0F /* OscOutboundPacketStream.cpp */; }; 63B57AC5BF4EF088491E0317 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50DF87D612C5AAE17AAFA6C0 /* ofxXmlSettings.cpp */; }; @@ -55,12 +52,12 @@ 9CF4130A7E6DA19A3DC42B9A /* ofxSmartFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C954E0E8B7DB9D6983309883 /* ofxSmartFont.cpp */; }; 9D44DC88EF9E7991B4A09951 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */; }; 9EF1133BC23669A5C94FE30F /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69668FDE141262BC3C6CA929 /* jsoncpp.cpp */; }; - A073A593602E93C69A807A04 /* Polygon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B2A8B1748F23EF9E4024266 /* Polygon.cpp */; }; A78C77753D562AE8F0E928ED /* Connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDF52649DEB8D25CA011EB41 /* Connection.cpp */; }; AD5CEB7DA4C7672EEBCD07DD /* PlateauScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 650F041FD82233563F7888D5 /* PlateauScene.cpp */; }; ADE367465D2A8EBAD4C7A8D9 /* IpEndpointName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD194746185E2DA11468377 /* IpEndpointName.cpp */; }; B266578FC55D23BFEBC042E7 /* ofxGuiGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF8674C7975F1063C5E30CA /* ofxGuiGroup.cpp */; }; B46143561CBBB1B000A1F988 /* OpeningScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B46143541CBBB1B000A1F988 /* OpeningScene.cpp */; }; + B46E7B351CBCFA5C00C41635 /* TextScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B46E7B331CBCFA5C00C41635 /* TextScene.cpp */; }; B56FE57CC35806596D38118C /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */; }; B96B39E410C021D1F0CD6098 /* VoroNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDFE3B511CB0D1BD5773172 /* VoroNode.cpp */; }; BC127D9651A2CA3C09456D8E /* LightScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0D34729FD480D67C00B9E35B /* LightScene.cpp */; }; @@ -123,7 +120,6 @@ 04461F001CB67C63004C391A /* VoroScenes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = VoroScenes.hpp; path = scenes/VoroScenes.hpp; sourceTree = ""; }; 04461F021CB7EEC8004C391A /* VoroEnd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VoroEnd.cpp; sourceTree = ""; }; 04461F031CB7EEC8004C391A /* VoroEnd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = VoroEnd.hpp; sourceTree = ""; }; - 04616A5BB01DD5C37184504D /* Vertex.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Vertex.h; path = ../../../addons/ofxCSG/src/CSG/Vertex.h; sourceTree = SOURCE_ROOT; }; 04C339FF9ADCF05DF2DA62A3 /* ofxDatGuiTextInputField.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxDatGuiTextInputField.h; path = ../../../addons/ofxDatGui/src/components/ofxDatGuiTextInputField.h; sourceTree = SOURCE_ROOT; }; 06990387B09CAF1F19CC0095 /* ofxVoro.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxVoro.cpp; path = ../../../addons/ofxVoro/src/ofxVoro.cpp; 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; }; @@ -131,7 +127,6 @@ 0AED834CE4DEC5260AF302A2 /* ofxOscParameterSync.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxOscParameterSync.cpp; path = ../../../addons/ofxOsc/src/ofxOscParameterSync.cpp; sourceTree = SOURCE_ROOT; }; 0D34729FD480D67C00B9E35B /* LightScene.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = LightScene.cpp; path = src/scenes/LightScene.cpp; sourceTree = SOURCE_ROOT; }; 123354539C152F1EE3FFC190 /* json-forwards.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = "json-forwards.h"; path = "../../../addons/ofxLibwebsockets/libs/jsoncpp/json/json-forwards.h"; sourceTree = SOURCE_ROOT; }; - 14917A4A7F01F4634B12629F /* LineSegment.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = LineSegment.h; path = ../../../addons/ofxCSG/src/CSG/LineSegment.h; sourceTree = SOURCE_ROOT; }; 152291B3E43B418B69BE9972 /* ofxSyncedParams.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSyncedParams.cpp; path = ../../../addons/ofxSyncedParams/src/ofxSyncedParams.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; }; 1645F56257269CD0356320BD /* ofxJSON.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxJSON.h; path = ../../../addons/ofxJSON/src/ofxJSON.h; sourceTree = SOURCE_ROOT; }; @@ -146,7 +141,6 @@ 2232A9453E355593EF36ADA7 /* Reactor.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Reactor.cpp; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Reactor.cpp; sourceTree = SOURCE_ROOT; }; 23640F57DF6C4BB6BFC5DA4C /* PacketListener.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = PacketListener.h; path = ../../../addons/ofxOsc/libs/oscpack/src/ip/PacketListener.h; sourceTree = SOURCE_ROOT; }; 25A1BC9D9497B6F1ADBF53B9 /* PlaneCutScene.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = PlaneCutScene.cpp; path = src/scenes/PlaneCutScene.cpp; sourceTree = SOURCE_ROOT; }; - 25EB393F641E2D96B4947177 /* Utils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Utils.h; path = ../../../addons/ofxCSG/src/CSG/Utils.h; sourceTree = SOURCE_ROOT; }; 26490D7CC31EF7D6ED5F925A /* ofxDatGui.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxDatGui.cpp; path = ../../../addons/ofxDatGui/src/ofxDatGui.cpp; sourceTree = SOURCE_ROOT; }; 26A541233BC6F736E758F718 /* ofxJSONElement.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxJSONElement.h; path = ../../../addons/ofxJSON/src/ofxJSONElement.h; sourceTree = SOURCE_ROOT; }; 2834D88A62CD23F3DE2C47D1 /* ofxButton.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxButton.h; path = ../../../addons/ofxGui/src/ofxButton.h; sourceTree = SOURCE_ROOT; }; @@ -157,8 +151,6 @@ 34A70E2C091020EE93F6B1CE /* Events.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Events.cpp; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Events.cpp; sourceTree = SOURCE_ROOT; }; 3811B7042C35F3342BA24E0B /* LightScene.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = LightScene.hpp; path = src/scenes/LightScene.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; }; - 3F7E41BE435B748DC6530CC2 /* Polygon.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Polygon.h; path = ../../../addons/ofxCSG/src/CSG/Polygon.h; sourceTree = SOURCE_ROOT; }; - 4091601133A9DA1ED8505149 /* ofxCSG.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxCSG.h; path = ../../../addons/ofxCSG/src/ofxCSG.h; sourceTree = SOURCE_ROOT; }; 40C8C85DFE84D3AB74C5064A /* ofxDatGuiParameterBindings.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxDatGuiParameterBindings.cpp; path = src/ofxDatGuiParameterBindings.cpp; sourceTree = SOURCE_ROOT; }; 422C4E1AAC7EC4D30B17702D /* ofxDatGuiIntObject.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxDatGuiIntObject.h; path = ../../../addons/ofxDatGui/src/core/ofxDatGuiIntObject.h; 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; }; @@ -175,7 +167,6 @@ 543294B630E89F2BC364FCA4 /* VoroNode.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = VoroNode.hpp; path = src/VoroNode.hpp; sourceTree = SOURCE_ROOT; }; 545BBA6F6669BED2DA497BC6 /* ofxDatGuiScrollView.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxDatGuiScrollView.h; path = ../../../addons/ofxDatGui/src/components/ofxDatGuiScrollView.h; sourceTree = SOURCE_ROOT; }; 57EEFEC8B85F7C3B15DD45A4 /* Protocol.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Protocol.cpp; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Protocol.cpp; sourceTree = SOURCE_ROOT; }; - 5B2A8B1748F23EF9E4024266 /* Polygon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Polygon.cpp; path = ../../../addons/ofxCSG/src/CSG/Polygon.cpp; sourceTree = SOURCE_ROOT; }; 5D95092D59E7A34C9DB7823E /* Server.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Server.cpp; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Server.cpp; sourceTree = SOURCE_ROOT; }; 6186D8DA6EFCD2D8AB91FB64 /* MountainScene.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = MountainScene.hpp; path = src/scenes/MountainScene.hpp; 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; }; @@ -183,8 +174,6 @@ 650F041FD82233563F7888D5 /* PlateauScene.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = PlateauScene.cpp; path = src/scenes/PlateauScene.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; }; 67C616C7572D9BE7B9AB3606 /* CrystalScene.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = CrystalScene.hpp; path = src/scenes/CrystalScene.hpp; sourceTree = SOURCE_ROOT; }; - 684D461CEBFB6BDE22F2E25E /* BoundBox.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = BoundBox.cpp; path = ../../../addons/ofxCSG/src/CSG/BoundBox.cpp; sourceTree = SOURCE_ROOT; }; - 68E26DD23976E64A6823E87A /* Triangle.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Triangle.cpp; path = ../../../addons/ofxCSG/src/CSG/Triangle.cpp; sourceTree = SOURCE_ROOT; }; 69668FDE141262BC3C6CA929 /* jsoncpp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = jsoncpp.cpp; path = ../../../addons/ofxLibwebsockets/libs/jsoncpp/jsoncpp.cpp; 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; }; 6BE845441E9F6A7532197F35 /* container_prd.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = container_prd.cc; path = "../../../addons/ofxVoro/libs/voro++/container_prd.cc"; sourceTree = SOURCE_ROOT; }; @@ -206,12 +195,10 @@ 7AE53F401CBBDAE900270AEE /* ofxSvg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxSvg.h; sourceTree = ""; }; 7E9BFCCE85FBD633333026FB /* qLabController.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = qLabController.hpp; path = src/qLabController.hpp; sourceTree = SOURCE_ROOT; }; 802251BAF1B35B1D67B32FD0 /* ofxSliderGroup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxSliderGroup.cpp; path = ../../../addons/ofxGui/src/ofxSliderGroup.cpp; sourceTree = SOURCE_ROOT; }; - 80E54DEF3CA6BD36EAF8D6D2 /* Triangle.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Triangle.h; path = ../../../addons/ofxCSG/src/CSG/Triangle.h; sourceTree = SOURCE_ROOT; }; 81967292BFC87A0144BD32C6 /* ofxOscSender.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxOscSender.cpp; path = ../../../addons/ofxOsc/src/ofxOscSender.cpp; sourceTree = SOURCE_ROOT; }; 832BDC407620CDBA568B713D /* tinyxmlerror.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = tinyxmlerror.cpp; path = ../../../addons/ofxXmlSettings/libs/tinyxmlerror.cpp; sourceTree = SOURCE_ROOT; }; 867CD6868636875C8CEC6551 /* OrganicMaterial.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = OrganicMaterial.cpp; path = src/OrganicMaterial.cpp; sourceTree = SOURCE_ROOT; }; 87297A908FECF87B7660C5C3 /* ofxStereoscopy.hpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxStereoscopy.hpp; path = src/ofxStereoscopy.hpp; sourceTree = SOURCE_ROOT; }; - 87E2EAE56DDA29FE49343859 /* BoundBox.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = BoundBox.h; path = ../../../addons/ofxCSG/src/CSG/BoundBox.h; sourceTree = SOURCE_ROOT; }; 87F26B4B24CBD428AD9EEBAA /* ofxBaseGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxBaseGui.h; path = ../../../addons/ofxGui/src/ofxBaseGui.h; sourceTree = SOURCE_ROOT; }; 89449E3044D456F7DE7BEA14 /* ofxPanel.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxPanel.h; path = ../../../addons/ofxGui/src/ofxPanel.h; sourceTree = SOURCE_ROOT; }; 896211FFD7650884437CE42C /* ofxSmartFont.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSmartFont.h; path = ../../../addons/ofxDatGui/src/libs/ofxSmartFont/ofxSmartFont.h; sourceTree = SOURCE_ROOT; }; @@ -239,6 +226,8 @@ B31C608870ECEB2490A93736 /* ofxOscParameterSync.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxOscParameterSync.h; path = ../../../addons/ofxOsc/src/ofxOscParameterSync.h; sourceTree = SOURCE_ROOT; }; B46143541CBBB1B000A1F988 /* OpeningScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpeningScene.cpp; sourceTree = ""; }; B46143551CBBB1B000A1F988 /* OpeningScene.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OpeningScene.hpp; sourceTree = ""; }; + B46E7B331CBCFA5C00C41635 /* TextScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextScene.cpp; sourceTree = ""; }; + B46E7B341CBCFA5C00C41635 /* TextScene.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TextScene.hpp; sourceTree = ""; }; B498F0559F473CF855EF6062 /* ofxDatGuiTheme.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxDatGuiTheme.h; path = ../../../addons/ofxDatGui/src/themes/ofxDatGuiTheme.h; sourceTree = SOURCE_ROOT; }; B87C60311EC1FE841C1ECD89 /* ofxLabel.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxLabel.h; path = ../../../addons/ofxGui/src/ofxLabel.h; sourceTree = SOURCE_ROOT; }; BA9FA17BACE0BC9114A35A23 /* Util.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Util.h; path = ../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include/ofxLibwebsockets/Util.h; sourceTree = SOURCE_ROOT; }; @@ -262,7 +251,6 @@ D31CF822CBBBE0B7167F4738 /* lws_config.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = lws_config.h; path = ../../../addons/ofxLibwebsockets/libs/libwebsockets/include/lws_config.h; 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; }; DBA908D8359A3CE423D7F35F /* ofxSyncedParams.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxSyncedParams.h; path = ../../../addons/ofxSyncedParams/src/ofxSyncedParams.h; sourceTree = SOURCE_ROOT; }; - DEB243EBD0267C08845C16EE /* LineSegment.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = LineSegment.cpp; path = ../../../addons/ofxCSG/src/CSG/LineSegment.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; }; DFDFE3B511CB0D1BD5773172 /* VoroNode.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = VoroNode.cpp; path = src/VoroNode.cpp; sourceTree = SOURCE_ROOT; }; E100ED9DCB412957A879CD5A /* ofxDatGuiControls.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxDatGuiControls.h; path = ../../../addons/ofxDatGui/src/components/ofxDatGuiControls.h; sourceTree = SOURCE_ROOT; }; @@ -434,6 +422,8 @@ 04461F031CB7EEC8004C391A /* VoroEnd.hpp */, B46143541CBBB1B000A1F988 /* OpeningScene.cpp */, B46143551CBBB1B000A1F988 /* OpeningScene.hpp */, + B46E7B331CBCFA5C00C41635 /* TextScene.cpp */, + B46E7B341CBCFA5C00C41635 /* TextScene.hpp */, ); name = scenes; sourceTree = ""; @@ -565,23 +555,6 @@ name = libs; sourceTree = ""; }; - 78D2F5C708852DFBB8CA1A94 /* CSG */ = { - isa = PBXGroup; - children = ( - 684D461CEBFB6BDE22F2E25E /* BoundBox.cpp */, - 87E2EAE56DDA29FE49343859 /* BoundBox.h */, - DEB243EBD0267C08845C16EE /* LineSegment.cpp */, - 14917A4A7F01F4634B12629F /* LineSegment.h */, - 5B2A8B1748F23EF9E4024266 /* Polygon.cpp */, - 3F7E41BE435B748DC6530CC2 /* Polygon.h */, - 68E26DD23976E64A6823E87A /* Triangle.cpp */, - 80E54DEF3CA6BD36EAF8D6D2 /* Triangle.h */, - 25EB393F641E2D96B4947177 /* Utils.h */, - 04616A5BB01DD5C37184504D /* Vertex.h */, - ); - name = CSG; - sourceTree = ""; - }; 7AE53F341CBBDAE900270AEE /* ofxSvg */ = { isa = PBXGroup; children = ( @@ -741,7 +714,6 @@ isa = PBXGroup; children = ( 7AE53F341CBBDAE900270AEE /* ofxSvg */, - FA58553341DABCD3FC75DDCD /* ofxCSG */, D8DD1043C333F6F63C8685E6 /* ofxDatGui */, 0D0595A62FF5ED8D37029107 /* ofxEasing */, 480A780D8D0308AE4A368801 /* ofxGui */, @@ -783,15 +755,6 @@ name = src; sourceTree = ""; }; - BD45E5EA171EA66D2CCA5547 /* src */ = { - isa = PBXGroup; - children = ( - 78D2F5C708852DFBB8CA1A94 /* CSG */, - 4091601133A9DA1ED8505149 /* ofxCSG.h */, - ); - name = src; - sourceTree = ""; - }; C300CFA0C92162B42A24ACE9 /* src */ = { isa = PBXGroup; children = ( @@ -911,14 +874,6 @@ name = src; sourceTree = ""; }; - FA58553341DABCD3FC75DDCD /* ofxCSG */ = { - isa = PBXGroup; - children = ( - BD45E5EA171EA66D2CCA5547 /* src */, - ); - name = ofxCSG; - sourceTree = ""; - }; FF8CDF57858E9B94E3237115 /* ip */ = { isa = PBXGroup; children = ( @@ -1037,10 +992,6 @@ B96B39E410C021D1F0CD6098 /* VoroNode.cpp in Sources */, 04461F041CB7EEC8004C391A /* VoroEnd.cpp in Sources */, 7AE53F451CBBDAE900270AEE /* ofxSvg.cpp in Sources */, - 58F0E0515AAFF0F7132F38FB /* BoundBox.cpp in Sources */, - 5D352DA5713A90C628CA8EBF /* LineSegment.cpp in Sources */, - A073A593602E93C69A807A04 /* Polygon.cpp in Sources */, - 0B5CAD222FB56DA4C7B5D87C /* Triangle.cpp in Sources */, D3C1C48E59CAA2D68C0DD477 /* ofxDatGuiComponent.cpp in Sources */, 9CF4130A7E6DA19A3DC42B9A /* ofxSmartFont.cpp in Sources */, C9466C434D1CF8AB968D298D /* ofxDatGui.cpp in Sources */, @@ -1086,6 +1037,7 @@ D74BF211B75A1C87AD9EFD51 /* common.cc in Sources */, 23F8502AA1FA2B1390FE7A09 /* container.cc in Sources */, 59A6F986FCCB12BF4CC1C865 /* container_prd.cc in Sources */, + B46E7B351CBCFA5C00C41635 /* TextScene.cpp in Sources */, 77CF44C1E470CEED2784335C /* pre_container.cc in Sources */, 570FE10C152F471768FFD2E0 /* unitcell.cc in Sources */, 8A499A106713A29A2B8E6782 /* v_base.cc in Sources */, diff --git a/ofStereo2016/openFrameworks-Info.plist b/ofStereo2016/openFrameworks-Info.plist index 8d64d2b..c4615ca 100644 --- a/ofStereo2016/openFrameworks-Info.plist +++ b/ofStereo2016/openFrameworks-Info.plist @@ -18,5 +18,7 @@ 1.0 CFBundleIconFile ${ICON} + NSSupportsSuddenTermination + diff --git a/ofStereo2016/src/TextScene.cpp b/ofStereo2016/src/TextScene.cpp new file mode 100644 index 0000000..fc89b0f --- /dev/null +++ b/ofStereo2016/src/TextScene.cpp @@ -0,0 +1,53 @@ +// +// TextScene.cpp +// ofStereo2016 +// +// Created by Stereo on 11/04/16. +// +// + +#include "TextScene.hpp" + +void TextScene::setup(){ + + font.load("Novecentowide-Bold.otf", 30, true, true, true, 0.1); + font.setLetterSpacing(0.9); + + globalParams->getVec3f("stage_size_cm").addListener(this, &TextScene::onStageSize); + +} + +void TextScene::update(){ + +} + +void TextScene::draw(){ + + ofSetColor(255,255); + drawText(); + +} + +void TextScene::onStageSize(ofVec3f& vec){ + +} + +void TextScene::drawText() { + ofPushStyle(); + ofPushMatrix(); + ofSetColor(textColor.get()); + float scale = textSize/font.getSize(); + ofRectangle bb = font.getStringBoundingBox(textString, 0,0); + ofTranslate(world->zInCam(textPosition.get())); + ofScale(scale, scale); + ofTranslate(-bb.width/2.0, -font.getSize()/2.0); + font.drawStringAsShapes(textString, 0, 0); + ofPopMatrix(); + ofPopStyle(); +} + +void TextScene::drawModel(){ + ofEnableDepthTest(); + drawText(); + ofDisableDepthTest(); +} \ No newline at end of file diff --git a/ofStereo2016/src/TextScene.hpp b/ofStereo2016/src/TextScene.hpp new file mode 100644 index 0000000..4823e1f --- /dev/null +++ b/ofStereo2016/src/TextScene.hpp @@ -0,0 +1,49 @@ +// +// TextScene.hpp +// ofStereo2016 +// +// Created by Stereo on 11/04/16. +// +// + +#pragma once + +#include "ofMain.h" +#include "ofxStereoscopy.hpp" + +class TextScene : public ofxStereoscopy::Scene { + +public: + + ofParameter textPosition {"position", ofVec3f(0, 250, 400),ofVec3f(-2000,-2000,-2000),ofVec3f(2000,2000,2000)}; + ofParameter textSize {"size", 30, 0.0, 1000}; + ofParameter textColor {"color", ofFloatColor(1.0,1.0,1.0,1.0),ofFloatColor(0.0,0.0,0.0,0.0),ofFloatColor(1.0,1.0,1.0,1.0)}; + ofParameter textString {"string", ""}; + + ofParameterGroup textParams {"text", + textPosition, + textSize, + textString, + textColor + }; + + ofParameterGroup params {"TextScene", + enabled, + qlab, + textParams + }; + + TextScene() { + ofxStereoscopy::Scene::params = params; + } + + ofTrueTypeFont font; + + void draw(); + void update(); + void setup(); + void onStageSize(ofVec3f& vec); + void drawText(); + void drawModel(); + +}; diff --git a/ofStereo2016/src/VoroNode.cpp b/ofStereo2016/src/VoroNode.cpp index a0e7f91..86cf6ff 100644 --- a/ofStereo2016/src/VoroNode.cpp +++ b/ofStereo2016/src/VoroNode.cpp @@ -9,6 +9,7 @@ #include "VoroNode.hpp" int VoroNode::counter = 0; +VoroNode * VoroNode::theNode = nullptr; VoroNode::VoroNode() { counter++; diff --git a/ofStereo2016/src/VoroNode.hpp b/ofStereo2016/src/VoroNode.hpp index 1f830ed..00eeb76 100644 --- a/ofStereo2016/src/VoroNode.hpp +++ b/ofStereo2016/src/VoroNode.hpp @@ -17,6 +17,7 @@ class VoroNode : public ofNode { public: + static VoroNode * theNode; static int counter; VoroNode(); diff --git a/ofStereo2016/src/ofApp.h b/ofStereo2016/src/ofApp.h index 58e33e0..840e34b 100644 --- a/ofStereo2016/src/ofApp.h +++ b/ofStereo2016/src/ofApp.h @@ -29,6 +29,7 @@ #include "VoroScenes.hpp" #include "OpeningScene.hpp" #include "VoroEnd.hpp" +#include "TextScene.hpp" class ofApp : public ofBaseApp{ @@ -44,6 +45,7 @@ class ofApp : public ofBaseApp{ scenes.push_back(make_shared()); scenes.push_back(make_shared()); scenes.push_back(make_shared()); + scenes.push_back(make_shared()); scenes.push_back(make_shared()); for( auto s : scenes) { diff --git a/ofStereo2016/src/scenes/PlateauScene.cpp b/ofStereo2016/src/scenes/PlateauScene.cpp index 9dc15e1..7142ea2 100644 --- a/ofStereo2016/src/scenes/PlateauScene.cpp +++ b/ofStereo2016/src/scenes/PlateauScene.cpp @@ -152,7 +152,6 @@ void PlateauScene::reconstructPlateau(){ ofSeedRandom(plateauRandomSeed); plateauPivotOrigin.set(ofVec3f(0,-globalParams->getVec3f("stage_size_cm")->z, globalParams->getVec3f("stage_size_cm")->z/2.0)); - } void PlateauScene::onStageSize(ofVec3f& stageSize){ diff --git a/ofStereo2016/src/scenes/VoroScenes.cpp b/ofStereo2016/src/scenes/VoroScenes.cpp index d78cc51..0ffa820 100644 --- a/ofStereo2016/src/scenes/VoroScenes.cpp +++ b/ofStereo2016/src/scenes/VoroScenes.cpp @@ -13,7 +13,6 @@ void VoroScenes::setup() { seed.addListener(this, &VoroScenes::reconstruct); numCells.addListener(this, &VoroScenes::reconstruct); - reconstruct(); } @@ -21,113 +20,27 @@ void VoroScenes::setup() { void VoroScenes::draw() { - ofEnableAlphaBlending(); - ofSetColor(255); - /*ofEnableAlphaBlending(); ofSetColor(255); - mat.begin(); - yClipped.draw(&mat); - mat.end();*/ - - - ofDrawSphere(subtractOffset, 10); - - ofPushMatrix(); - - //ofPoint anchor = box.getPosition() + ofVec3f(0, box.getHeight()/2, 0) + pivotOffset; - - /*ofDrawSphere(anchor + pivotOffset, 10); - - ofTranslate(anchor + pivotOffset); - - ofRotate(ofMap(pivotOffset.get().x, 100, -100, -45, 45), 0, 0, 1); - ofRotate(ofMap(pivotOffset.get().z, -100, 100, -45, 45), 1, 0, 0); - - ofTranslate(-(anchor + pivotOffset));*/ - //box.draw(); - - ofPopMatrix(); - - /* of3dPrimitive newBox = box; - - for(auto c : unClipped.getChildrenInSphere(dp(0), 80)) { - ofxCSG::meshDifference(newBox.getMesh(), c->getBakedMesh(), newBox.getMesh()); - //c->draw(); - } - */ + ofEnableAlphaBlending(); ofEnableLighting(); mat.begin(); - mat.setWorldMatrix(ofMatrix4x4::newIdentityMatrix()); - newBox.draw(); + mainNode.draw(&mat); mat.end(); } void VoroScenes::update() { - mat.setDiffuseColor(clusterColor.get()); - mat.setAmbientColor(ofFloatColor(1.0,0,0,1.0)); - mat.updateParameters(); - - - yClipped.setPosition(subtractOffset); - - /* - newBox = VoroNode::bakeMesh(box.getMesh(), box); - for(auto c : yClipped.getNearestChildren(dp(0)+subtractOffset.get(), 2)) { - ofxCSG::meshDifferencePostFlipB(newBox, c->getBakedMesh(), newBox); - newBox.setupIndicesAuto(); - //c->draw(); + if(doReconstruct){ + reconstruct(); + doReconstruct = false; } - */ - //ofMesh:: - - //crystalBoulder->setOrientation(crystalRotation); - //cluster->setScale(crystalSize/crystalBoulder->boundingBox.getWidth()); - //crystalOrigin = (dp(1)+dp(2))/2.0; - //cluster.setGlobalPosition(origin); - - /*clusterRotation += ofGetLastFrameTime() * 60.0 * ofVec3f( - clusterRotationAxis.get().x* - clusterRotationSpeed.get(), - clusterRotationAxis.get().y* - clusterRotationSpeed.get(), - clusterRotationAxis.get().z - *clusterRotationSpeed.get()); - */ - //cluster.setOrientation(clusterRotation); - - // - //cluster.rotateAround(<#float degrees#>, <#const ofVec3f &axis#>, <#const ofVec3f &point#>) - - /*yClipped.setScale(scale.get()); - - for(auto c : cluster.getChildren()) { - c->setScale(scaleCells); - for(auto cc : c->getChildren()) { - cc->setScale(scaleCells); - } - }*/ - - //mat.setDiffuseColor(crystalColor.get()); - //mat.setDiffuseColor(clusterColor.get()); - //mat.setAmbientColor(ofFloatColor(0,0,0,0)); - - // box.setScale(2,1,2); - // box.setPosition(origin); - - //ofVec3f p = box.getPosition(); - //box.setPosition(pivotAround); - - //box.setOrientation(ofVec3f(0,0,45)); - - //box.setPosition(p); - - //box.setTransformMatrix(<#const ofMatrix4x4 &m44#>) - - //box.rotateAround(sin(ofGetElapsedTimef())*45, pivotAround, box.getPosition()+ofVec3f(0, box.getHeight() /2, 0)); + mat.setDiffuseColor(clusterColor.get()); + mat.setAmbientColor(clusterColor.get()*0.5); + mat.updateParameters(); + box.setPosition(origin); } @@ -136,39 +49,23 @@ void VoroScenes::reconstruct(){ ofVec3f _s = globalParams->getVec3f("stage_size_cm").get(); box.setParent(world->origin); - - box.set(_s.x, _s.y*0.4, _s.z, 4,4,4); + box.set(_s.x, _s.x*0.5, _s.z, 4,2,4); box.setScale(1,1,1); - box.setPosition( ofVec3f(0, -box.getHeight()/2, box.getDepth()/2) ); - - scale.set(1); - origin.set(ofVec3f(0,0,0)); - - ofSeedRandom(seed.get()); - yClipped.setupFromBoundingBox(box.getWidth(), box.getHeight(), box.getDepth(), numCells, true,false,true); - yClipped.setParent(box); + box.setGlobalPosition( ofVec3f(0, -box.getHeight()/2, box.getDepth()/2) ); - ofSeedRandom(seed.get()); - unClipped.setupFromBoundingBox(box.getWidth(), box.getHeight(), box.getDepth(), numCells, true,true,true); - unClipped.setParent(box); + origin.set(box.getGlobalPosition()); ofSeedRandom(seed.get()); - yClippedCopy.setupFromBoundingBox(box.getWidth(), box.getHeight(), box.getDepth(), numCells, true,false,true); - yClippedCopy.setParent(box); - + mainNode.setupFromBoundingBox(box.getWidth(), box.getHeight(), box.getDepth(), numCells, true,false,true); + mainNode.setParent(box); } void VoroScenes::drawModel() { - //box.draw(); - //unClipped.draw(); - //yClipped.draw(); - //yClippedCopy.draw(); - - //of3dPrimitive newBox = box; - ofSetColor(255,75); - newBox.drawWireframe(); + box.drawWireframe(); + ofSetColor(255,20); + mainNode.draw(); } diff --git a/ofStereo2016/src/scenes/VoroScenes.hpp b/ofStereo2016/src/scenes/VoroScenes.hpp index 36d759e..94b01bc 100644 --- a/ofStereo2016/src/scenes/VoroScenes.hpp +++ b/ofStereo2016/src/scenes/VoroScenes.hpp @@ -12,9 +12,7 @@ #include "ofMain.h" #include "ofxStereoscopy.hpp" #include "VoroNode.hpp" -#include "ofxGui.h" #include "OrganicMaterial.hpp" -#include "ofxCSG.h" class VoroScenes : public ofxStereoscopy::Scene { @@ -27,26 +25,12 @@ class VoroScenes : public ofxStereoscopy::Scene { ofVec3f(-1000,-1000,-1000), ofVec3f(1000,1000,1000)}; - //ofParameter size {"size", ofVec3f(1000,1000,1000), ofVec3f(0,0,0), ofVec3f(10000,10000,10000) }; - ofParameter clusterColor {"color", ofFloatColor(1,1,1,1), ofFloatColor(0,0,0,0), ofFloatColor(1,1,1,1)}; - ofParameter scale {"scale", 0, 0, 10}; - ofParameter scaleCells {"scaleCells", 0,0,0.999}; - - ofParameter subtractOffset {"subtractOffset", ofVec3f(0,0,0), - ofVec3f(-100,-100,-100), - ofVec3f(100,100,100)}; - - - ofParameterGroup voroNodeParams {"cluster", numCells, seed, origin, - subtractOffset, - scale, - scaleCells, clusterColor, }; @@ -69,17 +53,15 @@ class VoroScenes : public ofxStereoscopy::Scene { template void reconstruct(type & t) { - reconstruct(); + doReconstruct = true; } - void reconstruct(); + bool doReconstruct = false; - ofBoxPrimitive box; + ofBoxPrimitive box; - VoroNode unClipped; - VoroNode yClipped; - VoroNode yClippedCopy; + VoroNode mainNode; //ofMesh intersect; //ofMesh outMesh; @@ -88,9 +70,6 @@ class VoroScenes : public ofxStereoscopy::Scene { OrganicMaterial mat; - ofMesh newBox; - - };