src/proto2/Physics.cc
author saiam
Fri, 28 Nov 2008 22:26:23 +0000
changeset 128 890ac82cdcc0
parent 124 2fd698e04779
child 131 5a81c6dc5451
permissions -rw-r--r--
Documenting more, cleaning variables. This code needs some serious
rewriting. (And we havent too many features either)
58
a53f5ad69500 "working" singleplayer
terom
parents: 54
diff changeset
     1
a53f5ad69500 "working" singleplayer
terom
parents: 54
diff changeset
     2
#include "Physics.hh"
a53f5ad69500 "working" singleplayer
terom
parents: 54
diff changeset
     3
#include "Engine.hh"
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
     4
#include "GameState.hh"
58
a53f5ad69500 "working" singleplayer
terom
parents: 54
diff changeset
     5
45
32c876923cac I added a couple of lines. This still clearly is not going to work in this state.
saiam
parents: 44
diff changeset
     6
#include <algorithm>
50
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 49
diff changeset
     7
#include <functional>
77
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
     8
#include <cmath>
104
5cb116dc0759 Pomppii paremmin
ekku
parents: 103
diff changeset
     9
#include <assert.h>
45
32c876923cac I added a couple of lines. This still clearly is not going to work in this state.
saiam
parents: 44
diff changeset
    10
60
26571fd9a8d1 physics is starting to work
terom
parents: 58
diff changeset
    11
PhysicsWorld::PhysicsWorld (Vector gravity, Vector dimensions)
105
91e3f3806b31 set UDP sockets as nonblocking
terom
parents: 104
diff changeset
    12
    : tick_timer(PHYSICS_TICK_MS), tick_counter(0), gravity(gravity), dimensions(dimensions), terrain(dimensions.x, std::vector<TerrainType>(dimensions.y, DIRT)) {
88
7431cd0cf900 Kuu n?kyy!
ekku
parents: 86
diff changeset
    13
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    14
    generateTerrain(1337);
50
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 49
diff changeset
    15
54
b8b043ba0abd fix some more compiler errors...
terom
parents: 52
diff changeset
    16
    slots.connect(tick_timer.sig_timer(), this, &PhysicsWorld::tick);
50
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 49
diff changeset
    17
    tick_timer.enable();
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 49
diff changeset
    18
}
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
    19
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
    20
void PhysicsWorld::addObject (PhysicsObject *object) {
47
87883096a882 It's like so cool.
saiam
parents: 45
diff changeset
    21
    objects.push_back(object);
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
    22
}
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
    23
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
    24
void PhysicsWorld::tick () {
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
    25
    //    Engine::log(DEBUG, "physics.apply_force") << "*tick*";
58
a53f5ad69500 "working" singleplayer
terom
parents: 54
diff changeset
    26
76
577f248b03b4 removed tabs from Physics.cc
nireco
parents: 75
diff changeset
    27
    for (std::vector<PhysicsObject*>::iterator i = objects.begin(); i != objects.end(); i++) {
577f248b03b4 removed tabs from Physics.cc
nireco
parents: 75
diff changeset
    28
        (*i)->tick(); 
577f248b03b4 removed tabs from Physics.cc
nireco
parents: 75
diff changeset
    29
    }
105
91e3f3806b31 set UDP sockets as nonblocking
terom
parents: 104
diff changeset
    30
91e3f3806b31 set UDP sockets as nonblocking
terom
parents: 104
diff changeset
    31
    tick_counter++;
91e3f3806b31 set UDP sockets as nonblocking
terom
parents: 104
diff changeset
    32
}
91e3f3806b31 set UDP sockets as nonblocking
terom
parents: 104
diff changeset
    33
91e3f3806b31 set UDP sockets as nonblocking
terom
parents: 104
diff changeset
    34
uint32_t PhysicsWorld::getTick (void) {
91e3f3806b31 set UDP sockets as nonblocking
terom
parents: 104
diff changeset
    35
    return tick_counter;
48
fa1da22db8a0 It looks like physics could now work, but I doubt it...
saiam
parents: 47
diff changeset
    36
}
fa1da22db8a0 It looks like physics could now work, but I doubt it...
saiam
parents: 47
diff changeset
    37
128
890ac82cdcc0 Documenting more, cleaning variables. This code needs some serious
saiam
parents: 124
diff changeset
    38
PhysicsObject::PhysicsObject (PhysicsWorld &world, float mass, 
890ac82cdcc0 Documenting more, cleaning variables. This code needs some serious
saiam
parents: 124
diff changeset
    39
                              Vector position, Vector velocity)
890ac82cdcc0 Documenting more, cleaning variables. This code needs some serious
saiam
parents: 124
diff changeset
    40
    : world(world), mass(mass), position(position), 
890ac82cdcc0 Documenting more, cleaning variables. This code needs some serious
saiam
parents: 124
diff changeset
    41
      velocity(velocity), facingRight(true), inAir(true) {
60
26571fd9a8d1 physics is starting to work
terom
parents: 58
diff changeset
    42
26571fd9a8d1 physics is starting to work
terom
parents: 58
diff changeset
    43
    world.addObject(this);
26571fd9a8d1 physics is starting to work
terom
parents: 58
diff changeset
    44
}
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
    45
96
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    46
Vector PhysicsObject::walk (bool right) {
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    47
    Vector cursor = right ? this->position + Vector(1,0) : this->position + Vector(-1,0);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    48
    Vector reached = this->position;
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    49
    
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    50
    //for(int steps = 0; steps < 3; steps++) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    51
    
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    52
    // Go up but not if the wall is over two pixels
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    53
    if(world.getType(cursor) != EMPTY) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    54
        for(int height = 0, max = 3; height < max+42; height++) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    55
            
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    56
            if(height >= max)
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    57
                return reached;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    58
            
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    59
            cursor.y--;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    60
            if(world.getType(cursor) == EMPTY) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    61
                // Check that the other parts of the worm don't collide with anything
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    62
                if(possibleLocation(cursor)) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    63
                    reached = cursor;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    64
                    continue;
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
    65
                } else {
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    66
                    // Can't get any further
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    67
                    return reached;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    68
                }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    69
            }
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    70
        }
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    71
    } else {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    72
        if(possibleLocation(cursor)) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    73
            reached = cursor;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    74
        }
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    75
        // Start checking if the lower squares are empty
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    76
        
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    77
        for(int depth = 0, max = 3; depth < max+42; depth++) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    78
            
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    79
            if(depth >= max) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    80
                // We can start a free fall now
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
    81
                //
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    82
                // TODO it should be set inAir if it falls from a cliff
116
0d36aade845e some stuff, don't remember what
nireco
parents: 115
diff changeset
    83
                this->inAir = true;
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    84
                
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    85
                // Put some speed there to make loke smoother
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    86
                //this->velocity.y = -5;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    87
                return reached;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    88
            }
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    89
            
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    90
            cursor.y++;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    91
            if(world.getType(cursor) == EMPTY) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    92
                // Check that the other parts of the worm don't collide with anything
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    93
                if(possibleLocation(cursor)) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    94
                    reached = cursor;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    95
                    continue;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    96
                } else {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
    97
                    // Can't get any further
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    98
                    return reached;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
    99
                }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   100
            }
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   101
        }
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   102
    }      
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   103
    
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   104
    //    cursor.x += right ? 1 : -1;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   105
    //}
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   106
    return reached;
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   107
}
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   108
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   109
void PhysicsObject::jump () {
114
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   110
    // Jump only if player is "on the ground"
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   111
    if (!this->inAir) {
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   112
 	velocity.y = -100;
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   113
	inAir = true;
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   114
    }
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   115
}
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   116
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   117
bool PhysicsObject::possibleLocation (Vector loc) {
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   118
    for(unsigned int i = 0; i < this->shape.size(); i++) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   119
        if(world.getType(loc+shape[i]) != EMPTY)
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   120
            return false;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   121
    }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   122
    return true;
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   123
}
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   124
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   125
/**
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   126
 * Updates object speed and position. This function organises force
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   127
 * integration and collision detection.
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   128
 */   
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   129
void PhysicsObject::updatePosition () {
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   130
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   131
    // Add gravity to the force queue
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 84
diff changeset
   132
    forceq.push(world.gravity);
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   133
    
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   134
    // Go trough every force in the queue
84
3cb862028a24 No nyt se toimii v?h?n paremmin. Koodia pit?? kyll? viel? siisti? aika huolella.
saiam
parents: 83
diff changeset
   135
    Force total;
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   136
    posAfterTick = position;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   137
    velAfterTick = velocity;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   138
    while (!forceq.empty()) {
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 84
diff changeset
   139
        total += forceq.front();
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   140
        forceq.pop();
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   141
    }
114
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   142
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   143
    // TODO: This is _ugly_ (but not so ugly as the last one I think)
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   144
    // hack. I think we should handle walking from the collision
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   145
    // detection code.
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   146
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   147
    if (!this->inAir) {
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   148
        if (total.x != 0)
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   149
            this->position = walk(total.x > 0);
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   150
        return; // argh
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   151
    }
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   152
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 84
diff changeset
   153
    integrate(total, PHYSICS_TICK_MS);
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   154
84
3cb862028a24 No nyt se toimii v?h?n paremmin. Koodia pit?? kyll? viel? siisti? aika huolella.
saiam
parents: 83
diff changeset
   155
    Vector newPosition = posAfterTick /*+ (velAfterTick * PHYSICS_TICK_MS)/1000*/;
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   156
    this->velocity = velAfterTick;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   157
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   158
   
114
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   159
    // Collision detection
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   160
    bool collided = false;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   161
   
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   162
    const Vector diffVec = newPosition-position;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   163
    const Vector unitVector = diffVec / diffVec.length();
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   164
    Vector reached = position;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   165
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   166
    while ((position-reached).length() < diffVec.length()) {
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   167
        // Check if any of the shapes points collide
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   168
        for (uint64_t i = 0; i < shape.size(); i ++) {
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   169
            if (world.getType(reached+shape[i]) != EMPTY) {  // Collision
124
2fd698e04779 fixed collision detection again, and put some needed rounding to getNormal
nireco
parents: 123
diff changeset
   170
                this->bounce(world.getNormal(reached+shape[i], reached-unitVector+shape[i]));
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   171
                reached = reached - unitVector; // Return to last point
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   172
                collided = true;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   173
                this->velocity *= COLLISION_ELASTICITY;
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   174
                if (this->velocity.length() < PLAYER_MIN_SPEED) {
115
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   175
                    this->inAir = false;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   176
                    this->velocity = Vector(0,0);
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   177
                }
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   178
                break;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   179
            }
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   180
        }
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   181
        if (collided)
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   182
            break;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   183
        reached += unitVector;
237ea0bb125a Kirjottelin jotain uuden t?rm?ystarkistuksen tapasta, se kyll? bugaa jotenkin.
saiam
parents: 114
diff changeset
   184
    }
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   185
   
95
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
   186
    
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   187
    /*
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   188
      bool collided = false;
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   189
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   190
      //goes 1 unit forward every step and check if has hit anything
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   191
      Vector unitVector = (newPosition-position) / (newPosition-position).length();
114
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   192
    
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   193
      Vector tmpVector = position;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   194
      Vector reached = position;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   195
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   196
      int steps = (int) (newPosition-position).length() + 2;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   197
        
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   198
      //Engine::log(DEBUG, "physics.update_position") << unitVector-newPosition;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   199
      //Vector foo = position+unitVector*steps-newPosition;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   200
      //Engine::log(DEBUG, "PhysicsObject.updatePosition") << "Virhe: "<< foo;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   201
    
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   202
      for(int i = 0; i < steps; i++) {
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   203
      tmpVector += unitVector;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   204
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   205
      float minVelocity = 10;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   206
      // Check if any of the four corners of the worm collide
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   207
      for(int sh = 0; sh < 4; sh++) {
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   208
      if(world.getType(tmpVector+shape[sh]) != EMPTY) {
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   209
      reached = position + unitVector*(i-1);
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   210
      collided = true;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   211
      this->bounce(world.getNormal(tmpVector+shape[sh], tmpVector-unitVector+shape[sh]));
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   212
      this->velocity *= 0.4;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   213
      if(abs(this->velocity.x) < minVelocity && (abs(this->velocity.y) < minVelocity)) {
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   214
      this->inAir = false;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   215
      this->velocity = Vector(0,0);
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   216
      }
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   217
      break;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   218
      }
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   219
      }
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   220
      if(collided)
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   221
      break;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   222
      }
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   223
    */
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   224
92
fe9da348afed Kimpoomisia
ekku
parents: 91
diff changeset
   225
    // In case of some float error check the final coordinate
77
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   226
    if(!collided) {
92
fe9da348afed Kimpoomisia
ekku
parents: 91
diff changeset
   227
        if(world.getType(newPosition+shape[0]) != EMPTY || (world.getType(newPosition+shape[1]) != EMPTY) 
114
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   228
           || (world.getType(newPosition+shape[2]) != EMPTY) || (world.getType(newPosition+shape[3]) != EMPTY)) {
92
fe9da348afed Kimpoomisia
ekku
parents: 91
diff changeset
   229
            
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   230
            Engine::log(DEBUG, "physics.update_position") << "didnt hit";
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   231
            // There was error, and there is ground
92
fe9da348afed Kimpoomisia
ekku
parents: 91
diff changeset
   232
            //newPosition = tmpVector;
77
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   233
        } else {
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   234
            // This means everything was ok, so no need to do anything
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   235
        }
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   236
    } else {
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   237
        newPosition = reached;
116
0d36aade845e some stuff, don't remember what
nireco
parents: 115
diff changeset
   238
        onCollision();
92
fe9da348afed Kimpoomisia
ekku
parents: 91
diff changeset
   239
        //this->velocity = Vector(0, 0);
77
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   240
        //TODO: it shouldn't just stop on collision
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   241
    }
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   242
    this->position = newPosition;
114
71f7e9d3d052 V?h?n siistin tota walkkia, viel? on kyll? tekemist?.
saiam
parents: 112
diff changeset
   243
    
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   244
}
97
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   245
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   246
/**
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   247
 * Gets the index of the given coordinate direction
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   248
 * referring to the DIRECTIONS table in Physics.hh
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   249
 */
95
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
   250
int getDirectionIndex (Vector dir) {
110
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   251
    if(dir.x == 0 && dir.y == -1) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   252
        return 0;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   253
    } else if(dir.x == 1 && dir.y == -1) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   254
        return 1;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   255
    } else if(dir.x == 1 && dir.y == 0) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   256
        return 2;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   257
    } else if(dir.x == 1 && dir.y == 1) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   258
        return 3;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   259
    } else if(dir.x == 0 && dir.y == 1) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   260
        return 4;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   261
    } else if(dir.x == -1 && dir.y == 1) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   262
        return 5;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   263
    } else if(dir.x == -1 && dir.y == 0) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   264
        return 6;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   265
    } else if(dir.x == -1 && dir.y == -1) {
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   266
        return 7;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   267
    }
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   268
    Engine::log(DEBUG, "physics.getDirectionIndex ") << "invalid direction: " << dir;
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   269
    return 0;
95
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
   270
}
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
   271
97
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   272
/**
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   273
 * Computes hitten wall's normal. Calculated from 3*3 grid
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   274
 */
95
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
   275
Vector PhysicsWorld::getNormal (Vector hitPoint, Vector prevPoint) {
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   276
    // Search free points with bfs and put them to vector
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   277
    std::vector<Vector> frees;
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   278
    Vector hit(hitPoint);
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   279
    Vector prev(prevPoint);
104
5cb116dc0759 Pomppii paremmin
ekku
parents: 103
diff changeset
   280
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   281
    assert(hit != prev);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   282
    
124
2fd698e04779 fixed collision detection again, and put some needed rounding to getNormal
nireco
parents: 123
diff changeset
   283
    int dirIdx = getDirectionIndex(prev.roundToInt() - hit.roundToInt());
122
16a73ebca810 No warnings anymore, but well have to think about that applyForce
saiam
parents: 116
diff changeset
   284
    //float tmp1 = hit.x-prev.x;
16a73ebca810 No warnings anymore, but well have to think about that applyForce
saiam
parents: 116
diff changeset
   285
    //float tmp2 = hit.y-prev.y;
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   286
    //    Engine::log(DEBUG, "physics.getNormal ") << dirIdx << " " << tmp1 << " " << tmp2;
104
5cb116dc0759 Pomppii paremmin
ekku
parents: 103
diff changeset
   287
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   288
    for(int i = 1; i <= 2; i++) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   289
        if(getType(hit+DIRECTIONS[(dirIdx+i) % 8]) == EMPTY)
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   290
            frees.push_back(DIRECTIONS[(dirIdx+i) % 8]);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   291
        else 
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   292
            break;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   293
    }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   294
    for(int i = 1; i <= 2; i++) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   295
        if(getType(hit+DIRECTIONS[(dirIdx-i+8) % 8]) == EMPTY)
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   296
            frees.push_back(DIRECTIONS[(dirIdx-i+8) % 8]);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   297
        else
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   298
            break;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   299
    }
98
606c419e42a7 Ei se viel? k??nny kun on sienestetty.
saiam
parents: 97
diff changeset
   300
    frees.push_back(DIRECTIONS[dirIdx]);
97
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   301
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   302
    Vector normal(0,0);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   303
    for(unsigned int i = 0; i < frees.size(); i++) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   304
        normal += frees[i];
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   305
    }
110
a3dd8691f13a and getNormal works finally
nireco
parents: 109
diff changeset
   306
    Engine::log(DEBUG, "physics.getNormal ") << "normal: " << normal;
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   307
    return normal;
97
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   308
}
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   309
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   310
/**
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   311
 * Bounces from straight wall in any direction.
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   312
 * Direction given as normal of that wall
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   313
 */
109
   314
// TODO Bounce doesnt work kun oikealle tai vasemmalle alaviistoon mennään suoralla (tangentaalinen arvo väärän suuntainen)
97
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   315
void PhysicsObject::bounce (Vector normal) {
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   316
    Vector tangent(normal.y, -normal.x);
101
1c52bd7fbc43 dot production vec*scalar
nireco
parents: 100
diff changeset
   317
    Vector tprojection = tangent*(velocity * tangent) / (tangent.length()*tangent.length());
1c52bd7fbc43 dot production vec*scalar
nireco
parents: 100
diff changeset
   318
    Vector nprojection = normal*(velocity * normal) / (normal.length()*normal.length());
99
c9b96dcfe4ee Mui. Sienet.
saiam
parents: 98
diff changeset
   319
    velocity = tprojection - nprojection;
97
2e7c8ab485de Voi tuska mun kanssani
ekku
parents: 96
diff changeset
   320
}
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   321
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 93
diff changeset
   322
/*bool PhysicsWorld::collided (Vector oldPos, Vector newPos) {
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   323
  return false;
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   324
  }*/
73
3274c4804ea5 Collision and stuff
ekku
parents: 71
diff changeset
   325
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   326
/**
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   327
 * Integrates given force over time and stores new position to
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   328
 * posAfterTick and new velocity to velAfterTick.
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   329
 * @param force Force vector.
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   330
 * @param dt The time the force is applied (<=PHYSICS_TICK_MS)
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   331
 */
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 84
diff changeset
   332
void PhysicsObject::integrate(Force force, TimeMS dt) {
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   333
    Derivative tmpd;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   334
    Derivative k1 = evaluate(force, 0, tmpd);
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   335
    Derivative k2 = evaluate(force, 0.5f*dt, k1);
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   336
    Derivative k3 = evaluate(force, 0.5f*dt, k2);
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   337
    Derivative k4 = evaluate(force, dt, k3);
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   338
    
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   339
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   340
    const Vector dxdt = (k1.dx + (k2.dx + k3.dx) * 2.0f + k4.dx) * 1.0f/6.0f;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   341
    const Vector dvdt = (k1.dv + (k2.dv + k3.dv) * 2.0f + k4.dv) * 1.0f/6.0f;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   342
    
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   343
    //    Engine::log(DEBUG, "PhysicsObject.integrate") << "Changes: "<< dxdt << " " << dvdt << " Time: " <<dt;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   344
    posAfterTick = posAfterTick + (dxdt * dt)/1000;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   345
    velAfterTick = velAfterTick + (dvdt * dt)/1000;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   346
    //Engine::log(DEBUG, "PhysicsObject.integrate") << "velAfterTick: " << velAfterTick;
70
a5b7499219a4 Some drafts
saiam
parents: 68
diff changeset
   347
}
a5b7499219a4 Some drafts
saiam
parents: 68
diff changeset
   348
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 84
diff changeset
   349
Derivative PhysicsObject::evaluate(Force force, TimeMS dt, Derivative &d) {
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   350
    Vector curPos = posAfterTick + (d.dx*dt)/1000;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   351
    Vector curVel = velAfterTick + (d.dv*dt)/1000;
58
a53f5ad69500 "working" singleplayer
terom
parents: 54
diff changeset
   352
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   353
    Derivative out;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   354
    out.dx = curVel;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   355
    out.dv = acceleration(force);
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   356
    //Engine::log(DEBUG, "PhysicsObject.evaluate") << "Out.dx: " << out.dx;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   357
    return out;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   358
}
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   359
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 84
diff changeset
   360
Vector PhysicsObject::acceleration(const Force &force) {
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   361
    return (force/mass);
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   362
}
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 82
diff changeset
   363
122
16a73ebca810 No warnings anymore, but well have to think about that applyForce
saiam
parents: 116
diff changeset
   364
void PhysicsObject::applyForce (Force force) {
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   365
    // Add applied force to the queue
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   366
    forceq.push(force);
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   367
}
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   368
108
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   369
void PhysicsObject::changeAim(float da) {
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   370
    this->aim += da;
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   371
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   372
    if (this->aim > PLAYER_AIM_MAX) this->aim = PLAYER_AIM_MAX;
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   373
    if (this->aim < PLAYER_AIM_MIN) this->aim = PLAYER_AIM_MIN;
109
   374
    //Engine::log(DEBUG, "PhysicsObject.changeAim") << "Player aim: " << this->aim;
108
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   375
}
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   376
128
890ac82cdcc0 Documenting more, cleaning variables. This code needs some serious
saiam
parents: 124
diff changeset
   377
void PhysicsObject::setFacing(bool facingRight) {
109
   378
    //Engine::log(DEBUG, "PhysicsObject.setFacing") << "Facing: " << right;
128
890ac82cdcc0 Documenting more, cleaning variables. This code needs some serious
saiam
parents: 124
diff changeset
   379
    this->facingRight = facingRight;
108
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   380
}
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   381
107
505bfa531496 send inAir attribute as part of NETWORK_PLAYER_POSITION...
terom
parents: 106
diff changeset
   382
void PhysicsObject::updatePhysics (Vector position, Vector velocity, bool inAir) {
47
87883096a882 It's like so cool.
saiam
parents: 45
diff changeset
   383
    this->position = position;
87883096a882 It's like so cool.
saiam
parents: 45
diff changeset
   384
    this->velocity = velocity;
107
505bfa531496 send inAir attribute as part of NETWORK_PLAYER_POSITION...
terom
parents: 106
diff changeset
   385
    this->inAir = inAir;
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   386
}
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   387
    
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   388
Vector PhysicsObject::getPosition () {
47
87883096a882 It's like so cool.
saiam
parents: 45
diff changeset
   389
    return this->position;
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   390
}
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   391
108
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   392
bool PhysicsObject::getFacing() {
128
890ac82cdcc0 Documenting more, cleaning variables. This code needs some serious
saiam
parents: 124
diff changeset
   393
    return this->facingRight;
108
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   394
}
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   395
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   396
float PhysicsObject::getAim() {
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   397
    return this->aim;
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   398
}
1b93045a5b0a T?ht?in lis?tty, tosin se piirret??n tosi rumasti.
saiam
parents: 107
diff changeset
   399
91
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 90
diff changeset
   400
std::vector<Vector>& PhysicsObject::getShape () {
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 90
diff changeset
   401
    return this->shape;
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 90
diff changeset
   402
}
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 90
diff changeset
   403
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 90
diff changeset
   404
void PhysicsObject::setShape (std::vector<Vector> shape) {
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   405
    this->shape = shape;
91
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 90
diff changeset
   406
}
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 90
diff changeset
   407
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   408
void PhysicsObject::tick () {
47
87883096a882 It's like so cool.
saiam
parents: 45
diff changeset
   409
    this->updatePosition();
44
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   410
}
b165c9a26b2e Physics implementation.
ekku
parents:
diff changeset
   411
75
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   412
/**
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   413
 * simple random map generation
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   414
 * first fills whole level with dirt
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   415
 * then randomizes circles of empty or rock
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   416
 * @param seed - seed number for random number generator
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   417
 */
79
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   418
void PhysicsWorld::generateTerrain(int seed) {
75
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   419
    // generating should use own random number generator, but didn't find easily how that is done
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   420
    srand(seed);
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   421
    
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   422
    // some constants to control random generation
103
ekku
parents: 102
diff changeset
   423
    const int min_range = 25;
ekku
parents: 102
diff changeset
   424
    const int max_range = 80;
ekku
parents: 102
diff changeset
   425
    const int num = 50;
75
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   426
    const int rock_rarity = 4; // 1 / rock_rarity will be rock circle
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   427
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   428
    // loops for amount of circles
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   429
    for(int i = 0; i < num; i++) {
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   430
        // information of new circle
79
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   431
        int midx = rand()%(int)dimensions.x;
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   432
        int midy = rand()%(int)dimensions.y;
88
7431cd0cf900 Kuu n?kyy!
ekku
parents: 86
diff changeset
   433
        int range = rand()%(max_range-min_range)+min_range;
79
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   434
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   435
        // put first circle in the middle of the cave
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   436
        // so that we have some area we can certainly spawn into 
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   437
        if(i == 0) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   438
            midx = dimensions.x/2;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   439
            midy = dimensions.y/2;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   440
            range = 150;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   441
        }
79
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   442
90
ekku
parents: 88
diff changeset
   443
        TerrainType type = EMPTY;
75
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   444
        if(rand()%rock_rarity == 0) {
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   445
            type = ROCK;
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   446
        }
90
ekku
parents: 88
diff changeset
   447
75
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   448
        // loops for every pixel of circle
79
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   449
        for(int x = std::max(0, midx-range); x < std::min((int)dimensions.x, midx+range); x++) {
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
   450
            for(int y = std::max(0, midy-range); y < std::min((int)dimensions.y, midy+range); y++) {
109
   451
                //if((x-midx) * (x-midx) + (y-midy) * (y-midy) < range*range) {
123
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   452
                // and sets it to type
7efb63402b2b Documenting a little bit
saiam
parents: 122
diff changeset
   453
                terrain[x][y] = type;
109
   454
                //}
75
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   455
            }
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   456
        }
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   457
    }
f2c79f2d9384 added simple random map generation
nireco
parents: 73
diff changeset
   458
}
77
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   459
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   460
/**
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   461
 * Returns terrainType in given tile. ROCK if tile is out of area
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   462
 * @param pos - coordinate of tile
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   463
 */
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   464
TerrainType PhysicsWorld::getType(int x, int y) const {
77
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   465
    if(x < 0 || y < 0 || x >= dimensions.x || y >= dimensions.y) {
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   466
        return ROCK;
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   467
    }
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   468
    return terrain[x][y];
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 76
diff changeset
   469
}
112
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   470
TerrainType PhysicsWorld::getType(Vector pos) const {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   471
    int x = (int)(pos.x);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   472
    int y = (int)(pos.y);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   473
    return getType(x, y);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   474
}
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   475
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   476
/**
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   477
 * Removes ground from given circle. ROCK is not removed.
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   478
 * @param (x, y) or pos - center of circle.
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   479
 * @param r - radius of circle
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   480
 */
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   481
void PhysicsWorld::removeGround(int x, int y, float r) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   482
    for(int i = x-(int)r; i < x+r; i++) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   483
        for(int j = y-(int)r; j < y+r; j++) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   484
            if(getType(i, j) != ROCK) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   485
                if((i-x)*(i-x)+(j-y)*(j-y) < r*r) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   486
                    // Safe because getType returns ROCK if tile is out of bounds
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   487
                    terrain[i][j] = EMPTY;
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   488
                }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   489
            }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   490
        }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   491
    }
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   492
}
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   493
void PhysicsWorld::removeGround(Vector pos, float r) {
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   494
    removeGround((int)pos.x, (int)pos.y, r);
1b9ad61bdf2d added method for removing ground, not used anywhere
nireco
parents: 111
diff changeset
   495
}