src/PhysicsObject.cc
author ekku
Mon, 08 Dec 2008 22:37:27 +0000
changeset 322 f94a5c192097
parent 299 e4dacf550ba1
child 336 ef598a3dc1b7
permissions -rw-r--r--
Rope fixing
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
     1
#include "PhysicsObject.hh"
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
     2
#include "Engine.hh"
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
     3
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
     4
#include <cmath>
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
     5
#include <utility>
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
     6
#include <queue>
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
     7
279
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
     8
PhysicsObject::PhysicsObject (PhysicsWorld &world, float mass, Vector position, Vector velocity, ObjectType type, 
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
     9
            float collision_elasticity, bool enabled) :
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    10
    world(world), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    11
    position(position), 
285
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
    12
    previousPosition(position),
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    13
    velocity(velocity), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    14
    mass(mass), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    15
    inAir(true), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    16
    collision_elasticity(collision_elasticity),
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    17
    aim(0), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    18
    facing(FACING_RIGHT), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    19
    alive(false),
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    20
    shouldDelete(false), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    21
    type(type), 
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
    22
    pivot(NULL)
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
    23
{  
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
    24
    if (enabled)
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
    25
        enable();  
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
    26
}
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
    27
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
    28
PhysicsObject::~PhysicsObject (void) {
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
    29
//    Engine::log(DEBUG, "PhysicsObject.destructor") << this /* << ": objects.size=" << ((int) world.objects.size()) */;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    30
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    31
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    32
/**
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    33
 * Player walks on floor.
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    34
 */
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    35
Vector PhysicsObject::walk_one_step (float partial, bool right) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    36
    // which way we are walking
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    37
    float deltaX = right ? partial : -partial;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    38
    Vector reached = this->position;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    39
    if(reached.roundToInt() == (reached+Vector(deltaX, 0)).roundToInt()) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    40
        return reached+Vector(deltaX, 0);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    41
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    42
    // Is there upward ramp
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    43
    if(!possibleLocation(position+Vector(deltaX, 0))) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    44
        // Yes. Then we check n pixels up
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    45
        for(int i = 1; i < 3; i++) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    46
            if(possibleLocation(position+Vector(deltaX, -i))) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    47
                // and when there is finally EMPTY, we can walk
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    48
                reached = position+Vector(deltaX, -i);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    49
                break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    50
            }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    51
        }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    52
    } else {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    53
        // Or downward ramp or flat
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    54
        for(int i = 0; 1; i++) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    55
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    56
            // And when there is finally ground we can step on
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    57
            // it. If there is no gound we still step there,
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    58
            // but will fall one pixel down
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    59
            if(possibleLocation(position+Vector(deltaX, i))) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    60
                reached = position+Vector(deltaX, i);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    61
            } else {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    62
                break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    63
            }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    64
            
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    65
            // If the fall is big enough, set the worm in the air
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    66
            if (i >= 2) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    67
//                Vector back = walk(dt, !right);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    68
                this->inAir = true;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    69
//                this->velocity.x = right ? velocity : -velocity;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    70
                // Avoid stepping two pixels down when it starts to free fall
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    71
                reached.y -= 2;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    72
//                this->velocity = (reached-back)*1000/dt;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    73
                break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    74
            }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    75
        }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    76
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    77
    // And we return where we got
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    78
    return reached;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    79
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    80
void PhysicsObject::walk (TimeMS dt, bool right) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    81
    float velocity = PLAYER_WALK_SPEED;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    82
    float walkAmount = (velocity*dt)/1000;
285
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
    83
    while (walkAmount > 0){// && !this->inAir) {
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
    84
        setPosition (walk_one_step((1 < walkAmount ? 1 : walkAmount), right));
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    85
        walkAmount--;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    86
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    87
    // TODO: Should the remaining walkAmount be handled somehow?
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    88
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    89
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    90
/**
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    91
 * Makes the player jump in the air.
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    92
 * @param direction -1: jump left, 0: jump up, 1: jump right
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    93
 */
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    94
void PhysicsObject::jump (int direction) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    95
    // Jump only if player is "on the ground"
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    96
    if (!this->inAir) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    97
 	    velocity.y = -100;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    98
        switch (direction) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
    99
            case 1:
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   100
                velocity.x += 20;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   101
                break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   102
            case -1:
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   103
                velocity.x -= 20;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   104
                break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   105
            case 0:
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   106
                break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   107
            default:
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   108
                throw std::logic_error("Invalid jump direction");
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   109
        }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   110
	    inAir = true;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   111
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   112
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   113
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   114
bool PhysicsObject::possibleLocation (Vector loc) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   115
    for(unsigned int i = 0; i < this->shape.size(); i++) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   116
        if(world.collides(loc+shape[i]))
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   117
            return false;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   118
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   119
    return true;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   120
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   121
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   122
/**
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   123
 * Updates object speed and position. This function organises force
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   124
 * integration and collision detection.
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   125
 */   
205
905028e58ed1 implement a new tick-timer that doesn't suck
terom
parents: 200
diff changeset
   126
void PhysicsObject::updatePosition (TimeMS dt) {
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   127
    // Add gravity to the force queue
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   128
    applyForce(world.gravity);
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   129
    
228
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   130
    // If the object (practically player) has a pivot point add
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   131
    // a force towards that
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   132
    if (pivot != NULL) {
322
f94a5c192097 Rope fixing
ekku
parents: 299
diff changeset
   133
        applyForce(getPivotForce());
228
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   134
    }
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   135
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   136
    std::pair<Force, TimeMS> force;
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   137
    std::queue<std::pair<Force, TimeMS> > newfq;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   138
    Force total;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   139
    while (!forceq.empty()) {
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   140
        force = forceq.front();
275
fa44b905bc2e Tried to take input tick into account in updatePosition but it still doesn't seem to work
saiam
parents: 273
diff changeset
   141
        if (force.second > dt) {
fa44b905bc2e Tried to take input tick into account in updatePosition but it still doesn't seem to work
saiam
parents: 273
diff changeset
   142
            force.second -= dt;
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   143
            newfq.push(force);
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   144
        }
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   145
        total += force.first;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   146
        forceq.pop();
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   147
    }
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   148
    forceq = newfq;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   149
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   150
    // If the player has stopped and there's some ground under some of the 3 some of the 3t
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   151
    // set inAir false
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   152
    if (this->velocity == Vector(0,0)) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   153
        this->inAir = !world.collides(this->position+shape[1]+Vector(0, 1))
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   154
                      && !world.collides(this->position+shape[2]+Vector(0, 1))
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   155
                      && !world.collides(this->position+shape[3]+Vector(0, 1));
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   156
        // If, however, there's a force caused by a bomb, e.g., set it in air.
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   157
        // Still, we have to be able to separate forces caused by walking attempts
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   158
        // and bombs etc (+0.1 because float comparison can be dangerous)
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   159
        if (total.y < 0.01 || fabs(total.x) > PLAYER_MOVE_FORCE + 0.1)
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   160
            this->inAir = true;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   161
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   162
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   163
    if(!possibleLocation(position)) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   164
        //if we are trapped in ground form dirtball or something
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   165
        //we might want to just return and set velocity to some value
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   166
        //return;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   167
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   168
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   169
    // If the worm is not in the air make it walk,
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   170
    // otherwise integrate the new position and velocity
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   171
    if (!this->inAir) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   172
        // It walks only if there's some vertical force
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   173
        if (total.x != 0) {
205
905028e58ed1 implement a new tick-timer that doesn't suck
terom
parents: 200
diff changeset
   174
            walk(dt, total.x > 0);
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   175
            this->velocity = Vector(0,0);
247
b87f68be579f When on the ground, dont integrate in vain
ekku
parents: 241
diff changeset
   176
        }   
b87f68be579f When on the ground, dont integrate in vain
ekku
parents: 241
diff changeset
   177
        // Now the possible walking has been done so we can return from this function.
b87f68be579f When on the ground, dont integrate in vain
ekku
parents: 241
diff changeset
   178
        // In walk inAir could have been set true, but that will be handled in the next tick.
b87f68be579f When on the ground, dont integrate in vain
ekku
parents: 241
diff changeset
   179
        return;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   180
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   181
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   182
    if (!possibleLocation(position))
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   183
        Engine::log(DEBUG, "PhysicsObject.updatePosition") << "impossible location: " << position;
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   184
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   185
    Vector newPosition;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   186
    Vector velAfterTick;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   187
    // Calculate new position and velocity to the given references
205
905028e58ed1 implement a new tick-timer that doesn't suck
terom
parents: 200
diff changeset
   188
    integrate(total, dt, newPosition, velAfterTick);
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   189
    this->velocity = velAfterTick;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   190
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   191
    // Collision detection
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   192
    bool collided = false;
252
25054ce94d07 Rope is released if the ground on the pivot point is destroyed.
ekku
parents: 247
diff changeset
   193
    Vector collisionPoint;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   194
   
279
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   195
    const Vector diffVec = newPosition - position;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   196
    const Vector unitVector = diffVec / diffVec.length();
297
809a0f84d581 bouncy bouncy
nireco
parents: 288
diff changeset
   197
    if(unitVector == Vector(0, 0)) {
809a0f84d581 bouncy bouncy
nireco
parents: 288
diff changeset
   198
        return;
809a0f84d581 bouncy bouncy
nireco
parents: 288
diff changeset
   199
    }
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   200
    Vector reached = position;
247
b87f68be579f When on the ground, dont integrate in vain
ekku
parents: 241
diff changeset
   201
    
279
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   202
    while ((position - reached).sqrLength() < diffVec.sqrLength()) {
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   203
        reached += unitVector;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   204
        // Check if any of the shapes points collide
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   205
        for (uint64_t i = 0; i < shape.size(); i++) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   206
            if (world.collides(reached+shape[i])) {  // Collision
252
25054ce94d07 Rope is released if the ground on the pivot point is destroyed.
ekku
parents: 247
diff changeset
   207
25054ce94d07 Rope is released if the ground on the pivot point is destroyed.
ekku
parents: 247
diff changeset
   208
                collisionPoint = reached+shape[i];
25054ce94d07 Rope is released if the ground on the pivot point is destroyed.
ekku
parents: 247
diff changeset
   209
279
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   210
                if (inAir)
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   211
                    this->bounce(world.getNormal(reached+shape[i], reached-unitVector+shape[i]));
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   212
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   213
                reached = reached - unitVector; // Return to last point
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   214
                collided = true;
279
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   215
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   216
                if (this->velocity.sqrLength() < PLAYER_MIN_SPEED * PLAYER_MIN_SPEED)
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   217
                    this->velocity = Vector(0,0);
279
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   218
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   219
                break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   220
            }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   221
        }
279
e36f5e1a1c8d let projectiles bounce, the new BounceBounce weapon puts the Physics engine into an infinite loop
terom
parents: 275
diff changeset
   222
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   223
        if (collided)
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   224
            break;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   225
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   226
   
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   227
    
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   228
    if (!possibleLocation(reached))
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   229
        Engine::log(DEBUG, "PhysicsObject.updatePosition") << "impossible location: " << position << ", diffVec=" << diffVec;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   230
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   231
    // In case of some float error check the final coordinate
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   232
    if (!collided) {
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   233
        if (!possibleLocation(newPosition)) {
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   234
            newPosition = reached;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   235
        } else {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   236
            // This means everything was ok, so no need to do anything
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   237
        }
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   238
285
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   239
        setPosition (newPosition);
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   240
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   241
    } else {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   242
        newPosition = reached;
285
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   243
        setPosition (newPosition);
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   244
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   245
        // the following may delete this object, so it must be the last thing called
288
47a5d7896aec some collisions on PhysicsWorld::tick
nireco
parents: 287
diff changeset
   246
        onCollision(collisionPoint);
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   247
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   248
        return;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   249
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   250
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   251
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   252
/**
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   253
 * Bounces from straight wall in any direction.
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   254
 * Direction given as normal of that wall
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   255
 */
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   256
void PhysicsObject::bounce (Vector normal) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   257
    // normal.sqrLength can't be 0 when got from getNormal()
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   258
    if (normal.sqrLength() != 0) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   259
        Vector nvel = velocity;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   260
        // We project the velocity on normal and remove twice that much from velocity
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   261
        nvel = nvel - ((2)*((nvel*normal)/(normal*normal))*normal);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   262
        velocity = nvel;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   263
        // We lose some of our speed on collision
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   264
        this->velocity *= this->collision_elasticity;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   265
    }
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   266
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   267
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   268
/**
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   269
 * Integrates given force over time and stores new position to
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   270
 * posAfterTick and new velocity to velAfterTick.
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   271
 * @param force Force vector.
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   272
 * @param dt The time the force is applied (<=PHYSICS_TICK_MS)
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   273
 */
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   274
void PhysicsObject::integrate(Force force, TimeMS dt, Vector &posAfterTick, Vector &velAfterTick) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   275
    posAfterTick = position;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   276
    velAfterTick = velocity;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   277
    Derivative tmpd;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   278
    Derivative k1 = evaluate(force, 0, tmpd, posAfterTick, velAfterTick);
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   279
    Derivative k2 = evaluate(force, dt / 2, k1, posAfterTick, velAfterTick);
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   280
    Derivative k3 = evaluate(force, dt / 2, k2, posAfterTick, velAfterTick);
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   281
    Derivative k4 = evaluate(force, dt, k3, posAfterTick, velAfterTick);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   282
    
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   283
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   284
    const Vector dxdt = (k1.dx + (k2.dx + k3.dx) * 2.0f + k4.dx) * 1.0f/6.0f;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   285
    const Vector dvdt = (k1.dv + (k2.dv + k3.dv) * 2.0f + k4.dv) * 1.0f/6.0f;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   286
    
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   287
    //    Engine::log(DEBUG, "PhysicsObject.integrate") << "Changes: "<< dxdt << " " << dvdt << " Time: " <<dt;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   288
    posAfterTick = posAfterTick + (dxdt * dt)/1000;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   289
    velAfterTick = velAfterTick + (dvdt * dt)/1000;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   290
    //Engine::log(DEBUG, "PhysicsObject.integrate") << "velAfterTick: " << velAfterTick;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   291
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   292
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   293
Derivative PhysicsObject::evaluate(Force force, TimeMS dt, Derivative &d, const Vector &posAfterTick, const Vector &velAfterTick) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   294
    Vector curPos = posAfterTick + (d.dx*dt)/1000;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   295
    Vector curVel = velAfterTick + (d.dv*dt)/1000;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   296
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   297
    Derivative out;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   298
    out.dx = curVel;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   299
    out.dv = acceleration(force);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   300
    //Engine::log(DEBUG, "PhysicsObject.evaluate") << "Out.dx: " << out.dx;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   301
    return out;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   302
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   303
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   304
Vector PhysicsObject::acceleration(const Force &force) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   305
    return (force/mass);
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   306
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   307
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   308
void PhysicsObject::applyForce (Force force, TimeMS dt) {
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   309
    // Add applied force to the queue
273
eeb699e1d908 Made forceq to contain time again.
saiam
parents: 272
diff changeset
   310
    forceq.push(std::make_pair(force, dt));
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   311
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   312
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   313
void PhysicsObject::changeAim(float da) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   314
    this->aim += da;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   315
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   316
    if (this->aim > PLAYER_AIM_MAX) this->aim = PLAYER_AIM_MAX;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   317
    if (this->aim < PLAYER_AIM_MIN) this->aim = PLAYER_AIM_MIN;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   318
    //Engine::log(DEBUG, "PhysicsObject.changeAim") << "Player aim: " << this->aim;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   319
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   320
287
f59c8dee7f91 getType added for physics object
ekku
parents: 285
diff changeset
   321
ObjectType PhysicsObject::getType (void) const {
f59c8dee7f91 getType added for physics object
ekku
parents: 285
diff changeset
   322
    return this->type;
f59c8dee7f91 getType added for physics object
ekku
parents: 285
diff changeset
   323
}
f59c8dee7f91 getType added for physics object
ekku
parents: 285
diff changeset
   324
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 257
diff changeset
   325
void PhysicsObject::setFacing (FacingDirection facing) {
215de3d4de60 change facingRight from a bool to an
terom
parents: 257
diff changeset
   326
    this->facing = facing;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   327
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   328
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 257
diff changeset
   329
void PhysicsObject::updatePhysics (Vector position, Vector velocity, bool inAir, FacingDirection facing, float aim) {
285
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   330
    setPosition (position);
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   331
    this->velocity = velocity;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   332
    this->inAir = inAir;
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 257
diff changeset
   333
    this->facing = facing;
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 197
diff changeset
   334
    this->aim = aim;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   335
}
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   336
257
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   337
Vector PhysicsObject::getPosition (void) const {
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   338
    return position;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   339
}
257
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   340
    
285
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   341
Vector PhysicsObject::getPreviousPosition (void) const {
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   342
    return previousPosition;
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   343
}
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   344
    
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   345
void PhysicsObject::setPosition (Vector pos) {
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   346
    this->previousPosition = this->position;
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   347
    this->position = pos;
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   348
}
c080c8c70333 Previous position added, and unsigned int bug fixed
ekku
parents: 282
diff changeset
   349
    
257
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   350
PixelCoordinate PhysicsObject::getCoordinate (void) const {
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   351
    return world.getPixelCoordinate(position);
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   352
}
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   353
257
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   354
Vector PhysicsObject::getVelocity (void) const {
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   355
    return velocity;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   356
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   357
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 257
diff changeset
   358
FacingDirection PhysicsObject::getFacing (void) const {
215de3d4de60 change facingRight from a bool to an
terom
parents: 257
diff changeset
   359
    return facing;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   360
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   361
257
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   362
float PhysicsObject::getAim (void) const {
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   363
    return aim;
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   364
}
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   365
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   366
Vector PhysicsObject::getDirection (void) const {
264
215de3d4de60 change facingRight from a bool to an
terom
parents: 257
diff changeset
   367
    return facing == FACING_RIGHT ? Vector(cos(aim), -sin(aim)) : Vector(-cos(aim), -sin(aim));
235
0a0c729365ee code cleanup
terom
parents: 229
diff changeset
   368
}
0a0c729365ee code cleanup
terom
parents: 229
diff changeset
   369
257
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   370
const std::vector<Vector>& PhysicsObject::getShape () const {
549783d71e51 add a handful of consts to PhysicsObject and modify draw to use getCoordinate, and replace old skin.png with new skin.png
terom
parents: 252
diff changeset
   371
    return shape;
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   372
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   373
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   374
void PhysicsObject::setShape (std::vector<Vector> shape) {
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   375
    this->shape = shape;
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   376
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   377
322
f94a5c192097 Rope fixing
ekku
parents: 299
diff changeset
   378
PhysicsObject *PhysicsObject::getPivot (void) {
f94a5c192097 Rope fixing
ekku
parents: 299
diff changeset
   379
    return this->pivot;
f94a5c192097 Rope fixing
ekku
parents: 299
diff changeset
   380
}
f94a5c192097 Rope fixing
ekku
parents: 299
diff changeset
   381
228
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   382
void PhysicsObject::setPivot (PhysicsObject *pivot) {
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   383
    this->pivot = pivot;
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   384
}
dbc1bb7a98b5 Rope has forces
ekku
parents: 225
diff changeset
   385
205
905028e58ed1 implement a new tick-timer that doesn't suck
terom
parents: 200
diff changeset
   386
void PhysicsObject::tick (TimeMS tick_length) {
905028e58ed1 implement a new tick-timer that doesn't suck
terom
parents: 200
diff changeset
   387
    this->updatePosition(tick_length);
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   388
}
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   389
    
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   390
void PhysicsObject::enable (void) {
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   391
    // only enable once until disabled
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   392
    if (alive)
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   393
        return;
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   394
    
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   395
    // mark as alive
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   396
    alive = true;
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   397
    
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   398
    // add the world objects list
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   399
    world.addPhysicsObject(this);
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   400
}
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   401
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   402
void PhysicsObject::disable (void) {
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   403
    // mark as disabled
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   404
    alive = false;
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   405
}
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   406
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   407
void PhysicsObject::destroy (void) {
241
e95b1602d836 implement the ROT (Rope Over TCP) protocol
terom
parents: 235
diff changeset
   408
    // mark as disabled and for deletion
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   409
    alive = false;
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   410
    shouldDelete = true;
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   411
}
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   412
    
299
e4dacf550ba1 implement players dying
terom
parents: 297
diff changeset
   413
bool PhysicsObject::isAlive (void) {
e4dacf550ba1 implement players dying
terom
parents: 297
diff changeset
   414
    return alive;
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   415
}
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   416
    
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   417
bool PhysicsObject::removeIfDestroyed (void) {
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   418
    if (!alive) {
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   419
        if (shouldDelete)
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   420
            delete this;
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   421
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   422
        return true;
225
22ecb9cb9245 Rope can be drawn.
ekku
parents: 223
diff changeset
   423
222
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   424
    } else {
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   425
        return false;
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   426
    }
293ddf4c067d reorganize PhysicsObject/Player/Projectile lists so that PhysicsObject doesn't need to know about its subclasses anymore, and PhysicsWorld doesn't need to know about GameState
ekku
parents: 221
diff changeset
   427
}
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   428
322
f94a5c192097 Rope fixing
ekku
parents: 299
diff changeset
   429
Vector PhysicsObject::getPivotForce (void) { 
f94a5c192097 Rope fixing
ekku
parents: 299
diff changeset
   430
    return Vector(0,0); 
197
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   431
}
d9ac888de778 Hajotetaan lis??
ekku
parents:
diff changeset
   432
268
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   433
bool PhysicsObject::collides (const PhysicsObject &obj) {
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   434
    const std::vector<Vector> oShape = obj.getShape();
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   435
    Vector p1, p2, p3;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   436
    int8_t sign, nsign;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   437
    for (std::vector<Vector>::const_iterator i = oShape.begin(); i != oShape.end(); i++) { // For every point in other shape
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   438
        p3 = *i + obj.getPosition();
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   439
        sign = 0;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   440
        for (std::vector<Vector>::const_iterator j = shape.begin(); j != shape.end(); j++) {
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   441
            p1 = *j + position;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   442
            if ( (j+1) == shape.end() ) p2 = *shape.begin() + position;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   443
            else p2 = *(j+1) + position;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   444
            nsign = crossProduct(p1, p2, p3);
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   445
            if ( sign == 0 ) sign = nsign;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   446
            else if ( ((sign < 0) && (nsign < 0)) || ((sign > 0) && (nsign > 0)) ) continue;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   447
            else return false;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   448
        }
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   449
    }
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   450
    return true;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   451
}
282
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   452
    
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   453
void  PhysicsObject::onCollision (Vector collisionPoint, PhysicsObject *other) {
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   454
    (void) collisionPoint;
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   455
    (void) other;
e0e4dfc3e528 compiles cleanly with -Wall -Wextra -Wconversion, not tested, but that shouldn't break anything :)
terom
parents: 279
diff changeset
   456
}
268
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   457
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   458
int8_t crossProduct (const Vector &p1, const Vector &p2, const Vector &p3) {
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   459
    float p = (p2.x - p1.x)*(p3.y - p1.y) - (p2.y - p1.y)*(p3.x - p1.x);
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   460
    if (p < 0)
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   461
        return -1;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   462
    else
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   463
        return 1;
0b96b88af335 Added collision detection method to PhysicsObject. Not tested.
saiam
parents: 265
diff changeset
   464
}