Context Navigation

← Previous Changeset
Next Changeset →

Changeset 5500 in orxonox.OLD

Timestamp:

Nov 8, 2005, 12:03:18 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: all the WorldEntities now have a const function to draw themselves

Location:

trunk/src/world_entities

Files:

: 34 edited

environment.cc (modified) (1 diff)
environment.h (modified) (1 diff)
npc2.cc (modified) (1 diff)
npc2.h (modified) (1 diff)
player.cc (modified) (1 diff)
player.h (modified) (1 diff)
power_ups/laser_power_up.cc (modified) (1 diff)
power_ups/laser_power_up.h (modified) (1 diff)
power_ups/turret_power_up.cc (modified) (1 diff)
power_ups/turret_power_up.h (modified) (1 diff)
satellite.cc (modified) (1 diff)
satellite.h (modified) (1 diff)
skysphere.cc (modified) (1 diff)
skysphere.h (modified) (1 diff)
terrain.cc (modified) (1 diff)
terrain.h (modified) (1 diff)
test_entity.cc (modified) (1 diff)
test_entity.h (modified) (1 diff)
weapons/laser.cc (modified) (1 diff)
weapons/laser.h (modified) (1 diff)
weapons/projectile.cc (modified) (1 diff)
weapons/projectile.h (modified) (1 diff)
weapons/rocket.cc (modified) (1 diff)
weapons/rocket.h (modified) (1 diff)
weapons/test_bullet.cc (modified) (1 diff)
weapons/test_bullet.h (modified) (1 diff)
weapons/test_gun.cc (modified) (1 diff)
weapons/test_gun.h (modified) (1 diff)
weapons/turret.cc (modified) (1 diff)
weapons/turret.h (modified) (1 diff)
weapons/weapon.cc (modified) (1 diff)
weapons/weapon.h (modified) (1 diff)
world_entity.cc (modified) (1 diff)
world_entity.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/world_entities/environment.cc

r5428	r5500
87	87	* draws the Environment
88	88	*/
89		void Environment::draw ()
	89	void Environment::draw () const
90	90	{
91	91	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/environment.h

r5361	r5500
30	30	virtual void tick (float time);
31	31
32		virtual void draw ();
	32	virtual void draw () const;
33	33
34	34	};

trunk/src/world_entities/npc2.cc

r5499	r5500
75	75	* Just override this function with whatever you want to be drawn.
76	76	*/
77		void NPC2::draw()
	77	void NPC2::draw() const
78	78	{
79	79	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/npc2.h

r5266	r5500
19	19
20	20	virtual void tick(float dt);
21		virtual void draw();
	21	virtual void draw() const;
22	22
23	23	virtual void collidesWith (WorldEntity* entity, const Vector& location);

trunk/src/world_entities/player.cc

r5483	r5500
233	233	* draws the player after transforming him.
234	234	*/
235		void Player::draw ()
	235	void Player::draw () const
236	236	{
237	237	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/player.h

r5435	r5500
44	44	virtual void collidesWith(WorldEntity* entity, const Vector& location);
45	45	virtual void tick(float time);
46		virtual void draw();
	46	virtual void draw() const;
47	47
48	48	virtual void process(const Event &event);

trunk/src/world_entities/power_ups/laser_power_up.cc

r5499	r5500
102	102	* Just override this function with whatever you want to be drawn.
103	103	*/
104		void LaserPowerUp::draw()
	104	void LaserPowerUp::draw() const
105	105	{ glMatrixMode(GL_MODELVIEW);
106	106	glPushMatrix();

trunk/src/world_entities/power_ups/laser_power_up.h

r5458	r5500
18	18	virtual void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
19	19	virtual void tick(float dt);
20		virtual void draw();
	20	virtual void draw() const;
21	21
22	22	private:

trunk/src/world_entities/power_ups/turret_power_up.cc

r5499	r5500
102	102	* Just override this function with whatever you want to be drawn.
103	103	*/
104		void TurretPowerUp::draw()
	104	void TurretPowerUp::draw() const
105	105	{ glMatrixMode(GL_MODELVIEW);
106	106	glPushMatrix();

trunk/src/world_entities/power_ups/turret_power_up.h

r5437	r5500
18	18	virtual void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location);
19	19	virtual void tick(float dt);
20		virtual void draw();
	20	virtual void draw() const;
21	21
22	22	private:

trunk/src/world_entities/satellite.cc

r5357	r5500
70	70	This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn.
71	71	*/
72		void Satellite::draw()
	72	void Satellite::draw() const
73	73	{
74	74	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/satellite.h

r5039	r5500
25	25	virtual ~Satellite ();
26	26
27		virtual void draw ();
	27	virtual void draw () const;
28	28	virtual void tick (float time);
29	29

trunk/src/world_entities/skysphere.cc

r5313	r5500
96	96	This part is normally precessed in the "Painting Phase".
97	97	*/
98		void Skysphere::draw()
	98	void Skysphere::draw() const
99	99	{
100	100	glPushMatrix();

trunk/src/world_entities/skysphere.h

r5405	r5500
32	32	void setTexture(char* fileName);
33	33
34		virtual void draw();
	34	virtual void draw() const;
35	35
36	36	private:

trunk/src/world_entities/terrain.cc

r5465	r5500
122	122
123	123
124		void Terrain::draw ()
	124	void Terrain::draw () const
125	125	{
126	126	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/terrain.h

r5465	r5500
36	36
37	37	void buildDebugTerrain(DebugTerrain debugTerrain);
38		virtual void draw();
	38	virtual void draw() const;
39	39
40	40	public:

trunk/src/world_entities/test_entity.cc

r5498	r5500
77	77
78	78
79		void TestEntity::draw ()
	79	void TestEntity::draw () const
80	80	{
81	81	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/test_entity.h

r5498	r5500
24	24	virtual void destroy ();
25	25	virtual void collidesWith(WorldEntity* entity, const Vector& location);
26		virtual void draw ();
	26	virtual void draw () const;
27	27
28	28	private:

trunk/src/world_entities/weapons/laser.cc

r5465	r5500
144	144
145	145
146		void Laser::draw ()
	146	void Laser::draw () const
147	147	{
148	148	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/weapons/laser.h

r5456	r5500
30	30
31	31	virtual void tick (float time);
32		virtual void draw ();
	32	virtual void draw () const;
33	33
34	34

trunk/src/world_entities/weapons/projectile.cc

r5357	r5500
127	127
128	128
129		void Projectile::draw ()
	129	void Projectile::draw () const
130	130	{
131	131	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/weapons/projectile.h

r5498	r5500
40	40
41	41	virtual void tick (float time);
42		virtual void draw ();
	42	virtual void draw () const;
43	43
44	44	protected:

trunk/src/world_entities/weapons/rocket.cc

r5499	r5500
177	177
178	178
179		void Rocket::draw ()
	179	void Rocket::draw () const
180	180	{
181	181	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/weapons/rocket.h

r5456	r5500
30	30
31	31	virtual void tick (float time);
32		virtual void draw ();
	32	virtual void draw () const;
33	33
34	34

trunk/src/world_entities/weapons/test_bullet.cc

r5499	r5500
171	171
172	172
173		void TestBullet::draw ()
	173	void TestBullet::draw () const
174	174	{
175	175	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/weapons/test_bullet.h

r5447	r5500
30	30
31	31	virtual void tick (float time);
32		virtual void draw ();
	32	virtual void draw () const;
33	33
34	34

trunk/src/world_entities/weapons/test_gun.cc

r5498	r5500
204	204	* this will draw the weapon
205	205	*/
206		void TestGun::draw ()
	206	void TestGun::draw () const
207	207	{
208	208	/* draw gun body */

trunk/src/world_entities/weapons/test_gun.h

r5498	r5500
51	51	virtual void destroy();
52	52
53		virtual void draw();
	53	virtual void draw() const;
54	54
55	55	private:

trunk/src/world_entities/weapons/turret.cc

r5456	r5500
156	156	* draws the Turret
157	157	*/
158		void Turret::draw ()
	158	void Turret::draw () const
159	159	{
160	160	this->getWeaponManager()->getFixedTarget()->debugDraw(10);

trunk/src/world_entities/weapons/turret.h

r4973	r5500
26	26	virtual void destroy();
27	27
28		virtual void draw();
	28	virtual void draw() const;
29	29
30	30	private:

trunk/src/world_entities/weapons/weapon.cc

r5498	r5500
533	533	* this will draw the weapon
534	534	*/
535		void Weapon::draw ()
	535	void Weapon::draw () const
536	536	{}
537	537

trunk/src/world_entities/weapons/weapon.h

r5441	r5500
150	150	void tickW(float dt); //!< this is a function that must be called by the weaponManager, or any other weaponHandler, all other functions are handled from within
151	151	virtual void tick(float dt) {};
152		virtual void draw();
	152	virtual void draw() const;
153	153
154	154	bool check() const;

trunk/src/world_entities/world_entity.cc

r5499	r5500
198	198	* Just override this function with whatever you want to be drawn.
199	199	*/
200		void WorldEntity::draw()
	200	void WorldEntity::draw() const
201	201	{
202	202	glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/world_entity.h

r5499	r5500
56	56
57	57	virtual void tick (float time);
58		virtual void draw ();
	58	virtual void draw () const;
59	59	void drawBVTree(unsigned int depth, int drawMode);
60	60

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 5500 in orxonox.OLD

Legend:

Download in other formats: