Changeset 6693 in orxonox.OLD for branches/network/src/lib

Timestamp:

Jan 25, 2006, 2:19:46 PM (18 years ago)

Author:

patrick

Message:

branches: removed spaceshipcontrol branche

Location:

branches/network/src/lib

Files:

• graphics/importer/material.cc (modified) (2 diffs)
• graphics/importer/md2Model.cc (modified) (1 diff)
• graphics/shader.cc (modified) (1 diff)
• graphics/text_engine/text.cc (modified) (1 diff)
• lang/base_object.cc (modified) (1 diff)
• particles/Makefile.am (modified) (2 diffs)
• particles/dot_particles.cc (copied) (copied from trunk/src/lib/particles/dot_particles.cc)
• particles/dot_particles.h (copied) (copied from trunk/src/lib/particles/dot_particles.h)
• particles/model_particles.cc (modified) (1 diff)
• particles/spark_particles.cc (modified) (1 diff)
• particles/sprite_particles.cc (modified) (2 diffs)
• util/count_pointer.h (copied) (copied from trunk/src/lib/util/count_pointer.h)
• util/executor/executor.cc (modified) (1 diff)
• util/multi_type.cc (modified) (2 diffs)
• util/multi_type.h (modified) (4 diffs)
• util/substring.h (modified) (1 diff)

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

@@ -81 +81 @@
     ResourceManager::getInstance()->unload(this->diffuseTexture);
   if (m.diffuseTexture != NULL)
-    this->diffuseTexture = m.diffuseTexture; /// HACK shoudl be:(Texture*)ResourceManager::getInstance()->load();
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->copy(m.diffuseTexture);
   this->ambientTexture = NULL; /// FIXME
   this->specularTexture = NULL; /// FIXME
@@ -303 +303 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap != NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target);
   else
     this->diffuseTexture = NULL;

branches/network/src/lib/graphics/importer/md2Model.cc

@@ -78 +78 @@
 {
   /* this creates the data container via ressource manager */
-  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, (void*)skinFileName);
+  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName);
   if( unlikely(this->data == NULL))
     PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");

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

@@ -106 +106 @@
 Shader* Shader::getShader(const char* vertexShaderFile, const char* fragmentShaderFile)
 {
-  return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER,  RP_LEVEL, (void*)fragmentShaderFile);
+  return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER,  RP_LEVEL, fragmentShaderFile);
 }
 

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

@@ -92 +92 @@
   if (fontFile != NULL)
   {
-    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
+    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
     if (tmpFont != NULL)
       this->font = tmpFont;

branches/network/src/lib/lang/base_object.cc

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
+   co-programmer: Benjamin Grauer
 */
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_BASE

branches/network/src/lib/particles/Makefile.am

@@ -11 +11 @@
                         spark_particles.cc \
                         model_particles.cc \
+                        dot_particles.cc \
                         \
                         quick_animation.cc
@@ -22 +23 @@
                         spark_particles.h \
                         model_particles.h \
+                        dot_particles.h \
                         \
                         quick_animation.h

branches/network/src/lib/particles/model_particles.cc

@@ -61 +61 @@
 */
 ModelParticles::~ModelParticles()
-{
-  // deleting all the living Particles
-  while (this->particles)
-  {
-    Particle* tmpDelPart = this->particles;
-    this->particles = this->particles->next;
-    delete tmpDelPart;
-  }
-
-  // deleting all the dead particles
-  while (this->deadList)
-  {
-    Particle* tmpDelPart = this->deadList;
-    this->deadList = this->deadList->next;
-    delete tmpDelPart;
-  }
-}
+{ }
 
 /**

branches/network/src/lib/particles/spark_particles.cc

@@ -60 +60 @@
 */
 SparkParticles::~SparkParticles()
-{
-  // deleting all the living Particles
-  while (this->particles)
-  {
-    Particle* tmpDelPart = this->particles;
-    this->particles = this->particles->next;
-    delete tmpDelPart;
-  }
-
-  // deleting all the dead particles
-  while (this->deadList)
-  {
-    Particle* tmpDelPart = this->deadList;
-    this->deadList = this->deadList->next;
-    delete tmpDelPart;
-  }
-}
+{ }
 
 /**

branches/network/src/lib/particles/sprite_particles.cc

@@ -61 +61 @@
 */
 SpriteParticles::~SpriteParticles()
-{
-  // deleting all the living Particles
-  while (this->particles)
-  {
-    Particle* tmpDelPart = this->particles;
-    this->particles = this->particles->next;
-    delete tmpDelPart;
-  }
-
-  // deleting all the dead particles
-  while (this->deadList)
-  {
-    Particle* tmpDelPart = this->deadList;
-    this->deadList = this->deadList->next;
-    delete tmpDelPart;
-  }
-}
+{ }
 
 /**
@@ -125 +109 @@
   GLboolean checkLight = false;
   glGetBooleanv(GL_LIGHTING, &checkLight);
-  if (checkLight == GL_TRUE)
-    glDisable(GL_LIGHTING);
+//  if (checkLight == GL_TRUE)
+//    glDisable(GL_LIGHTING);
   glMatrixMode(GL_MODELVIEW);
   glDepthMask(GL_FALSE);

branches/network/src/lib/util/executor/executor.cc

@@ -60 +60 @@
   {
     int type = va_arg(parameterList, int);
-    this->defaultValue[i].setType(type);
+    this->defaultValue[i].setType((MT_Type)type);
   }
 }

branches/network/src/lib/util/multi_type.cc

@@ -122 +122 @@
 
 /**
+ * @brief checks if the two Multitypes match
+ * @param mt MultiType to check against this one
+ * @returns true on match. false otherwise
+ *
+ * Two MultiType match if and only if
+ *  1. the internal Type is the same
+ *  2. the stored values match
+ */
+bool MultiType::operator==(const MultiType& mt) const
+{
+  if (this->type != mt.type)
+    return false;
+
+  switch (this->type)
+  {
+    case MT_NULL:
+      return true;
+    case MT_BOOL:
+      return (this->value.Bool == mt.value.Bool);
+    case MT_INT:
+      return (this->value.Int == mt.value.Int);
+    case MT_CHAR:
+      return (this->value.Char == mt.value.Char);
+    case MT_FLOAT:
+      return (this->value.Float == mt.value.Float);
+    case MT_STRING:
+      if (this->value.String != NULL && mt.value.String != NULL)
+        return (!strcmp(this->value.String, mt.value.String));
+      else
+        return (this->value.String == NULL && mt.value.String == NULL);
+  }
+}
+
+/**
+ * @brief checks if the internal value matches the boolean value.
+ * @param value to check against this one
+ * @returns true on match. false otherwise
+ *
+ * Two MultiType match if and only if
+ *  1. the stored values match the given Value
+ */
+bool MultiType::operator==(const char* value) const
+{
+  if (this->value.String != NULL && value != NULL)
+    return (!strcmp(this->value.String, value));
+  else
+    return (this->value.String == NULL && value == NULL);
+}
+
+
+/**
  * initializes the MultiType
  */
@@ -136 +187 @@
  * @param type the new Type
  */
-void MultiType::setType(int type)
+void MultiType::setType(MT_Type type)
 {
   if (this->type != type)
-    this->type = (MT_Type)type;
+    this->type = type;
 }
 

branches/network/src/lib/util/multi_type.h

@@ -31 +31 @@
  */
 class MultiType {
-
   public:
     MultiType();
@@ -42 +41 @@
     virtual ~MultiType();
 
-    MultiType& operator= (const MultiType& mt);
+    MultiType& operator=(const MultiType& mt);
+    MultiType& operator=(bool value) { this->setBool(value); return *this; };
+    MultiType& operator=(int value) { this->setInt(value); return *this; };
+    MultiType& operator=(float value) { this->setFloat(value); return *this; };
+    MultiType& operator=(char value) { this->setChar(value); return *this; };
+    MultiType& operator=(const char* value) { this->setString(value); return *this; };
 
-    void setType(int type);
+    bool operator==(const MultiType& mt) const;
+    bool operator==(bool value) const { return (this->getBool() == value); };
+    bool operator==(int value) const { return (this->getInt() == value); };
+    bool operator==(float value) const { return (this->getFloat() ==  value); };
+    bool operator==(char value) const { return (this->getChar() == value); };
+    bool operator==(const char* value) const;
+    bool operator==(MT_Type type) const { return (this->type == type); }
+    bool operator!=(MT_Type type) const { return (this->type != type); }
+
+    void setType(MT_Type type);
 
     void setBool(bool value);
@@ -52 +65 @@
     void setString(const char* value);
 
+    // for your convenience.
     inline void setValue(bool value) { this->setBool(value); };
     inline void setValue(int value) { this->setInt(value); };
@@ -81 +95 @@
 
   private:
-
     union MultiTypeValue
     {

branches/network/src/lib/util/substring.h

@@ -16 +16 @@
   ~SubString();
 
+  const char* operator[](unsigned int i) { return this->getString(i); };
+
   inline unsigned int getCount() { return this->splittersCount; };
   const char* getString(unsigned int i);