Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Commit

Permalink
Merge pull request #105 from JimMarlowe/JM-BFLY-1286
Browse files Browse the repository at this point in the history
Fix both butterfly examples #1286
  • Loading branch information
JoshEngebretson committed Dec 29, 2016
2 parents cfa4c4e + f8004ab commit 1c9cc28
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
23 changes: 22 additions & 1 deletion Butterflies/CSharp/Resources/Components/Spawner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ void Update(float timeStep)

for (var i = 0; i < 10; i++)
createButterflyNode(new Vector2(mousePos.X, mousePos.Y));
}
}
else if (input.GetMouseButtonDown(Constants.MOUSEB_RIGHT))
{
var mousePos = input.GetMousePosition();

createButterflyParticle(new Vector2(mousePos.X, mousePos.Y));
}

}

Expand All @@ -38,6 +44,21 @@ void createButterflyNode(Vector2 pos)

}

void createButterflyParticle(Vector2 pos)
{
//project mouse screen position to the world position
var screenPos = viewport.ScreenToWorldPoint((int) pos.X, (int) pos.Y, 0);

//create particle emitter
var emitter = Scene.CreateChild("ButterflyEmitter");

emitter.Position2D = new Vector2(screenPos.X, screenPos.Y);

var pex = emitter.CreateComponent<ParticleEmitter2D>();

pex.SetEffect(GetSubsystem<ResourceCache>().GetResource<ParticleEffect2D> ("Particles/particle.pex"));

}
Viewport viewport;


Expand Down
3 changes: 3 additions & 0 deletions Butterflies/JavaScript/Resources/Scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
// create a scene
var scene = new Atomic.Scene();

// assign scene into global so it's not GC'd
Atomic.Player.currentScene = scene;

// create an octree component
scene.createComponent("Octree");

Expand Down

0 comments on commit 1c9cc28

Please sign in to comment.