Changeset 855
- Timestamp:
- Aug 23, 2011, 8:36:09 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
monsterz/ios/classes/MonsterzViewController.mm (modified) (1 diff)
-
monsterz/ios/info.plist (modified) (1 diff)
-
monsterz/ios/monsterz.xcodeproj/project.pbxproj (modified) (25 diffs)
-
src/debug/quad.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/monsterz/ios/classes/MonsterzViewController.mm
r739 r855 34 34 { 35 35 Ticker::Setup(30.0f); 36 Video::Setup( 320, 480);36 Video::Setup(vec2i(320, 480)); 37 37 38 new Interface(); 39 new DebugFps(20, 20); 38 //new Interface(); 39 //new DebugFps(20, 20); 40 new DebugQuad(); 40 41 41 42 EAGLContext *aContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1]; -
trunk/monsterz/ios/info.plist
r731 r855 29 29 <key>UIStatusBarHidden</key> 30 30 <true/> 31 <key>UISupportedInterfaceOrientations</key> 32 <array/> 31 33 </dict> 32 34 </plist> -
trunk/monsterz/ios/monsterz.xcodeproj/project.pbxproj
r731 r855 4 4 classes = { 5 5 }; 6 objectVersion = 4 5;6 objectVersion = 46; 7 7 objects = { 8 8 … … 12 12 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 13 13 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 14 22C714C713FB155B0023929C /* ground.png in Resources */ = {isa = PBXBuildFile; fileRef = 22C714C513FB155B0023929C /* ground.png */; }; 15 22C714C813FB155B0023929C /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 22C714C613FB155B0023929C /* logo.png */; }; 16 22F6649F13FB15CB005F963B /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F6649D13FB15CB005F963B /* log.cpp */; }; 17 22F664A213FB15CB005F963B /* platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664A013FB15CB005F963B /* platform.cpp */; }; 18 22F664A613FB15CB005F963B /* shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664A413FB15CB005F963B /* shader.cpp */; }; 19 22F664B213FB15CB005F963B /* fps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664A813FB15CB005F963B /* fps.cpp */; }; 20 22F664B313FB15CB005F963B /* quad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664AA13FB15CB005F963B /* quad.cpp */; }; 21 22F664B413FB15CB005F963B /* record.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664AC13FB15CB005F963B /* record.cpp */; }; 22 22F664B513FB15CB005F963B /* sphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664AE13FB15CB005F963B /* sphere.cpp */; }; 23 22F664B613FB15CB005F963B /* stats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664B013FB15CB005F963B /* stats.cpp */; }; 24 22F664B913FB15CB005F963B /* score.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F664B713FB15CB005F963B /* score.cpp */; }; 14 25 28AD733F0D9D9553002E5188 /* mainwindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* mainwindow.xib */; }; 15 26 28EC4C5911D54ECE0027AA9F /* MonsterzViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28EC4C5711D54ECE0027AA9F /* MonsterzViewController.mm */; }; … … 26 37 CE86DBC71324077D004F76D1 /* font2.png in Resources */ = {isa = PBXBuildFile; fileRef = CE86DBAE1324077D004F76D1 /* font2.png */; }; 27 38 CE86DBC81324077D004F76D1 /* icons.png in Resources */ = {isa = PBXBuildFile; fileRef = CE86DBAF1324077D004F76D1 /* icons.png */; }; 28 CE86DBC91324077D004F76D1 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = CE86DBB01324077D004F76D1 /* logo.png */; };29 39 CE86DBCA1324077D004F76D1 /* tiles.png in Resources */ = {isa = PBXBuildFile; fileRef = CE86DBB11324077D004F76D1 /* tiles.png */; }; 30 40 CE86DBCB1324077D004F76D1 /* title0.png in Resources */ = {isa = PBXBuildFile; fileRef = CE86DBB21324077D004F76D1 /* title0.png */; }; … … 46 56 CE86DBDB1324077D004F76D1 /* titlestars.png in Resources */ = {isa = PBXBuildFile; fileRef = CE86DBC21324077D004F76D1 /* titlestars.png */; }; 47 57 CEA12E5B1326F0BE001D45B5 /* audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E0E1326F0BE001D45B5 /* audio.cpp */; }; 48 CEA12E5C1326F0BE001D45B5 /* debugfps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E121326F0BE001D45B5 /* debugfps.cpp */; };49 CEA12E5D1326F0BE001D45B5 /* debugquad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E141326F0BE001D45B5 /* debugquad.cpp */; };50 CEA12E5E1326F0BE001D45B5 /* debugrecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E161326F0BE001D45B5 /* debugrecord.cpp */; };51 CEA12E5F1326F0BE001D45B5 /* debugsphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E181326F0BE001D45B5 /* debugsphere.cpp */; };52 CEA12E601326F0BE001D45B5 /* debugstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E1A1326F0BE001D45B5 /* debugstats.cpp */; };53 58 CEA12E611326F0BE001D45B5 /* dict.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E1C1326F0BE001D45B5 /* dict.cpp */; }; 54 59 CEA12E631326F0BE001D45B5 /* emitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E201326F0BE001D45B5 /* emitter.cpp */; }; … … 66 71 CEA12E751326F0BF001D45B5 /* sampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E411326F0BE001D45B5 /* sampler.cpp */; }; 67 72 CEA12E761326F0BF001D45B5 /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E431326F0BE001D45B5 /* scene.cpp */; }; 68 CEA12E791326F0BF001D45B5 /* shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E491326F0BE001D45B5 /* shader.cpp */; };69 73 CEA12E7A1326F0BF001D45B5 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E4B1326F0BE001D45B5 /* text.cpp */; }; 70 74 CEA12E7B1326F0BF001D45B5 /* ticker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA12E4D1326F0BE001D45B5 /* ticker.cpp */; }; … … 89 93 1D6058910D05DD3D006BFB54 /* Monsterz.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Monsterz.app; sourceTree = BUILT_PRODUCTS_DIR; }; 90 94 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 95 22C714C513FB155B0023929C /* ground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ground.png; sourceTree = "<group>"; }; 96 22C714C613FB155B0023929C /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; }; 97 22F6649D13FB15CB005F963B /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = ../../src/log.cpp; sourceTree = "<group>"; }; 98 22F6649E13FB15CB005F963B /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = ../../src/log.h; sourceTree = "<group>"; }; 99 22F664A013FB15CB005F963B /* platform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform.cpp; path = ../../src/platform.cpp; sourceTree = "<group>"; }; 100 22F664A113FB15CB005F963B /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = ../../src/platform.h; sourceTree = "<group>"; }; 101 22F664A413FB15CB005F963B /* shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shader.cpp; sourceTree = "<group>"; }; 102 22F664A513FB15CB005F963B /* shader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shader.h; sourceTree = "<group>"; }; 103 22F664A813FB15CB005F963B /* fps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fps.cpp; sourceTree = "<group>"; }; 104 22F664A913FB15CB005F963B /* fps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fps.h; sourceTree = "<group>"; }; 105 22F664AA13FB15CB005F963B /* quad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quad.cpp; sourceTree = "<group>"; }; 106 22F664AB13FB15CB005F963B /* quad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quad.h; sourceTree = "<group>"; }; 107 22F664AC13FB15CB005F963B /* record.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = record.cpp; sourceTree = "<group>"; }; 108 22F664AD13FB15CB005F963B /* record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = record.h; sourceTree = "<group>"; }; 109 22F664AE13FB15CB005F963B /* sphere.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sphere.cpp; sourceTree = "<group>"; }; 110 22F664AF13FB15CB005F963B /* sphere.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sphere.h; sourceTree = "<group>"; }; 111 22F664B013FB15CB005F963B /* stats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stats.cpp; sourceTree = "<group>"; }; 112 22F664B113FB15CB005F963B /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stats.h; sourceTree = "<group>"; }; 113 22F664B713FB15CB005F963B /* score.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = score.cpp; path = ../score.cpp; sourceTree = "<group>"; }; 114 22F664B813FB15CB005F963B /* score.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = score.h; path = ../score.h; sourceTree = "<group>"; }; 91 115 28AD733E0D9D9553002E5188 /* mainwindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = mainwindow.xib; sourceTree = "<group>"; }; 92 116 28EC4C5611D54ECE0027AA9F /* MonsterzViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonsterzViewController.h; sourceTree = "<group>"; }; … … 108 132 CE86DBAE1324077D004F76D1 /* font2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = font2.png; path = ../gfx/font2.png; sourceTree = SOURCE_ROOT; }; 109 133 CE86DBAF1324077D004F76D1 /* icons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icons.png; path = ../gfx/icons.png; sourceTree = SOURCE_ROOT; }; 110 CE86DBB01324077D004F76D1 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo.png; path = ../gfx/logo.png; sourceTree = SOURCE_ROOT; };111 134 CE86DBB11324077D004F76D1 /* tiles.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tiles.png; path = ../gfx/tiles.png; sourceTree = SOURCE_ROOT; }; 112 135 CE86DBB21324077D004F76D1 /* title0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title0.png; path = ../gfx/title0.png; sourceTree = SOURCE_ROOT; }; … … 131 154 CEA12E101326F0BE001D45B5 /* bitfield.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bitfield.h; path = ../../src/bitfield.h; sourceTree = SOURCE_ROOT; }; 132 155 CEA12E111326F0BE001D45B5 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = core.h; path = ../../src/core.h; sourceTree = SOURCE_ROOT; }; 133 CEA12E121326F0BE001D45B5 /* debugfps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugfps.cpp; path = ../../src/debugfps.cpp; sourceTree = SOURCE_ROOT; };134 CEA12E131326F0BE001D45B5 /* debugfps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugfps.h; path = ../../src/debugfps.h; sourceTree = SOURCE_ROOT; };135 CEA12E141326F0BE001D45B5 /* debugquad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugquad.cpp; path = ../../src/debugquad.cpp; sourceTree = SOURCE_ROOT; };136 CEA12E151326F0BE001D45B5 /* debugquad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugquad.h; path = ../../src/debugquad.h; sourceTree = SOURCE_ROOT; };137 CEA12E161326F0BE001D45B5 /* debugrecord.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugrecord.cpp; path = ../../src/debugrecord.cpp; sourceTree = SOURCE_ROOT; };138 CEA12E171326F0BE001D45B5 /* debugrecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugrecord.h; path = ../../src/debugrecord.h; sourceTree = SOURCE_ROOT; };139 CEA12E181326F0BE001D45B5 /* debugsphere.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugsphere.cpp; path = ../../src/debugsphere.cpp; sourceTree = SOURCE_ROOT; };140 CEA12E191326F0BE001D45B5 /* debugsphere.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugsphere.h; path = ../../src/debugsphere.h; sourceTree = SOURCE_ROOT; };141 CEA12E1A1326F0BE001D45B5 /* debugstats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debugstats.cpp; path = ../../src/debugstats.cpp; sourceTree = SOURCE_ROOT; };142 CEA12E1B1326F0BE001D45B5 /* debugstats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugstats.h; path = ../../src/debugstats.h; sourceTree = SOURCE_ROOT; };143 156 CEA12E1C1326F0BE001D45B5 /* dict.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dict.cpp; path = ../../src/dict.cpp; sourceTree = SOURCE_ROOT; }; 144 157 CEA12E1D1326F0BE001D45B5 /* dict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dict.h; path = ../../src/dict.h; sourceTree = SOURCE_ROOT; }; … … 174 187 CEA12E431326F0BE001D45B5 /* scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scene.cpp; path = ../../src/scene.cpp; sourceTree = SOURCE_ROOT; }; 175 188 CEA12E441326F0BE001D45B5 /* scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scene.h; path = ../../src/scene.h; sourceTree = SOURCE_ROOT; }; 176 CEA12E491326F0BE001D45B5 /* shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shader.cpp; path = ../../src/shader.cpp; sourceTree = SOURCE_ROOT; };177 CEA12E4A1326F0BE001D45B5 /* shader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shader.h; path = ../../src/shader.h; sourceTree = SOURCE_ROOT; };178 189 CEA12E4B1326F0BE001D45B5 /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = text.cpp; path = ../../src/text.cpp; sourceTree = SOURCE_ROOT; }; 179 190 CEA12E4C1326F0BE001D45B5 /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = text.h; path = ../../src/text.h; sourceTree = SOURCE_ROOT; }; … … 244 255 sourceTree = "<group>"; 245 256 }; 257 22C714C413FB155B0023929C /* title */ = { 258 isa = PBXGroup; 259 children = ( 260 22C714C513FB155B0023929C /* ground.png */, 261 22C714C613FB155B0023929C /* logo.png */, 262 ); 263 name = title; 264 path = ../gfx/title; 265 sourceTree = "<group>"; 266 }; 267 22F664A313FB15CB005F963B /* shader */ = { 268 isa = PBXGroup; 269 children = ( 270 22F664A413FB15CB005F963B /* shader.cpp */, 271 22F664A513FB15CB005F963B /* shader.h */, 272 ); 273 name = shader; 274 path = ../../src/shader; 275 sourceTree = "<group>"; 276 }; 277 22F664A713FB15CB005F963B /* debug */ = { 278 isa = PBXGroup; 279 children = ( 280 22F664A813FB15CB005F963B /* fps.cpp */, 281 22F664A913FB15CB005F963B /* fps.h */, 282 22F664AA13FB15CB005F963B /* quad.cpp */, 283 22F664AB13FB15CB005F963B /* quad.h */, 284 22F664AC13FB15CB005F963B /* record.cpp */, 285 22F664AD13FB15CB005F963B /* record.h */, 286 22F664AE13FB15CB005F963B /* sphere.cpp */, 287 22F664AF13FB15CB005F963B /* sphere.h */, 288 22F664B013FB15CB005F963B /* stats.cpp */, 289 22F664B113FB15CB005F963B /* stats.h */, 290 ); 291 name = debug; 292 path = ../../src/debug; 293 sourceTree = "<group>"; 294 }; 246 295 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { 247 296 isa = PBXGroup; … … 293 342 isa = PBXGroup; 294 343 children = ( 344 22F664A713FB15CB005F963B /* debug */, 345 22F664A313FB15CB005F963B /* shader */, 346 22F664A013FB15CB005F963B /* platform.cpp */, 347 22F664A113FB15CB005F963B /* platform.h */, 348 22F6649D13FB15CB005F963B /* log.cpp */, 349 22F6649E13FB15CB005F963B /* log.h */, 295 350 CEA12E0E1326F0BE001D45B5 /* audio.cpp */, 296 351 CEA12E0F1326F0BE001D45B5 /* audio.h */, 297 352 CEA12E101326F0BE001D45B5 /* bitfield.h */, 298 353 CEA12E111326F0BE001D45B5 /* core.h */, 299 CEA12E121326F0BE001D45B5 /* debugfps.cpp */,300 CEA12E131326F0BE001D45B5 /* debugfps.h */,301 CEA12E141326F0BE001D45B5 /* debugquad.cpp */,302 CEA12E151326F0BE001D45B5 /* debugquad.h */,303 CEA12E161326F0BE001D45B5 /* debugrecord.cpp */,304 CEA12E171326F0BE001D45B5 /* debugrecord.h */,305 CEA12E181326F0BE001D45B5 /* debugsphere.cpp */,306 CEA12E191326F0BE001D45B5 /* debugsphere.h */,307 CEA12E1A1326F0BE001D45B5 /* debugstats.cpp */,308 CEA12E1B1326F0BE001D45B5 /* debugstats.h */,309 354 CEA12E1C1326F0BE001D45B5 /* dict.cpp */, 310 355 CEA12E1D1326F0BE001D45B5 /* dict.h */, … … 340 385 CEA12E431326F0BE001D45B5 /* scene.cpp */, 341 386 CEA12E441326F0BE001D45B5 /* scene.h */, 342 CEA12E491326F0BE001D45B5 /* shader.cpp */,343 CEA12E4A1326F0BE001D45B5 /* shader.h */,344 387 CEA12E4B1326F0BE001D45B5 /* text.cpp */, 345 388 CEA12E4C1326F0BE001D45B5 /* text.h */, … … 365 408 isa = PBXGroup; 366 409 children = ( 410 22C714C413FB155B0023929C /* title */, 367 411 CE608AD813244071006A700F /* ascii.png */, 368 412 CE86DBAA1324077D004F76D1 /* background.png */, … … 372 416 CE86DBAE1324077D004F76D1 /* font2.png */, 373 417 CE86DBAF1324077D004F76D1 /* icons.png */, 374 CE86DBB01324077D004F76D1 /* logo.png */,375 418 CE86DBB11324077D004F76D1 /* tiles.png */, 376 419 CE86DBB21324077D004F76D1 /* title0.png */, … … 398 441 isa = PBXGroup; 399 442 children = ( 443 22F664B713FB15CB005F963B /* score.cpp */, 444 22F664B813FB15CB005F963B /* score.h */, 400 445 CEA12E821326F117001D45B5 /* board.cpp */, 401 446 CEA12E831326F117001D45B5 /* board.h */, … … 440 485 29B97313FDCFA39411CA2CEA /* Project object */ = { 441 486 isa = PBXProject; 487 attributes = { 488 LastUpgradeCheck = 0410; 489 }; 442 490 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "monsterz" */; 443 compatibilityVersion = "Xcode 3. 1";491 compatibilityVersion = "Xcode 3.2"; 444 492 developmentRegion = English; 445 493 hasScannedForEncodings = 1; … … 472 520 CE86DBC71324077D004F76D1 /* font2.png in Resources */, 473 521 CE86DBC81324077D004F76D1 /* icons.png in Resources */, 474 CE86DBC91324077D004F76D1 /* logo.png in Resources */,475 522 CE86DBCA1324077D004F76D1 /* tiles.png in Resources */, 476 523 CE86DBCB1324077D004F76D1 /* title0.png in Resources */, … … 492 539 CE86DBDB1324077D004F76D1 /* titlestars.png in Resources */, 493 540 CE608AD913244071006A700F /* ascii.png in Resources */, 541 22C714C713FB155B0023929C /* ground.png in Resources */, 542 22C714C813FB155B0023929C /* logo.png in Resources */, 494 543 ); 495 544 runOnlyForDeploymentPostprocessing = 0; … … 507 556 28EC4C5911D54ECE0027AA9F /* MonsterzViewController.mm in Sources */, 508 557 CEA12E5B1326F0BE001D45B5 /* audio.cpp in Sources */, 509 CEA12E5C1326F0BE001D45B5 /* debugfps.cpp in Sources */,510 CEA12E5D1326F0BE001D45B5 /* debugquad.cpp in Sources */,511 CEA12E5E1326F0BE001D45B5 /* debugrecord.cpp in Sources */,512 CEA12E5F1326F0BE001D45B5 /* debugsphere.cpp in Sources */,513 CEA12E601326F0BE001D45B5 /* debugstats.cpp in Sources */,514 558 CEA12E611326F0BE001D45B5 /* dict.cpp in Sources */, 515 559 CEA12E631326F0BE001D45B5 /* emitter.cpp in Sources */, … … 527 571 CEA12E751326F0BF001D45B5 /* sampler.cpp in Sources */, 528 572 CEA12E761326F0BF001D45B5 /* scene.cpp in Sources */, 529 CEA12E791326F0BF001D45B5 /* shader.cpp in Sources */,530 573 CEA12E7A1326F0BF001D45B5 /* text.cpp in Sources */, 531 574 CEA12E7B1326F0BF001D45B5 /* ticker.cpp in Sources */, … … 542 585 CEA12F3D1326F118001D45B5 /* thumbs.cpp in Sources */, 543 586 CEA12F3E1326F118001D45B5 /* title.cpp in Sources */, 587 22F6649F13FB15CB005F963B /* log.cpp in Sources */, 588 22F664A213FB15CB005F963B /* platform.cpp in Sources */, 589 22F664A613FB15CB005F963B /* shader.cpp in Sources */, 590 22F664B213FB15CB005F963B /* fps.cpp in Sources */, 591 22F664B313FB15CB005F963B /* quad.cpp in Sources */, 592 22F664B413FB15CB005F963B /* record.cpp in Sources */, 593 22F664B513FB15CB005F963B /* sphere.cpp in Sources */, 594 22F664B613FB15CB005F963B /* stats.cpp in Sources */, 595 22F664B913FB15CB005F963B /* score.cpp in Sources */, 544 596 ); 545 597 runOnlyForDeploymentPostprocessing = 0; … … 552 604 buildSettings = { 553 605 ALWAYS_SEARCH_USER_PATHS = NO; 606 "CODE_SIGN_IDENTITY[sdk=*]" = ""; 554 607 COPY_PHASE_STRIP = NO; 555 608 GCC_DYNAMIC_NO_PIC = NO; … … 571 624 buildSettings = { 572 625 ALWAYS_SEARCH_USER_PATHS = NO; 626 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; 573 627 COPY_PHASE_STRIP = YES; 574 628 GCC_PRECOMPILE_PREFIX_HEADER = YES; … … 589 643 buildSettings = { 590 644 ARCHS = "$(ARCHS_STANDARD_32_BIT)"; 591 "CODE_SIGN_IDENTITY[sdk= iphoneos*]" = "iPhone Developer";645 "CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer"; 592 646 GCC_C_LANGUAGE_STANDARD = c99; 593 647 GCC_INPUT_FILETYPE = automatic; 594 648 GCC_PREPROCESSOR_DEFINITIONS = ( 595 649 DEBUG, 596 HAVE_GLES_ 1X,650 HAVE_GLES_2X, 597 651 ); 652 GCC_VERSION = com.apple.compilers.llvmgcc42; 598 653 GCC_WARN_ABOUT_RETURN_TYPE = YES; 599 654 GCC_WARN_UNUSED_VARIABLE = YES; 600 PREBINDING = NO;601 655 SDKROOT = iphoneos; 602 656 }; … … 610 664 GCC_C_LANGUAGE_STANDARD = c99; 611 665 GCC_INPUT_FILETYPE = automatic; 612 GCC_PREPROCESSOR_DEFINITIONS = HAVE_GLES_1X; 666 GCC_PREPROCESSOR_DEFINITIONS = HAVE_GLES_2X; 667 GCC_VERSION = com.apple.compilers.llvmgcc42; 613 668 GCC_WARN_ABOUT_RETURN_TYPE = YES; 614 669 GCC_WARN_UNUSED_VARIABLE = YES; 615 670 OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; 616 PREBINDING = NO;617 671 SDKROOT = iphoneos; 618 672 }; -
trunk/src/debug/quad.cpp
r851 r855 431 431 * Renders an orange square. 432 432 */ 433 #if !defined ANDROID_NDK 433 #if !defined ANDROID_NDK && !defined __APPLE__ 434 434 glColor4f(orange.x, orange.y, orange.z, orange.w); 435 435 glEnableClientState(GL_VERTEX_ARRAY); … … 449 449 * Renders a multicoloured square with varying colors. 450 450 */ 451 #if !defined ANDROID_NDK 451 #if !defined ANDROID_NDK && !defined __APPLE__ 452 452 glEnableClientState(GL_VERTEX_ARRAY); 453 453 glEnableClientState(GL_COLOR_ARRAY); … … 470 470 * animated distorted checkerboard. 471 471 */ 472 #if !defined ANDROID_NDK 472 #if !defined ANDROID_NDK && !defined __APPLE__ 473 473 glEnable(GL_TEXTURE_2D); 474 474 glBindTexture(GL_TEXTURE_2D, data->texture[0]);
Note: See TracChangeset
for help on using the changeset viewer.
