istereo
changeset 23:e3742aafc85b
oh yeah
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Thu, 08 Sep 2011 02:57:29 +0300 |
parents | 889dade25667 |
children | 70309d71c899 |
files | istereo.xcodeproj/project.pbxproj src/istereo.c |
diffstat | 2 files changed, 143 insertions(+), 115 deletions(-) [+] |
line diff
1.1 --- a/istereo.xcodeproj/project.pbxproj Wed Sep 07 10:56:18 2011 +0300 1.2 +++ b/istereo.xcodeproj/project.pbxproj Thu Sep 08 02:57:29 2011 +0300 1.3 @@ -3,62 +3,67 @@ 1.4 archiveVersion = 1; 1.5 classes = { 1.6 }; 1.7 - objectVersion = 45; 1.8 + objectVersion = 46; 1.9 objects = { 1.10 1.11 /* Begin PBXBuildFile section */ 1.12 - 062A12991416E9750070199C /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12911416E9750070199C /* EAGLView.m */; }; 1.13 - 062A129A1416E9750070199C /* ES1Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12931416E9750070199C /* ES1Renderer.m */; }; 1.14 - 062A129B1416E9750070199C /* ES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12951416E9750070199C /* ES2Renderer.m */; }; 1.15 - 062A129C1416E9750070199C /* istereoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12981416E9750070199C /* istereoAppDelegate.m */; }; 1.16 - 062A12A51416E9920070199C /* istereo.c in Sources */ = {isa = PBXBuildFile; fileRef = 062A129D1416E9920070199C /* istereo.c */; }; 1.17 - 062A12A61416E9920070199C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A129F1416E9920070199C /* main.m */; }; 1.18 - 062A12A71416E9920070199C /* sanegl.c in Sources */ = {isa = PBXBuildFile; fileRef = 062A12A11416E9920070199C /* sanegl.c */; }; 1.19 - 062A12A81416E9920070199C /* sdr.c in Sources */ = {isa = PBXBuildFile; fileRef = 062A12A31416E9920070199C /* sdr.c */; }; 1.20 - 062A12AB1416E9A00070199C /* test.p.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 062A12A91416E9A00070199C /* test.p.glsl */; }; 1.21 - 062A12AC1416E9A00070199C /* test.v.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 062A12AA1416E9A00070199C /* test.v.glsl */; }; 1.22 - 0649A5BF14171BCF00AB62D4 /* respath.c in Sources */ = {isa = PBXBuildFile; fileRef = 0649A5BD14171BCF00AB62D4 /* respath.c */; }; 1.23 - 0649A6A1141740FA00AB62D4 /* tiles.ppm in Resources */ = {isa = PBXBuildFile; fileRef = 0649A6A0141740FA00AB62D4 /* tiles.ppm */; }; 1.24 - 0649A6A91417411600AB62D4 /* tex.c in Sources */ = {isa = PBXBuildFile; fileRef = 0649A6A71417411600AB62D4 /* tex.c */; }; 1.25 + 06D8CEC71418314000EF1378 /* cam.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEAE1418314000EF1378 /* cam.c */; }; 1.26 + 06D8CEC81418314000EF1378 /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB21418314000EF1378 /* EAGLView.m */; }; 1.27 + 06D8CEC91418314000EF1378 /* ES1Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB41418314000EF1378 /* ES1Renderer.m */; }; 1.28 + 06D8CECA1418314000EF1378 /* ES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB61418314000EF1378 /* ES2Renderer.m */; }; 1.29 + 06D8CECB1418314000EF1378 /* istereo.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB81418314000EF1378 /* istereo.c */; }; 1.30 + 06D8CECD1418314000EF1378 /* istereoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEBC1418314000EF1378 /* istereoAppDelegate.m */; }; 1.31 + 06D8CECE1418314000EF1378 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEBD1418314000EF1378 /* main.m */; }; 1.32 + 06D8CECF1418314000EF1378 /* respath.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEBF1418314000EF1378 /* respath.c */; }; 1.33 + 06D8CED01418314000EF1378 /* sanegl.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEC11418314000EF1378 /* sanegl.c */; }; 1.34 + 06D8CED11418314000EF1378 /* sdr.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEC31418314000EF1378 /* sdr.c */; }; 1.35 + 06D8CED21418314000EF1378 /* tex.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEC51418314000EF1378 /* tex.c */; }; 1.36 + 06D8CED51418317200EF1378 /* tiles.ppm in Resources */ = {isa = PBXBuildFile; fileRef = 06D8CED41418317200EF1378 /* tiles.ppm */; }; 1.37 + 06D8CED81418318400EF1378 /* test.p.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 06D8CED61418318400EF1378 /* test.p.glsl */; }; 1.38 + 06D8CED91418318400EF1378 /* test.v.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 06D8CED71418318400EF1378 /* test.v.glsl */; }; 1.39 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1.40 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 1.41 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 1.42 + 28EC4C5A11D54ECE0027AA9F /* istereoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28EC4C5811D54ECE0027AA9F /* istereoViewController.xib */; }; 1.43 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 1.44 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; 1.45 /* End PBXBuildFile section */ 1.46 1.47 /* Begin PBXFileReference section */ 1.48 - 062A12901416E9750070199C /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = EAGLView.h; path = src/EAGLView.h; sourceTree = "<group>"; }; 1.49 - 062A12911416E9750070199C /* EAGLView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = EAGLView.m; path = src/EAGLView.m; sourceTree = "<group>"; }; 1.50 - 062A12921416E9750070199C /* ES1Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES1Renderer.h; path = src/ES1Renderer.h; sourceTree = "<group>"; }; 1.51 - 062A12931416E9750070199C /* ES1Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES1Renderer.m; path = src/ES1Renderer.m; sourceTree = "<group>"; }; 1.52 - 062A12941416E9750070199C /* ES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES2Renderer.h; path = src/ES2Renderer.h; sourceTree = "<group>"; }; 1.53 - 062A12951416E9750070199C /* ES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES2Renderer.m; path = src/ES2Renderer.m; sourceTree = "<group>"; }; 1.54 - 062A12961416E9750070199C /* ESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ESRenderer.h; path = src/ESRenderer.h; sourceTree = "<group>"; }; 1.55 - 062A12971416E9750070199C /* istereoAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereoAppDelegate.h; path = src/istereoAppDelegate.h; sourceTree = "<group>"; }; 1.56 - 062A12981416E9750070199C /* istereoAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = istereoAppDelegate.m; path = src/istereoAppDelegate.m; sourceTree = "<group>"; }; 1.57 - 062A129D1416E9920070199C /* istereo.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = istereo.c; path = src/istereo.c; sourceTree = "<group>"; }; 1.58 - 062A129E1416E9920070199C /* istereo.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereo.h; path = src/istereo.h; sourceTree = "<group>"; }; 1.59 - 062A129F1416E9920070199C /* main.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/main.m; sourceTree = "<group>"; }; 1.60 - 062A12A01416E9920070199C /* opengl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = opengl.h; path = src/opengl.h; sourceTree = "<group>"; }; 1.61 - 062A12A11416E9920070199C /* sanegl.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sanegl.c; path = src/sanegl.c; sourceTree = "<group>"; }; 1.62 - 062A12A21416E9920070199C /* sanegl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sanegl.h; path = src/sanegl.h; sourceTree = "<group>"; }; 1.63 - 062A12A31416E9920070199C /* sdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sdr.c; path = src/sdr.c; sourceTree = "<group>"; }; 1.64 - 062A12A41416E9920070199C /* sdr.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sdr.h; path = src/sdr.h; sourceTree = "<group>"; }; 1.65 - 062A12A91416E9A00070199C /* test.p.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.p.glsl; path = sdr/test.p.glsl; sourceTree = "<group>"; }; 1.66 - 062A12AA1416E9A00070199C /* test.v.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.v.glsl; path = sdr/test.v.glsl; sourceTree = "<group>"; }; 1.67 - 0649A5BD14171BCF00AB62D4 /* respath.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = respath.c; path = src/respath.c; sourceTree = "<group>"; }; 1.68 - 0649A5BE14171BCF00AB62D4 /* respath.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = respath.h; path = src/respath.h; sourceTree = "<group>"; }; 1.69 - 0649A6A0141740FA00AB62D4 /* tiles.ppm */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; path = tiles.ppm; sourceTree = "<group>"; }; 1.70 - 0649A6A71417411600AB62D4 /* tex.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = tex.c; path = src/tex.c; sourceTree = "<group>"; }; 1.71 - 0649A6A81417411600AB62D4 /* tex.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = tex.h; path = src/tex.h; sourceTree = "<group>"; }; 1.72 + 06D8CEAE1418314000EF1378 /* cam.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cam.c; path = src/cam.c; sourceTree = "<group>"; }; 1.73 + 06D8CEAF1418314000EF1378 /* cam.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cam.h; path = src/cam.h; sourceTree = "<group>"; }; 1.74 + 06D8CEB01418314000EF1378 /* config.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = config.h; path = src/config.h; sourceTree = "<group>"; }; 1.75 + 06D8CEB11418314000EF1378 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = EAGLView.h; path = src/EAGLView.h; sourceTree = "<group>"; }; 1.76 + 06D8CEB21418314000EF1378 /* EAGLView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = EAGLView.m; path = src/EAGLView.m; sourceTree = "<group>"; }; 1.77 + 06D8CEB31418314000EF1378 /* ES1Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES1Renderer.h; path = src/ES1Renderer.h; sourceTree = "<group>"; }; 1.78 + 06D8CEB41418314000EF1378 /* ES1Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES1Renderer.m; path = src/ES1Renderer.m; sourceTree = "<group>"; }; 1.79 + 06D8CEB51418314000EF1378 /* ES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES2Renderer.h; path = src/ES2Renderer.h; sourceTree = "<group>"; }; 1.80 + 06D8CEB61418314000EF1378 /* ES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES2Renderer.m; path = src/ES2Renderer.m; sourceTree = "<group>"; }; 1.81 + 06D8CEB71418314000EF1378 /* ESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ESRenderer.h; path = src/ESRenderer.h; sourceTree = "<group>"; }; 1.82 + 06D8CEB81418314000EF1378 /* istereo.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = istereo.c; path = src/istereo.c; sourceTree = "<group>"; }; 1.83 + 06D8CEBA1418314000EF1378 /* istereo.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereo.h; path = src/istereo.h; sourceTree = "<group>"; }; 1.84 + 06D8CEBB1418314000EF1378 /* istereoAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereoAppDelegate.h; path = src/istereoAppDelegate.h; sourceTree = "<group>"; }; 1.85 + 06D8CEBC1418314000EF1378 /* istereoAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = istereoAppDelegate.m; path = src/istereoAppDelegate.m; sourceTree = "<group>"; }; 1.86 + 06D8CEBD1418314000EF1378 /* main.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/main.m; sourceTree = "<group>"; }; 1.87 + 06D8CEBE1418314000EF1378 /* opengl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = opengl.h; path = src/opengl.h; sourceTree = "<group>"; }; 1.88 + 06D8CEBF1418314000EF1378 /* respath.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = respath.c; path = src/respath.c; sourceTree = "<group>"; }; 1.89 + 06D8CEC01418314000EF1378 /* respath.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = respath.h; path = src/respath.h; sourceTree = "<group>"; }; 1.90 + 06D8CEC11418314000EF1378 /* sanegl.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sanegl.c; path = src/sanegl.c; sourceTree = "<group>"; }; 1.91 + 06D8CEC21418314000EF1378 /* sanegl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sanegl.h; path = src/sanegl.h; sourceTree = "<group>"; }; 1.92 + 06D8CEC31418314000EF1378 /* sdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sdr.c; path = src/sdr.c; sourceTree = "<group>"; }; 1.93 + 06D8CEC41418314000EF1378 /* sdr.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sdr.h; path = src/sdr.h; sourceTree = "<group>"; }; 1.94 + 06D8CEC51418314000EF1378 /* tex.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = tex.c; path = src/tex.c; sourceTree = "<group>"; }; 1.95 + 06D8CEC61418314000EF1378 /* tex.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = tex.h; path = src/tex.h; sourceTree = "<group>"; }; 1.96 + 06D8CED41418317200EF1378 /* tiles.ppm */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; path = tiles.ppm; sourceTree = "<group>"; }; 1.97 + 06D8CED61418318400EF1378 /* test.p.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.p.glsl; path = sdr/test.p.glsl; sourceTree = "<group>"; }; 1.98 + 06D8CED71418318400EF1378 /* test.v.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.v.glsl; path = sdr/test.v.glsl; sourceTree = "<group>"; }; 1.99 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1.100 1D6058910D05DD3D006BFB54 /* istereo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = istereo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1.101 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 1.102 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; }; 1.103 + 28EC4C5811D54ECE0027AA9F /* istereoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = istereoViewController.xib; sourceTree = "<group>"; }; 1.104 28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 1.105 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 1.106 - 32CA4F630368D1EE00C91783 /* istereo_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = istereo_Prefix.pch; sourceTree = "<group>"; }; 1.107 8D1107310486CEB800E47090 /* istereo-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "istereo-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; }; 1.108 /* End PBXFileReference section */ 1.109 1.110 @@ -77,47 +82,50 @@ 1.111 /* End PBXFrameworksBuildPhase section */ 1.112 1.113 /* Begin PBXGroup section */ 1.114 - 062A128D1416E9400070199C /* src */ = { 1.115 + 06D8CEAC1418312500EF1378 /* src */ = { 1.116 isa = PBXGroup; 1.117 children = ( 1.118 - 0649A6A71417411600AB62D4 /* tex.c */, 1.119 - 0649A6A81417411600AB62D4 /* tex.h */, 1.120 - 0649A5BD14171BCF00AB62D4 /* respath.c */, 1.121 - 0649A5BE14171BCF00AB62D4 /* respath.h */, 1.122 - 062A129D1416E9920070199C /* istereo.c */, 1.123 - 062A129E1416E9920070199C /* istereo.h */, 1.124 - 062A12A01416E9920070199C /* opengl.h */, 1.125 - 062A12A11416E9920070199C /* sanegl.c */, 1.126 - 062A12A21416E9920070199C /* sanegl.h */, 1.127 - 062A12A31416E9920070199C /* sdr.c */, 1.128 - 062A12A41416E9920070199C /* sdr.h */, 1.129 - 062A128F1416E94D0070199C /* gay */, 1.130 + 06D8CED31418314700EF1378 /* gay */, 1.131 + 06D8CEAE1418314000EF1378 /* cam.c */, 1.132 + 06D8CEAF1418314000EF1378 /* cam.h */, 1.133 + 06D8CEB01418314000EF1378 /* config.h */, 1.134 + 06D8CEB81418314000EF1378 /* istereo.c */, 1.135 + 06D8CEBA1418314000EF1378 /* istereo.h */, 1.136 + 06D8CEBE1418314000EF1378 /* opengl.h */, 1.137 + 06D8CEBF1418314000EF1378 /* respath.c */, 1.138 + 06D8CEC01418314000EF1378 /* respath.h */, 1.139 + 06D8CEC11418314000EF1378 /* sanegl.c */, 1.140 + 06D8CEC21418314000EF1378 /* sanegl.h */, 1.141 + 06D8CEC31418314000EF1378 /* sdr.c */, 1.142 + 06D8CEC41418314000EF1378 /* sdr.h */, 1.143 + 06D8CEC51418314000EF1378 /* tex.c */, 1.144 + 06D8CEC61418314000EF1378 /* tex.h */, 1.145 ); 1.146 name = src; 1.147 sourceTree = "<group>"; 1.148 }; 1.149 - 062A128E1416E9450070199C /* sdr */ = { 1.150 + 06D8CEAD1418312A00EF1378 /* sdr */ = { 1.151 isa = PBXGroup; 1.152 children = ( 1.153 - 062A12A91416E9A00070199C /* test.p.glsl */, 1.154 - 062A12AA1416E9A00070199C /* test.v.glsl */, 1.155 + 06D8CED61418318400EF1378 /* test.p.glsl */, 1.156 + 06D8CED71418318400EF1378 /* test.v.glsl */, 1.157 ); 1.158 name = sdr; 1.159 sourceTree = "<group>"; 1.160 }; 1.161 - 062A128F1416E94D0070199C /* gay */ = { 1.162 + 06D8CED31418314700EF1378 /* gay */ = { 1.163 isa = PBXGroup; 1.164 children = ( 1.165 - 062A129F1416E9920070199C /* main.m */, 1.166 - 062A12901416E9750070199C /* EAGLView.h */, 1.167 - 062A12911416E9750070199C /* EAGLView.m */, 1.168 - 062A12921416E9750070199C /* ES1Renderer.h */, 1.169 - 062A12931416E9750070199C /* ES1Renderer.m */, 1.170 - 062A12941416E9750070199C /* ES2Renderer.h */, 1.171 - 062A12951416E9750070199C /* ES2Renderer.m */, 1.172 - 062A12961416E9750070199C /* ESRenderer.h */, 1.173 - 062A12971416E9750070199C /* istereoAppDelegate.h */, 1.174 - 062A12981416E9750070199C /* istereoAppDelegate.m */, 1.175 + 06D8CEBD1418314000EF1378 /* main.m */, 1.176 + 06D8CEBB1418314000EF1378 /* istereoAppDelegate.h */, 1.177 + 06D8CEBC1418314000EF1378 /* istereoAppDelegate.m */, 1.178 + 06D8CEB11418314000EF1378 /* EAGLView.h */, 1.179 + 06D8CEB21418314000EF1378 /* EAGLView.m */, 1.180 + 06D8CEB31418314000EF1378 /* ES1Renderer.h */, 1.181 + 06D8CEB41418314000EF1378 /* ES1Renderer.m */, 1.182 + 06D8CEB51418314000EF1378 /* ES2Renderer.h */, 1.183 + 06D8CEB61418314000EF1378 /* ES2Renderer.m */, 1.184 + 06D8CEB71418314000EF1378 /* ESRenderer.h */, 1.185 ); 1.186 name = gay; 1.187 sourceTree = "<group>"; 1.188 @@ -133,9 +141,8 @@ 1.189 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { 1.190 isa = PBXGroup; 1.191 children = ( 1.192 - 062A128E1416E9450070199C /* sdr */, 1.193 - 062A128D1416E9400070199C /* src */, 1.194 - 29B97315FDCFA39411CA2CEA /* Other Sources */, 1.195 + 06D8CEAD1418312A00EF1378 /* sdr */, 1.196 + 06D8CEAC1418312500EF1378 /* src */, 1.197 29B97317FDCFA39411CA2CEA /* Resources */, 1.198 29B97323FDCFA39411CA2CEA /* Frameworks */, 1.199 19C28FACFE9D520D11CA2CBB /* Products */, 1.200 @@ -143,18 +150,11 @@ 1.201 name = CustomTemplate; 1.202 sourceTree = "<group>"; 1.203 }; 1.204 - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { 1.205 - isa = PBXGroup; 1.206 - children = ( 1.207 - 32CA4F630368D1EE00C91783 /* istereo_Prefix.pch */, 1.208 - ); 1.209 - name = "Other Sources"; 1.210 - sourceTree = "<group>"; 1.211 - }; 1.212 29B97317FDCFA39411CA2CEA /* Resources */ = { 1.213 isa = PBXGroup; 1.214 children = ( 1.215 - 0649A6A0141740FA00AB62D4 /* tiles.ppm */, 1.216 + 06D8CED41418317200EF1378 /* tiles.ppm */, 1.217 + 28EC4C5811D54ECE0027AA9F /* istereoViewController.xib */, 1.218 28AD733E0D9D9553002E5188 /* MainWindow.xib */, 1.219 8D1107310486CEB800E47090 /* istereo-Info.plist */, 1.220 ); 1.221 @@ -182,6 +182,7 @@ 1.222 1D60588D0D05DD3D006BFB54 /* Resources */, 1.223 1D60588E0D05DD3D006BFB54 /* Sources */, 1.224 1D60588F0D05DD3D006BFB54 /* Frameworks */, 1.225 + 0654CF1F141837890086E965 /* ShellScript */, 1.226 ); 1.227 buildRules = ( 1.228 ); 1.229 @@ -198,8 +199,15 @@ 1.230 29B97313FDCFA39411CA2CEA /* Project object */ = { 1.231 isa = PBXProject; 1.232 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "istereo" */; 1.233 - compatibilityVersion = "Xcode 3.1"; 1.234 + compatibilityVersion = "Xcode 3.2"; 1.235 + developmentRegion = English; 1.236 hasScannedForEncodings = 1; 1.237 + knownRegions = ( 1.238 + English, 1.239 + Japanese, 1.240 + French, 1.241 + German, 1.242 + ); 1.243 mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; 1.244 projectDirPath = ""; 1.245 projectRoot = ""; 1.246 @@ -215,29 +223,47 @@ 1.247 buildActionMask = 2147483647; 1.248 files = ( 1.249 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */, 1.250 - 062A12AB1416E9A00070199C /* test.p.glsl in Resources */, 1.251 - 062A12AC1416E9A00070199C /* test.v.glsl in Resources */, 1.252 - 0649A6A1141740FA00AB62D4 /* tiles.ppm in Resources */, 1.253 + 28EC4C5A11D54ECE0027AA9F /* istereoViewController.xib in Resources */, 1.254 + 06D8CED51418317200EF1378 /* tiles.ppm in Resources */, 1.255 + 06D8CED81418318400EF1378 /* test.p.glsl in Resources */, 1.256 + 06D8CED91418318400EF1378 /* test.v.glsl in Resources */, 1.257 ); 1.258 runOnlyForDeploymentPostprocessing = 0; 1.259 }; 1.260 /* End PBXResourcesBuildPhase section */ 1.261 1.262 +/* Begin PBXShellScriptBuildPhase section */ 1.263 + 0654CF1F141837890086E965 /* ShellScript */ = { 1.264 + isa = PBXShellScriptBuildPhase; 1.265 + buildActionMask = 2147483647; 1.266 + files = ( 1.267 + ); 1.268 + inputPaths = ( 1.269 + ); 1.270 + outputPaths = ( 1.271 + ); 1.272 + runOnlyForDeploymentPostprocessing = 0; 1.273 + shellPath = /bin/sh; 1.274 + shellScript = "export CODESIGN_ALLOCATE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate\nif [ \"${PLATFORM_NAME}\" == \"iphoneos\" ]; then\n/Developer/iphoneentitlements401/gen_entitlements.py \"my.company.${PROJECT_NAME}\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/${PROJECT_NAME}.xcent\";\ncodesign -f -s \"iPhone Developer\" --entitlements \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/${PROJECT_NAME}.xcent\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/\"\nfi\n"; 1.275 + }; 1.276 +/* End PBXShellScriptBuildPhase section */ 1.277 + 1.278 /* Begin PBXSourcesBuildPhase section */ 1.279 1D60588E0D05DD3D006BFB54 /* Sources */ = { 1.280 isa = PBXSourcesBuildPhase; 1.281 buildActionMask = 2147483647; 1.282 files = ( 1.283 - 062A12991416E9750070199C /* EAGLView.m in Sources */, 1.284 - 062A129A1416E9750070199C /* ES1Renderer.m in Sources */, 1.285 - 062A129B1416E9750070199C /* ES2Renderer.m in Sources */, 1.286 - 062A129C1416E9750070199C /* istereoAppDelegate.m in Sources */, 1.287 - 062A12A51416E9920070199C /* istereo.c in Sources */, 1.288 - 062A12A61416E9920070199C /* main.m in Sources */, 1.289 - 062A12A71416E9920070199C /* sanegl.c in Sources */, 1.290 - 062A12A81416E9920070199C /* sdr.c in Sources */, 1.291 - 0649A5BF14171BCF00AB62D4 /* respath.c in Sources */, 1.292 - 0649A6A91417411600AB62D4 /* tex.c in Sources */, 1.293 + 06D8CEC71418314000EF1378 /* cam.c in Sources */, 1.294 + 06D8CEC81418314000EF1378 /* EAGLView.m in Sources */, 1.295 + 06D8CEC91418314000EF1378 /* ES1Renderer.m in Sources */, 1.296 + 06D8CECA1418314000EF1378 /* ES2Renderer.m in Sources */, 1.297 + 06D8CECB1418314000EF1378 /* istereo.c in Sources */, 1.298 + 06D8CECD1418314000EF1378 /* istereoAppDelegate.m in Sources */, 1.299 + 06D8CECE1418314000EF1378 /* main.m in Sources */, 1.300 + 06D8CECF1418314000EF1378 /* respath.c in Sources */, 1.301 + 06D8CED01418314000EF1378 /* sanegl.c in Sources */, 1.302 + 06D8CED11418314000EF1378 /* sdr.c in Sources */, 1.303 + 06D8CED21418314000EF1378 /* tex.c in Sources */, 1.304 ); 1.305 runOnlyForDeploymentPostprocessing = 0; 1.306 }; 1.307 @@ -277,13 +303,14 @@ 1.308 isa = XCBuildConfiguration; 1.309 buildSettings = { 1.310 ARCHS = "$(ARCHS_STANDARD_32_BIT)"; 1.311 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 1.312 + CODE_SIGN_IDENTITY = "Don't Code Sign"; 1.313 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; 1.314 GCC_C_LANGUAGE_STANDARD = c99; 1.315 GCC_PREPROCESSOR_DEFINITIONS = DEBUG; 1.316 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1.317 GCC_WARN_UNUSED_VARIABLE = YES; 1.318 PREBINDING = NO; 1.319 - SDKROOT = iphoneos4.0; 1.320 + SDKROOT = iphoneos; 1.321 }; 1.322 name = Debug; 1.323 }; 1.324 @@ -291,13 +318,14 @@ 1.325 isa = XCBuildConfiguration; 1.326 buildSettings = { 1.327 ARCHS = "$(ARCHS_STANDARD_32_BIT)"; 1.328 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 1.329 + CODE_SIGN_IDENTITY = "Don't Code Sign"; 1.330 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; 1.331 GCC_C_LANGUAGE_STANDARD = c99; 1.332 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1.333 GCC_WARN_UNUSED_VARIABLE = YES; 1.334 OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; 1.335 PREBINDING = NO; 1.336 - SDKROOT = iphoneos4.0; 1.337 + SDKROOT = iphoneos; 1.338 }; 1.339 name = Release; 1.340 };
2.1 --- a/src/istereo.c Wed Sep 07 10:56:18 2011 +0300 2.2 +++ b/src/istereo.c Thu Sep 08 02:57:29 2011 +0300 2.3 @@ -30,7 +30,7 @@ 2.4 int segm = 20; 2.5 float ring_height = 0.5; 2.6 2.7 -float split = 0.5; 2.8 +float split = 0.53; 2.9 2.10 int init(void) 2.11 { 2.12 @@ -71,12 +71,29 @@ 2.13 if(stereo) { 2.14 int split_pt = (int)((float)view_ysz * split); 2.15 2.16 - /* left eye */ 2.17 + /* right eye */ 2.18 glViewport(0, 0, view_xsz, split_pt); 2.19 cam_aspect((float)split_pt / (float)view_xsz); 2.20 2.21 gl_matrix_mode(GL_PROJECTION); 2.22 gl_load_identity(); 2.23 + cam_stereo_proj_matrix(CAM_RIGHT); 2.24 + gl_rotatef(-90, 0, 0, 1); 2.25 + 2.26 + gl_matrix_mode(GL_MODELVIEW); 2.27 + gl_load_identity(); 2.28 + cam_stereo_view_matrix(CAM_RIGHT); 2.29 + gl_translatef(-pan_x, -pan_y, -1.1 * ring_height * segm); 2.30 + /*gl_rotatef(-90, 0, 0, 1);*/ 2.31 + 2.32 + render(tsec); 2.33 + 2.34 + /* left eye */ 2.35 + glViewport(0, split_pt, view_xsz, view_ysz - split_pt); 2.36 + cam_aspect((float)(view_ysz - split_pt) / (float)view_xsz); 2.37 + 2.38 + gl_matrix_mode(GL_PROJECTION); 2.39 + gl_load_identity(); 2.40 cam_stereo_proj_matrix(CAM_LEFT); 2.41 gl_rotatef(-90, 0, 0, 1); 2.42 2.43 @@ -87,23 +104,6 @@ 2.44 /*gl_rotatef(-90, 0, 0, 1);*/ 2.45 2.46 render(tsec); 2.47 - 2.48 - /* right eye */ 2.49 - glViewport(0, split_pt, view_xsz, view_ysz - split_pt); 2.50 - cam_aspect((float)(view_ysz - split_pt) / (float)view_xsz); 2.51 - 2.52 - gl_matrix_mode(GL_PROJECTION); 2.53 - gl_load_identity(); 2.54 - cam_stereo_proj_matrix(CAM_RIGHT); 2.55 - gl_rotatef(-90, 0, 0, 1); 2.56 - 2.57 - gl_matrix_mode(GL_MODELVIEW); 2.58 - gl_load_identity(); 2.59 - cam_stereo_view_matrix(CAM_RIGHT); 2.60 - gl_translatef(-pan_x, -pan_y, -1.1 * ring_height * segm); 2.61 - /*gl_rotatef(-90, 0, 0, 1);*/ 2.62 - 2.63 - render(tsec); 2.64 } else { 2.65 gl_matrix_mode(GL_MODELVIEW); 2.66 gl_load_identity();