Skip to content

Commit

Permalink
Added simple animations
Browse files Browse the repository at this point in the history 
Animation system is up and running
added 3 animation files, head*.txt
zoomed out scene to accomodate new giant head
Still need to add a bit of detail tothe character
still need to fix the headHappy to head.txt animation transistion
  • Loading branch information
Krishna committed Mar 28, 2010
1 parent e6574e9 commit 90d2673
Show file tree
Hide file tree
Showing 6 changed files with 384 additions and 109 deletions.
3 changes: 2 additions & 1 deletion game.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ void dropShadowPiece();
{
viewer = v;
}
int numBlocksCleared;
private:
bool doesPieceFit(const Piece& p, int x, int y) const;

Expand Down Expand Up @@ -181,7 +182,7 @@ void dropShadowPiece();

// Extra stuff
int score_, linesCleared_;
int numBlocksCleared;

int numDeleted;
double clearBarPos;
Viewer *viewer;
Expand Down
46 changes: 46 additions & 0 deletions head.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
1 2 1 0.88887 0.850980392 0.835294118 HEAD
8 5 0 4 4 0 0 0 0 2
8 5 0 4 4 0 0 0 0 2

1 2 1 0.88887 0.850980392 0.835294118 LEYE
7 4 0.2 0.4 1.6 0 0 0 0 2
7 4 0.2 0.4 1.6 0 0 0 0 2

1 2 1 0.88887 0.850980392 0.835294118 REYE
9 4 0.2 0.4 1.6 0 0 0 0 2
9 4 0.2 0.4 1.6 0 0 0 0 2

1 3 1 0.88887 0.850980392 0.835294118 MOUTH
8 2 0.2 0.5 0.5 0 0 0 0 4
8 2 0.2 0.7 0.3 0 0 0 0 5
8 2 0.2 0.5 0.5 0 0 0 0 4

1 2 1 1 1 1 FACE
8 3 0.1 2 1.8 0 0 0 0 2
8 3 0.1 2 1.8 0 0 0 0 2

1 9 1 1 1 1 RPUPIL
8.8 2.9 0.2 0.1 0.1 0 0 0 0 2
8.9 3.1 0.2 0.08 0.12 0 0 0 0 2
9 3.2 0.2 0.06 0.14 0 0 0 0 2
9.1 3.1 0.2 0.08 0.12 0 0 0 0 2
9.2 2.9 0.2 0.1 0.1 0 0 0 0 2
9.1 3.1 0.2 0.08 0.12 0 0 0 0 2
9 3.2 0.2 0.06 0.14 0 0 0 0 2
8.9 3.1 0.2 0.08 0.12 0 0 0 0 2
8.8 2.9 0.2 0.1 0.1 0 0 0 0 2

1 9 1 1 1 1 LPUPIL
6.8 2.9 0.2 0.1 0.1 0 0 0 0 2
6.9 3.1 0.2 0.08 0.12 0 0 0 0 2
7 3.2 0.2 0.06 0.14 0 0 0 0 2
7.1 3.1 0.2 0.08 0.12 0 0 0 0 2
7.2 2.9 0.2 0.1 0.1 0 0 0 0 2
7.1 3.1 0.2 0.08 0.12 0 0 0 0 2
7 3.2 0.2 0.06 0.14 0 0 0 0 2
6.9 3.1 0.2 0.08 0.12 0 0 0 0 2
6.8 2.9 0.2 0.1 0.1 0 0 0 0 2

0 2 1 0.88887 0.850980392 0.835294118 RECT
5 3.3 0.3 5 3.3 1 0 0 0 2
5 3.3 0.3 5 3.3 1 0 0 0 2
87 changes: 87 additions & 0 deletions headHappy.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
1 9 0 0.88887 0.850980392 0.835294118 HEAD
8 5 0 4 4 0 0 0 0 5
8 5 0 6 6 0 0 0 0 5
7 6 0 6 6 0 0 0 0 5
6 5 0 6 6 0 0 0 0 5
7 6 0 6 6 0 0 0 0 5
8 5 0 6 6 0 0 0 0 5
9 6 0 6 6 0 0 0 0 5
10 5 0 6 6 0 0 0 0 5
8 5 0 4 4 0 0 0 0 5

1 9 0 0.88887 0.850980392 0.835294118 LEYE
7 4 0.2 0.4 1.6 0 0 0 0 5
7 4 0.2 0.6 2.4 0 0 0 0 5
6 5 0.2 0.6 2.4 0 0 0 0 5
5 4 0.2 0.6 2.4 0 0 0 0 5
6 5 0.2 0.6 2.4 0 0 0 0 5
7 4 0.2 0.6 2.4 0 0 0 0 5
8 5 0.2 0.6 2.4 0 0 0 0 5
9 4 0.2 0.6 2.4 0 0 0 0 5
7 4 0.2 0.4 1.6 0 0 0 0 5

1 9 0 0.88887 0.850980392 0.835294118 REYE
9 4 0.2 0.4 1.6 0 0 0 0 5
9 4 0.2 0.6 2.4 0 0 0 0 5
8 5 0.2 0.6 2.4 0 0 0 0 5
7 4 0.2 0.6 2.4 0 0 0 0 5
8 5 0.2 0.6 2.4 0 0 0 0 5
9 4 0.2 0.6 2.4 0 0 0 0 5
10 5 0.2 0.6 2.4 0 0 0 0 5
11 4 0.2 0.6 2.4 0 0 0 0 5
9 4 0.2 0.4 1.6 0 0 0 0 5

1 9 0 0.88887 0.850980392 0.835294118 MOUTH
8 2 0.2 0.5 0.5 0 0 0 0 5
8 1.5 0.2 0.75 0.75 0 0 0 0 5
7 2.5 0.2 0.75 0.75 0 0 0 0 5
6 1.5 0.2 0.75 0.75 0 0 0 0 5
7 2.5 0.2 0.75 0.75 0 0 0 0 5
8 1.5 0.2 0.75 0.75 0 0 0 0 5
9 2.5 0.2 0.75 0.75 0 0 0 0 5
10 1.5 0.2 0.75 0.75 0 0 0 0 5
8 2 0.2 0.5 0.5 0 0 0 0 5

1 9 0 1 1 1 FACE
8 3 0.1 2 1.8 0 0 0 0 5
8 3 0.1 3 2.7 0 0 0 0 5
7 4 0.1 3 2.7 0 0 0 0 5
6 3 0.1 3 2.7 0 0 0 0 5
7 4 0.1 3 2.7 0 0 0 0 5
8 3 0.1 3 2.7 0 0 0 0 5
9 4 0.1 3 2.7 0 0 0 0 5
10 3 0.1 3 2.7 0 0 0 0 5
8 3 0.1 2 1.8 0 0 0 0 5

1 9 0 1 1 1 RPUPIL
8.8 2.9 0.2 0.1 0.1 0 0 0 0 5
8.8 2.9 0.2 0.15 0.15 0 0 0 0 5
7.8 3.9 0.2 0.15 0.15 0 0 0 0 5
6.8 2.9 0.2 0.15 0.15 0 0 0 0 5
7.8 3.9 0.2 0.15 0.15 0 0 0 0 5
8.8 2.9 0.2 0.15 0.15 0 0 0 0 5
9.8 3.9 0.2 0.15 0.15 0 0 0 0 5
10.8 2.9 0.2 0.15 0.15 0 0 0 0 5
8.8 2.9 0.2 0.1 0.1 0 0 0 0 5

1 9 0 1 1 1 LPUPIL
6.8 2.9 0.2 0.1 0.1 0 0 0 0 5
6.8 2.9 0.2 0.15 0.15 0 0 0 0 5
5.8 3.9 0.2 0.15 0.15 0 0 0 0 5
4.8 2.9 0.2 0.15 0.15 0 0 0 0 5
5.8 3.9 0.2 0.15 0.15 0 0 0 0 5
6.8 2.9 0.2 0.15 0.15 0 0 0 0 5
7.8 3.9 0.2 0.15 0.15 0 0 0 0 5
8.6 2.9 0.2 0.15 0.15 0 0 0 0 5
6.8 2.9 0.2 0.1 0.1 0 0 0 0 5

0 9 0 0.88887 0.850980392 0.835294118 RECT
5 3.3 0.3 5 3.3 1 0 0 0 5
4.9 3.3 0.3 7.5 4.95 1 0 0 0 5
3.9 4.3 0.3 7.5 4.95 1 0 0 0 5
2.9 3.3 0.3 7.5 4.95 1 0 0 0 5
3.9 4.3 0.3 7.5 4.95 1 0 0 0 5
4.9 3.3 0.3 7.5 4.95 1 0 0 0 5
5.9 4.3 0.3 7.5 4.95 1 0 0 0 5
6.9 3.3 0.3 7.5 4.95 1 0 0 0 5
5 3.3 0.3 5 3.3 1 0 0 0 5
43 changes: 43 additions & 0 deletions headSad.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
1 2 1 0.88887 0.850980392 0.835294118 HEAD
8 5 0 4 4 0 0 0 0 2
8 5 0 4 4 0 0 0 0 2

1 2 1 0.88887 0.850980392 0.835294118 LEYE
7 4 0.2 0.4 1.6 0 0 0 0 2
7 4 0.2 0.4 1.6 0 0 0 0 2

1 2 1 0.88887 0.850980392 0.835294118 REYE
9 4 0.2 0.4 1.6 0 0 0 0 2
9 4 0.2 0.4 1.6 0 0 0 0 2

1 2 1 0.88887 0.850980392 0.835294118 MOUTH
8 2 0.2 0.5 0.5 0 0 0 0 2
8 2 0.2 0.5 0.5 0 0 0 0 2

1 2 1 1 1 1 FACE
8 3 0.1 2 1.8 0 0 0 0 2
8 3 0.1 2 1.8 0 0 0 0 2

1 2 1 1 1 1 RPUPIL
9.0 2.9 0.2 0.1 0.1 0 0 0 0 2
9.0 2.9 0.2 0.1 0.1 0 0 0 0 2

1 2 1 1 1 1 LPUPIL
7.0 2.9 0.2 0.1 0.1 0 0 0 0 2
7.0 2.9 0.2 0.1 0.1 0 0 0 0 2

0 2 1 0.88887 0.850980392 0.835294118 RECT
5 3.3 0.3 5 3.3 1 0 0 0 2
5 3.3 0.3 5 3.3 1 0 0 0 2

1 2 1 0.88887 0.850980392 0.835294118 LTEAR
9.2 2.9 0.2 0.1 0.17 0 0 0 0 10
9.2 1.5 0.2 0.07 0.2 0 0 0 0 10

1 2 1 0.88887 0.850980392 0.835294118 RTEAR
6.7 2.9 0.2 0.07 0.2 0 0 0 0 10
6.7 1.5 0.2 0.07 0.2 0 0 0 0 10

1 2 1 1 1 1 MAKESADFACE
8 1.8 0.21 0.72 0.32 0 0 0 0 2
8 1.8 0.21 0.72 0.32 0 0 0 0 2
Loading

0 comments on commit 90d2673

Please sign in to comment.