Permalink
Browse files

fixes for documentation

  • Loading branch information...
obviousjim committed May 14, 2012
1 parent 98e1beb commit df110c1855b9fa9a7a61529ae7149109c77e71cf
@@ -7,6 +7,19 @@
objects = {
/* Begin PBXBuildFile section */
+ A67E692015604CCB00B8E8CC /* ofxEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E68F815604CCB00B8E8CC /* ofxEasing.cpp */; };
+ A67E692115604CCB00B8E8CC /* ofxEasingBack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E68FA15604CCB00B8E8CC /* ofxEasingBack.cpp */; };
+ A67E692215604CCB00B8E8CC /* ofxEasingBounce.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E68FC15604CCB00B8E8CC /* ofxEasingBounce.cpp */; };
+ A67E692315604CCB00B8E8CC /* ofxEasingCirc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E68FE15604CCB00B8E8CC /* ofxEasingCirc.cpp */; };
+ A67E692415604CCB00B8E8CC /* ofxEasingCubic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690015604CCB00B8E8CC /* ofxEasingCubic.cpp */; };
+ A67E692515604CCB00B8E8CC /* ofxEasingElastic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690215604CCB00B8E8CC /* ofxEasingElastic.cpp */; };
+ A67E692615604CCB00B8E8CC /* ofxEasingExpo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690415604CCB00B8E8CC /* ofxEasingExpo.cpp */; };
+ A67E692715604CCB00B8E8CC /* ofxEasingLinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690615604CCB00B8E8CC /* ofxEasingLinear.cpp */; };
+ A67E692815604CCB00B8E8CC /* ofxEasingQuad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690815604CCB00B8E8CC /* ofxEasingQuad.cpp */; };
+ A67E692915604CCB00B8E8CC /* ofxEasingQuart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690A15604CCB00B8E8CC /* ofxEasingQuart.cpp */; };
+ A67E692A15604CCB00B8E8CC /* ofxEasingQuint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690C15604CCB00B8E8CC /* ofxEasingQuint.cpp */; };
+ A67E692B15604CCB00B8E8CC /* ofxEasingSine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E690E15604CCB00B8E8CC /* ofxEasingSine.cpp */; };
+ A67E692C15604CCB00B8E8CC /* ofxTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A67E691015604CCB00B8E8CC /* ofxTween.cpp */; };
BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; };
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; };
@@ -109,6 +122,33 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ A67E68F715604CCB00B8E8CC /* easing_terms_of_use.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = easing_terms_of_use.html; sourceTree = "<group>"; };
+ A67E68F815604CCB00B8E8CC /* ofxEasing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasing.cpp; sourceTree = "<group>"; };
+ A67E68F915604CCB00B8E8CC /* ofxEasing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasing.h; sourceTree = "<group>"; };
+ A67E68FA15604CCB00B8E8CC /* ofxEasingBack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingBack.cpp; sourceTree = "<group>"; };
+ A67E68FB15604CCB00B8E8CC /* ofxEasingBack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingBack.h; sourceTree = "<group>"; };
+ A67E68FC15604CCB00B8E8CC /* ofxEasingBounce.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingBounce.cpp; sourceTree = "<group>"; };
+ A67E68FD15604CCB00B8E8CC /* ofxEasingBounce.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingBounce.h; sourceTree = "<group>"; };
+ A67E68FE15604CCB00B8E8CC /* ofxEasingCirc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingCirc.cpp; sourceTree = "<group>"; };
+ A67E68FF15604CCB00B8E8CC /* ofxEasingCirc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingCirc.h; sourceTree = "<group>"; };
+ A67E690015604CCB00B8E8CC /* ofxEasingCubic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingCubic.cpp; sourceTree = "<group>"; };
+ A67E690115604CCB00B8E8CC /* ofxEasingCubic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingCubic.h; sourceTree = "<group>"; };
+ A67E690215604CCB00B8E8CC /* ofxEasingElastic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingElastic.cpp; sourceTree = "<group>"; };
+ A67E690315604CCB00B8E8CC /* ofxEasingElastic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingElastic.h; sourceTree = "<group>"; };
+ A67E690415604CCB00B8E8CC /* ofxEasingExpo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingExpo.cpp; sourceTree = "<group>"; };
+ A67E690515604CCB00B8E8CC /* ofxEasingExpo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingExpo.h; sourceTree = "<group>"; };
+ A67E690615604CCB00B8E8CC /* ofxEasingLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingLinear.cpp; sourceTree = "<group>"; };
+ A67E690715604CCB00B8E8CC /* ofxEasingLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingLinear.h; sourceTree = "<group>"; };
+ A67E690815604CCB00B8E8CC /* ofxEasingQuad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingQuad.cpp; sourceTree = "<group>"; };
+ A67E690915604CCB00B8E8CC /* ofxEasingQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingQuad.h; sourceTree = "<group>"; };
+ A67E690A15604CCB00B8E8CC /* ofxEasingQuart.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingQuart.cpp; sourceTree = "<group>"; };
+ A67E690B15604CCB00B8E8CC /* ofxEasingQuart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingQuart.h; sourceTree = "<group>"; };
+ A67E690C15604CCB00B8E8CC /* ofxEasingQuint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingQuint.cpp; sourceTree = "<group>"; };
+ A67E690D15604CCB00B8E8CC /* ofxEasingQuint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingQuint.h; sourceTree = "<group>"; };
+ A67E690E15604CCB00B8E8CC /* ofxEasingSine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxEasingSine.cpp; sourceTree = "<group>"; };
+ A67E690F15604CCB00B8E8CC /* ofxEasingSine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingSine.h; sourceTree = "<group>"; };
+ A67E691015604CCB00B8E8CC /* ofxTween.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxTween.cpp; sourceTree = "<group>"; };
+ A67E691115604CCB00B8E8CC /* ofxTween.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxTween.h; sourceTree = "<group>"; };
BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
@@ -357,9 +397,61 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ A67E68DF15604CCB00B8E8CC /* ofxTween */ = {
+ isa = PBXGroup;
+ children = (
+ A67E68F515604CCB00B8E8CC /* src */,
+ );
+ name = ofxTween;
+ path = ../../../addons/ofxTween;
+ sourceTree = "<group>";
+ };
+ A67E68F515604CCB00B8E8CC /* src */ = {
+ isa = PBXGroup;
+ children = (
+ A67E68F615604CCB00B8E8CC /* Easings */,
+ A67E691015604CCB00B8E8CC /* ofxTween.cpp */,
+ A67E691115604CCB00B8E8CC /* ofxTween.h */,
+ );
+ path = src;
+ sourceTree = "<group>";
+ };
+ A67E68F615604CCB00B8E8CC /* Easings */ = {
+ isa = PBXGroup;
+ children = (
+ A67E68F715604CCB00B8E8CC /* easing_terms_of_use.html */,
+ A67E68F815604CCB00B8E8CC /* ofxEasing.cpp */,
+ A67E68F915604CCB00B8E8CC /* ofxEasing.h */,
+ A67E68FA15604CCB00B8E8CC /* ofxEasingBack.cpp */,
+ A67E68FB15604CCB00B8E8CC /* ofxEasingBack.h */,
+ A67E68FC15604CCB00B8E8CC /* ofxEasingBounce.cpp */,
+ A67E68FD15604CCB00B8E8CC /* ofxEasingBounce.h */,
+ A67E68FE15604CCB00B8E8CC /* ofxEasingCirc.cpp */,
+ A67E68FF15604CCB00B8E8CC /* ofxEasingCirc.h */,
+ A67E690015604CCB00B8E8CC /* ofxEasingCubic.cpp */,
+ A67E690115604CCB00B8E8CC /* ofxEasingCubic.h */,
+ A67E690215604CCB00B8E8CC /* ofxEasingElastic.cpp */,
+ A67E690315604CCB00B8E8CC /* ofxEasingElastic.h */,
+ A67E690415604CCB00B8E8CC /* ofxEasingExpo.cpp */,
+ A67E690515604CCB00B8E8CC /* ofxEasingExpo.h */,
+ A67E690615604CCB00B8E8CC /* ofxEasingLinear.cpp */,
+ A67E690715604CCB00B8E8CC /* ofxEasingLinear.h */,
+ A67E690815604CCB00B8E8CC /* ofxEasingQuad.cpp */,
+ A67E690915604CCB00B8E8CC /* ofxEasingQuad.h */,
+ A67E690A15604CCB00B8E8CC /* ofxEasingQuart.cpp */,
+ A67E690B15604CCB00B8E8CC /* ofxEasingQuart.h */,
+ A67E690C15604CCB00B8E8CC /* ofxEasingQuint.cpp */,
+ A67E690D15604CCB00B8E8CC /* ofxEasingQuint.h */,
+ A67E690E15604CCB00B8E8CC /* ofxEasingSine.cpp */,
+ A67E690F15604CCB00B8E8CC /* ofxEasingSine.h */,
+ );
+ path = Easings;
+ sourceTree = "<group>";
+ };
BB4B014C10F69532006C3DED /* addons */ = {
isa = PBXGroup;
children = (
+ A67E68DF15604CCB00B8E8CC /* ofxTween */,
E75B9526153EE6ED0074C2BE /* ofxOsc */,
E734B78E153DA92A00E7E20F /* ofxCameraTrack */,
E738E6D8153C488900BDA0F3 /* ofxCv */,
@@ -1158,6 +1250,19 @@
E75B9562153EE6EE0074C2BE /* ofxOscMessage.cpp in Sources */,
E75B9563153EE6EE0074C2BE /* ofxOscReceiver.cpp in Sources */,
E75B9564153EE6EE0074C2BE /* ofxOscSender.cpp in Sources */,
+ A67E692015604CCB00B8E8CC /* ofxEasing.cpp in Sources */,
+ A67E692115604CCB00B8E8CC /* ofxEasingBack.cpp in Sources */,
+ A67E692215604CCB00B8E8CC /* ofxEasingBounce.cpp in Sources */,
+ A67E692315604CCB00B8E8CC /* ofxEasingCirc.cpp in Sources */,
+ A67E692415604CCB00B8E8CC /* ofxEasingCubic.cpp in Sources */,
+ A67E692515604CCB00B8E8CC /* ofxEasingElastic.cpp in Sources */,
+ A67E692615604CCB00B8E8CC /* ofxEasingExpo.cpp in Sources */,
+ A67E692715604CCB00B8E8CC /* ofxEasingLinear.cpp in Sources */,
+ A67E692815604CCB00B8E8CC /* ofxEasingQuad.cpp in Sources */,
+ A67E692915604CCB00B8E8CC /* ofxEasingQuart.cpp in Sources */,
+ A67E692A15604CCB00B8E8CC /* ofxEasingQuint.cpp in Sources */,
+ A67E692B15604CCB00B8E8CC /* ofxEasingSine.cpp in Sources */,
+ A67E692C15604CCB00B8E8CC /* ofxTween.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1197,7 +1302,7 @@
"-D__MACOSX_CORE__",
"-lpthread",
);
- SDKROOT = macosx10.6;
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
};
name = Debug;
};
@@ -1228,7 +1333,7 @@
"-D__MACOSX_CORE__",
"-lpthread",
);
- SDKROOT = macosx10.6;
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
};
name = Release;
};
@@ -1,33 +1,21 @@
<settings>
- <soundDirectory>
- e:\Media\SoundExports\
- </soundDirectory>
- <portraitMediaBin>
- e:\Media\MediaBinForShow\
- </soundDirectory>
- <screenType>
- CLOSE
- </screenType>
-
- <screenRect>
- <x>0</x>
- <y>0</y>
- <w>720</w>
- <h>2160</h>
- </screenRect>
- <screenRect>
- <x>720</x>
- <y>0</y>
- <w>720</w>
- <h>2160</h>
- </screenRect>
-
- <pointSize>
- 2.5
- </pointSize>
-
- <lineWidth>
- 1
- </lineWidth>
-
-</settings>
+ <soundDirectory>/Volumes/Headroom/IslingtonMill/SoundBin/</soundDirectory>
+ <portraitMediaBin>/Volumes/Headroom/IslingtonMill/MediaBinForShow/</portraitMediaBin>
+ <screenType>CLOSE</screenType>
+ <screenRect>
+ <x>0</x>
+ <y>0</y>
+ <w>720</w>
+ <h>2160</h>
+ </screenRect>
+ <screenRect>
+ <x>720</x>
+ <y>0</y>
+ <w>720</w>
+ <h>2160</h>
+ </screenRect>
+ <pointSize>2.5</pointSize>
+ <lineWidth>1</lineWidth>
+ <xshift>-0.00125</xshift>
+ <yshift>0.049</yshift>
+</settings>
@@ -2,7 +2,7 @@
<!-- ALICE -->
<portrait>
<name>alice</name>
- <soundFile>AliceBaldwin.wav</soundFile>
+ <soundFile>Alice.aif</soundFile>
<close>
<mediaFolder>ALICE_CLOSE</mediaFolder>
</close>
@@ -11,7 +11,7 @@
<!-- MARK -->
<portrait>
<name>mark</name>
- <soundFile>Mark.wav</soundFile>
+ <soundFile>Mark.aif</soundFile>
<close>
<startFrame>83</startFrame>
<endFrame>1048</endFrame>
@@ -34,7 +34,7 @@
<!-- JENNY -->
<portrait>
<name>jenny</name>
- <soundFile>Jenny.wav</soundFile>
+ <soundFile>Jenny.aif</soundFile>
<close>
<mediaFolder>JEN_CLOSE</mediaFolder>
</close>
@@ -43,7 +43,7 @@
<!-- ALASDAIR -->
<portrait>
<name>alasdair</name>
- <soundFile>Alasdair.wav</soundFile>
+ <soundFile>Alasdair.aif</soundFile>
<close>
<mediaFolder>ALASDAIR_CLOSE</mediaFolder>
</close>
@@ -52,26 +52,26 @@
<!-- KEV -->
<portrait>
<name>kev</name>
- <soundFile>Kev.wav</soundFile>
+ <soundFile>Kev.aif</soundFile>
<close>
<mediaFolder>KEV_CLOSE</mediaFolder>
</close>
</portrait>
<portrait>
<name>lisa</name>
- <soundFile>Lisa.wav</soundFile>
+ <soundFile>Lisa.aif</soundFile>
<close>
<mediaFolder>LISA_CLOSE</mediaFolder>
</close>
</portrait>
-
+<!--
<portrait>
<name>matthew</name>
<soundFile>Matthew.wav</soundFile>
<close>
<mediaFolder>MATT_CLOSE</mediaFolder>
</close>
</portrait>
-
+-->
</portraits>
@@ -1,16 +1,10 @@
#version 110
#extension GL_ARB_texture_rectangle : enable
-varying float debug;
uniform sampler2DRect tex0;
-varying vec4 texCdNorm;
void main()
{
vec4 col = texture2DRect(tex0, gl_TexCoord[0].st);
- //col = texCdNorm;
-
- col.a = 1.;
- //col.rg = gl_TexCoord[0].xy;
- gl_FragColor = col * debug;
+ gl_FragColor = col * gl_Color;
}
@@ -1,28 +1,21 @@
-uniform float dummy;
uniform vec2 dim;
uniform vec2 fudge;
-varying float debug;
-varying vec4 texCdNorm;
void main(void)
{
- debug = 1.;
- mat4 tTex = gl_TextureMatrix[0];
gl_Position = ftransform();
- vec4 object = gl_Vertex;
+ gl_FrontColor = gl_Color;
+
+ mat4 tTex = gl_TextureMatrix[0];
+ vec4 texCd = tTex * gl_Vertex;
+ texCd.xyz /= texCd.w;
- vec4 withinRGB = tTex *object;
- withinRGB.rgb /= withinRGB.w;
- withinRGB.x *= -1;
- withinRGB.xy += 1.;
- withinRGB.xy /= 2.;
- withinRGB.y = 1. - withinRGB.y;
- withinRGB.xy += vec2(0, .043);
-
- //debug = -tTex[3][2] > 20. ? 1. : 0.;
- vec4 texCd = vec4(0.);
- texCdNorm = withinRGB;
- texCd.xy = texCdNorm.xy * dim;
-
+ texCd.xy += 1.;
+ texCd.xy /= 2.;
+ texCd.y = 1. - texCd.y;
+ texCd.x = 1. - texCd.x;
+ texCd.xy += fudge;
+
+ texCd.xy *= dim;
gl_TexCoord[0] = texCd;
}
Oops, something went wrong.

0 comments on commit df110c1

Please sign in to comment.