Context Navigation

importer

Timestamp:

Aug 22, 2006, 1:16:23 PM (18 years ago)

Author:

bensch

Message:

adapted many classes to the new ClassID System, now comes the hard part… Scripting… then Network… wow this will be so bad :/

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

-                      r9406
+                      r9685
 #include "util/loading/resource_manager.h"
+NewObjectListDefinition(Material);
 /**
  * @brief creates a Material.
 …
 Material::Material (const std::string& mtlName)
+{
   this->setClassID(CL_MATERIAL, "Material");
+  this->registerObject(this, Material::_objectList);
   this->setIllum(3);

r8761	r9685
24	24	class Material : public BaseObject
25	25	{
	26	NewObjectListDeclaration(Material);
26	27	public:
27	28	Material (const std::string& mtlName = "");

-                      r9406
+                      r9685
+NewObjectListDefinition(MD2Model);
 //! the model anorms
 …
 MD2Model::MD2Model(const std::string& modelFileName, const std::string& skinFileName, float scale)
+{
   this->setClassID(CL_MD2_MODEL, "MD2Model");
+  this->registerObject(this, MD2Model::_objectList);
   /* this creates the data container via ressource manager */
   if (!modelFileName.empty())

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

-                      r8316
+                      r9685
 #include "debug.h"
+NewObjectListDefinition(MediaContainer);
 /**
 …
+{
   // set the class id for the base object
   this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
+  this->registerObject(this, MediaContainer::_objectList);
   fps = 0;

r7221	r9685
24	24	class MediaContainer : public TextureSequence
25	25	{
26
	26	NewObjectListDeclaration(MediaContainer);
27	27	private:
28	28

-                      r7221
+                      r9685
 #include "debug.h"
+NewObjectListDefinition(MoviePlayer);
 MoviePlayer::MoviePlayer(const std::string& filename)
+{
   // set the class id for the base object
+  this->setClassID(CL_MOVIE_PLAYER, "MoviePlayer");
+  this->registerObject(this, MoviePlayer::_objectList);
   status = STOP;
   timer = 0;

r7221	r9685
31	31	class MoviePlayer : public BaseObject
32	32	{
	33	NewObjectListDeclaration(MoviePlayer);
33	34
34	35	private:

-                      r9406
+                      r9685
 #endif
+NewObjectListDefinition(Texture);
 /**
 …
     : data(texture.data)
+{
   this->setClassID(CL_TEXTURE, "Texture");
+  this->registerObject(this, Texture::_objectList);
   this->priority = 0.5;
+}
 …
 void Texture::init()
+{
   this->setClassID(CL_TEXTURE, "Texture");
+  this->registerObject(this, Texture::_objectList);
   this->data = TextureDataPointer(new TextureData());

r8761	r9685
20	20	class Texture : public BaseObject
21	21	{
	22	NewObjectListDeclaration(Texture);
22	23	public:
23	24	Texture();

-                      r9406
+                      r9685
 #endif
+NewObjectListDefinition(TextureSequence);
 /**
  * @brief Constructor for a Texture
 …
 TextureSequence::TextureSequence(unsigned int count, ...)
+{
   this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence");
+  this->registerObject(this, TextureSequence::_objectList);
   va_list textureNameList;
 …
 TextureSequence::TextureSequence(const std::vector<std::string>& textureNames, const std::string& prependFolder)
+{
   this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence");
+  this->registerObject(this, TextureSequence::_objectList);
   this->loadImageSeries(textureNames, prependFolder);
+}

r8324	r9685
15	15	class TextureSequence : public Texture
16	16	{
	17	NewObjectListDeclaration(TextureSequence);
17	18	public:
18	19	TextureSequence(unsigned int count = 0, ...);

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