SketchScene:

/ line position is a spline, not a function of noise + line noise + stones throw / sphere is ball
RecoilPerformanceGroup · Apr 20, 2016 · dc9404e · dc9404e
1 parent 6751bb3
commit dc9404e
Show file tree

Hide file tree

Showing 10 changed files with 361 additions and 130 deletions.
diff --git a/ofStereo2016/addons.make b/ofStereo2016/addons.make
@@ -8,4 +8,5 @@ ofxSyncedParams
 ofxVoro
 ofxXmlSettings
 ofxSVG
-ofxCGAL
+ofxMSACore
+ofxMSAInterpolator
diff --git a/ofStereo2016/bin/data/Lights.xml b/ofStereo2016/bin/data/Lights.xml
@@ -1,5 +1,5 @@
 <Lights>
-	<enabled>0</enabled>
+	<enabled>1</enabled>
 	<directionalLight>
 		<diffuseColor>79, 79, 79, 255</diffuseColor>
 		<ambientColor>0, 0, 0, 255</ambientColor>

diff --git a/ofStereo2016/bin/data/sketch.xml b/ofStereo2016/bin/data/sketch.xml
@@ -13,4 +13,40 @@
 <lineWidth>8.16326, 34.6939</lineWidth>
 <use3dInput>1</use3dInput>
 <fadeDepth>0</fadeDepth>
+<rotationEuler>0, 0, 0</rotationEuler>
+	<rotationCenter>0, 0, 0</rotationCenter>
+	<line>
+		<start>0</start>
+		<end>1</end>
+		<resolution>411</resolution>
+		<width>15.8163</width>
+		<depthFade>510.204</depthFade>
+		<noiseAmplitude>0</noiseAmplitude>
+		<noisePhase>0</noisePhase>
+		<use3dInput>0</use3dInput>
+		<nextPos>0.313203, 0.708871, 0.229904</nextPos>
+		<lineAddPos>0</lineAddPos>
+		<clear>0</clear>
+		<load>0</load>
+		<save>0</save>
+	</line>
+	<shard>
+		<size>20</size>
+		<color>1, 1, 1, 1</color>
+		<material>
+			<noise>
+				<displacement>
+					<velocity>0, 0, 0</velocity>
+					<scale>1, 1, 1</scale>
+					<amount>0, 0, 0</amount>
+				</displacement>
+				<texture>
+					<velocity>0, 0, 0</velocity>
+					<scale>1.6666, 1.6666, 1.6666</scale>
+					<amount>-0.025</amount>
+				</texture>
+			</noise>
+		</material>
+	<position>0</position>
+	</shard>
 </sketch>
diff --git a/ofStereo2016/bin/data/stereo.xml b/ofStereo2016/bin/data/stereo.xml
@@ -76,7 +76,7 @@
 			</wall>
 		</roomScene>
 		<Lights>
-			<enabled>0</enabled>
+			<enabled>1</enabled>
 			<add_to_qlab>0</add_to_qlab>
 			<directionalLight1>
 				<diffuseColor>1, 1, 1, 255</diffuseColor>
@@ -194,6 +194,42 @@
 			<reset>0</reset>
 		<use3dInput>1</use3dInput>
 		<fadeDepth>0</fadeDepth>
+		<rotationEuler>0, 0, 0</rotationEuler>
+			<rotationCenter>0, 0, 0</rotationCenter>
+			<line>
+				<start>0</start>
+				<end>1</end>
+				<resolution>411</resolution>
+				<width>15.8163</width>
+				<depthFade>510.204</depthFade>
+				<noiseAmplitude>0</noiseAmplitude>
+				<noisePhase>0</noisePhase>
+				<use3dInput>0</use3dInput>
+				<nextPos>0.313203, 0.708871, 0.229904</nextPos>
+				<lineAddPos>0</lineAddPos>
+				<clear>0</clear>
+				<load>0</load>
+				<save>0</save>
+			</line>
+			<shard>
+				<size>20</size>
+				<color>1, 1, 1, 1</color>
+				<material>
+					<noise>
+						<displacement>
+							<velocity>0, 0, 0</velocity>
+							<scale>1, 1, 1</scale>
+							<amount>0, 0, 0</amount>
+						</displacement>
+						<texture>
+							<velocity>0, 0, 0</velocity>
+							<scale>1.6666, 1.6666, 1.6666</scale>
+							<amount>-0.025</amount>
+						</texture>
+					</noise>
+				</material>
+			<position>0</position>
+			</shard>
 		</sketch>
 		<TextScene>
 			<enabled>0</enabled>

diff --git a/ofStereo2016/ofStereo2016.xcodeproj/project.pbxproj b/ofStereo2016/ofStereo2016.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
 		72A929D3561B8232A182ABFC /* ofxOscBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65EEFA3DA3526E9CDD9C21F9 /* ofxOscBundle.cpp */; };
 		77CF44C1E470CEED2784335C /* pre_container.cc in Sources */ = {isa = PBXBuildFile; fileRef = F6BC3F2FE4E1233071671277 /* pre_container.cc */; };
 		7A2D09E81CC55C6A00003DBD /* SoundField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A2D09E61CC55C6A00003DBD /* SoundField.cpp */; };
+		7AE153E71CC7886C00D025F2 /* MSACoreGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AE153C61CC7886C00D025F2 /* MSACoreGL.cpp */; };
 		7AE53F411CBBDAE900270AEE /* src_colors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AE53F381CBBDAE900270AEE /* src_colors.cpp */; };
 		7AE53F421CBBDAE900270AEE /* svgtiny.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AE53F391CBBDAE900270AEE /* svgtiny.cpp */; };
 		7AE53F431CBBDAE900270AEE /* svgtiny_gradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AE53F3B1CBBDAE900270AEE /* svgtiny_gradient.cpp */; };
@@ -204,6 +205,19 @@
 		78D67A00EB899FAC09430597 /* ofxLabel.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofxLabel.cpp; path = ../../../addons/ofxGui/src/ofxLabel.cpp; sourceTree = SOURCE_ROOT; };
 		7A2D09E61CC55C6A00003DBD /* SoundField.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SoundField.cpp; sourceTree = "<group>"; };
 		7A2D09E71CC55C6A00003DBD /* SoundField.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SoundField.hpp; sourceTree = "<group>"; };
+		7AE153C21CC7886C00D025F2 /* MSACore-Cinder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MSACore-Cinder.h"; sourceTree = "<group>"; };
+		7AE153C31CC7886C00D025F2 /* MSACore-OF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MSACore-OF.h"; sourceTree = "<group>"; };
+		7AE153C41CC7886C00D025F2 /* MSACore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSACore.h; sourceTree = "<group>"; };
+		7AE153C51CC7886C00D025F2 /* MSACoreCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSACoreCommon.h; sourceTree = "<group>"; };
+		7AE153C61CC7886C00D025F2 /* MSACoreGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MSACoreGL.cpp; sourceTree = "<group>"; };
+		7AE153C71CC7886C00D025F2 /* MSACoreGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSACoreGL.h; sourceTree = "<group>"; };
+		7AE153C81CC7886C00D025F2 /* MSACoreMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSACoreMath.h; sourceTree = "<group>"; };
+		7AE153DF1CC7886C00D025F2 /* MSAInterpolationTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSAInterpolationTypes.h; sourceTree = "<group>"; };
+		7AE153E01CC7886C00D025F2 /* MSAInterpolator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSAInterpolator.h; sourceTree = "<group>"; };
+		7AE153E11CC7886C00D025F2 /* MSAInterpolator1D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSAInterpolator1D.h; sourceTree = "<group>"; };
+		7AE153E21CC7886C00D025F2 /* MSAInterpolator2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSAInterpolator2D.h; sourceTree = "<group>"; };
+		7AE153E31CC7886C00D025F2 /* MSAInterpolator3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSAInterpolator3D.h; sourceTree = "<group>"; };
+		7AE153E41CC7886C00D025F2 /* MSAInterpolatorT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSAInterpolatorT.h; sourceTree = "<group>"; };
 		7AE53F381CBBDAE900270AEE /* src_colors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = src_colors.cpp; sourceTree = "<group>"; };
 		7AE53F391CBBDAE900270AEE /* svgtiny.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = svgtiny.cpp; sourceTree = "<group>"; };
 		7AE53F3A1CBBDAE900270AEE /* svgtiny.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = svgtiny.h; sourceTree = "<group>"; };
@@ -614,6 +628,51 @@
 			name = Unused;
 			sourceTree = "<group>";
 		};
+		7AE153BD1CC7886C00D025F2 /* ofxMSACore */ = {
+			isa = PBXGroup;
+			children = (
+				7AE153C11CC7886C00D025F2 /* src */,
+			);
+			name = ofxMSACore;
+			path = ../../../addons/ofxMSACore;
+			sourceTree = "<group>";
+		};
+		7AE153C11CC7886C00D025F2 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				7AE153C21CC7886C00D025F2 /* MSACore-Cinder.h */,
+				7AE153C31CC7886C00D025F2 /* MSACore-OF.h */,
+				7AE153C41CC7886C00D025F2 /* MSACore.h */,
+				7AE153C51CC7886C00D025F2 /* MSACoreCommon.h */,
+				7AE153C61CC7886C00D025F2 /* MSACoreGL.cpp */,
+				7AE153C71CC7886C00D025F2 /* MSACoreGL.h */,
+				7AE153C81CC7886C00D025F2 /* MSACoreMath.h */,
+			);
+			path = src;
+			sourceTree = "<group>";
+		};
+		7AE153C91CC7886C00D025F2 /* ofxMSAInterpolator */ = {
+			isa = PBXGroup;
+			children = (
+				7AE153DE1CC7886C00D025F2 /* src */,
+			);
+			name = ofxMSAInterpolator;
+			path = ../../../addons/ofxMSAInterpolator;
+			sourceTree = "<group>";
+		};
+		7AE153DE1CC7886C00D025F2 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				7AE153DF1CC7886C00D025F2 /* MSAInterpolationTypes.h */,
+				7AE153E01CC7886C00D025F2 /* MSAInterpolator.h */,
+				7AE153E11CC7886C00D025F2 /* MSAInterpolator1D.h */,
+				7AE153E21CC7886C00D025F2 /* MSAInterpolator2D.h */,
+				7AE153E31CC7886C00D025F2 /* MSAInterpolator3D.h */,
+				7AE153E41CC7886C00D025F2 /* MSAInterpolatorT.h */,
+			);
+			path = src;
+			sourceTree = "<group>";
+		};
 		7AE53F341CBBDAE900270AEE /* ofxSvg */ = {
 			isa = PBXGroup;
 			children = (
@@ -772,6 +831,8 @@
 		BB4B014C10F69532006C3DED /* addons */ = {
 			isa = PBXGroup;
 			children = (
+				7AE153BD1CC7886C00D025F2 /* ofxMSACore */,
+				7AE153C91CC7886C00D025F2 /* ofxMSAInterpolator */,
 				7AE53F341CBBDAE900270AEE /* ofxSvg */,
 				D8DD1043C333F6F63C8685E6 /* ofxDatGui */,
 				0D0595A62FF5ED8D37029107 /* ofxEasing */,
@@ -1051,6 +1112,7 @@
 				E896A5EA7FB9998EE0E6F916 /* RoomScene.cpp in Sources */,
 				4D2C7CE3795E3A842B36E824 /* SketchScene.cpp in Sources */,
 				B96B39E410C021D1F0CD6098 /* VoroNode.cpp in Sources */,
+				7AE153E71CC7886C00D025F2 /* MSACoreGL.cpp in Sources */,
 				04461F041CB7EEC8004C391A /* VoroEnd.cpp in Sources */,
 				7AE53F451CBBDAE900270AEE /* ofxSvg.cpp in Sources */,
 				D3C1C48E59CAA2D68C0DD477 /* ofxDatGuiComponent.cpp in Sources */,

diff --git a/...o2016/ofStereo2016.xcodeproj/project.xcworkspace/xcshareddata/ofStereo2016.xcscmblueprint b/...o2016/ofStereo2016.xcodeproj/project.xcworkspace/xcshareddata/ofStereo2016.xcscmblueprint
@@ -6,10 +6,12 @@
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
     "9233F0F4A2BE011BD468E5177A5AD6623263B23D" : 0,
     "FB950DA91696DB40601A43AFF1A56B2E39217374" : 0,
+    "65FAA983A662D43645B6C2BEE45CDCC6359DE6D9" : 0,
     "3FD0A6B0728805B39B1EC65C31D9BA97C2D2ABC7" : 0,
     "86145F1292B789AB93966AE12565F1D778504ABC" : 0,
     "C75356AAE162B156DEBAB12E906B72422A9A501B" : 0,
     "5DB7C332A3A89035E93556A2A38BF414005BA671" : 0,
+    "CB1CF109CA3A77AF931BD92C92B3F38F4A501645" : 0,
     "D114DAD45B7655488468EAC36418C27884EA94B2" : 0,
     "2204A9F914F6C3C85F7A96073C7376834AF2FCA2" : 0,
     "0B4E6AD6B26818A33F82E9CC97C1D7F2BB2D1FE6" : 0
@@ -18,10 +20,12 @@
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "9233F0F4A2BE011BD468E5177A5AD6623263B23D" : "..\/addons\/ofxDatGui",
     "FB950DA91696DB40601A43AFF1A56B2E39217374" : "..\/addons\/ofxLibwebsockets",
+    "65FAA983A662D43645B6C2BEE45CDCC6359DE6D9" : "..\/addons\/ofxMSAInterpolator",
     "3FD0A6B0728805B39B1EC65C31D9BA97C2D2ABC7" : "..\/addons\/ofxBiquadFilter",
     "86145F1292B789AB93966AE12565F1D778504ABC" : "..\/addons\/ofxEasing",
     "C75356AAE162B156DEBAB12E906B72422A9A501B" : "..\/addons\/ofxVoro",
     "5DB7C332A3A89035E93556A2A38BF414005BA671" : "..\/addons\/ofxJSON",
+    "CB1CF109CA3A77AF931BD92C92B3F38F4A501645" : "..\/addons\/ofxMSACore",
     "D114DAD45B7655488468EAC36418C27884EA94B2" : "..\/addons\/ofxSyncedParams",
     "2204A9F914F6C3C85F7A96073C7376834AF2FCA2" : "Stereo2016\/",
     "0B4E6AD6B26818A33F82E9CC97C1D7F2BB2D1FE6" : "..\/addons\/ofxCSG"
@@ -50,6 +54,11 @@
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5DB7C332A3A89035E93556A2A38BF414005BA671"
     },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/memo\/ofxMSAInterpolator.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "65FAA983A662D43645B6C2BEE45CDCC6359DE6D9"
+    },
     {
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/arturoc\/ofxEasing.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
@@ -65,6 +74,11 @@
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C75356AAE162B156DEBAB12E906B72422A9A501B"
     },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/memo\/ofxMSACore.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CB1CF109CA3A77AF931BD92C92B3F38F4A501645"
+    },
     {
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/fx-lange\/ofxSyncedParams.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

diff --git a/ofStereo2016/src/PushDown.hpp b/ofStereo2016/src/PushDown.hpp
@@ -99,7 +99,6 @@ class PushDown : public ofxStereoscopy::Scene {
 
     OrganicMaterial mat;
 
-
 };
 
 

diff --git a/ofStereo2016/src/VoroNode.hpp b/ofStereo2016/src/VoroNode.hpp
@@ -55,6 +55,7 @@ class VoroNode : public ofNode {
     int nCells;
 
     ofVec3f renderPosOffset;
+    ofVec3f velocity;
 
     //int seed;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,7 +99,6 @@ class PushDown : public ofxStereoscopy::Scene {

		OrganicMaterial mat;


		};


Expand Down