Elysian Shadows

Code: Select all

//// INSIDE Player::handle_collision()
      // ...   //

				//Determine overlap for each axis
				int xDist = abs((rect1.x + rect1.w / 2) - (rect2.x + rect2.w / 2)); 
				int yDist = abs((rect1.y + rect2.h / 2) - (rect2.y + rect2.h / 2));
					
				Singleton<Log>::getInstance()->print("Rect2: x(%d), y(%d)", rect2.x, rect2.y);

				//minimal amount of distance that the two can be apart and not collide
				int xMinDist = rect1.w/2 + rect2.w;
				int yMinDist = rect1.h/2 + rect2.h;

				//neither axis is colliding
				if(xDist >= xMinDist || yDist >= yMinDist) {
					continue; 
				}
				int xOverlap = xDist - xMinDist;
				int yOverlap = yDist - yMinDist;
	
				collidedTimes++;

				onObject = false;

				if(abs(xOverlap) < abs(yOverlap)) { 
             //move the player by the amount of the overlap
					if(rect2.x < rect1.x) {
						x += std::abs(xOverlap);
					} else {
						x -= std::abs(xOverlap);
					}
				} else { 
					if(rect2.y < rect1.y){
						y += std::abs(yOverlap);
						onObject = true;
					}
					else { 			
						y -= std::abs(yOverlap);
					}
				}
			}
		}

Code: Select all

void Player::update() 
{
     //only add gravity if he's not on objects.. this is pretty dumb.. must modify it
	if(!onObject) Singleton<Physics>::getInstance()->apply_gravity(this);	
	update_collision();  //move the collision box to match players coords
	handle_collision();  //handles the collision
	move();                //moves players coords based on the velocities
	handle_input();	   //handle input and updates velocities
	draw();                //renders the player sprite on screen
}

Code: Select all

void Player::update()
{
   handle_input();      //handle input and updates velocities
   move();                //moves players coords based on the velocities
     //only add gravity if he's not on objects.. this is pretty dumb.. must modify it
   if(!onObject) Singleton<Physics>::getInstance()->apply_gravity(this);   
   update_collision();  //move the collision box to match players coords
   handle_collision();  //handles the collision 
   draw();                //renders the player sprite on screen
}

Code: Select all

            //Update the player
            player.Update();

            //Reset collision dist
            collisionDist.X = 0;
            collisionDist.Y = 0;

            //Check for collisions
            for (int i = 0; i < map.collisionRects.Count(); i++)
            {
                if(IsColliding(player.collisionRect, map.collisionRects[i]))
                {
                    //If there are multiple collision make sure we only react to the most severe
                    if (normal.X > collisionDist.X)
                        collisionDist.X = normal.X;
                    if (normal.Y > collisionDist.Y)
                        collisionDist.Y = normal.Y;
                }
            }

            //Update the players position
            player.position.X += collisionDist.X;
            player.position.Y += collisionDist.Y;

Code: Select all

        bool IsColliding(Rectangle body1, Rectangle body2)
        {
            //Reset the normal vector
            normal.X = 0;
            normal.Y = 0;

            //Get the centre of each body
            Vector2 body1Centre = new Vector2(body1.X + (body1.Width / 2), body1.Y + (body1.Height / 2));
            Vector2 body2Centre = new Vector2(body2.X + (body2.Width / 2), body2.Y + (body2.Height / 2));

            //Declare 2 local vectors
            Vector2 distance, absDistance;

            //xMag and yMag represent the magnitudes of the x and y components of the normal vector
            float xMag, yMag;

            //Calculate the difference in position of the two bodies
            distance = body1Centre - body2Centre;

            //Get the combined half heights/widths of the rects
            float xAdd = ((body1.Width) + (body2.Width)) / 2.0f;
            float yAdd = ((body1.Height) + (body2.Height)) / 2.0f;

            //Calculate absDistance, according to distance
            absDistance.X = (distance.X < 0) ? -distance.X : distance.X;
            absDistance.Y = (distance.Y< 0) ? -distance.Y : distance.Y;

            //Check if there is a collision
            if (!((absDistance.X < xAdd) && (absDistance.Y < yAdd)))
                return false;

            //The magnitude of the normal vector is determined by the overlap in the rectangles.
            xMag = xAdd - absDistance.X;
            yMag = yAdd - absDistance.Y;

            //Only adjust the normal vector in the direction of the least significant overlap.
            if (xMag < yMag)
                normal.X = (distance.X > 0) ? xMag : -xMag;
            else
                normal.Y = (distance.Y > 0) ? yMag : -yMag;

            //There was a collision, return true
            return true;
        }

Code: Select all

if(!onObject) 
    Singleton<Physics>::getInstance()->apply_gravity(this);   

Code: Select all

	//special pleading... this is bad.. need a better fix
	if(onObject) {
	//assume not on boxes				
	onObject = false; 
        /* Test collisions */
        if a collision is detected
          if it's a "player is on the left or right" type collision
             if player is above the current object 
                then do nothing;
        } else {
	//assume not on boxes				
	onObject = false; 
        /* Test collisions */
       }