Merge branch 'master' of git://github.com/lukemaurer/cs510fly

Author: Tom Stellard

Airplane.cpp

@@ -1,5 +1,8 @@
 #include "Airplane.h"
 
+#include "Target.h"
+#include "World.h"
+
 const Ogre::String Airplane::SCENE_NODE_NAME = "Airplane";
 
 static const float MINIMUM_TIME_STEP = 0.01f;
@@ -220,6 +223,8 @@ void Airplane::checkGroundCollision() {
     if (state.position.y < Y_MIN) {
         if (state.velocity.y < -LANDING_ROD_MAX || getPitch() < LANDING_PITCH_MIN)
             crash();
+        else
+            land();
 
         state.position.y = Y_MIN;
         state.velocity.y = 0.0f;
@@ -237,6 +242,11 @@ void Airplane::crash() {
 
 }
 
+void Airplane::land() {
+    if (game->getWorld()->getTarget()->inRange(this))
+        game->win();
+}
+
 void Airplane::stopEngine() {
     if(!engineOn){
         return;

Airplane.h

@@ -59,6 +59,7 @@ class Airplane : public Object {
     static float dragCoefficient(float aoa);
 
     void checkGroundCollision();
+    void land();
     void crash();
 
     void updateSound();

Game.cpp

@@ -153,6 +153,8 @@ bool Game::setup() {
 }
 
 void Game::startLevel(int index) {
+    currentLevelIndex = index;
+    
     world.reset(new World(this));
     currentLevel = levels[index].get();
     currentLevel->populate(world.get());
@@ -192,9 +194,13 @@ bool Game::checkBreak() {
 
 void Game::lose() {
     cameraNode->translate(Ogre::Vector3(0.0f, 10.0f, 50.0f));
-    std::cerr << "FAIL\n";
 }
 
+void Game::win() {
+    startLevel((currentLevelIndex + 1) % levels.size());
+}
+
+
 bool Game::loadWavFile(ALuint * buffer, std::string file) {
 
 #ifdef LINUX

Game.h

@@ -37,6 +37,7 @@ class Game {
     Ogre::String levelPath;
     Ogre::String audioPath;
     std::vector<std::tr1::shared_ptr<const Level> > levels;
+    int currentLevelIndex;
     const Level *currentLevel;
     std::auto_ptr<World> world;
     std::auto_ptr<Display> display;
@@ -67,6 +68,7 @@ class Game {
 
     void startLevel(int index);
     void lose();
+    void win();
 private:
     bool setup();
     bool loadWavFile(ALuint *buffer, std::string file);

Target.cpp

@@ -2,6 +2,8 @@
 
 #include "Airplane.h"
 
+static const float RANGE = 50.0f;
+
 Target::Target(Ogre::SceneNode * sceneNode) : sceneNode(sceneNode){
 
     Ogre::SceneManager * sceneManager = sceneNode->getCreator();
@@ -17,4 +19,8 @@ Target::~Target() { }
 
 Ogre::Vector3 Target::displacement(const Airplane * airplane) const {
     return sceneNode->getPosition() - airplane->getPosition();
+}
+
+bool Target::inRange(const Airplane * airplane) const {
+    return airplane->getPosition().squaredDistance(sceneNode->getPosition()) < RANGE * RANGE;
 }

Target.h

@@ -8,4 +8,5 @@ class Target{
     ~Target();
 
     Ogre::Vector3 displacement(const Airplane *) const;
+    bool inRange(const Airplane *) const;
 };