Skip to content

Commit

Permalink
Merge pull request #5 from gabriel-skantze/disable_random_moves
Browse files Browse the repository at this point in the history
The random facial movements are moved from the AbstractFace to the Sy…
  • Loading branch information
LedanDark committed Apr 12, 2017
2 parents b509114 + 53e8c5a commit 5ee6471
Show file tree
Hide file tree
Showing 3 changed files with 657 additions and 515 deletions.
43 changes: 43 additions & 0 deletions core/src/iristk/situated/SystemAgent.java
Expand Up @@ -26,6 +26,11 @@ public class SystemAgent extends Agent {
private File staticFolder;

private HashMap<String,Item> items = new HashMap<>();

//The blinking is enabled in all skills by default
private boolean blinkingEnabled = true;
//The random face movements are enabled in all skills by default
private boolean randomMovementsEnabled = true;

public SystemAgentModule systemAgentModule = null;

Expand Down Expand Up @@ -512,5 +517,43 @@ public static String processDisplay(String text, String display) {
}
return display;
}

/**
* Returns if the agent should perform the blinking action or not
*
* @return blinkingEnabled
*/
public boolean shouldBlink() {
return blinkingEnabled;
}


/**
* Controls if the agent should perform the blinking movement
*
* @param b true if the agent should blink, false otherwise
*/
public void enableBlinking(boolean b) {
blinkingEnabled = b;
}

/**
* Returns if the agent should perform the random facial movements or not
*
* @return randomMovementsEnabled
*/
public boolean shouldPerformRandomMovements() {
return randomMovementsEnabled;
}


/**
* Controls if the agent should perform the random facial movements.
*
* @param b true if the agent should perform random movements, false otherwise
*/
public void enableRandomMovements(boolean b) {
randomMovementsEnabled = b;
}

}

0 comments on commit 5ee6471

Please sign in to comment.