Browse Source

Some cleanups

Josh Engebretson 10 years ago
parent
commit
1f7f86cd10

+ 10 - 0
Butterflies/Resources/Components/Butterfly.js

@@ -3,6 +3,8 @@
 var halfWidth = Atomic.graphics.width * Atomic.PIXEL_SIZE * 0.5;
 var halfHeight = Atomic.graphics.height * Atomic.PIXEL_SIZE * 0.5;
 
+var animationSet = Atomic.cache.getResource("AnimationSet2D", "Sprites/butterfly.scml");
+
 exports.component = function(self) {
 
     var node = self.node;
@@ -10,6 +12,14 @@ exports.component = function(self) {
     self.rotationSpeed = 10;
     self.direction = Math.random() * Math.PI * 2;
     self.time = 0.0;
+    
+    var spr = node.createComponent("AnimatedSprite2D");
+
+    spr.animationSet = animationSet;
+    spr.setAnimation("idle");
+    spr.color = [.1 + Math.random() * .9, .1 + Math.random() * .9, .1 + Math.random() * .9, 1];
+    spr.blendMode = Atomic.BLEND_ALPHA;
+    
 
     self.start = function() {
 

+ 1 - 9
Butterflies/Resources/Components/Spawner.js

@@ -1,12 +1,11 @@
 'atomic component';
 
 var viewport = Atomic.renderer.getViewport(0);
-var animationSet = Atomic.cache.getResource("AnimationSet2D", "Sprites/butterfly.scml");
+
 var particleEffect = Atomic.cache.getResource("ParticleEffect2D", "Particles/particle.pex");
 
 exports.component = function(self) {
 
-
     self.update = function(timeStep) {
 
         if (Atomic.input.getMouseButtonDown(Atomic.MOUSEB_LEFT)) {
@@ -16,13 +15,6 @@ exports.component = function(self) {
 
             var butterfly = self.scene.createChild("Butterfly");
             butterfly.position2D = pos;
-
-            var spr = butterfly.createComponent("AnimatedSprite2D");
-
-            spr.animationSet = animationSet;
-            spr.setAnimation("idle");
-            spr.color = [.1 + Math.random() * .9, .1 + Math.random() * .9, .1 + Math.random() * .9, 1];
-            spr.blendMode = Atomic.BLEND_ALPHA;
             butterfly.createJSComponent("Components/Butterfly.js");
 
         } else if (Atomic.input.getMouseButtonPress(Atomic.MOUSEB_RIGHT)) {