Feature/particles view update #375
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,11 +13,10 @@ | |
| import android.graphics.drawable.ShapeDrawable; | ||
| import android.graphics.drawable.shapes.RectShape; | ||
| import android.support.v4.content.ContextCompat; | ||
| import android.support.v4.util.Pair; | ||
| import android.util.AttributeSet; | ||
| import android.view.View; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Random; | ||
|
|
@@ -27,13 +26,22 @@ | |
|
|
||
| public class ParticlesAnimationView extends View { | ||
|
|
||
| @SuppressWarnings("unused") | ||
| private static final String TAG = ParticlesAnimationView.class.getSimpleName(); | ||
|
|
||
| // Use a single static Random generator to ensure the randomness. Also save memory. | ||
| private static final Random random = new Random(); | ||
|
|
||
| private static final int MAX_HEXAGONS = 40; | ||
|
|
||
| private static final int LINK_HEXAGON_DISTANCE = 600; | ||
|
|
||
| private final Paint paint = new Paint(); | ||
|
|
||
| private final List<Particle> particles = new ArrayList<>(); | ||
|
|
||
| private final List<Line> lines = new ArrayList<>(); | ||
|
|
||
| public ParticlesAnimationView(Context context) { | ||
| this(context, null); | ||
| } | ||
|
|
@@ -54,18 +62,32 @@ public void onWindowFocusChanged(boolean hasWindowFocus) { | |
| if (hasWindowFocus) { | ||
| particles.clear(); | ||
| particles.addAll(createParticles(MAX_HEXAGONS)); | ||
|
|
||
| lines.clear(); | ||
| for (int i = 0; i < particles.size() - 1; i++) { | ||
| Particle particle = particles.get(i); | ||
| // So there are exactly C(particles.size(), 2) (Mathematical Combination) number of lines, which makes more sense. | ||
| for (int j = i + 1; j < particles.size(); j++) { | ||
| lines.add(new Line(particle, particles.get(j))); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDetachedFromWindow() { | ||
| super.onDetachedFromWindow(); | ||
| lines.clear(); | ||
| particles.clear(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDraw(Canvas canvas) { | ||
| super.onDraw(canvas); | ||
| for (int i = 0, size = particles.size(); i < size; i++) { | ||
| particles.get(i).draw(canvas, paint); | ||
| } | ||
|
|
||
| for (int i = 0, size = lines.size(); i < size; i++) { | ||
| lines.get(i).draw(canvas, paint); | ||
| } | ||
|
|
@@ -100,68 +122,43 @@ public Shader resize(int width, int height) { | |
| private List<Particle> createParticles(int count) { | ||
| List<Particle> particles = new ArrayList<>(); | ||
| for (int i = 0; i < count; i++) { | ||
| particles.add(new Particle(getWidth(), getHeight(), this)); | ||
| } | ||
| return particles; | ||
| } | ||
|
|
||
| /** | ||
| * A Pair of 'Particles' whose centers can be 'linked to each other ... Called 'Line'. | ||
|
|
||
| */ | ||
| private static class Line extends Pair<Particle, Particle> { | ||
|
|
||
| private static final int MAX_ALPHA = 172; | ||
|
|
||
| /** | ||
| * Constructor for a Pair. | ||
| * | ||
| * @param first the first object in the Pair | ||
| * @param second the second object in the pair | ||
| */ | ||
| Line(Particle first, Particle second) { | ||
| super(first, second); | ||
| } | ||
|
|
||
| void draw(Canvas canvas, Paint paint) { | ||
| if (!first.shouldBeLinked(LINK_HEXAGON_DISTANCE, second)) { | ||
|
There was a problem hiding this comment. In my opinion, There was a problem hiding this comment. @roana0229 not really get your full point, but do you mean to call Yesterday I thought about something like: @Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
for (int i = 0, size = particles.size(); i < size; i++) {
particles.get(i).draw(canvas, paint);
}
// for (int i = 0, size = lines.size(); i < size; i++) {
// lines.get(i).draw(canvas, paint);
//}
for (int i = 0; i < particles.size() - 1; i++) {
for (int j = i + 1; j < particles.size(); j++) {
if (particles.get(i).shouldBeLinked(LINK_HEXAGON_DISTANCE, particles.get(j))) {
// TODO draw, use the code from Line
}
}
}
}I think what you mean is the following: // ParticlesAnimationView
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
for (int i = 0, size = particles.size(); i < size; i++) {
particles.get(i).draw(canvas, paint);
}
for (int i = 0, size = lines.size(); i < size; i++) {
if (lines.get(i).shouldDraw()) {
lines.get(i).draw(canvas, paint);
}
}
}
// ParticlesAnimationView$Line
///// shouldDraw simply returns the comparison
boolean shouldDraw() {
return first.shouldBeLinked(LINK_HEXAGON_DISTANCE, second);
}Neither of above gain any huge impact (but the later looks clean and better, in fact :D). For now I would like to keep current version (this PR is pretty huge now) and maybe another PR from you if you really want to :p. So it is up to you ^^. There was a problem hiding this comment. I thought that
OK! 😄 |
||
| return; | ||
| } | ||
|
|
||
| final double distance = Math.sqrt( | ||
| Math.pow(second.center.x - first.center.x, 2) + Math.pow((second.center.y - first.center.y), 2) | ||
| ); | ||
| final int alpha = MAX_ALPHA - (int) Math.floor(distance * MAX_ALPHA / LINK_HEXAGON_DISTANCE); | ||
| paint.setAlpha(alpha); | ||
| canvas.drawLine(first.center.x, first.center.y, second.center.x, second.center.y, paint); | ||
| } | ||
| } | ||
|
|
||
| private static class Particle { | ||
|
|
||
| private static final int MAX_ALPHA = 128; | ||
| private static final float BASE_RADIUS = 100f; | ||
|
|
@@ -173,27 +170,37 @@ private class Particle { | |
| private Point center; | ||
| private Point vector; | ||
|
|
||
| final Path path = new Path(); | ||
|
|
||
| Particle(int maxWidth, int maxHeight, View view) { | ||
| this(maxWidth, maxHeight, view.getWidth(), view.getHeight()); | ||
| } | ||
|
|
||
| Particle(int maxWidth, int maxHeight, int hostWidth, int hostHeight) { | ||
| center = new Point(); | ||
| vector = new Point(); | ||
| reset(maxWidth, maxHeight); | ||
| center.x = (int) (hostWidth - hostWidth * random.nextFloat()); | ||
| center.y = (int) (hostHeight - hostHeight * random.nextFloat()); | ||
| } | ||
|
|
||
| boolean shouldBeLinked(int linkedDistance, Particle particle) { | ||
| if (this.equals(particle)) { | ||
| return false; | ||
| } | ||
| // Math.pow(x, 2) and x * x stuff, for your information and my curiosity. | ||
| // ref: http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/5755b2aee8e8/src/share/vm/opto/library_call.cpp#l1799 | ||
| final double distance = Math.sqrt( | ||
| Math.pow(particle.center.x - this.center.x, 2) + Math.pow(particle.center.y - this.center.y, 2) | ||
| ); | ||
| return distance < linkedDistance; | ||
| } | ||
|
|
||
| void draw(Canvas canvas, Paint paint) { | ||
| move(canvas.getWidth(), canvas.getHeight()); | ||
| paint.setAlpha(alpha); | ||
| createHexagonPathOrUpdate(center.x, center.y, scale); | ||
| canvas.drawPath(this.path, paint); | ||
| } | ||
|
|
||
| private void move(int maxWidth, int maxHeight) { | ||
|
|
@@ -216,7 +223,6 @@ private void move(int maxWidth, int maxHeight) { | |
| } | ||
|
|
||
| private void reset(int maxWidth, int maxHeight) { | ||
| scale = random.nextFloat() + random.nextFloat(); | ||
| alpha = random.nextInt(MAX_ALPHA + 1); | ||
| moveSpeed = random.nextFloat() + random.nextFloat() + 0.5f; | ||
|
|
@@ -247,8 +253,8 @@ private void reset(int maxWidth, int maxHeight) { | |
| } | ||
| } | ||
|
|
||
| private void createHexagonPathOrUpdate(float centerX, float centerY, float scale) { | ||
| path.reset(); | ||
| final int radius = (int) (BASE_RADIUS * scale); | ||
| for (int i = 0; i < 6; i++) { | ||
| float x = (float) (centerX + radius * (Math.cos(2.0 * i * Math.PI / 6.0 + Math.PI))); | ||
|
|
@@ -260,7 +266,6 @@ private Path getHexagonPath(float centerX, float centerY, float scale) { | |
| } | ||
| } | ||
| path.close(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🆒