From 11a2a8968984d35e59809d5c4ef602db9fac52dc Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Fri, 22 Jun 2012 11:40:11 +0100
Subject: new media files

---
 gaunt01/src/bird.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'gaunt01/src/bird.cpp')

diff --git a/gaunt01/src/bird.cpp b/gaunt01/src/bird.cpp
index 7d9fb02..6e7ff92 100644
--- a/gaunt01/src/bird.cpp
+++ b/gaunt01/src/bird.cpp
@@ -21,6 +21,15 @@ bird::bird()
 	
 	//how to track state/ bring animation in and out
 	state=SCANNING;
+	
+	sounds=new ofSoundPlayer[7];
+	sounds[0].loadSound("aggressive1.wav");
+	sounds[1].loadSound("aggressive2.wav");
+	sounds[2].loadSound("chirp1.wav");
+	sounds[3].loadSound("chirp2.wav");
+	sounds[4].loadSound("rattle1.wav");
+	sounds[5].loadSound("rattle2.wav");
+	sounds[6].loadSound("rattle3.wav");
 
 	texture.loadImage("TextureBird.jpg");
 
@@ -28,7 +37,7 @@ bird::bird()
 	position=ofVec3f(ofRandom(ofGetWidth()/4,(3*ofGetWidth())/4),ofRandom(ofGetHeight()/4,(3*ofGetHeight())/4),-ofGetHeight()/10);
 	heading=-90;
 	direction=ofVec3f(0,-1,0); //director for a heading of 0, level
-	velocity=1.0f/30;
+	velocity=1.0f/20;
 
 	turnRate=20;
 	diveRate=0;
@@ -182,7 +191,7 @@ void bird::update(map<int,player>& players, float angle){
 		//influence direction
 		turnRate+=playhead[nearnum]*.1;
 		//check if relatively high
-		if (position.z<-ofGetHeight()/40) {
+		if (position.z<-ofGetHeight()/20) {
 			if (diveRate<2.0f) {
 				//increase dive rate
 				diveRate+=0.1f;
@@ -218,7 +227,7 @@ void bird::update(map<int,player>& players, float angle){
 			if (diveRate<0.5f) {
 				model.sequences["swoop"].fadeout(0.5);
 				model.sequences["flap"].start();
-				state=SWOOPING;
+				state=SCANNING;
 			}
 			break;
 		case ATTACKING:
@@ -288,7 +297,7 @@ void bird::drawDebug(){
 	if (DEBUG) {
 		ofSetHexColor(0xff00ff);
 		char numStr[100];
-		sprintf(numStr, "radius: %4.2f\nheading: %4.2f\nangle: %4.2f\ndive: %4.2f\nheight: %4.2f", centre.distance(ofVec2f(position.x,position.y)),heading,edgeangle,diveRate,position.z);
+		sprintf(numStr, "dive: %4.2f\nheight: %4.2f\n%s", diveRate,position.z,state==1?"SCANNING":state==2?"SWOOPING":"ATTACKING");
 		ofDrawBitmapString(numStr,10,10);
 	}
 	
-- 
cgit v1.2.3