added pong vm
This commit is contained in:
parent
2eaa278517
commit
c7919309e9
13 changed files with 567 additions and 2348 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 709b568efbc99c954507d1593bc5633f900bc5dc
|
||||
Subproject commit 2f2785fafb0da6db75810eb6fa97d09c58257588
|
|
@ -25,8 +25,8 @@
|
|||
@property (nonatomic, retain) NSString *gameToken;
|
||||
|
||||
- (id)initWithDelegate:(id)delegate;
|
||||
- (NSData *)makeMessageWithCommand:(NSString *)command andArgs:(NSString *)args;
|
||||
- (void)parseHeader:(NSData *)headerData;
|
||||
- (NSData *)makeMessageFor:(NSString *)serverOrGame withCommand:(NSString *)command andArgs:(NSString *)args;
|
||||
- (void)parseAndSetHeader:(NSData *)headerData;
|
||||
|
||||
- (void)define:(NSString *)sourceCode;
|
||||
- (void)sendCommand:(NSString *)command withArgs:(NSString *)args;
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#define HEADER_DELIMITER [@"\n\n" dataUsingEncoding:NSUTF8StringEncoding]
|
||||
|
||||
#define NO_TAG 7
|
||||
#define CONNECT_HEAD 8
|
||||
#define CONNECT_BODY 9
|
||||
#define HELLO_HEAD 10
|
||||
|
@ -25,6 +26,8 @@
|
|||
#define DEFINE_BODY 13
|
||||
#define COMMAND_HEAD 14
|
||||
#define COMMAND_BODY 15
|
||||
#define HEAD 16
|
||||
#define BODY 17
|
||||
|
||||
@synthesize asyncSocket, delegate, gameToken, currentHeaders;
|
||||
|
||||
|
@ -34,28 +37,27 @@
|
|||
asyncSocket = [[AsyncSocket alloc] initWithDelegate:self];
|
||||
|
||||
[asyncSocket connectToHost:GGS_HOST onPort:GGS_PORT error:nil];
|
||||
[asyncSocket readDataToData:HEADER_DELIMITER withTimeout:NO_TIMEOUT tag:CONNECT_HEAD];
|
||||
[asyncSocket readDataToData:HEADER_DELIMITER withTimeout:NO_TIMEOUT tag:HEAD];
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSData *)makeMessageWithCommand:(NSString *)command andArgs:(NSString *)args {
|
||||
return [[NSString stringWithFormat:@"Token: %@\nServer-Command: %@\nContent-Length: %i\n\n%@",
|
||||
- (NSData *)makeMessageFor:(NSString *)serverOrGame withCommand:(NSString *)command andArgs:(NSString *)args {
|
||||
return [[NSString stringWithFormat:@"Token: %@\n%@-Command: %@\nContent-Length: %i\n\n%@",
|
||||
self.gameToken,
|
||||
serverOrGame,
|
||||
command,
|
||||
[args length],
|
||||
args] dataUsingEncoding:NSUTF8StringEncoding];
|
||||
}
|
||||
|
||||
- (void)define:(NSString *)sourceCode {
|
||||
[asyncSocket writeData:[self makeMessageWithCommand:@"define" andArgs:sourceCode] withTimeout:NO_TIMEOUT tag:DEFINE_HEAD];
|
||||
[asyncSocket readDataToData:HEADER_DELIMITER withTimeout:NO_TIMEOUT tag:DEFINE_BODY];
|
||||
[asyncSocket writeData:[self makeMessageFor:@"Server" withCommand:@"define" andArgs:sourceCode] withTimeout:NO_TIMEOUT tag:NO_TAG];
|
||||
}
|
||||
|
||||
- (void)sendCommand:(NSString *)command withArgs:(NSString *)args {
|
||||
[asyncSocket writeData:[self makeMessageWithCommand:command andArgs:args] withTimeout:NO_TIMEOUT tag:COMMAND_HEAD];
|
||||
[asyncSocket readDataToData:HEADER_DELIMITER withTimeout:NO_TIMEOUT tag:COMMAND_BODY];
|
||||
[asyncSocket writeData:[self makeMessageFor:@"Game" withCommand:command andArgs:args] withTimeout:NO_TIMEOUT tag:NO_TAG];
|
||||
}
|
||||
|
||||
- (void)onSocket:(AsyncSocket *)sock didConnectToHost:(NSString *)host port:(UInt16)port {
|
||||
|
@ -64,53 +66,49 @@
|
|||
|
||||
- (void)onSocket:(AsyncSocket *)sender didReadData:(NSData *)data withTag:(long)tag {
|
||||
|
||||
if (tag == CONNECT_HEAD) {
|
||||
|
||||
[self parseHeader:data];
|
||||
|
||||
if ([self.currentHeaders objectForKey:@"Size"] != nil) {
|
||||
[asyncSocket readDataToLength:[[self.currentHeaders objectForKey:@"Size"] intValue] withTimeout:NO_TIMEOUT tag:CONNECT_BODY];
|
||||
}
|
||||
|
||||
|
||||
} else if (tag == CONNECT_BODY) {
|
||||
|
||||
if (tag == HEAD) {
|
||||
[self parseAndSetHeader:data];
|
||||
|
||||
NSString *response = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
|
||||
self.gameToken = response;
|
||||
[response release];
|
||||
[delegate GGSNetwork:self ready:YES];
|
||||
|
||||
} else if (tag == DEFINE_HEAD) {
|
||||
|
||||
[self.delegate GGSNetwork:self defined:YES];
|
||||
|
||||
} else if (tag == DEFINE_BODY) {
|
||||
|
||||
// nothing to do
|
||||
|
||||
} else if (tag == COMMAND_HEAD) {
|
||||
|
||||
[self parseHeader:data];
|
||||
|
||||
if ([self.currentHeaders objectForKey:@"Size"] != nil) {
|
||||
[asyncSocket readDataToLength:[[self.currentHeaders objectForKey:@"Size"] intValue] withTimeout:NO_TIMEOUT tag:COMMAND_BODY];
|
||||
NSInteger size = [[self.currentHeaders objectForKey:@"Content-Size"] intValue];
|
||||
if (size > 0) {
|
||||
[asyncSocket readDataToLength:size withTimeout:NO_TIMEOUT tag:BODY];
|
||||
} else {
|
||||
[delegate GGSNetwork:self receivedCommand:[self.currentHeaders objectForKey:@"Client-Command"] withArgs:@""];
|
||||
[asyncSocket readDataToData:HEADER_DELIMITER withTimeout:NO_TIMEOUT tag:HEAD];
|
||||
}
|
||||
|
||||
} else if (tag == COMMAND_BODY) {
|
||||
} else {
|
||||
|
||||
NSString *response = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
|
||||
if ([self.currentHeaders objectForKey:@"Client-Command"] != nil) {
|
||||
[delegate GGSNetwork:self receivedCommand:[self.currentHeaders objectForKey:@"Client-Command"] withArgs:response];
|
||||
[asyncSocket readDataToData:HEADER_DELIMITER withTimeout:NO_TIMEOUT tag:COMMAND_BODY];
|
||||
|
||||
NSString *command = [self.currentHeaders objectForKey:@"Client-Command"];
|
||||
if ([command isEqualToString:@"defined"]) {
|
||||
|
||||
if ([response isEqualToString:@"ok"]) {
|
||||
[delegate GGSNetwork:self defined:YES];
|
||||
} else {
|
||||
[delegate GGSNetwork:self defined:NO];
|
||||
}
|
||||
|
||||
} else if ([command isEqualToString:@"hello"]) {
|
||||
|
||||
self.gameToken = response;
|
||||
|
||||
[delegate GGSNetwork:self ready:YES];
|
||||
|
||||
} else {
|
||||
[delegate GGSNetwork:self receivedCommand:command withArgs:response];
|
||||
}
|
||||
[response release];
|
||||
|
||||
[asyncSocket readDataToData:HEADER_DELIMITER withTimeout:NO_TIMEOUT tag:HEAD];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)parseHeader:(NSData *)headerData {
|
||||
- (void)parseAndSetHeader:(NSData *)headerData {
|
||||
NSString *headerString = [[NSString alloc] initWithData:headerData encoding:NSUTF8StringEncoding];
|
||||
NSArray *headers = [headerString componentsSeparatedByString:@"\n"];
|
||||
|
||||
|
||||
NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity:[headers count]];
|
||||
|
||||
for (NSInteger i=0; i<[headers count]; i++) {
|
||||
|
@ -118,8 +116,8 @@
|
|||
|
||||
if ([header rangeOfString:@"Client-Command: "].location == 0) {
|
||||
[dict setValue:[header substringFromIndex:16] forKey:@"Client-Command"];
|
||||
} else if ([header rangeOfString:@"Size: "].location == 0) {
|
||||
[dict setValue:[header substringFromIndex:6] forKey:@"Size"];
|
||||
} else if ([header rangeOfString:@"Content-Size: "].location == 0) {
|
||||
[dict setValue:[header substringFromIndex:14] forKey:@"Content-Size"];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,10 @@
|
|||
#define WIDTH 480
|
||||
#define HEIGHT 320
|
||||
|
||||
@synthesize ballView, player1View, player2View, tapToBegin, pointsP1, pointsP2;
|
||||
#define TOX(x) ( WIDTH / 100 * (x))
|
||||
#define TOY(y) ( HEIGHT / 100 * (y))
|
||||
|
||||
@synthesize ballView, player1View, player2View, tapToBegin, pointsP1, pointsP2, ggsNetwork;
|
||||
|
||||
/*
|
||||
// The designated initializer. Override to perform setup that is required before the view is loaded.
|
||||
|
@ -38,6 +41,10 @@
|
|||
}
|
||||
*/
|
||||
|
||||
-(BOOL)canBecomeFirstResponder {
|
||||
return YES;
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark GGSNetwork Delegate
|
||||
|
||||
|
@ -47,16 +54,28 @@
|
|||
|
||||
- (void)GGSNetwork:(GGSNetwork *)_ggsNetwork defined:(BOOL)defined {
|
||||
if (defined) {
|
||||
[ggsNetwork sendCommand:@"nick" withArgs:@"jeena"];
|
||||
[ggsNetwork sendCommand:@"chat" withArgs:@"Hi everybody I'm pong."];
|
||||
[ggsNetwork sendCommand:@"ready" withArgs:@""];
|
||||
} else {
|
||||
NSLog(@"Not defined");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
- (void)GGSNetwork:(GGSNetwork *)ggsNetwork receivedCommand:(NSString *)command withArgs:(NSString *)args {
|
||||
- (void)GGSNetwork:(GGSNetwork *)_ggsNetwork receivedCommand:(NSString *)command withArgs:(NSString *)args {
|
||||
NSLog(@"Command: %@; Args: %@", command, args);
|
||||
|
||||
if ([command isEqualToString:@"ball"]) {
|
||||
NSArray *ball = [args componentsSeparatedByString:@","];
|
||||
ballView.center = CGPointMake([[ball objectAtIndex:0] intValue], [[ball objectAtIndex:1] intValue]);
|
||||
} else if ([command isEqualToString:@"player1_y"]) {
|
||||
player1View.center = CGPointMake(20, TOY([args intValue]));
|
||||
} else if ([command isEqualToString:@"player2_y"]) {
|
||||
player2View.center = CGPointMake(WIDTH - 40, TOY([args intValue]));
|
||||
} else if ([command isEqualToString:@"player1_points"]) {
|
||||
pointsP1.text = args;
|
||||
} else if ([command isEqualToString:@"player2_points"]) {
|
||||
pointsP2.text = args;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -70,8 +89,8 @@
|
|||
ggsNetwork = [[GGSNetwork alloc] initWithDelegate:self];
|
||||
|
||||
gamePaused = YES;
|
||||
[self startPositions];
|
||||
[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(moveBall) userInfo:nil repeats:YES];
|
||||
//[self startPositions];
|
||||
//[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(moveBall) userInfo:nil repeats:YES];
|
||||
}
|
||||
|
||||
-(void)viewDidAppear:(BOOL)animated {
|
||||
|
@ -104,7 +123,7 @@
|
|||
// e.g. self.myOutlet = nil;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
# pragma mark -
|
||||
# pragma mark Ball
|
||||
|
||||
|
@ -222,7 +241,7 @@
|
|||
pointsP1.text = @"0";
|
||||
pointsP2.text = @"0";
|
||||
}
|
||||
|
||||
*/
|
||||
# pragma mark -
|
||||
# pragma mark Dealloc
|
||||
|
||||
|
|
|
@ -271,7 +271,7 @@
|
|||
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
|
||||
<array>
|
||||
<array>
|
||||
<integer>11</integer>
|
||||
<integer>8</integer>
|
||||
<integer>1</integer>
|
||||
<integer>0</integer>
|
||||
</array>
|
||||
|
@ -296,7 +296,7 @@
|
|||
<real>186</real>
|
||||
</array>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>1041 121 1267 1297 0 0 2560 1418 </string>
|
||||
<string>1164 121 1267 1297 0 0 2560 1418 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXSmartGroupTreeModule</string>
|
||||
|
@ -314,7 +314,7 @@
|
|||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CE0B20306471E060097A5F4</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>GGSNetwork.m</string>
|
||||
<string>PongViewController.m</string>
|
||||
<key>PBXSplitModuleInNavigatorKey</key>
|
||||
<dict>
|
||||
<key>Split0</key>
|
||||
|
@ -322,11 +322,11 @@
|
|||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CE0B20406471E060097A5F4</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>GGSNetwork.m</string>
|
||||
<string>PongViewController.m</string>
|
||||
<key>_historyCapacity</key>
|
||||
<integer>0</integer>
|
||||
<key>bookmark</key>
|
||||
<string>1FBEC151131B2C52006D5497</string>
|
||||
<string>1F369E7B1323081C004E7A99</string>
|
||||
<key>history</key>
|
||||
<array>
|
||||
<string>1FBEBF151319F5C1006D5497</string>
|
||||
|
@ -334,11 +334,11 @@
|
|||
<string>1FBEC002131AA71C006D5497</string>
|
||||
<string>1FBEC05C131B085D006D5497</string>
|
||||
<string>1FBEC05D131B085D006D5497</string>
|
||||
<string>1FBEC124131B2559006D5497</string>
|
||||
<string>1FBEC12D131B2581006D5497</string>
|
||||
<string>1FBEC12E131B2581006D5497</string>
|
||||
<string>1FBEC141131B2757006D5497</string>
|
||||
<string>1FBEC13C131B26A1006D5497</string>
|
||||
<string>1F369E761323081C004E7A99</string>
|
||||
<string>1F369E771323081C004E7A99</string>
|
||||
<string>1F369E781323081C004E7A99</string>
|
||||
<string>1F369E791323081C004E7A99</string>
|
||||
<string>1F369E7A1323081C004E7A99</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>SplitCount</key>
|
||||
|
@ -350,14 +350,14 @@
|
|||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{0, 0}, {1059, 1064}}</string>
|
||||
<string>{{0, 0}, {1059, 1251}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>1041 121 1267 1297 0 0 2560 1418 </string>
|
||||
<string>1164 121 1267 1297 0 0 2560 1418 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXNavigatorGroup</string>
|
||||
<key>Proportion</key>
|
||||
<string>1064pt</string>
|
||||
<string>1251pt</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>ContentConfiguration</key>
|
||||
|
@ -370,14 +370,14 @@
|
|||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{0, 1069}, {1059, 187}}</string>
|
||||
<string>{{0, 1256}, {1059, 0}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>1041 121 1267 1297 0 0 2560 1418 </string>
|
||||
<string>1164 121 1267 1297 0 0 2560 1418 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>XCDetailModule</string>
|
||||
<key>Proportion</key>
|
||||
<string>187pt</string>
|
||||
<string>0pt</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>Proportion</key>
|
||||
|
@ -396,9 +396,9 @@
|
|||
</array>
|
||||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>1FBEBE4E1319CC38006D5497</string>
|
||||
<string>1F369E7C1323081C004E7A99</string>
|
||||
<string>1CE0B1FE06471DED0097A5F4</string>
|
||||
<string>1FBEBE4F1319CC38006D5497</string>
|
||||
<string>1F369E7D1323081C004E7A99</string>
|
||||
<string>1CE0B20306471E060097A5F4</string>
|
||||
<string>1CE0B20506471E060097A5F4</string>
|
||||
</array>
|
||||
|
@ -536,15 +536,15 @@
|
|||
<integer>5</integer>
|
||||
<key>WindowOrderList</key>
|
||||
<array>
|
||||
<string>1FBEBE9F1319D79C006D5497</string>
|
||||
<string>1FBEBEA01319D79C006D5497</string>
|
||||
<string>1FA056A412F0B540003F1373</string>
|
||||
<string>1F369E861323081C004E7A99</string>
|
||||
<string>1F369E871323081C004E7A99</string>
|
||||
<string>1CD10A99069EF8BA00B06720</string>
|
||||
<string>1FA056A412F0B540003F1373</string>
|
||||
<string>1C78EAAD065D492600B07095</string>
|
||||
<string>/Users/jeena/Projects/Pong/Pong.xcodeproj</string>
|
||||
<string>/Users/jeena/Student/GGS/games/Pong/Pong.xcodeproj</string>
|
||||
</array>
|
||||
<key>WindowString</key>
|
||||
<string>1041 121 1267 1297 0 0 2560 1418 </string>
|
||||
<string>1164 121 1267 1297 0 0 2560 1418 </string>
|
||||
<key>WindowToolsV3</key>
|
||||
<array>
|
||||
<dict>
|
||||
|
@ -560,14 +560,12 @@
|
|||
<key>Dock</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CD0528F0623707200166675</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>PongViewController.m</string>
|
||||
<string></string>
|
||||
<key>StatusBarVisibility</key>
|
||||
<true/>
|
||||
</dict>
|
||||
|
@ -623,7 +621,7 @@
|
|||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>1FA056A412F0B540003F1373</string>
|
||||
<string>1FBEBE501319CC38006D5497</string>
|
||||
<string>1F369E7E1323081C004E7A99</string>
|
||||
<string>1CD0528F0623707200166675</string>
|
||||
<string>XCMainBuildResultsModuleGUID</string>
|
||||
</array>
|
||||
|
@ -667,8 +665,8 @@
|
|||
<string>yes</string>
|
||||
<key>sizes</key>
|
||||
<array>
|
||||
<string>{{0, 0}, {316, 194}}</string>
|
||||
<string>{{316, 0}, {378, 194}}</string>
|
||||
<string>{{0, 0}, {316, 201}}</string>
|
||||
<string>{{316, 0}, {378, 201}}</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>VerticalSplitView</key>
|
||||
|
@ -683,8 +681,8 @@
|
|||
<string>yes</string>
|
||||
<key>sizes</key>
|
||||
<array>
|
||||
<string>{{0, 0}, {694, 194}}</string>
|
||||
<string>{{0, 194}, {694, 187}}</string>
|
||||
<string>{{0, 0}, {694, 201}}</string>
|
||||
<string>{{0, 201}, {694, 180}}</string>
|
||||
</array>
|
||||
</dict>
|
||||
</dict>
|
||||
|
@ -717,7 +715,7 @@
|
|||
<real>148</real>
|
||||
</array>
|
||||
<key>Frame</key>
|
||||
<string>{{316, 0}, {378, 194}}</string>
|
||||
<string>{{316, 0}, {378, 201}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>108 977 694 422 0 0 2560 1418 </string>
|
||||
</dict>
|
||||
|
@ -745,13 +743,13 @@
|
|||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>1CD10A99069EF8BA00B06720</string>
|
||||
<string>1FBEBE981319D79C006D5497</string>
|
||||
<string>1F369E7F1323081C004E7A99</string>
|
||||
<string>1C162984064C10D400B95A72</string>
|
||||
<string>1FBEBE991319D79C006D5497</string>
|
||||
<string>1FBEBE9A1319D79C006D5497</string>
|
||||
<string>1FBEBE9B1319D79C006D5497</string>
|
||||
<string>1FBEBE9C1319D79C006D5497</string>
|
||||
<string>1FBEBE9D1319D79C006D5497</string>
|
||||
<string>1F369E801323081C004E7A99</string>
|
||||
<string>1F369E811323081C004E7A99</string>
|
||||
<string>1F369E821323081C004E7A99</string>
|
||||
<string>1F369E831323081C004E7A99</string>
|
||||
<string>1F369E841323081C004E7A99</string>
|
||||
</array>
|
||||
<key>ToolbarConfiguration</key>
|
||||
<string>xcode.toolbar.config.debugV3</string>
|
||||
|
@ -760,11 +758,15 @@
|
|||
<key>WindowToolGUID</key>
|
||||
<string>1CD10A99069EF8BA00B06720</string>
|
||||
<key>WindowToolIsVisible</key>
|
||||
<true/>
|
||||
<false/>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>FirstTimeWindowDisplayed</key>
|
||||
<false/>
|
||||
<key>Identifier</key>
|
||||
<string>windowTool.find</string>
|
||||
<key>IsVertical</key>
|
||||
<true/>
|
||||
<key>Layout</key>
|
||||
<array>
|
||||
<dict>
|
||||
|
@ -779,26 +781,16 @@
|
|||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CDD528C0622207200134675</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string><No Editor></string>
|
||||
<key>PBXSplitModuleInNavigatorKey</key>
|
||||
<dict>
|
||||
<key>Split0</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
<string>1CD0528D0623707200166675</string>
|
||||
</dict>
|
||||
<key>SplitCount</key>
|
||||
<string>1</string>
|
||||
</dict>
|
||||
<string></string>
|
||||
<key>StatusBarVisibility</key>
|
||||
<integer>1</integer>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{0, 0}, {781, 167}}</string>
|
||||
<string>{{0, 0}, {781, 212}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>62 385 781 470 0 0 1440 878 </string>
|
||||
<string>1185 925 781 470 0 0 2560 1418 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXNavigatorGroup</string>
|
||||
|
@ -807,11 +799,11 @@
|
|||
</dict>
|
||||
</array>
|
||||
<key>Proportion</key>
|
||||
<string>50%</string>
|
||||
<string>212pt</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>BecomeActive</key>
|
||||
<integer>1</integer>
|
||||
<true/>
|
||||
<key>ContentConfiguration</key>
|
||||
<dict>
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
|
@ -822,18 +814,18 @@
|
|||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{8, 0}, {773, 254}}</string>
|
||||
<string>{{0, 217}, {781, 212}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>62 385 781 470 0 0 1440 878 </string>
|
||||
<string>1185 925 781 470 0 0 2560 1418 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXProjectFindModule</string>
|
||||
<key>Proportion</key>
|
||||
<string>50%</string>
|
||||
<string>212pt</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>Proportion</key>
|
||||
<string>428pt</string>
|
||||
<string>429pt</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>Name</key>
|
||||
|
@ -843,23 +835,21 @@
|
|||
<string>PBXProjectFindModule</string>
|
||||
</array>
|
||||
<key>StatusbarIsVisible</key>
|
||||
<integer>1</integer>
|
||||
<true/>
|
||||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>1C530D57069F1CE1000CFCEE</string>
|
||||
<string>1C530D58069F1CE1000CFCEE</string>
|
||||
<string>1C530D59069F1CE1000CFCEE</string>
|
||||
<string>1FC1C556131C35AC00D1FF71</string>
|
||||
<string>1FC1C557131C35AC00D1FF71</string>
|
||||
<string>1CDD528C0622207200134675</string>
|
||||
<string>1C530D5A069F1CE1000CFCEE</string>
|
||||
<string>1CE0B1FE06471DED0097A5F4</string>
|
||||
<string>1CD0528E0623707200166675</string>
|
||||
</array>
|
||||
<key>WindowString</key>
|
||||
<string>62 385 781 470 0 0 1440 878 </string>
|
||||
<string>1185 925 781 470 0 0 2560 1418 </string>
|
||||
<key>WindowToolGUID</key>
|
||||
<string>1C530D57069F1CE1000CFCEE</string>
|
||||
<key>WindowToolIsVisible</key>
|
||||
<integer>0</integer>
|
||||
<false/>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Identifier</key>
|
||||
|
@ -890,18 +880,18 @@
|
|||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{0, 0}, {662, 564}}</string>
|
||||
<string>{{0, 0}, {673, 481}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>1852 70 662 605 0 0 2560 1418 </string>
|
||||
<string>3600 653 673 522 2560 0 1920 1200 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXDebugCLIModule</string>
|
||||
<key>Proportion</key>
|
||||
<string>564pt</string>
|
||||
<string>481pt</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>Proportion</key>
|
||||
<string>564pt</string>
|
||||
<string>481pt</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>Name</key>
|
||||
|
@ -915,13 +905,13 @@
|
|||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>1C78EAAD065D492600B07095</string>
|
||||
<string>1FBEBE9E1319D79C006D5497</string>
|
||||
<string>1F369E851323081C004E7A99</string>
|
||||
<string>1C78EAAC065D492600B07095</string>
|
||||
</array>
|
||||
<key>ToolbarConfiguration</key>
|
||||
<string>xcode.toolbar.config.consoleV3</string>
|
||||
<key>WindowString</key>
|
||||
<string>1852 70 662 605 0 0 2560 1418 </string>
|
||||
<string>3600 653 673 522 2560 0 1920 1200 </string>
|
||||
<key>WindowToolGUID</key>
|
||||
<string>1C78EAAD065D492600B07095</string>
|
||||
<key>WindowToolIsVisible</key>
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,36 +1,35 @@
|
|||
function Storage(type) {
|
||||
if (type == "world" || type == "localStorage" || type == "players") {
|
||||
this.type = type;
|
||||
this.tableToken = tableToken;
|
||||
var self = this;
|
||||
|
||||
return {
|
||||
setItem: function(key, value) {
|
||||
if(this.type != "players")
|
||||
callErlang("ggs_db setItem " + escapeErlang([self.tableToken, self.type, key, value]));
|
||||
callErlang("ggs_db setItem " + escapeErlang([GGS.tableToken, self.type, key, value]));
|
||||
else
|
||||
throw "No such method setItem()";
|
||||
},
|
||||
getItem: function(key) {
|
||||
return callErlang("ggs_db getItem " + escapeErlang([self.tableToken, self.type, key]));
|
||||
return callErlang("ggs_db getItem " + escapeErlang([GGS.tableToken, self.type, key]));
|
||||
},
|
||||
key: function(position) {
|
||||
return callErlang("ggs_db key " + escapeErlang([self.tableToken, self.type, position]));
|
||||
return callErlang("ggs_db key " + escapeErlang([GGS.tableToken, self.type, position]));
|
||||
},
|
||||
length: {
|
||||
get: function() {
|
||||
return callErlang("ggs_db length " + escapeErlang([self.tableToken, self.type]));
|
||||
return callErlang("ggs_db length " + escapeErlang([GGS.tableToken, self.type]));
|
||||
}
|
||||
},
|
||||
removeItem: function(key) {
|
||||
if(this.type != "players")
|
||||
callErlang("ggs_db removeItem " + escapeErlang([self.tableToken, self.type, key]));
|
||||
callErlang("ggs_db removeItem " + escapeErlang([GGS.tableToken, self.type, key]));
|
||||
else
|
||||
throw "No such method removeItem()";
|
||||
},
|
||||
clear: function() {
|
||||
if(this.type != "players")
|
||||
callErlang("ggs_db clear " + escapeErlang([self.tableToken, self.type]));
|
||||
callErlang("ggs_db clear " + escapeErlang([GGS.tableToken, self.type]));
|
||||
else
|
||||
throw "No such method clear()";
|
||||
}
|
||||
|
@ -71,13 +70,13 @@ _GGS.prototype.sendCommandToAll = function(command, args) {
|
|||
}
|
||||
|
||||
_GGS.prototype.serverLog = function(message) {
|
||||
callErlang("error_logger info_msg " + escapeErlang([message]))
|
||||
callErlang("'error_logger info_msg " + escapeErlang([message]) + "'");
|
||||
}
|
||||
|
||||
function escapeErlang(args) {
|
||||
var str = JSON.stringify(args);
|
||||
str = str.replace("'", "\\\'");
|
||||
return "'" + str + "'";
|
||||
return str;
|
||||
}
|
||||
|
||||
function Player(token) {
|
||||
|
@ -89,7 +88,9 @@ function Player(token) {
|
|||
|
||||
return {
|
||||
sendCommand: function(command, args) {
|
||||
callErlang("ggs_table send_command " + escapeErlang(GGS.tableToken, command, args));
|
||||
ejsLog("/tmp/ggs-test.txt", "'ggs_table send_command " + escapeErlang([GGS.tableToken+ "", playerToken, command, args])+"'");
|
||||
//callErlang("'ggs_table send_command " + escapeErlang([GGS.tableToken+ "", playerToken, command, args]) + "'");
|
||||
ejsLog("/tmp/ggs-test.txt", "done");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@ handle_call(join_lobby, From, State) ->
|
|||
Token = helpers:get_new_token(),
|
||||
Players = State#co_state.players,
|
||||
io:format("join_lobby from: ~p~n", [From]),
|
||||
{Pid, Sock} = From,
|
||||
{Pid, _Sock} = From,
|
||||
NewState = State#co_state{players = [{Pid, Token} | Players]},
|
||||
back_up(NewState),
|
||||
{reply, {ok, Token}, NewState};
|
||||
|
|
|
@ -54,9 +54,10 @@ stop(GameVM) ->
|
|||
init([Table]) ->
|
||||
process_flag(trap_exit, true),
|
||||
{ok, Port} = js_driver:new(),
|
||||
% %% @TODO: add here default JS API instead
|
||||
{ok, JSAPISourceCode} = file:read_file("src/ggs_api.js"),
|
||||
ok = js:define(Port, JSAPISourceCode),
|
||||
InitGGSJSString = "var GGS = new _GGS(" ++ Table ++ ");",
|
||||
ok = js:define(Port, list_to_binary(InitGGSJSString)),
|
||||
{ok, #state { port = Port, table = Table }}.
|
||||
|
||||
%% private
|
||||
|
@ -66,14 +67,20 @@ handle_call({eval, SourceCode}, _From, #state { port = Port } = State) ->
|
|||
{reply, Ret, State}.
|
||||
|
||||
%% @private
|
||||
handle_cast({define, SourceCode}, #state { port = Port } = State) ->
|
||||
ok = js:define(Port, list_to_binary(SourceCode)),
|
||||
{noreply, State};
|
||||
handle_cast({define, SourceCode}, #state { port = Port, table = Table } = State) ->
|
||||
Ret = js:define(Port, list_to_binary(SourceCode)),
|
||||
case Ret of
|
||||
ok ->
|
||||
ggs_table:notify_all_players(Table, {"defined", "ok"}),
|
||||
{noreply, State};
|
||||
Other ->
|
||||
ggs_table:notify_all_players(Table, {"defined", "error " ++ Other}),
|
||||
{noreply, State}
|
||||
end;
|
||||
handle_cast({player_command, Player, Command, Args}, #state { port = Port } = State) ->
|
||||
Arguments = string:concat("'", string:concat(
|
||||
string:join([js_escape(Player), js_escape(Command), js_escape(Args)], "','"), "'")),
|
||||
Js = list_to_binary(string:concat(string:concat("playerCommand(", Arguments), ");")),
|
||||
Js = list_to_binary("playerCommand(new Player('" ++ Player ++ "'), '" ++ js_escape(Command) ++ "', '" ++ js_escape(Args) ++ "');"),
|
||||
js_driver:define_js(Port, Js),
|
||||
erlang:display(binary_to_list(Js)),
|
||||
{noreply, State};
|
||||
handle_cast(stop, State) ->
|
||||
{stop, normal, State};
|
||||
|
|
279
src/ggs_gamevm_p.erl
Normal file
279
src/ggs_gamevm_p.erl
Normal file
|
@ -0,0 +1,279 @@
|
|||
%% @doc This module is responsible for running the game VM:s. You can issue
|
||||
%% commands to a vm using this module.
|
||||
|
||||
-module(ggs_gamevm_p).
|
||||
-behaviour(gen_server).
|
||||
|
||||
%% gen_server callbacks
|
||||
-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
|
||||
terminate/2, code_change/3]).
|
||||
|
||||
-record(state, { port, table } ).
|
||||
|
||||
%% API
|
||||
-export([start_link/1, define/2, player_command/4, stop/1, call_js/2]).
|
||||
|
||||
|
||||
%% ----------------------------------------------------------------------
|
||||
% API implementation
|
||||
|
||||
%% @doc Create a new VM process. The process ID is returned and can be used
|
||||
%% with for example the define method of this module.
|
||||
start_link(Table) ->
|
||||
erlang_js:start(), %% @TODO: should only be done once
|
||||
{ok, Pid} = gen_server:start_link(?MODULE, [Table], []),
|
||||
Pid.
|
||||
|
||||
%% @doc Define some new code on the specified VM, returns the atom ok.
|
||||
define(GameVM, SourceCode) ->
|
||||
gen_server:cast(GameVM, {define, SourceCode}).
|
||||
|
||||
%% @doc Execute a player command on the specified VM. This function is
|
||||
%% asynchronous, and returns ok.
|
||||
%% @spec player_command(GameVM, User, Command, Args) -> ok
|
||||
%% GameVM = process IS of VM
|
||||
%% Player = the player running the command
|
||||
%% Command = a game command to run
|
||||
%% Args = arguments for the Command parameter
|
||||
player_command(GameVM, Player, Command, Args) ->
|
||||
gen_server:cast(GameVM, {player_command, Player, Command, Args}).
|
||||
|
||||
%% @private
|
||||
% only for tests
|
||||
call_js(GameVM, SourceCode) ->
|
||||
gen_server:call(GameVM, {eval, SourceCode}).
|
||||
|
||||
% @doc stops the gamevm process
|
||||
stop(GameVM) ->
|
||||
gen_server:cast(GameVM, stop).
|
||||
|
||||
|
||||
%% ----------------------------------------------------------------------
|
||||
|
||||
%% @private
|
||||
init([Table]) ->
|
||||
process_flag(trap_exit, true),
|
||||
{ok, Port} = js_driver:new(),
|
||||
{ok, JSAPISourceCode} = file:read_file("src/ggs_api.js"),
|
||||
ok = js:define(Port, JSAPISourceCode),
|
||||
InitGGSJSString = "var GGS = new _GGS(" ++ Table ++ ");",
|
||||
ok = js:define(Port, list_to_binary(InitGGSJSString)),
|
||||
{ok, #state { port = Port, table = Table }}.
|
||||
|
||||
%% private
|
||||
% only needed for the tests
|
||||
handle_call({eval, SourceCode}, _From, #state { port = Port } = State) ->
|
||||
{ok, Ret} = js:eval(Port, list_to_binary(SourceCode)),
|
||||
{reply, Ret, State}.
|
||||
|
||||
%% @private
|
||||
handle_cast({define, SourceCode}, #state { port = Port, table = Table } = State) ->
|
||||
Ret = js:define(Port, list_to_binary(SourceCode)),
|
||||
case Ret of
|
||||
ok ->
|
||||
ggs_table:notify_all_players(Table, {"defined", "ok"}),
|
||||
{noreply, State};
|
||||
Other ->
|
||||
ggs_table:notify_all_players(Table, {"defined", "error " ++ Other}),
|
||||
{noreply, State}
|
||||
end;
|
||||
handle_cast({player_command, Player, Command, Args}, #state { port = _Port, table = Table } = State) ->
|
||||
intern_player_command(Table, Player, Command, Args),
|
||||
{noreply, State};
|
||||
handle_cast(stop, State) ->
|
||||
{stop, normal, State};
|
||||
handle_cast(Msg, S) ->
|
||||
error_logger:error_report([unknown_msg, Msg]),
|
||||
{noreply, S}.
|
||||
|
||||
%% @private
|
||||
handle_info(Msg, S) ->
|
||||
error_logger:error_report([unknown_msg, Msg]),
|
||||
{noreply, S}.
|
||||
|
||||
%% @private
|
||||
terminate(_Reason, _State) ->
|
||||
ok.
|
||||
|
||||
%% @private
|
||||
code_change(_OldVsn, State, _Extra) ->
|
||||
{ok, State}.
|
||||
|
||||
%js_escape(S) ->
|
||||
% lists:flatmap(fun($\') -> [$\\, $\']; (X) -> [X] end, S).
|
||||
|
||||
|
||||
intern_player_command(Table, Player, Command, _Args) ->
|
||||
case Command of
|
||||
"ready" ->
|
||||
intern_add_player(Table, Player);
|
||||
"up" ->
|
||||
intern_up(Table, Player);
|
||||
"down" ->
|
||||
intern_down(Table, Player);
|
||||
"start" ->
|
||||
intern_start(Table, Player)
|
||||
end.
|
||||
|
||||
intern_add_player(Table, Player) ->
|
||||
{ok, PlayerList} = ggs_table:get_player_list(Table),
|
||||
case length(PlayerList) of
|
||||
1 ->
|
||||
ggs_db:setItem(Table, local_storage, Player, player1),
|
||||
ggs_db:setItem(Table, local_storage, player1_y, 50),
|
||||
ggs_table:send_command(Table, Player, {"welcome", int2str(1)}),
|
||||
ggs_table:notify_all_players(Table, {"player1_y", int2str(50)});
|
||||
2 ->
|
||||
ggs_db:setItem(Table, local_storage, Player, player2),
|
||||
ggs_db:setItem(Table, local_storage, player2_y, 50),
|
||||
ggs_table:send_command(Table, Player, {"welcome", int2str(2)}),
|
||||
ggs_table:send_command(Table, Player, {"player1_y", int2str(50)}),
|
||||
ggs_table:notify_all_players(Table, {"player2_y", int2str(50)});
|
||||
_Other ->
|
||||
ggs_table:send_command(Table, Player, {"not_welcome", ""})
|
||||
end.
|
||||
|
||||
|
||||
intern_up(Table, Player) ->
|
||||
case ggs_db:getItem(Table, local_storage, Player) of
|
||||
player1 ->
|
||||
Y = ggs_db:getItem(Table, local_storage, player1_y),
|
||||
NewY = Y - 10,
|
||||
case NewY >= 0 of
|
||||
true ->
|
||||
ggs_db:setItem(Table, local_storage, player1_y, NewY),
|
||||
ggs_table:notify_all_players(Table, {"player1_y", int2str(NewY)});
|
||||
_Other ->
|
||||
ggs_table:send_command(Table, Player, {"notice", "Already on top"})
|
||||
end;
|
||||
player2 ->
|
||||
Y = ggs_db:getItem(Table, local_storage, player2_y),
|
||||
NewY = Y - 10,
|
||||
case NewY >= 0 of
|
||||
true ->
|
||||
ggs_db:setItem(Table, local_storage, player2_y, NewY),
|
||||
ggs_table:notify_all_players(Table, {"player2_y", int2str(NewY)});
|
||||
_Other ->
|
||||
ggs_table:send_command(Table, Player, {"notice", "Already on top"})
|
||||
end
|
||||
end.
|
||||
|
||||
intern_down(Table, Player) ->
|
||||
case ggs_db:getItem(Table, local_storage, Player) of
|
||||
player1 ->
|
||||
Y = ggs_db:getItem(Table, local_storage, player1_y),
|
||||
NewY = Y + 10,
|
||||
case NewY =< 100 of
|
||||
true ->
|
||||
ggs_db:setItem(Table, local_storage, player1_y, NewY),
|
||||
ggs_table:notify_all_players(Table, {"player1_y", int2str(NewY)});
|
||||
_Other ->
|
||||
ggs_table:send_command(Table, Player, {"notice", "Already on bottom"})
|
||||
end;
|
||||
player2 ->
|
||||
Y = ggs_db:getItem(Table, local_storage, player2_y),
|
||||
NewY = Y + 10,
|
||||
case NewY =< 100 of
|
||||
true ->
|
||||
ggs_db:setItem(Table, local_storage, player2_y, NewY),
|
||||
ggs_table:notify_all_players(Table, {"player2_y", int2str(NewY)});
|
||||
_Other ->
|
||||
ggs_table:send_command(Table, Player, {"notice", "Already on bottom"})
|
||||
end
|
||||
end.
|
||||
|
||||
intern_start(Table, Player) ->
|
||||
case ggs_db:getItem(Table, local_storage, Player) of
|
||||
player1 ->
|
||||
ggs_db:setItem(Table, local_storage, player1_ready, true),
|
||||
ggs_db:setItem(Table, local_storage, player1_points, 0),
|
||||
case ggs_db:getItem(Table, local_storage, player2_ready) of
|
||||
true ->
|
||||
ggs_table:notify_all_players(Table, {"game", "start"}),
|
||||
ggs_db:setItem(Table, local_storage, ball, {50,50,1,1}),
|
||||
spawn(fun() -> game_loop([Table]) end);
|
||||
false ->
|
||||
ggs_table:send_command(Table, Player, {"game", "wait"})
|
||||
end;
|
||||
player2 ->
|
||||
ggs_db:setItem(Table, local_storage, player2_ready, true),
|
||||
ggs_db:setItem(Table, local_storage, player2_points, 0),
|
||||
case ggs_db:getItem(Table, local_storage, player1_ready) of
|
||||
true ->
|
||||
ggs_table:notify_all_players(Table, {"game", "start"}),
|
||||
ggs_db:setItem(Table, local_storage, ball, {50,50,-1,-1}),
|
||||
spawn(fun() -> game_loop([Table]) end);
|
||||
false ->
|
||||
ggs_table:send_command(Table, Player, {"game", "wait"})
|
||||
end
|
||||
end.
|
||||
|
||||
game_loop([Table]) ->
|
||||
receive
|
||||
tick ->
|
||||
{BX, BY, SX, SY} = step_ball(ggs_db:getItem(Table, local_storage, ball)),
|
||||
Ball = {BX, BY, SX, SY},
|
||||
ggs_db:setItem(Table, local_storage, ball, Ball),
|
||||
ggs_table:notify_all_players(Table, {"ball", int2str(BX) ++ "," ++ int2str(BY)}),
|
||||
check_ball(Table, Ball);
|
||||
'EXIT' ->
|
||||
exit(normal)
|
||||
after 5000 ->
|
||||
self() ! tick
|
||||
end.
|
||||
|
||||
int2str(Int) ->
|
||||
lists:flatten(io_lib:format("~p", [Int])).
|
||||
|
||||
step_ball({BX, BY, SX, SY}) ->
|
||||
{BX + SX, BY + SY, SX, BY}.
|
||||
|
||||
check_ball(Table, {BX, BY, SX, SY}) ->
|
||||
% check up and down bounds
|
||||
case (BY > 90) or (BY < 0) of
|
||||
true ->
|
||||
NewSY = -SY;
|
||||
false ->
|
||||
NewSY = SY
|
||||
end,
|
||||
|
||||
% check intersection with player1
|
||||
P1Y = ggs_db:getItem(Table, local_storage, player1_y),
|
||||
case check_intersect({0, P1Y, 10, 30}, {BX, BY, 10, 10}) of
|
||||
true ->
|
||||
SX1 = -SX;
|
||||
false ->
|
||||
SX1 = SX
|
||||
end,
|
||||
|
||||
% check intersection with player2
|
||||
P2Y = ggs_db:getItem(Table, local_storage, player2_y),
|
||||
case check_intersect({90, P2Y, 10, 30}, {BX, BY, 10, 10}) of
|
||||
true ->
|
||||
SX2 = - SX1;
|
||||
false ->
|
||||
SX2 = SX1
|
||||
end,
|
||||
ggs_db:setItem(Table, local_storage, ball, {BX, BY , SX2, NewSY}),
|
||||
|
||||
% check for point player1
|
||||
if BX > 90 ->
|
||||
Player1Points = ggs_db:getItem(Table, local_storage, player1_points),
|
||||
NewPlayer1Points = Player1Points + 1,
|
||||
ggs_db:setItem(Table, local_storage, player1_points, NewPlayer1Points),
|
||||
ggs_table:notify_all_players(Table, {"player1_points", int2str(NewPlayer1Points)}),
|
||||
exit(normal)
|
||||
end,
|
||||
|
||||
% check for point player2
|
||||
if BX < 0 ->
|
||||
Player2Points = ggs_db:getItem(Table, local_storage, player2_points),
|
||||
NewPlayer2Points = Player2Points + 1,
|
||||
ggs_db:setItem(Table, local_storage, player2_points, NewPlayer2Points),
|
||||
ggs_table:notify_all_players(Table, {"player2_points", int2str(NewPlayer2Points)}),
|
||||
exit(normal)
|
||||
end.
|
||||
|
||||
|
||||
check_intersect({AX, AY, AW, AH}, {BX, BY, BW, BH}) ->
|
||||
not (BX > (AX + AW)) or ((BX + BW) < AX) or (BY > (AY + AH)) or ((BY + BH) < AY).
|
|
@ -23,14 +23,14 @@ start_link(Socket) ->
|
|||
% us, otherwise these messages end up in our parent.
|
||||
erlang:port_connect(Socket, self()),
|
||||
{ok, Token} = ggs_coordinator:join_lobby(),
|
||||
TableStatus = ggs_coordinator:join_table(1337),
|
||||
TableStatus = ggs_coordinator:join_table("1337"),
|
||||
case TableStatus of
|
||||
{ok, Table} ->
|
||||
notify(self(), self(), {"hello", Token}),
|
||||
loop(#pl_state{socket = Socket, token = Token, table = Table});
|
||||
{error, no_such_table} ->
|
||||
ggs_coordinator:create_table({force, 1337}),
|
||||
{ok, Table} = ggs_coordinator:join_table(1337),
|
||||
ggs_coordinator:create_table({force, "1337"}),
|
||||
{ok, Table} = ggs_coordinator:join_table("1337"),
|
||||
notify(self(), self(), {"hello", Token}),
|
||||
loop(#pl_state{socket = Socket, token = Token, table = Table})
|
||||
end.
|
||||
|
@ -42,7 +42,7 @@ start_link(Socket) ->
|
|||
notify(Player, From, Message) ->
|
||||
erlang:display(Message),
|
||||
{Cmd, Data} = Message,
|
||||
Parsed = ggs_protocol:create_message(Cmd, "text","text", Data),
|
||||
Parsed = ggs_protocol:create_message(Cmd, "text","text", Data),
|
||||
Player ! {notify, From, Parsed}.
|
||||
|
||||
%% @doc Get the player token uniquely representing the player.
|
||||
|
@ -69,6 +69,7 @@ loop(#pl_state{token = _Token, socket = Socket, table = Table} = State) ->
|
|||
self() ! Parsed,
|
||||
loop(State);
|
||||
{notify, _From, Message} ->
|
||||
erlang:display(Message),
|
||||
gen_tcp:send(Socket, Message),
|
||||
loop(State);
|
||||
% Below are messages generated by the parser
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
notify_all_players/2,
|
||||
notify_game/3,
|
||||
get_player_list/1,
|
||||
notify_player/4]).
|
||||
send_command/3]).
|
||||
|
||||
|
||||
%% ----------------------------------------------------------------------
|
||||
|
@ -66,24 +66,16 @@ notify_game(TablePid, From, Message) ->
|
|||
|
||||
%% @doc Notify a player sitting at this table with the message supplied.
|
||||
%% Player, Table and From are in token form.
|
||||
notify_player(TableToken, PlayerToken, From, Message) ->
|
||||
send_command(TableToken, PlayerToken, Message) ->
|
||||
TablePid = ggs_coordinator:table_token_to_pid(TableToken),
|
||||
%PlayerPid = ggs_coordinator:player_token_to_pid(PlayerToken),
|
||||
gen_server:cast(TablePid, {notify_player, PlayerToken, From, Message}).
|
||||
|
||||
send_command(TableToken, PlayerToken, Command, Args) ->
|
||||
gen_logger:not_implemented().
|
||||
|
||||
send_command_to_all(TableToken, Command, Args) ->
|
||||
gen_logger:not_implemented().
|
||||
|
||||
gen_server:cast(TablePid, {notify_player, PlayerToken, self(), Message}).
|
||||
|
||||
%% ----------------------------------------------------------------------
|
||||
|
||||
%% @private
|
||||
init([TableToken]) ->
|
||||
process_flag(trap_exit, true),
|
||||
GameVM = ggs_gamevm:start_link(TableToken),
|
||||
GameVM = ggs_gamevm_p:start_link(TableToken),
|
||||
{ok, #state {
|
||||
game_vm = GameVM,
|
||||
players = [] }}.
|
||||
|
@ -110,14 +102,14 @@ handle_cast({notify, Player, Message}, #state { game_vm = GameVM } = State) ->
|
|||
PlayerToken = ggs_coordinator:player_pid_to_token(Player),
|
||||
case Message of
|
||||
{server, define, Args} ->
|
||||
ggs_gamevm:define(GameVM, Args);
|
||||
ggs_gamevm_p:define(GameVM, Args);
|
||||
{game, Command, Args} ->
|
||||
ggs_gamevm:player_command(GameVM, PlayerToken, Command, Args)
|
||||
ggs_gamevm_p:player_command(GameVM, PlayerToken, Command, Args)
|
||||
end,
|
||||
{noreply, State};
|
||||
|
||||
handle_cast({notify_game, Message, From}, #state { game_vm = GameVM } = State) ->
|
||||
ggs_gamevm:player_command(GameVM, From, Message, ""),
|
||||
ggs_gamevm_p:player_command(GameVM, From, Message, ""),
|
||||
{noreply, State};
|
||||
|
||||
handle_cast({notify_all_players, Message}, #state{players = Players} = State) ->
|
||||
|
|
|
@ -45,9 +45,9 @@ create_table_test() ->
|
|||
timer:sleep(100),
|
||||
% Forcibly create a table. This functionality should be disabled
|
||||
% in the production system, but is pretty nice for testing.
|
||||
Response = ggs_coordinator:create_table({force, 1337}),
|
||||
?assert(Response == {ok, 1337}).
|
||||
Response = ggs_coordinator:create_table({force, "1337"}),
|
||||
?assert(Response == {ok, "1337"}).
|
||||
|
||||
join_good_table_test() ->
|
||||
Response = ggs_coordinator:join_table(1337),
|
||||
?assert(Response == {ok, 1337}).
|
||||
Response = ggs_coordinator:join_table("1337"),
|
||||
?assert(Response == {ok, "1337"}).
|
||||
|
|
Reference in a new issue