src/proto2/Physics.hh
author terom
Mon, 24 Nov 2008 17:14:29 +0000
changeset 96 4a801210096c
parent 95 10704e1df844
child 98 606c419e42a7
permissions -rw-r--r--
fix movement physics+network code to some degree, jumping is now buggy?
42
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
     1
#ifndef PHYSICS_HH
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
     2
#define PHYSICS_HH
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
     3
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
     4
#include "Vector.hh"
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
     5
72
04428c5e548c Enum fix
ekku
parents: 71
diff changeset
     6
#include <vector>
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
     7
#include <queue>
50
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 48
diff changeset
     8
#include <ClanLib/core.h>
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 48
diff changeset
     9
79
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
    10
typedef uint16_t TimeMS;
78
bbc21da84813 This is probably better way of representing time
saiam
parents: 77
diff changeset
    11
79
295ecb26d8ff jotain mik? hajottaa kaiken
ekku
parents: 78
diff changeset
    12
const TimeMS PHYSICS_TICK_MS = 10;
42
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
    13
72
04428c5e548c Enum fix
ekku
parents: 71
diff changeset
    14
enum TerrainType {EMPTY, DIRT, ROCK};
71
b5dbb83daa94 En takaa et k??ntyy en?? 8)
ekku
parents: 70
diff changeset
    15
95
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
    16
const Vector DIRECTIONS[] = { Vector(0,-1), Vector(1,-1), Vector(1,0), Vector(1,1),
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
    17
							Vector(0,1), Vector(-1,1), Vector(-1,0), Vector(-1,-1) };
10704e1df844 Normal stuff
ekku
parents: 94
diff changeset
    18
50
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 48
diff changeset
    19
// forward-declare
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 48
diff changeset
    20
class PhysicsObject;
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 83
diff changeset
    21
typedef Vector Force;
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    22
struct Derivative;
50
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 48
diff changeset
    23
42
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
    24
class PhysicsWorld {
60
26571fd9a8d1 physics is starting to work
terom
parents: 58
diff changeset
    25
    friend class PhysicsObject;
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    26
    
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    27
private:
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    28
    CL_Timer tick_timer;
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    29
    
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    30
protected:
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    31
    std::vector<PhysicsObject*> objects;
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    32
    Vector gravity;
86
ed31ece6f340 Segfault <3 (mik? oli odotettavaa)
saiam
parents: 85
diff changeset
    33
    Vector dimensions;
ed31ece6f340 Segfault <3 (mik? oli odotettavaa)
saiam
parents: 85
diff changeset
    34
ed31ece6f340 Segfault <3 (mik? oli odotettavaa)
saiam
parents: 85
diff changeset
    35
72
04428c5e548c Enum fix
ekku
parents: 71
diff changeset
    36
    std::vector<std::vector<TerrainType> > terrain;
71
b5dbb83daa94 En takaa et k??ntyy en?? 8)
ekku
parents: 70
diff changeset
    37
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    38
    CL_SlotContainer slots;
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    39
    
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    40
    PhysicsWorld (Vector gravity, Vector dimensions);
86
ed31ece6f340 Segfault <3 (mik? oli odotettavaa)
saiam
parents: 85
diff changeset
    41
ed31ece6f340 Segfault <3 (mik? oli odotettavaa)
saiam
parents: 85
diff changeset
    42
ed31ece6f340 Segfault <3 (mik? oli odotettavaa)
saiam
parents: 85
diff changeset
    43
public:
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    44
    
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    45
    void addObject (PhysicsObject *object);
50
9e1a6506f5a1 some rough-handed code modifications towards a newer, better, working Physics
terom
parents: 48
diff changeset
    46
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    47
    void tick (void);
74
279788e460fd changed some tabs from Physics.hh
nireco
parents: 73
diff changeset
    48
    void generateTerrain (int seed);
279788e460fd changed some tabs from Physics.hh
nireco
parents: 73
diff changeset
    49
    bool collided (Vector oldPos, Vector newPos);
77
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 75
diff changeset
    50
98dc9008d15f changed collision detection, remove old if content with new
nireco
parents: 75
diff changeset
    51
    TerrainType getType(Vector pos) const;
42
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
    52
};
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
    53
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
    54
class PhysicsObject {
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    55
protected:
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    56
    PhysicsWorld &world;
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    57
    
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    58
    float mass;
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    59
    Vector position;
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    60
    Vector velocity;
74
279788e460fd changed some tabs from Physics.hh
nireco
parents: 73
diff changeset
    61
    // Whether the object (worms mainly) is in the air 
279788e460fd changed some tabs from Physics.hh
nireco
parents: 73
diff changeset
    62
    // or firmly on the ground. Affects to physics.
279788e460fd changed some tabs from Physics.hh
nireco
parents: 73
diff changeset
    63
    bool inAir;
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    64
91
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
    65
	// Shape of the object. We use a polygon with 4 edges
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
    66
	// to make easy to draw with Clanlib. The coordinates
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
    67
	// are relative to the center point.
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
    68
	std::vector<Vector> shape;
88
7431cd0cf900 Kuu n?kyy!
ekku
parents: 86
diff changeset
    69
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    70
    // Force queue that is emptied on every tick
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    71
    std::queue<Force> forceq;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    72
    Vector posAfterTick;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    73
    Vector velAfterTick;
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
    74
91
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
    75
	/**
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
    76
	 * @param shape Corners of the four sided polygon.
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
    77
	 */
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    78
    PhysicsObject (PhysicsWorld &world, float mass, Vector position, Vector velocity);
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    79
    
96
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    80
    /**
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    81
     * Used to handle in-air movement
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    82
     */    
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 83
diff changeset
    83
    virtual void applyForce (Force force, TimeMS dt);
96
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    84
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    85
    /**
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    86
     * Called on network clients to sync state from server
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    87
     */
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
    88
    void updatePhysics (Vector position, Vector velocity);
96
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    89
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    90
    /**
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    91
     * Handle ground movement
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    92
     *
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    93
     * @return new position
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    94
     */
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    95
	Vector walk (bool right);
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    96
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    97
    /**
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    98
     * Handle ground-jumping
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
    99
     */
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 91
diff changeset
   100
	void jump (void);
96
4a801210096c fix movement physics+network code to some degree, jumping is now buggy?
terom
parents: 95
diff changeset
   101
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   102
private:
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   103
    void updatePosition (void);
94
08bebac3d0c2 Maalla liikkumista
ekku
parents: 91
diff changeset
   104
	bool possibleLocation (Vector loc);
69
309c11126949 little cleanup
saiam
parents: 66
diff changeset
   105
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   106
    /**
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   107
     * Use RK4 to integrate the effects of force over a time intervall.
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   108
     */
85
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 83
diff changeset
   109
    void integrate(Force force, TimeMS dt);
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 83
diff changeset
   110
    Derivative evaluate(Force force, TimeMS dt, Derivative &d);
351cb6b69c04 Making things simpler. More to come soon.
saiam
parents: 83
diff changeset
   111
    Vector acceleration(const Force &force);
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   112
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   113
public:
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   114
    Vector getPosition (void);
91
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
   115
	std::vector<Vector>& getShape(void);
0a6d675099dc Mato salmiakin muotoiseksi
ekku
parents: 88
diff changeset
   116
	void setShape (std::vector<Vector> shape);
70
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   117
    
a5b7499219a4 Some drafts
saiam
parents: 69
diff changeset
   118
    void tick (void);
42
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
   119
};
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
   120
83
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   121
struct Derivative {
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   122
    Vector dx; // Velocity
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   123
    Vector dv; // Acceleration
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   124
};
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   125
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   126
cbba9729e92b Integrointia fyssaan, jotain pikkubugausta havaittavissa.
saiam
parents: 79
diff changeset
   127
42
eb1a93a38cde lazy commit that breaks everything, should be a branch
terom
parents:
diff changeset
   128
#endif