Rtch/LibD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Re-adding some of my AABB stuff, now we know that it is not causing problems.

Browse Source
This commit is contained in:
Rtch90 2012-04-12 16:04:33 +01:00
parent 06e13c3c33
commit 79872d8452
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Collision/AABB.cpp
View File

@ -62,8 +62,8 @@ void AABB::CreateAABBFromSprite(const char* filename) {
// I have no methods here, hopefully KonoM will have it
// implemented real soon...
//float spriteWidth = _sprite->w;
//float spriteHeight = _sprite->h;
float spriteWidth = _sprite->w;
float spriteHeight = _sprite->h;
// Find the min, look through until we find a first instance of a white color.
bool found = false;
@ -75,14 +75,14 @@ void AABB::CreateAABBFromSprite(const char* filename) {
for(int height = 0; height < _sprite->h; height++) {
// FUCKING PAIN IN THE ASS MOTHERFUCKER!!!!
DWORD offset = height * screen->pitch + width;
// if(((DWORD)pixels[offset]) != 0 && !found) {
// _min = Vec2((float)width, (float)height);
// found = true;
// color = ((DWORD)pixels[offset]);
// // Break out of these god forsaken loops.
// width = _sprite->w;
// height = _sprite->h;
// }
if(((DWORD)pixels[offset]) != 0 && !found) {
_min = Vec2((float)width, (float)height);
found = true;
color = ((DWORD)pixels[offset]);
// Break out of these god forsaken loops.
width = _sprite->w;
height = _sprite->h;
}
}
}
@ -91,10 +91,10 @@ void AABB::CreateAABBFromSprite(const char* filename) {
found = false;
for(int width = (int)_min.x; width < _sprite->w; width++) {
DWORD offset = (DWORD)_min.y * screen->pitch + width;
// if(((DWORD)pixels[offset] != color && !found)) {
// found = true;
// _max.x = (float)width;
// }
if(((DWORD)pixels[offset] != color && !found)) {
found = true;
_max.x = (float)width;
}
}
// Now for the max.y
@ -102,11 +102,11 @@ void AABB::CreateAABBFromSprite(const char* filename) {
found = false;
for(int height = (int)_min.y; height < _sprite->w; height++) {
DWORD offset = height * screen->pitch + (DWORD)_min.x;
// if(((DWORD)pixels[offset]) != color && !found) {
// found = true;
// _max.y = (float)height;
// break;
// }
if(((DWORD)pixels[offset]) != color && !found) {
found = true;
_max.y = (float)height;
break;
}
}
_staticMax = _max;
_staticMin = _min;