Changeset 7055 in orxonox.OLD for trunk

Timestamp:

Feb 6, 2006, 2:52:14 PM (18 years ago)

Author:

patrick

Message:

trunk: md2 scaling patch

Location:

trunk/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (2 diffs)
• lib/graphics/importer/md2Model.h (modified) (2 diffs)
• world_entities/terrain.cc (modified) (4 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/md2Model.cc

@@ -75 +75 @@
   \brief simple constructor initializing all variables
 */
-MD2Model::MD2Model(const char* modelFileName, const char* skinFileName)
+MD2Model::MD2Model(const char* modelFileName, const char* skinFileName, float scale)
 {
   /* this creates the data container via ressource manager */
@@ -82 +82 @@
     PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");
 
+  this->data->scaleFactor = scaleFactor;
   this->scaleFactor = this->data->scaleFactor;
 

trunk/src/lib/graphics/importer/md2Model.h

@@ -178 +178 @@
 {
  public:
-  MD2Data(const char* modelFileName, const char* skinFileName);
+   MD2Data(const char* modelFileName, const char* skinFileName);
   virtual ~MD2Data();
 
@@ -212 +212 @@
 
 public:
-  MD2Model(const char* modelFileName, const char* skinFileName = NULL);
+  MD2Model(const char* modelFileName, const char* skinFileName = NULL, float scale = 1.0f);
   virtual ~MD2Model();
 

trunk/src/world_entities/terrain.cc

@@ -43 +43 @@
 {
   this->init();
+
+
   if( root != NULL)
     this->loadParams(root);
-
-   this->heightMapMaterial = new Material();
-   heightMapMaterial->setTransparency(1.0);
-
-   heightMapMaterial->setDiffuse(0.4,0.4,0.4);
-   heightMapMaterial->setAmbient(0.4,0.4,0.4 );
-   heightMapMaterial->setSpecular(0.4,0.4,0.4);
-   heightMapMaterial->setShininess(.5);
-   heightMapMaterial->setTransparency(1.0);
 
 //  if (this->model != NULL)
@@ -119 +112 @@
 
   this->heightMap = NULL;
-  this->heightMapMaterial = NULL;
+
+  this->heightMapMaterial = new Material();
 }
 
@@ -169 +163 @@
 void Terrain::loadTexture(const char* textureName)
 {
-  if (this->heightMapMaterial != NULL)
-      delete this->heightMapMaterial;
-
-   this->heightMapMaterial = new Material();
-
    PRINTF(0)("Load texture: %s\n", textureName);
 
@@ -183 +172 @@
 
    heightMapMaterial->setDiffuseMap(textureName);
-//    heightMapMaterial->setAmbientMap(textureName);
-//    heightMapMaterial->setSpecularMap(t extureName);
+   heightMapMaterial->setAmbientMap(textureName);
+   heightMapMaterial->setSpecularMap(textureName);
 }
 

trunk/src/world_entities/world_entity.cc

@@ -163 +163 @@
     {
       PRINTF(4)("fetching MD2 file: %s\n", fileName);
-      Model* m = new MD2Model(fileName, this->md2TextureFileName);
+      Model* m = new MD2Model(fileName, this->md2TextureFileName, this->scaling);
       //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
       this->setModel(m, 0);