# HG changeset patch # User John Tsiombikas # Date 1315439849 -10800 # Node ID e3742aafc85b53e1b0b6c52ba2058ae26e610b50 # Parent 889dade2566727a8ac88d6ebc00f397db645019e oh yeah diff -r 889dade25667 -r e3742aafc85b istereo.xcodeproj/project.pbxproj --- a/istereo.xcodeproj/project.pbxproj Wed Sep 07 10:56:18 2011 +0300 +++ b/istereo.xcodeproj/project.pbxproj Thu Sep 08 02:57:29 2011 +0300 @@ -3,62 +3,67 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 062A12991416E9750070199C /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12911416E9750070199C /* EAGLView.m */; }; - 062A129A1416E9750070199C /* ES1Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12931416E9750070199C /* ES1Renderer.m */; }; - 062A129B1416E9750070199C /* ES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12951416E9750070199C /* ES2Renderer.m */; }; - 062A129C1416E9750070199C /* istereoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A12981416E9750070199C /* istereoAppDelegate.m */; }; - 062A12A51416E9920070199C /* istereo.c in Sources */ = {isa = PBXBuildFile; fileRef = 062A129D1416E9920070199C /* istereo.c */; }; - 062A12A61416E9920070199C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 062A129F1416E9920070199C /* main.m */; }; - 062A12A71416E9920070199C /* sanegl.c in Sources */ = {isa = PBXBuildFile; fileRef = 062A12A11416E9920070199C /* sanegl.c */; }; - 062A12A81416E9920070199C /* sdr.c in Sources */ = {isa = PBXBuildFile; fileRef = 062A12A31416E9920070199C /* sdr.c */; }; - 062A12AB1416E9A00070199C /* test.p.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 062A12A91416E9A00070199C /* test.p.glsl */; }; - 062A12AC1416E9A00070199C /* test.v.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 062A12AA1416E9A00070199C /* test.v.glsl */; }; - 0649A5BF14171BCF00AB62D4 /* respath.c in Sources */ = {isa = PBXBuildFile; fileRef = 0649A5BD14171BCF00AB62D4 /* respath.c */; }; - 0649A6A1141740FA00AB62D4 /* tiles.ppm in Resources */ = {isa = PBXBuildFile; fileRef = 0649A6A0141740FA00AB62D4 /* tiles.ppm */; }; - 0649A6A91417411600AB62D4 /* tex.c in Sources */ = {isa = PBXBuildFile; fileRef = 0649A6A71417411600AB62D4 /* tex.c */; }; + 06D8CEC71418314000EF1378 /* cam.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEAE1418314000EF1378 /* cam.c */; }; + 06D8CEC81418314000EF1378 /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB21418314000EF1378 /* EAGLView.m */; }; + 06D8CEC91418314000EF1378 /* ES1Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB41418314000EF1378 /* ES1Renderer.m */; }; + 06D8CECA1418314000EF1378 /* ES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB61418314000EF1378 /* ES2Renderer.m */; }; + 06D8CECB1418314000EF1378 /* istereo.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEB81418314000EF1378 /* istereo.c */; }; + 06D8CECD1418314000EF1378 /* istereoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEBC1418314000EF1378 /* istereoAppDelegate.m */; }; + 06D8CECE1418314000EF1378 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEBD1418314000EF1378 /* main.m */; }; + 06D8CECF1418314000EF1378 /* respath.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEBF1418314000EF1378 /* respath.c */; }; + 06D8CED01418314000EF1378 /* sanegl.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEC11418314000EF1378 /* sanegl.c */; }; + 06D8CED11418314000EF1378 /* sdr.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEC31418314000EF1378 /* sdr.c */; }; + 06D8CED21418314000EF1378 /* tex.c in Sources */ = {isa = PBXBuildFile; fileRef = 06D8CEC51418314000EF1378 /* tex.c */; }; + 06D8CED51418317200EF1378 /* tiles.ppm in Resources */ = {isa = PBXBuildFile; fileRef = 06D8CED41418317200EF1378 /* tiles.ppm */; }; + 06D8CED81418318400EF1378 /* test.p.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 06D8CED61418318400EF1378 /* test.p.glsl */; }; + 06D8CED91418318400EF1378 /* test.v.glsl in Resources */ = {isa = PBXBuildFile; fileRef = 06D8CED71418318400EF1378 /* test.v.glsl */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; + 28EC4C5A11D54ECE0027AA9F /* istereoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28EC4C5811D54ECE0027AA9F /* istereoViewController.xib */; }; 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 062A12901416E9750070199C /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = EAGLView.h; path = src/EAGLView.h; sourceTree = ""; }; - 062A12911416E9750070199C /* EAGLView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = EAGLView.m; path = src/EAGLView.m; sourceTree = ""; }; - 062A12921416E9750070199C /* ES1Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES1Renderer.h; path = src/ES1Renderer.h; sourceTree = ""; }; - 062A12931416E9750070199C /* ES1Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES1Renderer.m; path = src/ES1Renderer.m; sourceTree = ""; }; - 062A12941416E9750070199C /* ES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES2Renderer.h; path = src/ES2Renderer.h; sourceTree = ""; }; - 062A12951416E9750070199C /* ES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES2Renderer.m; path = src/ES2Renderer.m; sourceTree = ""; }; - 062A12961416E9750070199C /* ESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ESRenderer.h; path = src/ESRenderer.h; sourceTree = ""; }; - 062A12971416E9750070199C /* istereoAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereoAppDelegate.h; path = src/istereoAppDelegate.h; sourceTree = ""; }; - 062A12981416E9750070199C /* istereoAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = istereoAppDelegate.m; path = src/istereoAppDelegate.m; sourceTree = ""; }; - 062A129D1416E9920070199C /* istereo.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = istereo.c; path = src/istereo.c; sourceTree = ""; }; - 062A129E1416E9920070199C /* istereo.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereo.h; path = src/istereo.h; sourceTree = ""; }; - 062A129F1416E9920070199C /* main.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/main.m; sourceTree = ""; }; - 062A12A01416E9920070199C /* opengl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = opengl.h; path = src/opengl.h; sourceTree = ""; }; - 062A12A11416E9920070199C /* sanegl.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sanegl.c; path = src/sanegl.c; sourceTree = ""; }; - 062A12A21416E9920070199C /* sanegl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sanegl.h; path = src/sanegl.h; sourceTree = ""; }; - 062A12A31416E9920070199C /* sdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sdr.c; path = src/sdr.c; sourceTree = ""; }; - 062A12A41416E9920070199C /* sdr.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sdr.h; path = src/sdr.h; sourceTree = ""; }; - 062A12A91416E9A00070199C /* test.p.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.p.glsl; path = sdr/test.p.glsl; sourceTree = ""; }; - 062A12AA1416E9A00070199C /* test.v.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.v.glsl; path = sdr/test.v.glsl; sourceTree = ""; }; - 0649A5BD14171BCF00AB62D4 /* respath.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = respath.c; path = src/respath.c; sourceTree = ""; }; - 0649A5BE14171BCF00AB62D4 /* respath.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = respath.h; path = src/respath.h; sourceTree = ""; }; - 0649A6A0141740FA00AB62D4 /* tiles.ppm */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; path = tiles.ppm; sourceTree = ""; }; - 0649A6A71417411600AB62D4 /* tex.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = tex.c; path = src/tex.c; sourceTree = ""; }; - 0649A6A81417411600AB62D4 /* tex.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = tex.h; path = src/tex.h; sourceTree = ""; }; + 06D8CEAE1418314000EF1378 /* cam.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cam.c; path = src/cam.c; sourceTree = ""; }; + 06D8CEAF1418314000EF1378 /* cam.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cam.h; path = src/cam.h; sourceTree = ""; }; + 06D8CEB01418314000EF1378 /* config.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = config.h; path = src/config.h; sourceTree = ""; }; + 06D8CEB11418314000EF1378 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = EAGLView.h; path = src/EAGLView.h; sourceTree = ""; }; + 06D8CEB21418314000EF1378 /* EAGLView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = EAGLView.m; path = src/EAGLView.m; sourceTree = ""; }; + 06D8CEB31418314000EF1378 /* ES1Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES1Renderer.h; path = src/ES1Renderer.h; sourceTree = ""; }; + 06D8CEB41418314000EF1378 /* ES1Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES1Renderer.m; path = src/ES1Renderer.m; sourceTree = ""; }; + 06D8CEB51418314000EF1378 /* ES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ES2Renderer.h; path = src/ES2Renderer.h; sourceTree = ""; }; + 06D8CEB61418314000EF1378 /* ES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ES2Renderer.m; path = src/ES2Renderer.m; sourceTree = ""; }; + 06D8CEB71418314000EF1378 /* ESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ESRenderer.h; path = src/ESRenderer.h; sourceTree = ""; }; + 06D8CEB81418314000EF1378 /* istereo.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = istereo.c; path = src/istereo.c; sourceTree = ""; }; + 06D8CEBA1418314000EF1378 /* istereo.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereo.h; path = src/istereo.h; sourceTree = ""; }; + 06D8CEBB1418314000EF1378 /* istereoAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = istereoAppDelegate.h; path = src/istereoAppDelegate.h; sourceTree = ""; }; + 06D8CEBC1418314000EF1378 /* istereoAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = istereoAppDelegate.m; path = src/istereoAppDelegate.m; sourceTree = ""; }; + 06D8CEBD1418314000EF1378 /* main.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/main.m; sourceTree = ""; }; + 06D8CEBE1418314000EF1378 /* opengl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = opengl.h; path = src/opengl.h; sourceTree = ""; }; + 06D8CEBF1418314000EF1378 /* respath.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = respath.c; path = src/respath.c; sourceTree = ""; }; + 06D8CEC01418314000EF1378 /* respath.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = respath.h; path = src/respath.h; sourceTree = ""; }; + 06D8CEC11418314000EF1378 /* sanegl.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sanegl.c; path = src/sanegl.c; sourceTree = ""; }; + 06D8CEC21418314000EF1378 /* sanegl.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sanegl.h; path = src/sanegl.h; sourceTree = ""; }; + 06D8CEC31418314000EF1378 /* sdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sdr.c; path = src/sdr.c; sourceTree = ""; }; + 06D8CEC41418314000EF1378 /* sdr.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sdr.h; path = src/sdr.h; sourceTree = ""; }; + 06D8CEC51418314000EF1378 /* tex.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = tex.c; path = src/tex.c; sourceTree = ""; }; + 06D8CEC61418314000EF1378 /* tex.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = tex.h; path = src/tex.h; sourceTree = ""; }; + 06D8CED41418317200EF1378 /* tiles.ppm */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; path = tiles.ppm; sourceTree = ""; }; + 06D8CED61418318400EF1378 /* test.p.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.p.glsl; path = sdr/test.p.glsl; sourceTree = ""; }; + 06D8CED71418318400EF1378 /* test.v.glsl */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = test.v.glsl; path = sdr/test.v.glsl; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* istereo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = istereo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; + 28EC4C5811D54ECE0027AA9F /* istereoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = istereoViewController.xib; sourceTree = ""; }; 28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 32CA4F630368D1EE00C91783 /* istereo_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = istereo_Prefix.pch; sourceTree = ""; }; 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 = ""; }; /* End PBXFileReference section */ @@ -77,47 +82,50 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 062A128D1416E9400070199C /* src */ = { + 06D8CEAC1418312500EF1378 /* src */ = { isa = PBXGroup; children = ( - 0649A6A71417411600AB62D4 /* tex.c */, - 0649A6A81417411600AB62D4 /* tex.h */, - 0649A5BD14171BCF00AB62D4 /* respath.c */, - 0649A5BE14171BCF00AB62D4 /* respath.h */, - 062A129D1416E9920070199C /* istereo.c */, - 062A129E1416E9920070199C /* istereo.h */, - 062A12A01416E9920070199C /* opengl.h */, - 062A12A11416E9920070199C /* sanegl.c */, - 062A12A21416E9920070199C /* sanegl.h */, - 062A12A31416E9920070199C /* sdr.c */, - 062A12A41416E9920070199C /* sdr.h */, - 062A128F1416E94D0070199C /* gay */, + 06D8CED31418314700EF1378 /* gay */, + 06D8CEAE1418314000EF1378 /* cam.c */, + 06D8CEAF1418314000EF1378 /* cam.h */, + 06D8CEB01418314000EF1378 /* config.h */, + 06D8CEB81418314000EF1378 /* istereo.c */, + 06D8CEBA1418314000EF1378 /* istereo.h */, + 06D8CEBE1418314000EF1378 /* opengl.h */, + 06D8CEBF1418314000EF1378 /* respath.c */, + 06D8CEC01418314000EF1378 /* respath.h */, + 06D8CEC11418314000EF1378 /* sanegl.c */, + 06D8CEC21418314000EF1378 /* sanegl.h */, + 06D8CEC31418314000EF1378 /* sdr.c */, + 06D8CEC41418314000EF1378 /* sdr.h */, + 06D8CEC51418314000EF1378 /* tex.c */, + 06D8CEC61418314000EF1378 /* tex.h */, ); name = src; sourceTree = ""; }; - 062A128E1416E9450070199C /* sdr */ = { + 06D8CEAD1418312A00EF1378 /* sdr */ = { isa = PBXGroup; children = ( - 062A12A91416E9A00070199C /* test.p.glsl */, - 062A12AA1416E9A00070199C /* test.v.glsl */, + 06D8CED61418318400EF1378 /* test.p.glsl */, + 06D8CED71418318400EF1378 /* test.v.glsl */, ); name = sdr; sourceTree = ""; }; - 062A128F1416E94D0070199C /* gay */ = { + 06D8CED31418314700EF1378 /* gay */ = { isa = PBXGroup; children = ( - 062A129F1416E9920070199C /* main.m */, - 062A12901416E9750070199C /* EAGLView.h */, - 062A12911416E9750070199C /* EAGLView.m */, - 062A12921416E9750070199C /* ES1Renderer.h */, - 062A12931416E9750070199C /* ES1Renderer.m */, - 062A12941416E9750070199C /* ES2Renderer.h */, - 062A12951416E9750070199C /* ES2Renderer.m */, - 062A12961416E9750070199C /* ESRenderer.h */, - 062A12971416E9750070199C /* istereoAppDelegate.h */, - 062A12981416E9750070199C /* istereoAppDelegate.m */, + 06D8CEBD1418314000EF1378 /* main.m */, + 06D8CEBB1418314000EF1378 /* istereoAppDelegate.h */, + 06D8CEBC1418314000EF1378 /* istereoAppDelegate.m */, + 06D8CEB11418314000EF1378 /* EAGLView.h */, + 06D8CEB21418314000EF1378 /* EAGLView.m */, + 06D8CEB31418314000EF1378 /* ES1Renderer.h */, + 06D8CEB41418314000EF1378 /* ES1Renderer.m */, + 06D8CEB51418314000EF1378 /* ES2Renderer.h */, + 06D8CEB61418314000EF1378 /* ES2Renderer.m */, + 06D8CEB71418314000EF1378 /* ESRenderer.h */, ); name = gay; sourceTree = ""; @@ -133,9 +141,8 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 062A128E1416E9450070199C /* sdr */, - 062A128D1416E9400070199C /* src */, - 29B97315FDCFA39411CA2CEA /* Other Sources */, + 06D8CEAD1418312A00EF1378 /* sdr */, + 06D8CEAC1418312500EF1378 /* src */, 29B97317FDCFA39411CA2CEA /* Resources */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, @@ -143,18 +150,11 @@ name = CustomTemplate; sourceTree = ""; }; - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 32CA4F630368D1EE00C91783 /* istereo_Prefix.pch */, - ); - name = "Other Sources"; - sourceTree = ""; - }; 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 0649A6A0141740FA00AB62D4 /* tiles.ppm */, + 06D8CED41418317200EF1378 /* tiles.ppm */, + 28EC4C5811D54ECE0027AA9F /* istereoViewController.xib */, 28AD733E0D9D9553002E5188 /* MainWindow.xib */, 8D1107310486CEB800E47090 /* istereo-Info.plist */, ); @@ -182,6 +182,7 @@ 1D60588D0D05DD3D006BFB54 /* Resources */, 1D60588E0D05DD3D006BFB54 /* Sources */, 1D60588F0D05DD3D006BFB54 /* Frameworks */, + 0654CF1F141837890086E965 /* ShellScript */, ); buildRules = ( ); @@ -198,8 +199,15 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "istereo" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; projectRoot = ""; @@ -215,29 +223,47 @@ buildActionMask = 2147483647; files = ( 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */, - 062A12AB1416E9A00070199C /* test.p.glsl in Resources */, - 062A12AC1416E9A00070199C /* test.v.glsl in Resources */, - 0649A6A1141740FA00AB62D4 /* tiles.ppm in Resources */, + 28EC4C5A11D54ECE0027AA9F /* istereoViewController.xib in Resources */, + 06D8CED51418317200EF1378 /* tiles.ppm in Resources */, + 06D8CED81418318400EF1378 /* test.p.glsl in Resources */, + 06D8CED91418318400EF1378 /* test.v.glsl in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 0654CF1F141837890086E965 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + 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"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 1D60588E0D05DD3D006BFB54 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 062A12991416E9750070199C /* EAGLView.m in Sources */, - 062A129A1416E9750070199C /* ES1Renderer.m in Sources */, - 062A129B1416E9750070199C /* ES2Renderer.m in Sources */, - 062A129C1416E9750070199C /* istereoAppDelegate.m in Sources */, - 062A12A51416E9920070199C /* istereo.c in Sources */, - 062A12A61416E9920070199C /* main.m in Sources */, - 062A12A71416E9920070199C /* sanegl.c in Sources */, - 062A12A81416E9920070199C /* sdr.c in Sources */, - 0649A5BF14171BCF00AB62D4 /* respath.c in Sources */, - 0649A6A91417411600AB62D4 /* tex.c in Sources */, + 06D8CEC71418314000EF1378 /* cam.c in Sources */, + 06D8CEC81418314000EF1378 /* EAGLView.m in Sources */, + 06D8CEC91418314000EF1378 /* ES1Renderer.m in Sources */, + 06D8CECA1418314000EF1378 /* ES2Renderer.m in Sources */, + 06D8CECB1418314000EF1378 /* istereo.c in Sources */, + 06D8CECD1418314000EF1378 /* istereoAppDelegate.m in Sources */, + 06D8CECE1418314000EF1378 /* main.m in Sources */, + 06D8CECF1418314000EF1378 /* respath.c in Sources */, + 06D8CED01418314000EF1378 /* sanegl.c in Sources */, + 06D8CED11418314000EF1378 /* sdr.c in Sources */, + 06D8CED21418314000EF1378 /* tex.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -277,13 +303,14 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Don't Code Sign"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = iphoneos4.0; + SDKROOT = iphoneos; }; name = Debug; }; @@ -291,13 +318,14 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Don't Code Sign"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; - SDKROOT = iphoneos4.0; + SDKROOT = iphoneos; }; name = Release; }; diff -r 889dade25667 -r e3742aafc85b src/istereo.c --- a/src/istereo.c Wed Sep 07 10:56:18 2011 +0300 +++ b/src/istereo.c Thu Sep 08 02:57:29 2011 +0300 @@ -30,7 +30,7 @@ int segm = 20; float ring_height = 0.5; -float split = 0.5; +float split = 0.53; int init(void) { @@ -71,12 +71,29 @@ if(stereo) { int split_pt = (int)((float)view_ysz * split); - /* left eye */ + /* right eye */ glViewport(0, 0, view_xsz, split_pt); cam_aspect((float)split_pt / (float)view_xsz); gl_matrix_mode(GL_PROJECTION); gl_load_identity(); + cam_stereo_proj_matrix(CAM_RIGHT); + gl_rotatef(-90, 0, 0, 1); + + gl_matrix_mode(GL_MODELVIEW); + gl_load_identity(); + cam_stereo_view_matrix(CAM_RIGHT); + gl_translatef(-pan_x, -pan_y, -1.1 * ring_height * segm); + /*gl_rotatef(-90, 0, 0, 1);*/ + + render(tsec); + + /* left eye */ + glViewport(0, split_pt, view_xsz, view_ysz - split_pt); + cam_aspect((float)(view_ysz - split_pt) / (float)view_xsz); + + gl_matrix_mode(GL_PROJECTION); + gl_load_identity(); cam_stereo_proj_matrix(CAM_LEFT); gl_rotatef(-90, 0, 0, 1); @@ -87,23 +104,6 @@ /*gl_rotatef(-90, 0, 0, 1);*/ render(tsec); - - /* right eye */ - glViewport(0, split_pt, view_xsz, view_ysz - split_pt); - cam_aspect((float)(view_ysz - split_pt) / (float)view_xsz); - - gl_matrix_mode(GL_PROJECTION); - gl_load_identity(); - cam_stereo_proj_matrix(CAM_RIGHT); - gl_rotatef(-90, 0, 0, 1); - - gl_matrix_mode(GL_MODELVIEW); - gl_load_identity(); - cam_stereo_view_matrix(CAM_RIGHT); - gl_translatef(-pan_x, -pan_y, -1.1 * ring_height * segm); - /*gl_rotatef(-90, 0, 0, 1);*/ - - render(tsec); } else { gl_matrix_mode(GL_MODELVIEW); gl_load_identity();