This commit is contained in:
parent
a8f6989d13
commit
8f6f2a90be
7 changed files with 41 additions and 37 deletions
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include "FX\FXAttachAnim.h"
|
||||
|
||||
#include "FX\FXThwack.h"
|
||||
#include "FX\FXBubble.h"
|
||||
#include "FX\FXfallingTile.h"
|
||||
#include "FX\FXSteam.h"
|
||||
|
@ -241,11 +242,11 @@ void TestFX(DVECTOR Pos)
|
|||
}
|
||||
*/
|
||||
/*****************************************************************************/
|
||||
int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_FOUNTAIN_WATER;
|
||||
int FXType=(CFX::FX_TYPE)CFX::FX_TYPE_THWACK;
|
||||
void TestFX(DVECTOR Pos,CThing *Parent)
|
||||
{
|
||||
CFXAttachAnim *FX=(CFXAttachAnim*)CFX::Create((CFX::FX_TYPE)FXType,Pos);
|
||||
Parent->addChild(FX);
|
||||
// Parent->addChild(FX);
|
||||
// TestFXPtr->setLife(32);
|
||||
}
|
||||
|
||||
|
@ -340,6 +341,10 @@ CFX *NewFX;
|
|||
NewFX->setData(&FXOilFountainData);
|
||||
break;
|
||||
|
||||
case FX_TYPE_THWACK:
|
||||
NewFX=new ("FXThwack") CFXThwack();
|
||||
break;
|
||||
|
||||
case FX_TYPE_NRG_BAR:
|
||||
NewFX=new ("NRG Bar") CFXNRGBar();
|
||||
break;
|
||||
|
|
|
@ -38,6 +38,8 @@ public:
|
|||
FX_TYPE_FOUNTAIN_LAVA,
|
||||
FX_TYPE_FOUNTAIN_OIL,
|
||||
|
||||
FX_TYPE_THWACK,
|
||||
|
||||
FX_TYPE_LIGHTNING_BOLT,
|
||||
FX_TYPE_LIGHTNING_SHEET,
|
||||
FX_TYPE_LIGHTNING_BLAST,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/***********************/
|
||||
/*** Anim Base Class ***/
|
||||
/***********************/
|
||||
/*****************/
|
||||
/*** Thwack!!! ***/
|
||||
/*****************/
|
||||
|
||||
#include "system\global.h"
|
||||
#include <DStructs.h>
|
||||
|
@ -10,40 +10,39 @@
|
|||
#include <sprites.h>
|
||||
#include "level\level.h"
|
||||
#include "game\game.h"
|
||||
#include "gfx\otpos.h"
|
||||
|
||||
#include "FX\FXBaseAnim.h"
|
||||
#include "FX\FXAttachAnim.h"
|
||||
#include "FX\FXThwack.h"
|
||||
|
||||
const int ThwackLife=12;
|
||||
|
||||
/*****************************************************************************/
|
||||
void CFXAttachAnim::init(DVECTOR const &_Pos)
|
||||
void CFXThwack::init(DVECTOR const &_Pos)
|
||||
{
|
||||
CFXBaseAnim::init(_Pos);
|
||||
CFX::init(_Pos);
|
||||
Life=ThwackLife;
|
||||
OtPos=OTPOS__ACTOR_POS-1;
|
||||
Angle=getRnd()&4095;
|
||||
Scale=2048+1024+(getRnd()&2047);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*** Render ******************************************************************/
|
||||
/*****************************************************************************/
|
||||
void CFXAttachAnim::render()
|
||||
|
||||
void CFXThwack::render()
|
||||
{
|
||||
CFXBaseAnim::render();
|
||||
DVECTOR RenderPos;
|
||||
|
||||
getFXRenderPos(RenderPos);
|
||||
if (!canRender() || !IsVisible) return;
|
||||
|
||||
CThing *Parent=getParent();
|
||||
ASSERT(Parent);
|
||||
|
||||
DVECTOR &ParentPos=Parent->getRenderPos();
|
||||
int FrameW=Frame->x1-Frame->x0;
|
||||
int HalfW=FrameW>>1;
|
||||
|
||||
Frame->x0=ParentPos.vx-HalfW;
|
||||
Frame->y0=ParentPos.vy;
|
||||
Frame->x1=ParentPos.vx+HalfW;
|
||||
Frame->y1=ParentPos.vy;
|
||||
|
||||
int BY=Frame->y2-Frame->y0;
|
||||
// setCollisionCentreOffset(0,BY>>1);
|
||||
setCollisionSize(FrameW,BY*2);
|
||||
SpriteBank *SprBank=CGameScene::getSpriteBank();
|
||||
POLY_FT4 *Ft4=SprBank->printRotatedScaledSprite(FRM__THWACK,RenderPos.vx,RenderPos.vy,Scale,Scale,Angle,OtPos);
|
||||
setSemiTrans(Ft4,1);
|
||||
Ft4->tpage|=1<<5;
|
||||
int Col=(256/ThwackLife)*Life;
|
||||
setRGB0(Ft4,Col,Col,Col);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,22 +1,21 @@
|
|||
/***********************/
|
||||
/*** Anim Base Class ***/
|
||||
/***********************/
|
||||
/*****************/
|
||||
/*** Thwack!!! ***/
|
||||
/*****************/
|
||||
|
||||
#ifndef __FX_FX_ATTACH_ANIM_HEADER__
|
||||
#define __FX_FX_ATTACH_ANIM_HEADER__
|
||||
#ifndef __FX_FX_THWACK_HEADER__
|
||||
#define __FX_FX_THWACK_HEADER__
|
||||
|
||||
#include "fx/fx.h"
|
||||
#include "fx/fxbaseAnim.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
class CFXAttachAnim : public CFXBaseAnim
|
||||
class CFXThwack : public CFX
|
||||
{
|
||||
public:
|
||||
virtual void init(DVECTOR const &Pos);
|
||||
virtual void render();
|
||||
|
||||
protected:
|
||||
|
||||
u16 Angle,Scale;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue