10 năm trước cách đây · 53708ab411
--- a/img/anti-muon/anti-muon-1.png
+++ b/img/anti-muon/anti-muon-1.png
--- a/img/anti-muon/anti-muon-2.png
+++ b/img/anti-muon/anti-muon-2.png
--- a/img/anti-muon/anti-muon-3.png
+++ b/img/anti-muon/anti-muon-3.png
--- a/img/anti-muon/anti-muon-4.png
+++ b/img/anti-muon/anti-muon-4.png
--- a/img/anti-muon/anti-muon-5.png
+++ b/img/anti-muon/anti-muon-5.png
--- a/img/anti-muon/anti-muon-6.png
+++ b/img/anti-muon/anti-muon-6.png
--- a/img/anti-muon/anti-muon-7.png
+++ b/img/anti-muon/anti-muon-7.png
--- a/img/anti-muon/anti-muon-8.png
+++ b/img/anti-muon/anti-muon-8.png
--- a/img/anti-muon/anti-muon.gif
+++ b/img/anti-muon/anti-muon.gif
--- a/img/anti-muon/anti-muon.xcf
+++ b/img/anti-muon/anti-muon.xcf
--- a/img/electron/electron-1.png
+++ b/img/electron/electron-1.png
--- a/img/electron/electron-2.png
+++ b/img/electron/electron-2.png
--- a/img/electron/electron-3.png
+++ b/img/electron/electron-3.png
--- a/img/electron/electron-4.png
+++ b/img/electron/electron-4.png
--- a/img/electron/electron-5.png
+++ b/img/electron/electron-5.png
--- a/img/electron/electron-6.png
+++ b/img/electron/electron-6.png
--- a/img/electron/electron-7.png
+++ b/img/electron/electron-7.png
--- a/img/electron/electron-8.png
+++ b/img/electron/electron-8.png
--- a/img/electron/electron.gif
+++ b/img/electron/electron.gif
--- a/img/electron/electron.xcf
+++ b/img/electron/electron.xcf
--- a/img/higgs/higgs-1.png
+++ b/img/higgs/higgs-1.png
--- a/img/higgs/higgs-10.png
+++ b/img/higgs/higgs-10.png
--- a/img/higgs/higgs-2.png
+++ b/img/higgs/higgs-2.png
--- a/img/higgs/higgs-3.png
+++ b/img/higgs/higgs-3.png
--- a/img/higgs/higgs-4.png
+++ b/img/higgs/higgs-4.png
--- a/img/higgs/higgs-5.png
+++ b/img/higgs/higgs-5.png
--- a/img/higgs/higgs-6.png
+++ b/img/higgs/higgs-6.png
--- a/img/higgs/higgs-7.png
+++ b/img/higgs/higgs-7.png
--- a/img/higgs/higgs-8.png
+++ b/img/higgs/higgs-8.png
--- a/img/higgs/higgs-9.png
+++ b/img/higgs/higgs-9.png
--- a/img/higgs/higgs.gif
+++ b/img/higgs/higgs.gif
--- a/img/higgs/higgs.xcf
+++ b/img/higgs/higgs.xcf
--- a/img/muon/muon-1.png
+++ b/img/muon/muon-1.png
--- a/img/muon/muon-2.png
+++ b/img/muon/muon-2.png
--- a/img/muon/muon-3.png
+++ b/img/muon/muon-3.png
--- a/img/muon/muon-4.png
+++ b/img/muon/muon-4.png
--- a/img/muon/muon-5.png
+++ b/img/muon/muon-5.png
--- a/img/muon/muon-6.png
+++ b/img/muon/muon-6.png
--- a/img/muon/muon-7.png
+++ b/img/muon/muon-7.png
--- a/img/muon/muon-8.png
+++ b/img/muon/muon-8.png
--- a/img/muon/muon.gif
+++ b/img/muon/muon.gif
--- a/img/muon/muon.xcf
+++ b/img/muon/muon.xcf
--- a/img/physicist/physicist-1.png
+++ b/img/physicist/physicist-1.png
--- a/img/physicist/physicist-2.png
+++ b/img/physicist/physicist-2.png
--- a/img/physicist/physicist-3.png
+++ b/img/physicist/physicist-3.png
--- a/img/physicist/physicist-4.png
+++ b/img/physicist/physicist-4.png
--- a/img/physicist/physicist-5.png
+++ b/img/physicist/physicist-5.png
--- a/img/physicist/physicist-6.png
+++ b/img/physicist/physicist-6.png
--- a/img/physicist/physicist-7.png
+++ b/img/physicist/physicist-7.png
--- a/img/physicist/physicist-8.png
+++ b/img/physicist/physicist-8.png
--- a/img/physicist/physicist.gif
+++ b/img/physicist/physicist.gif
--- a/img/physicist/physicist.xcf
+++ b/img/physicist/physicist.xcf
--- a/img/positron/positron-1.png
+++ b/img/positron/positron-1.png
--- a/img/positron/positron-2.png
+++ b/img/positron/positron-2.png
--- a/img/positron/positron-3.png
+++ b/img/positron/positron-3.png
--- a/img/positron/positron-4.png
+++ b/img/positron/positron-4.png
--- a/img/positron/positron-5.png
+++ b/img/positron/positron-5.png
--- a/img/positron/positron-6.png
+++ b/img/positron/positron-6.png
--- a/img/positron/positron-7.png
+++ b/img/positron/positron-7.png
--- a/img/positron/positron-8.png
+++ b/img/positron/positron-8.png
--- a/img/positron/positron.gif
+++ b/img/positron/positron.gif
--- a/img/positron/positron.xcf
+++ b/img/positron/positron.xcf
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 
				 <html>
			
 
				 <head>
			
 
				 	<title>Snakey Particles</title>
			
 
				-	<script src="https://code.createjs.com/createjs-2015.05.21.min.js"></script>
			
 
				+	<script src="https://code.createjs.com/createjs-2015.05.21.combined.js"></script>
			
 
				 	<script src="js/views/physicist.js"></script>
			
 
				 	<script src="js/views/particle.js"></script>
			
 
				 	<script src="js/models/physicist.js"></script>
			
--- a/js/controller.js
+++ b/js/controller.js
@@ -16,7 +16,7 @@ var Controller = function(){
 
				 
			
 
				 	this.possible_collectibles = [
			
 
				 		{collectible: higgs, probability: 3e-3},
			
 
				-		{collectible: electron, probability: .05}
			
 
				+		{collectible: electron, probability: .5}
			
 
				 		]
			
 
				 	this.stage = new createjs.Stage("demoCanvas");
			
 
				 }
			
@@ -34,9 +34,9 @@ Controller.prototype.spawn_collectibles = function(){
 
				 	var rnd_pos = this.get_random_position();
			
 
				 	if (this.is_position_free(rnd_pos)) {
			
 
				 		collectible.position = rnd_pos;
			
 
				+		this.collectibles.push(collectible);
			
 
				+		this.add_view(new ParticleView(collectible));
			
 
				 	}
			
 
				-	this.collectibles.push(collectible);
			
 
				-    this.add_view(new ParticleView(collectible));
			
 
				 }
			
 
				 
			
 
				 Controller.prototype.start_game = function(){
			
--- a/js/models/particle.js
+++ b/js/models/particle.js
@@ -2,6 +2,14 @@ var Particle = function(position){
 
				 	Collectible.call(this, position);
			
 
				 	this.type = "Higgs";
			
 
				 	this.mass = 125;
			
 
				+	this.draw_properties = {
			
 
				+		colors: ["hsl(0, 100%, 50%)", "hsl(0, 40%, 50%)"],
			
 
				+		ratios: [0, 1],
			
 
				+		inner_radius: .03,
			
 
				+		outer_radius: .13,
			
 
				+		inner_center: {x: .07, y: .07},
			
 
				+		outer_center: {x: 0, y: 0}
			
 
				+		};
			
 
				 	this.charge = 0;
			
 
				 	this.start_time = 1234;
			
 
				 	this.decay_time = 4444;
			
--- a/js/script.js
+++ b/js/script.js
@@ -10,12 +10,12 @@ function init() {
 
				 
			
 
				     controller.start_game();
			
 
				 
			
 
				-    var p2 = new Particle({x: 10, y: 10});
			
 
				+    var p2 = new Particle({x: 3, y: 3});
			
 
				     p2.start_time = createjs.Ticker.getTime();
			
 
				     p2.target = {
			
 
				         time: p2.start_time + 1000,
			
 
				-        x: 12,
			
 
				-        y: 15
			
 
				+        x: 10,
			
 
				+        y: 7
			
 
				     }
			
 
				     var p2v = new ParticleView(p2);
			
 
				     controller.add_view(p2v);
			
--- a/js/views/particle.js
+++ b/js/views/particle.js
@@ -1,7 +1,13 @@
 
				 (function(window) {
			
 
				     function ParticleView(modelObject){
			
 
				-        this.graphics.beginFill("blue").drawCircle(0, 0, window.cell_size * 0.15 / 2);
			
 
				         this.model = modelObject;
			
 
				+		var dp = this.model.draw_properties;
			
 
				+		var cs = window.cell_size;
			
 
				+        this.graphics
			
 
				+			.beginRadialGradientFill(dp.colors, dp.ratios, 
			
 
				+				dp.inner_center.x * cs, dp.inner_center.y * cs , dp.inner_radius * cs,
			
 
				+				dp.outer_center.x * cs, dp.outer_center.y * cs, dp.outer_radius * cs)
			
 
				+			.drawCircle(0, 0, cs * dp.outer_radius);
			
 
				     }
			
 
				 
			
 
				     ParticleView.prototype = new createjs.Shape();