Compare commits

...

5 Commits

Author SHA1 Message Date
wgroeneveld 1f2cfb7234 remove -03 optimization flag for testing to enable debugging 2020-07-13 11:06:17 +02:00
Wouter Groeneveld 941aea1241
Merge pull request #14 from rodri042/replacing-dynamic-cast-with-boolean
Replacing dynamic_cast with boolean for performance reasons
2020-06-28 15:57:36 +02:00
Wouter Groeneveld aef56ed72c
Merge pull request #13 from rodri042/position-signed-ints
Position getters now return signed ints
2020-06-28 15:56:11 +02:00
Rodrigo Alfonso 0004269c21 Replacing dynamic_cast with boolean 2020-06-24 05:19:40 -03:00
Rodrigo Alfonso 337631b839 Position getters now return signed ints 2020-06-24 05:09:40 -03:00
5 changed files with 11 additions and 8 deletions

View File

@ -61,6 +61,7 @@ protected:
u8 animationDelay, numberOfFrames, beginFrame, currentFrame, previousFrame, animationCounter;
bool animating;
OBJ_ATTR oam;
bool isAffine;
void syncAnimation();
virtual void syncOam();
@ -96,8 +97,8 @@ public:
GBAVector getPosAsVector() { return GBAVector(getPos()); }
VECTOR getCenter() { return { x + w / 2, y + h / 2 }; }
VECTOR getVelocity() { return { dx, dy}; }
u32 getX() { return x; }
u32 getY() { return y; }
int getX() { return x; }
int getY() { return y; }
u32 getDx() { return dx; }
u32 getDy() { return dy; }
u32 getWidth() { return w; }

View File

@ -13,11 +13,11 @@ void AffineSprite::identity() {
}
AffineSprite::AffineSprite(const AffineSprite &other) : Sprite(other), affIndex(other.affIndex) {
isAffine = true;
}
AffineSprite::AffineSprite(const void *imgData, int imgSize, int xC, int yC, SpriteSize spriteSize) : Sprite(imgData, imgSize, xC, yC, spriteSize), affIndex(0) {
isAffine = true;
}
void AffineSprite::rotate(u16 alpha) {

View File

@ -17,7 +17,7 @@ Sprite::Sprite(const Sprite &other) : Sprite(nullptr, 0, other.x, other.y, other
}
Sprite::Sprite(const void *imageData, int imageSize, int x, int y, SpriteSize size)
: x(x), y(y), data(imageData), imageSize(imageSize), spriteSize(size), priority(0),
: x(x), y(y), data(imageData), imageSize(imageSize), spriteSize(size), priority(0), isAffine(false),
animationDelay(0), numberOfFrames(0), beginFrame(0), currentFrame(0), animationCounter(0) {
setAttributesBasedOnSize(size);
}

View File

@ -47,11 +47,10 @@ void SpriteManager::copyOverSpriteOAMToVRAM() {
oam_mem[i] = sprite->oam;
auto affine = dynamic_cast<AffineSprite*>(sprite);
if(affine) {
if(sprite->isAffine) {
// WHY warning: can't do this: obj_aff_mem[affineIndex] = *affineShadow;
// because that would override OAM also! only want to set non-overlapping affine attribs
auto affine = static_cast<AffineSprite*>(sprite);
affine->setTransformationMatrix(&obj_aff_mem[affineIndex]);
affine->setAffineIndex(affineIndex);
affineIndex++;

View File

@ -14,6 +14,9 @@ SET(CMAKE_EXE_LINKER_FLAGS "${BASE_CMAKE_LINK_FLAGS}")
SET(CMAKE_C_COMPILER gcc)
SET(CMAKE_CXX_COMPILER g++)
# remove -03 optimization flag otherwise debugging will be annoying as hell
SET(CMAKE_CXX_FLAGS "-Wno-narrowing")
add_definitions(-DCODE_COMPILED_AS_PART_OF_TEST)
include_directories(${GTEST_LIBRARY}/include)