Permalink
Browse files

fixed bug with highscore stripe

gitignore updated
  • Loading branch information...
1 parent 2ae23cb commit 4ef39d4f8124bc482d972da071d32185e8c67314 @haqu committed Jul 13, 2012
View
23 .gitignore
@@ -1,6 +1,23 @@
+# Mac OS X
.DS_Store
-build
-*.pbxuser
+
+# XCode (and ancestors) per-user config (very noisy, and not relevant)
+*.mode1
*.mode1v3
*.mode2v3
-*.xcuserstate
+*.perspective
+*.perspectivev3
+*.pbxuser
+
+# Xcode 4
+xcuserdata/
+project.xcworkspace/
+
+# automatic backup files
+*~.nib
+*.swp
+*~
+
+# cocos2d
+PLBlocks.framework/*
+*.pyc
View
85 tweejump.xcodeproj/xcuserdata/haqu.xcuserdatad/xcschemes/tweejump.xcscheme
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "tweejump.app"
+ BlueprintName = "tweejump"
+ ReferencedContainer = "container:tweejump.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "tweejump.app"
+ BlueprintName = "tweejump"
+ ReferencedContainer = "container:tweejump.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "tweejump.app"
+ BlueprintName = "tweejump"
+ ReferencedContainer = "container:tweejump.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+ BuildableName = "tweejump.app"
+ BlueprintName = "tweejump"
+ ReferencedContainer = "container:tweejump.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
View
27 tweejump.xcodeproj/xcuserdata/haqu.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>tweejump.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>1D6058900D05DD3D006BFB54</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ <key>F49E735615ACCF46009C8E84</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>
View
56 tweejump/Classes/Highscores.m
@@ -208,31 +208,37 @@ - (void)button2Callback:(id)sender {
}
- (void)draw {
-// NSLog(@"draw");
-
-// if(currentScorePosition < 0) return;
-//
-// glColor4ub(0,0,0,50);
-//
-// float w = 320.0f;
-// float h = 27.0f;
-// float x = (320.0f - w)/2;
-// float y = 359.0f - currentScorePosition * h;
-//
-// GLfloat vertices[4][2];
-// GLubyte indices[4] = { 0, 1, 3, 2 };
-//
-// glVertexPointer(2, GL_FLOAT, 0, vertices);
-// glEnableClientState(GL_VERTEX_ARRAY);
-//
-// vertices[0][0] = x; vertices[0][1] = y;
-// vertices[1][0] = x+w; vertices[1][1] = y;
-// vertices[2][0] = x+w; vertices[2][1] = y+h;
-// vertices[3][0] = x; vertices[3][1] = y+h;
-//
-// glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_BYTE, indices);
-//
-// glDisableClientState(GL_VERTEX_ARRAY);
+ [super draw];
+
+ if(currentScorePosition < 0) return;
+
+ glColor4f(0.0f, 0.0f, 0.0f, 0.2f);
+
+ float w = 320.0f;
+ float h = 27.0f;
+ float x = (320.0f - w) / 2.0f;
+ float y = 359.0f - currentScorePosition * h;
+
+ GLfloat vertices[4][2];
+ GLubyte indices[4] = { 0, 1, 3, 2 };
+
+ vertices[0][0] = x; vertices[0][1] = y;
+ vertices[1][0] = x+w; vertices[1][1] = y;
+ vertices[2][0] = x+w; vertices[2][1] = y+h;
+ vertices[3][0] = x; vertices[3][1] = y+h;
+
+ glDisable(GL_TEXTURE_2D);
+ glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+ glDisableClientState(GL_COLOR_ARRAY);
+
+ glVertexPointer(2, GL_FLOAT, 0, vertices);
+ glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_BYTE, indices);
+
+ glEnableClientState(GL_COLOR_ARRAY);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+ glEnable(GL_TEXTURE_2D);
+
+ glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
}
- (void)changePlayerDone {

0 comments on commit 4ef39d4

Please sign in to comment.