Skip to content

Disabled random resizing of bubbles in Bubble Pop #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevindeland merged 1 commit into from
Aug 10, 2018
Merged

Disabled random resizing of bubbles in Bubble Pop #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_MC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,8 @@ public void doLayout(int width, int height, CBp_Data data) {

// This is the scale the bubble will expand too.
//
SBubbles[i1].setAssignedScale(getRandInRange(_scaleRange));
//SBubbles[i1].setAssignedScale(getRandInRange(_scaleRange));
SBubbles[i1].setAssignedScale(1.0f);

Paint paint = new Paint();

Expand Down
9 changes: 6 additions & 3 deletions comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBp_Mechanic_RISE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ private boolean launchBubble() {
String correctVal = _currData.answer;

nextBubble.setColor(BP_CONST.bubbleColors[colorNdx]);
nextBubble.setScale(getRandInRange(_scaleRange));
//nextBubble.setScale(getRandInRange(_scaleRange));
nextBubble.setScale(1.0f);

// Cycle on the indexes to display
//
Expand All @@ -238,7 +239,8 @@ private boolean launchBubble() {

//Moved set color and scale here after text has been set
nextBubble.setColor(BP_CONST.bubbleColors[colorNdx]);
nextBubble.setScale(getRandInRange(_scaleRange));
//nextBubble.setScale(getRandInRange(_scaleRange));
nextBubble.setScale(1.0f);

int[] shapeSet = BP_CONST.drawableMap.get(responseVal);

Expand All @@ -261,7 +263,8 @@ private boolean launchBubble() {

//Moved set color and scale here after text has been set
nextBubble.setColor(BP_CONST.bubbleColors[colorNdx]);
nextBubble.setScale(getRandInRange(_scaleRange));
//nextBubble.setScale(getRandInRange(_scaleRange));
nextBubble.setScale(1.0f);

break;
}
Expand Down