Add descriptions to scenario and slightly change scenario view
This commit is contained in:
parent
38b41a6053
commit
cecd9e20f6
2 changed files with 26 additions and 7 deletions
|
@ -30,10 +30,10 @@ public class Scenario {
|
|||
|
||||
// the levels in the right order.
|
||||
public static final ArrayList<Integer> SCENARIOS = new ArrayList<Integer>() {{
|
||||
add(LVL_ANGER);
|
||||
add(LVL_JOY);
|
||||
add(LVL_SURPRISE);
|
||||
add(LVL_ANGER);
|
||||
add(LVL_SADDNESS);
|
||||
add(LVL_SURPRISE);
|
||||
}};
|
||||
|
||||
static int DESIRED_FPS = 25;
|
||||
|
@ -354,13 +354,31 @@ public class Scenario {
|
|||
|
||||
switch(id) {
|
||||
case LVL_ANGER:
|
||||
return "I am sooo ANGRY";
|
||||
return "CEO";
|
||||
case LVL_JOY:
|
||||
return "Let's be joyfull!";
|
||||
return "The Conversation";
|
||||
case LVL_SURPRISE:
|
||||
return "What a surprise";
|
||||
return "Party time!";
|
||||
case LVL_SADDNESS:
|
||||
return "Please, don't cry...";
|
||||
return "Six feet under";
|
||||
}
|
||||
return "...";
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
|
||||
switch(id) {
|
||||
case LVL_ANGER:
|
||||
return "You're CEO of a big company. Remarkably, research shows that CEO's of big companies look generally more angry and disgusted when the company is doing well.\n" +
|
||||
"\n" +
|
||||
"However, you're company is not doing well. Make sure you hide this for the press that is watching every move!";
|
||||
case LVL_JOY:
|
||||
return "You're at a job interview, and you know your face is being monitored.\n" +
|
||||
"Make sure that you express your enthusiasm for the job!";
|
||||
case LVL_SURPRISE:
|
||||
return "Your friends have organised a surprise party and you've found out! However, you don't want them to know this. First keep calm and then make sure you're as surprised and joyful as possible!\n";
|
||||
case LVL_SADDNESS:
|
||||
return "You're at the funeral of your great aunt. You don't really know her, but still want to show your respect.";
|
||||
}
|
||||
return "...";
|
||||
}
|
||||
|
|
|
@ -135,6 +135,7 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
|
|||
|
||||
@Override
|
||||
public void onDraw(Canvas canvas) {
|
||||
// canvas.drawColor(0x00AAAAAA);
|
||||
//do drawing stuff here.
|
||||
|
||||
float height = canvas.getHeight();
|
||||
|
@ -167,7 +168,7 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
|
|||
float cy = bottomline_height;
|
||||
|
||||
|
||||
canvas.drawCircle(cx, cy, max_ball_radius, mainPaint);
|
||||
// canvas.drawCircle(cx, cy, max_ball_radius, mainPaint);
|
||||
canvas.drawCircle(cx, cy, max_ball_radius + 5, emoOutlinePaints.get(emotion));
|
||||
|
||||
// canvas.drawCircle(cx, cy, max_ball_radius * value/100, emoPaints.get(emotion.ordinal()));
|
||||
|
|
Loading…
Reference in a new issue