summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-02-07 09:09:13 +0100
committerTreeki <treeki@gmail.com>2013-02-07 09:09:13 +0100
commitf66e56e087e58c3b7319e9065c375c502228dceb (patch)
tree2ebf5cf9d35ea31675b4910db9587ca63b7dfe48
parent2c48652f74512e371b19ce2a8fbc4038742bced0 (diff)
downloadkamek-f66e56e087e58c3b7319e9065c375c502228dceb.tar.gz
kamek-f66e56e087e58c3b7319e9065c375c502228dceb.zip
is the podouble done now? maybe??
-rw-r--r--src/bossPodouble.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/bossPodouble.cpp b/src/bossPodouble.cpp
index 260ca9d..4b85cf1 100644
--- a/src/bossPodouble.cpp
+++ b/src/bossPodouble.cpp
@@ -26,7 +26,7 @@ class daPodouble : public daBoss {
m3d::mdl_c bodyModel;
m3d::mdl_c fogModel;
- m3d::mdl_c fog2Model;
+ //m3d::mdl_c fog2Model;
m3d::anmChr_c fleeAnimation;
m3d::anmTexSrt_c body;
@@ -34,8 +34,8 @@ class daPodouble : public daBoss {
m3d::anmChr_c fogChr;
m3d::anmTexSrt_c fogSRT;
- m3d::anmChr_c fog2Chr;
- m3d::anmTexSrt_c fog2SRT;
+ //m3d::anmChr_c fog2Chr;
+ //m3d::anmTexSrt_c fog2SRT;
char isFire;
@@ -217,7 +217,7 @@ int daPodouble::onCreate() {
// Fog down and anms
- mdl = this->resFile.GetResMdl("bubble_fog2");
+ /*mdl = this->resFile.GetResMdl("bubble_fog2");
fog2Model.setup(mdl, &allocator, 0x124, 1, 0);
anmChr = this->resFile.GetResAnmChr("bubble_fog2");
@@ -229,7 +229,7 @@ int daPodouble::onCreate() {
anmRes = this->resFile.GetResAnmTexSrt("bubble_fog");
this->fog2SRT.setup(mdl, anmRes, &this->allocator, 0, 1);
this->fog2SRT.bindEntry(&this->fog2Model, anmRes, 0, 0);
- this->fog2Model.bindAnim(&this->fog2SRT, 0.0);
+ this->fog2Model.bindAnim(&this->fog2SRT, 0.0);*/
@@ -291,7 +291,7 @@ int daPodouble::onExecute() {
}
int daPodouble::onDraw() {
- if (this->speed.y >= 0) {
+// if (this->speed.y >= 0) {
matrix.translation(pos.x, pos.y, pos.z);
fogModel.setDrawMatrix(matrix);
@@ -300,12 +300,13 @@ int daPodouble::onDraw() {
fogModel.scheduleForDrawing();
fogModel._vf1C();
+ fogChr.process();
- if(this->fogChr.isAnimationDone())
- this->fogChr.setCurrentFrame(0.0);
+ //if(this->fogChr.isAnimationDone())
+ // this->fogChr.setCurrentFrame(0.0);
this->fogSRT.process();
- }
+/* }
else {
matrix.translation(pos.x, pos.y, pos.z);
@@ -320,7 +321,7 @@ int daPodouble::onDraw() {
this->fog2Chr.setCurrentFrame(0.0);
this->fog2SRT.process();
- }
+ }*/
matrix.translation(pos.x, pos.y, pos.z);
matrix.applyRotationYXZ(&rot.x, &rot.y, &rot.z);
@@ -630,10 +631,15 @@ int daPodouble::onDraw() {
this->timer = 0;
nw4r::g3d::ResAnmChr anmChr = resFile.GetResAnmChr(isFire ? "RedFlee" : "BlueFlee");
+
fleeAnimation.bind(&bodyModel, anmChr, 1);
bodyModel.bindAnim(&fleeAnimation, 0.0);
fleeAnimation.setUpdateRate(0.5f);
+ fogChr.bind(&fogModel, anmChr, 1);
+ fogModel.bindAnim(&fogChr, 0.0f);
+ fogChr.setUpdateRate(0.5f);
+
PlaySound(this, SE_EMY_GABON_ROCK_THROW);
}
void daPodouble::executeState_SyncDie() {