jeena/GGS
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

added sound to pong and fixed some bugs

Browse source
This commit is contained in:
Jeena Paradies 2011-03-06 05:25:35 +01:00
parent c7919309e9
commit ac4036dfc8
15 changed files with 1373 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ggs_coordinator.erl
View file

@ -102,7 +102,6 @@ init([]) ->
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,
NewState = State#co_state{players = [{Pid, Token} | Players]},
back_up(NewState),

86
src/ggs_gamevm_p.erl
View file

@ -191,8 +191,9 @@ intern_start(Table, Player) ->
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 ->
Pid = spawn(fun() -> game_loop([Table]) end),
Pid ! tick;
_Other ->
ggs_table:send_command(Table, Player, {"game", "wait"})
end;
player2 ->
@ -202,8 +203,9 @@ intern_start(Table, Player) ->
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 ->
GameLoop = spawn(fun() -> game_loop([Table]) end),
GameLoop ! tick;
_Other ->
ggs_table:send_command(Table, Player, {"game", "wait"})
end
end.
@ -215,18 +217,19 @@ game_loop([Table]) ->
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);
check_ball(Table, Ball),
timer:send_after(50, tick),
game_loop([Table]);
'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}.
Ball = {BX + SX, BY + SY, SX, SY},
Ball.
check_ball(Table, {BX, BY, SX, SY}) ->
% check up and down bounds
@ -237,43 +240,52 @@ check_ball(Table, {BX, BY, SX, SY}) ->
NewSY = SY
end,
% check intersection with player1
% check intersection with a player
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
case (check_intersect({0, P1Y, 10, 30}, {BX, BY, 10, 10}) or check_intersect({99, P2Y, 10, 30}, {BX, BY, 10, 10})) of
true ->
SX2 = - SX1;
NewSX = -SX,
case NewSX of
-1 ->
ggs_table:notify_all_players(Table, {"sound", "ping"});
1 ->
ggs_table:notify_all_players(Table, {"sound", "pong"})
end;
false ->
SX2 = SX1
NewSX = SX
end,
ggs_db:setItem(Table, local_storage, ball, {BX, BY , SX2, NewSY}),
ggs_db:setItem(Table, local_storage, ball, {BX, BY , NewSX, 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)
case BX > 100 of
true ->
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);
false ->
ok
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)
case BX < 0 of
true ->
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);
false ->
ok
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).
check_intersect({AX1, AY1, AW, AH}, {BX1, BY1, BW, BH}) ->
AX2 = AX1 + AW,
AY2 = AY1 + AH,
BX2 = BX1 + BW,
BY2 = BY1 + BH,
(AX1 < BX2) and (AX2 > BX1) and (AY1 < BY2) and (AY2 > BY1).

5
src/ggs_player.erl
View file

@ -40,7 +40,6 @@ start_link(Socket) ->
%% @spec notify(Player::Pid(), From::Pid(),
%% {Command::String(), Message::string()}) -> ok
notify(Player, From, Message) ->
erlang:display(Message),
{Cmd, Data} = Message,
Parsed = ggs_protocol:create_message(Cmd, "text","text", Data),
Player ! {notify, From, Parsed}.
@ -62,14 +61,10 @@ stop(_Player,_Table) ->
loop(#pl_state{token = _Token, socket = Socket, table = Table} = State) ->
receive
{tcp, Socket, Data} -> % Just echo for now..
io:format("Parsing via protocol module..~n"),
erlang:display(Data),
Parsed = ggs_protocol:parse(Data),
erlang:display(Parsed),
self() ! Parsed,
loop(State);
{notify, _From, Message} ->
erlang:display(Message),
gen_tcp:send(Socket, Message),
loop(State);
% Below are messages generated by the parser

2
src/ggs_table.erl
View file

@ -44,7 +44,6 @@ remove_player(Table, Player) ->
%% @doc Get a list of all player processes attached to this table
get_player_list(TableToken) ->
TablePid = ggs_coordinator:table_token_to_pid(TableToken),
erlang:display(TablePid),
gen_server:call(TablePid, get_player_list).
% @doc stops the table process
@ -88,7 +87,6 @@ handle_call({remove_player, Player}, _From, #state { players = Players } = State
{reply, ok, State#state { players = Players -- [Player] }};
handle_call(get_player_list, _From, #state { players = Players } = State) ->
io:format("Players: ~p~n", [Players]),
TokenPlayers = lists:map(
fun (Pid) -> ggs_coordinator:player_pid_to_token(Pid) end, Players),
{reply, {ok, TokenPlayers}, State};