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

Fix both butterfly examples #1286 #105

Merged
merged 2 commits into from Dec 29, 2016
Merged

Fix both butterfly examples #1286 #105

merged 2 commits into from Dec 29, 2016

Conversation

ghost
Copy link

@ghost ghost commented Dec 28, 2016

the JS butterfly example need the Scene object to be referenced so not to be GC'd. I attached it to the Atomic.Player, since that's where it would have been attached if it had loaded a scene.
The CS butterfly example did not have the butterfly emitter with the right mouse button, so that was added.

Copy link
Contributor

@JoshEngebretson JoshEngebretson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR. This is looking good, only issue is seems have C# editor set to tabs... I know, right? :)

var mousePos = input.GetMousePosition();

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good add, though looks like we picked up some tabs here 🌮

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm, I blame pasting into monodevelop! fixed.

@@ -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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch :)

@JoshEngebretson
Copy link
Contributor

Awesome, thanks :) We all get a bit of tab (or space) tar on us when visiting the pits :)

LANDING! ✈️

@JoshEngebretson JoshEngebretson merged commit 1c9cc28 into AtomicGameEngine:master Dec 29, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant