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