Context Navigation

← Previous Change
Next Change →

graphics

Timestamp:

Sep 1, 2006, 8:06:39 PM (18 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:

branches/new_class_id/src/lib/graphics

Files:

: 72 edited

effects/atmospheric_engine.cc (modified) (3 diffs)
effects/atmospheric_engine.h (modified) (1 diff)
effects/cloud_effect.cc (modified) (1 diff)
effects/cloud_effect.h (modified) (1 diff)
effects/fog_effect.cc (modified) (1 diff)
effects/fog_effect.h (modified) (1 diff)
effects/graphics_effect.cc (modified) (1 diff)
effects/graphics_effect.h (modified) (1 diff)
effects/lense_flare.cc (modified) (1 diff)
effects/lense_flare.h (modified) (1 diff)
effects/lightning_effect.cc (modified) (1 diff)
effects/lightning_effect.h (modified) (1 diff)
effects/rain_effect.cc (modified) (1 diff)
effects/rain_effect.h (modified) (1 diff)
effects/snow_effect.cc (modified) (1 diff)
effects/snow_effect.h (modified) (1 diff)
effects/volfog_effect.cc (modified) (1 diff)
effects/volfog_effect.h (modified) (1 diff)
effects/weather_effect.cc (modified) (1 diff)
effects/weather_effect.h (modified) (1 diff)
graphics_engine.cc (modified) (2 diffs)
graphics_engine.h (modified) (1 diff)
importer/height_map.cc (modified) (1 diff)
importer/height_map.h (modified) (1 diff)
importer/interactive_model.cc (modified) (1 diff)
importer/interactive_model.h (modified) (1 diff)
importer/material.cc (modified) (1 diff)
importer/material.h (modified) (1 diff)
importer/md2/md2Model.cc (modified) (1 diff)
importer/md2/md2Model.h (modified) (1 diff)
importer/media_container.cc (modified) (1 diff)
importer/media_container.h (modified) (1 diff)
importer/model.cc (modified) (1 diff)
importer/model.h (modified) (1 diff)
importer/movie_player.cc (modified) (1 diff)
importer/movie_player.h (modified) (1 diff)
importer/objModel.cc (modified) (1 diff)
importer/objModel.h (modified) (1 diff)
importer/static_model.cc (modified) (1 diff)
importer/static_model.h (modified) (1 diff)
importer/texture.cc (modified) (1 diff)
importer/texture.h (modified) (1 diff)
importer/texture_sequence.cc (modified) (1 diff)
importer/texture_sequence.h (modified) (1 diff)
importer/vertex_array_model.cc (modified) (1 diff)
importer/vertex_array_model.h (modified) (1 diff)
light.cc (modified) (2 diffs)
light.h (modified) (2 diffs)
render2D/element_2d.cc (modified) (1 diff)
render2D/element_2d.h (modified) (1 diff)
render2D/image_plane.cc (modified) (1 diff)
render2D/image_plane.h (modified) (1 diff)
render2D/render_2d.cc (modified) (1 diff)
render2D/render_2d.h (modified) (1 diff)
shader.cc (modified) (1 diff)
shader.h (modified) (1 diff)
spatial_separation/quadtree.cc (modified) (1 diff)
spatial_separation/quadtree.h (modified) (1 diff)
spatial_separation/quadtree_node.cc (modified) (1 diff)
spatial_separation/quadtree_node.h (modified) (1 diff)
spatial_separation/spatial_separation.cc (modified) (1 diff)
spatial_separation/spatial_separation.h (modified) (1 diff)
text_engine/font.cc (modified) (1 diff)
text_engine/font.h (modified) (1 diff)
text_engine/limited_width_text.cc (modified) (1 diff)
text_engine/limited_width_text.h (modified) (1 diff)
text_engine/multi_line_text.cc (modified) (1 diff)
text_engine/multi_line_text.h (modified) (1 diff)
text_engine/text.cc (modified) (1 diff)
text_engine/text.h (modified) (1 diff)
text_engine/text_engine.cc (modified) (2 diffs)
text_engine/text_engine.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.cc

-                      r9694
+                      r9715
 #include "util/loading/factory.h"
 NewObjectListDefinition(AtmosphericEngine);
+ObjectListDefinition(AtmosphericEngine);
 /**
 …
 void AtmosphericEngine::draw() const
+{
   for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
+  for (ObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
        it != WeatherEffect::objectList().end();
        ++it)
 …
+{
   for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
+  for (ObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
        it != WeatherEffect::objectList().end();
        ++it)

branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.h

r9685	r9715
14	14	class AtmosphericEngine : public BaseObject
15	15	{
16		~~New~~ObjectListDeclaration(AtmosphericEngine);
	16	ObjectListDeclaration(AtmosphericEngine);
17	17	public:
18	18	~AtmosphericEngine();

branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc

r9709	r9715
40	40	float CloudEffect::fadeTime;
41	41
42		~~New~~ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
	42	ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
43	43
44	44

branches/new_class_id/src/lib/graphics/effects/cloud_effect.h

r9686	r9715
37	37
38	38	class CloudEffect : public WeatherEffect {
39		~~New~~ObjectListDeclaration(CloudEffect);
	39	ObjectListDeclaration(CloudEffect);
40	40
41	41	public:

branches/new_class_id/src/lib/graphics/effects/fog_effect.cc

r9709	r9715
22	22	#include "cloud_effect.h"
23	23
24		~~New~~ObjectListDefinition(FogEffect);
	24	ObjectListDefinition(FogEffect);
25	25	// Define shell commands
26	26	//SHELL_COMMAND(activate, FogEffect, activateFog);

branches/new_class_id/src/lib/graphics/effects/fog_effect.h

r9686	r9715
15	15	class FogEffect : public WeatherEffect
16	16	{
17		~~New~~ObjectListDeclaration(FogEffect);
	17	ObjectListDeclaration(FogEffect);
18	18	public:
19	19	FogEffect(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/effects/graphics_effect.cc

r9685	r9715
22	22	#include "util/loading/load_param.h"
23	23
24		~~New~~ObjectListDefinition(GraphicsEffect);
	24	ObjectListDefinition(GraphicsEffect);
25	25
26	26	/**

branches/new_class_id/src/lib/graphics/effects/graphics_effect.h

r9685	r9715
13	13	//! A class that handles GraphicsEffects. The GraphicsEffectManager operates on this.
14	14	class GraphicsEffect : public BaseObject {
15		~~New~~ObjectListDeclaration(GraphicsEffect);
	15	ObjectListDeclaration(GraphicsEffect);
16	16	public:
17	17	GraphicsEffect(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/effects/lense_flare.cc

r9709	r9715
35	35	#include "class_id.h"
36	36
37		~~New~~ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
	37	ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
38	38	CREATE_FACTORY(LenseFlare);
39	39

branches/new_class_id/src/lib/graphics/effects/lense_flare.h

r9686	r9715
26	26	class LenseFlare : public GraphicsEffect
27	27	{
28		~~New~~ObjectListDeclaration(LenseFlare);
	28	ObjectListDeclaration(LenseFlare);
29	29	public:
30	30	LenseFlare(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc

r9709	r9715
29	29	#include "class_id.h"
30	30
31		~~New~~ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
	31	ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
32	32
33	33	SHELL_COMMAND(activate, LightningEffect, activateLightning);

branches/new_class_id/src/lib/graphics/effects/lightning_effect.h

r9686	r9715
19	19	class LightningEffect : public WeatherEffect
20	20	{
21		~~New~~ObjectListDeclaration(LightningEffect);
	21	ObjectListDeclaration(LightningEffect);
22	22	public:
23	23	LightningEffect(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

r9709	r9715
33	33	#include "class_id.h"
34	34
35		~~New~~ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
	35	ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
36	36
37	37	// Define shell commands

branches/new_class_id/src/lib/graphics/effects/rain_effect.h

r9686	r9715
25	25	class RainEffect : public WeatherEffect
26	26	{
27		~~New~~ObjectListDeclaration(RainEffect);
	27	ObjectListDeclaration(RainEffect);
28	28	public:
29	29	RainEffect(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

r9709	r9715
32	32	#include "class_id.h"
33	33
34		~~New~~ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
	34	ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
35	35	SHELL_COMMAND(activate, SnowEffect, activateSnow);
36	36	SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);

branches/new_class_id/src/lib/graphics/effects/snow_effect.h

r9686	r9715
23	23	class SnowEffect : public WeatherEffect
24	24	{
25		~~New~~ObjectListDeclaration(SnowEffect);
	25	ObjectListDeclaration(SnowEffect);
26	26	public:
27	27	SnowEffect(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc

r9709	r9715
48	48
49	49	#include "class_id.h"
50		~~New~~ObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
	50	ObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
51	51	CREATE_FACTORY(VolFogEffect);
52	52

branches/new_class_id/src/lib/graphics/effects/volfog_effect.h

r9686	r9715
13	13	class VolFogEffect : public WeatherEffect
14	14	{
15		~~New~~ObjectListDeclaration(VolFogEffect);
	15	ObjectListDeclaration(VolFogEffect);
16	16	public:
17	17	VolFogEffect(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/effects/weather_effect.cc

r9685	r9715
20	20	#include "util/loading/load_param.h"
21	21
22		~~New~~ObjectListDefinition(WeatherEffect);
	22	ObjectListDefinition(WeatherEffect);
23	23
24	24	/**

branches/new_class_id/src/lib/graphics/effects/weather_effect.h

r9685	r9715
12	12	class WeatherEffect : public BaseObject
13	13	{
14		~~New~~ObjectListDeclaration(WeatherEffect);
	14	ObjectListDeclaration(WeatherEffect);
15	15
16	16	public:

branches/new_class_id/src/lib/graphics/graphics_engine.cc

-                      r9685
+                      r9715
 SHELL_COMMAND(fps, GraphicsEngine, toggleFPSdisplay);
 NewObjectListDefinition(GraphicsEngine);
+ObjectListDefinition(GraphicsEngine);
 /**
 …
   // tick the graphics effects
   for (NewObjectList<GraphicsEffect>::const_iterator it = GraphicsEffect::objectList().begin();
+  for (ObjectList<GraphicsEffect>::const_iterator it = GraphicsEffect::objectList().begin();
        it != GraphicsEffect::objectList().end();
        ++it)

branches/new_class_id/src/lib/graphics/graphics_engine.h

r9685	r9715
30	30	class GraphicsEngine : public EventListener
31	31	{
32		~~New~~ObjectListDeclaration(GraphicsEngine);
	32	ObjectListDeclaration(GraphicsEngine);
33	33	public:
34	34	virtual ~GraphicsEngine();

branches/new_class_id/src/lib/graphics/importer/height_map.cc

r9684	r9715
327	327
328	328
329		~~New~~ObjectListDefinition(HeightMap);
	329	ObjectListDefinition(HeightMap);
330	330
331	331

branches/new_class_id/src/lib/graphics/importer/height_map.h

r9684	r9715
72	72	class HeightMap : public VertexArrayModel
73	73	{
74		~~New~~ObjectListDeclaration(HeightMap);
	74	ObjectListDeclaration(HeightMap);
75	75	friend class Tile;
76	76

branches/new_class_id/src/lib/graphics/importer/interactive_model.cc

r9684	r9715
22	22
23	23
24		~~New~~ObjectListDefinition(InteractiveModel);
	24	ObjectListDefinition(InteractiveModel);
25	25
26	26	/**

branches/new_class_id/src/lib/graphics/importer/interactive_model.h

r9684	r9715
30	30	class InteractiveModel : public Model
31	31	{
32		~~New~~ObjectListDeclaration(InteractiveModel);
	32	ObjectListDeclaration(InteractiveModel);
33	33	public:
34	34	InteractiveModel();

branches/new_class_id/src/lib/graphics/importer/material.cc

r9685	r9715
27	27	#include "util/loading/resource_manager.h"
28	28
29		~~New~~ObjectListDefinition(Material);
	29	ObjectListDefinition(Material);
30	30
31	31	/**

branches/new_class_id/src/lib/graphics/importer/material.h

r9685	r9715
24	24	class Material : public BaseObject
25	25	{
26		~~New~~ObjectListDeclaration(Material);
	26	ObjectListDeclaration(Material);
27	27	public:
28	28	Material (const std::string& mtlName = "");

branches/new_class_id/src/lib/graphics/importer/md2/md2Model.cc

r9685	r9715
22	22
23	23
24		~~New~~ObjectListDefinition(MD2Model);
	24	ObjectListDefinition(MD2Model);
25	25
26	26	//! the model anorms

branches/new_class_id/src/lib/graphics/importer/md2/md2Model.h

r9685	r9715
149	149	//! This is a MD2 Model class
150	150	class MD2Model : public InteractiveModel {
151		~~New~~ObjectListDeclaration(MD2Model);
	151	ObjectListDeclaration(MD2Model);
152	152	public:
153	153	MD2Model(const std::string& modelFileName, const std::string& skinFileName = "", float scale = 1.0f);

branches/new_class_id/src/lib/graphics/importer/media_container.cc

r9685	r9715
30	30	#include "debug.h"
31	31
32		~~New~~ObjectListDefinition(MediaContainer);
	32	ObjectListDefinition(MediaContainer);
33	33
34	34	/**

branches/new_class_id/src/lib/graphics/importer/media_container.h

r9685	r9715
24	24	class MediaContainer : public TextureSequence
25	25	{
26		~~New~~ObjectListDeclaration(MediaContainer);
	26	ObjectListDeclaration(MediaContainer);
27	27	private:
28	28

branches/new_class_id/src/lib/graphics/importer/model.cc

r9684	r9715
20	20	#include "glincl.h"
21	21
22		~~New~~ObjectListDefinition(Model);
	22	ObjectListDefinition(Model);
23	23
24	24	/**

branches/new_class_id/src/lib/graphics/importer/model.h

r9684	r9715
54	54	//! This class defines the basic components of a model
55	55	class Model : virtual public BaseObject {
56		~~New~~ObjectListDeclaration(Model);
	56	ObjectListDeclaration(Model);
57	57
58	58	public:

branches/new_class_id/src/lib/graphics/importer/movie_player.cc

r9685	r9715
30	30	#include "debug.h"
31	31
32		~~New~~ObjectListDefinition(MoviePlayer);
	32	ObjectListDefinition(MoviePlayer);
33	33
34	34	MoviePlayer::MoviePlayer(const std::string& filename)

branches/new_class_id/src/lib/graphics/importer/movie_player.h

r9685	r9715
31	31	class MoviePlayer : public BaseObject
32	32	{
33		~~New~~ObjectListDeclaration(MoviePlayer);
	33	ObjectListDeclaration(MoviePlayer);
34	34
35	35	private:

branches/new_class_id/src/lib/graphics/importer/objModel.cc

r9684	r9715
27	27	#include "compiler.h"
28	28
29		~~New~~ObjectListDefinition(OBJModel);
	29	ObjectListDefinition(OBJModel);
30	30	/**
31	31	* @brief Crates a 3D-Model, loads in a File and scales it.

branches/new_class_id/src/lib/graphics/importer/objModel.h

r9684	r9715
12	12	class OBJModel : public StaticModel
13	13	{
14		~~New~~ObjectListDeclaration(OBJModel);
	14	ObjectListDeclaration(OBJModel);
15	15	public:
16	16	OBJModel(const std::string& fileName, float scaling = 1.0);

branches/new_class_id/src/lib/graphics/importer/static_model.cc

r9684	r9715
134	134	/// MODEL ///
135	135	/////////////
136		~~New~~ObjectListDefinition(StaticModel);
	136	ObjectListDefinition(StaticModel);
137	137
138	138	/**

branches/new_class_id/src/lib/graphics/importer/static_model.h

r9684	r9715
94	94	class StaticModel : public Model
95	95	{
96		~~New~~ObjectListDeclaration(StaticModel);
	96	ObjectListDeclaration(StaticModel);
97	97	public:
98	98	StaticModel(const std::string& modelName = "");

branches/new_class_id/src/lib/graphics/importer/texture.cc

r9685	r9715
64	64	#endif
65	65
66		~~New~~ObjectListDefinition(Texture);
	66	ObjectListDefinition(Texture);
67	67
68	68	/**

branches/new_class_id/src/lib/graphics/importer/texture.h

r9685	r9715
20	20	class Texture : public BaseObject
21	21	{
22		~~New~~ObjectListDeclaration(Texture);
	22	ObjectListDeclaration(Texture);
23	23	public:
24	24	Texture();

branches/new_class_id/src/lib/graphics/importer/texture_sequence.cc

r9685	r9715
28	28	#endif
29	29
30		~~New~~ObjectListDefinition(TextureSequence);
	30	ObjectListDefinition(TextureSequence);
31	31
32	32	/**

branches/new_class_id/src/lib/graphics/importer/texture_sequence.h

r9685	r9715
15	15	class TextureSequence : public Texture
16	16	{
17		~~New~~ObjectListDeclaration(TextureSequence);
	17	ObjectListDeclaration(TextureSequence);
18	18	public:
19	19	TextureSequence(unsigned int count = 0, ...);

branches/new_class_id/src/lib/graphics/importer/vertex_array_model.cc

r9684	r9715
24	24
25	25
26		~~New~~ObjectListDefinition(VertexArrayModel);
	26	ObjectListDefinition(VertexArrayModel);
27	27
28	28	/////////////

branches/new_class_id/src/lib/graphics/importer/vertex_array_model.h

r9684	r9715
27	27	class VertexArrayModel : public Model
28	28	{
29		~~New~~ObjectListDeclaration(VertexArrayModel);
	29	ObjectListDeclaration(VertexArrayModel);
30	30	public:
31	31	VertexArrayModel();

branches/new_class_id/src/lib/graphics/light.cc

-                      r9709
+                      r9715
 #include "class_id.h"
 NewObjectListDefinitionID(Light, CL_LIGHT);
+ObjectListDefinitionID(Light, CL_LIGHT);
 CREATE_FACTORY(Light);
 …
 ** LIGHT-MANAGER **
 ******************/
 NewObjectListDefinition(LightManager);
+ObjectListDefinition(LightManager);
 /**
  *  standard constructor for a Light

branches/new_class_id/src/lib/graphics/light.h

-                      r9685
+                      r9715
 class Light : public PNode
+{
   NewObjectListDeclaration(Light);
+  ObjectListDeclaration(Light);
 public:
   Light(const TiXmlElement* root = NULL);
 …
 class LightManager : public BaseObject
+{
   NewObjectListDeclaration(LightManager);
+  ObjectListDeclaration(LightManager);
   friend class Light;

branches/new_class_id/src/lib/graphics/render2D/element_2d.cc

r9685	r9715
35	35	SHELL_COMMAND(debug, Element2D, debug2D);
36	36
37		~~New~~ObjectListDefinition(Element2D);
	37	ObjectListDefinition(Element2D);
38	38
39	39

branches/new_class_id/src/lib/graphics/render2D/element_2d.h

r9685	r9715
89	89	class Element2D : virtual public BaseObject
90	90	{
91		~~New~~ObjectListDeclaration(Element2D);
	91	ObjectListDeclaration(Element2D);
92	92
93	93	public:

branches/new_class_id/src/lib/graphics/render2D/image_plane.cc

r9709	r9715
26	26	#include "class_id.h"
27	27
28		~~New~~ObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
	28	ObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
29	29	CREATE_FACTORY(ImagePlane);
30	30

branches/new_class_id/src/lib/graphics/render2D/image_plane.h

r9685	r9715
17	17	class ImagePlane : public Element2D
18	18	{
19		~~New~~ObjectListDeclaration(ImagePlane);
	19	ObjectListDeclaration(ImagePlane);
20	20	public:
21	21	ImagePlane(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/graphics/render2D/render_2d.cc

r9685	r9715
21	21	#include "element_2d.h"
22	22
23		~~New~~ObjectListDefinition(Render2D);
	23	ObjectListDefinition(Render2D);
24	24
25	25

branches/new_class_id/src/lib/graphics/render2D/render_2d.h

r9685	r9715
14	14	class Render2D : public BaseObject
15	15	{
16		~~New~~ObjectListDeclaration(Render2D);
	16	ObjectListDeclaration(Render2D);
17	17
18	18	friend class Element2D;

branches/new_class_id/src/lib/graphics/shader.cc

r9685	r9715
33	33
34	34
35		~~New~~ObjectListDefinition(Shader);
	35	ObjectListDefinition(Shader);
36	36
37	37	/**

branches/new_class_id/src/lib/graphics/shader.h

r9685	r9715
19	19	class Shader : public BaseObject
20	20	{
21		~~New~~ObjectListDeclaration(Shader);
	21	ObjectListDeclaration(Shader);
22	22	public:
23	23	class Uniform

branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.cc

r9685	r9715
27	27	#define QUADTREE_MATERIAL_COUNT 4
28	28
29		~~New~~ObjectListDefinition(Quadtree);
	29	ObjectListDefinition(Quadtree);
30	30	/**
31	31	* standard constructor

branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.h

r9685	r9715
21	21	//! A class for quadtree separation of the world
22	22	class Quadtree : public BaseObject {
23		~~New~~ObjectListDeclaration(Quadtree);
	23	ObjectListDeclaration(Quadtree);
24	24
25	25	public:

branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.cc

r9685	r9715
27	27
28	28
29		~~New~~ObjectListDefinition(QuadtreeNode);
	29	ObjectListDefinition(QuadtreeNode);
30	30
31	31	/**

branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.h

r9685	r9715
26	26	//! A class for a Quadtree Node representation
27	27	class QuadtreeNode : public BaseObject {
28		~~New~~ObjectListDeclaration(QuadtreeNode);
	28	ObjectListDeclaration(QuadtreeNode);
29	29
30	30	public:

branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.cc

r9685	r9715
24	24
25	25
26		~~New~~ObjectListDefinition(SpatialSeparation);
	26	ObjectListDefinition(SpatialSeparation);
27	27
28	28	/**

branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.h

r9685	r9715
19	19	//! A class for spatial separation of vertices based arrays
20	20	class SpatialSeparation : public BaseObject {
21		~~New~~ObjectListDeclaration(SpatialSeparation);
	21	ObjectListDeclaration(SpatialSeparation);
22	22
23	23	public:

branches/new_class_id/src/lib/graphics/text_engine/font.cc

r9685	r9715
29	29	#include "compiler.h"
30	30
31		~~New~~ObjectListDefinition(Font);
	31	ObjectListDefinition(Font);
32	32
33	33	Font::Font()

branches/new_class_id/src/lib/graphics/text_engine/font.h

r9685	r9715
19	19	class Font : public Material
20	20	{
21		~~New~~ObjectListDeclaration(Font);
	21	ObjectListDeclaration(Font);
22	22
23	23	public:

branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.cc

r9685	r9715
19	19	#include "font.h"
20	20
21		~~New~~ObjectListDefinition(LimitedWidthText);
	21	ObjectListDefinition(LimitedWidthText);
22	22	/**
23	23	* @brief creates a new Text Element

branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.h

r9685	r9715
14	14	class LimitedWidthText : public Text
15	15	{
16		~~New~~ObjectListDeclaration(LimitedWidthText);
	16	ObjectListDeclaration(LimitedWidthText);
17	17	public:
18	18	typedef enum {

branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.cc

r9685	r9715
19	19	#include "font.h"
20	20
21		~~New~~ObjectListDefinition(MultiLineText);
	21	ObjectListDefinition(MultiLineText);
22	22
23	23	/**

branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.h

r9685	r9715
14	14	class MultiLineText : public Text
15	15	{
16		~~New~~ObjectListDeclaration(MultiLineText);
	16	ObjectListDeclaration(MultiLineText);
17	17	public:
18	18	MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0);

branches/new_class_id/src/lib/graphics/text_engine/text.cc

r9685	r9715
22	22	#include "debug.h"
23	23
24		~~New~~ObjectListDefinition(Text);
	24	ObjectListDefinition(Text);
25	25
26	26	/**

branches/new_class_id/src/lib/graphics/text_engine/text.h

r9685	r9715
26	26	class Text : public Element2D
27	27	{
28		~~New~~ObjectListDeclaration(Text);
	28	ObjectListDeclaration(Text);
29	29	public:
30	30	Text(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE);

branches/new_class_id/src/lib/graphics/text_engine/text_engine.cc

-                      r9685
+                      r9715
 /// TEXT-ENGINE ///
 ///////////////////
 NewObjectListDefinition(TextEngine);
+ObjectListDefinition(TextEngine);
 /**
  *  standard constructor
 …
   PRINT(0)("Reference: %p; Text Counts: %d\n", this, Text::objectList().size());
   for (NewObjectList<Text>::const_iterator it = Text::objectList().begin();
+  for (ObjectList<Text>::const_iterator it = Text::objectList().begin();
        it != Text::objectList().end();
        ++it)

branches/new_class_id/src/lib/graphics/text_engine/text_engine.h

r9685	r9715
24	24	class TextEngine : public BaseObject
25	25	{
26		~~New~~ObjectListDeclaration(TextEngine);
	26	ObjectListDeclaration(TextEngine);
27	27	public:
28	28	virtual ~TextEngine();

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

Context Navigation

Changeset 9715 in orxonox.OLD for branches/new_class_id/src/lib/graphics

Legend:

Download in other formats: