Context Navigation

← Previous Change
Next Change →

importer

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/importer

Files:

: 24 edited

height_map.cc (modified) (1 diff)
height_map.h (modified) (1 diff)
interactive_model.cc (modified) (1 diff)
interactive_model.h (modified) (1 diff)
material.cc (modified) (1 diff)
material.h (modified) (1 diff)
md2/md2Model.cc (modified) (1 diff)
md2/md2Model.h (modified) (1 diff)
media_container.cc (modified) (1 diff)
media_container.h (modified) (1 diff)
model.cc (modified) (1 diff)
model.h (modified) (1 diff)
movie_player.cc (modified) (1 diff)
movie_player.h (modified) (1 diff)
objModel.cc (modified) (1 diff)
objModel.h (modified) (1 diff)
static_model.cc (modified) (1 diff)
static_model.h (modified) (1 diff)
texture.cc (modified) (1 diff)
texture.h (modified) (1 diff)
texture_sequence.cc (modified) (1 diff)
texture_sequence.h (modified) (1 diff)
vertex_array_model.cc (modified) (1 diff)
vertex_array_model.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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();

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/importer

Legend:

Download in other formats: