Changeset 8904 in orxonox.OLD

Timestamp:

Jun 29, 2006, 1:40:35 PM (18 years ago)

Author:

bottac

Message:

bugfix

Location:

branches/single_player_map/src

Files:

• lib/graphics/importer/bsp_file.cc (modified) (5 diffs)
• lib/graphics/importer/bsp_file.h (modified) (2 diffs)
• lib/graphics/importer/bsp_manager.cc (modified) (2 diffs)
• lib/graphics/importer/bsp_manager.h (modified) (2 diffs)
• world_entities/bsp_entity.cc (modified) (7 diffs)

branches/single_player_map/src/lib/graphics/importer/bsp_file.cc

@@ -46 +46 @@
 BspFile::BspFile()
 {}
+
+BspFile::~ BspFile()
+{
+  delete [] nodes;
+  delete [] leaves;
+  delete [] planes;
+  delete [] bspModels;
+  delete [] leafFaces;
+  delete [] faces;
+  delete [] leafBrushes;
+  delete [] brushes;
+  delete [] brushSides;
+  delete [] vertice;
+  delete [] meshverts;
+  delete [] visData;
+  delete [] textures;
+  delete [] patchVertice;
+  delete [] patchIndexes;
+ // delete [] patchTrianglesPerRow;
+  delete [] lightMaps;
+  
+  for(int i = 0; i < this->numPatches; ++i) delete this->VertexArrayModels[i];
+ // delete  [] VertexArrayModels;
+  
+  for(int i = 0; i < this->numTextures; ++i)
+  {
+    delete this->Materials[i].mat;
+    //delete this->Materials[i].aviMat;
+  }
+  delete [] this->Materials;
+  //delete [] testSurf;
+  
+  
+  
+}
 
 /**
@@ -294 +329 @@
     this->patchVertice = new char[8*8*44*(this->numPatches+10)];
     this->patchIndexes = new char[7*8*2*4*(this->numPatches+10)];
-    this->patchRowIndexes = new int*[7*4*this->numPatches];
+ // this->patchRowIndexes = new int*[7*4*this->numPatches]; Not needed?
     this->patchTrianglesPerRow = new char[7*4*this->numPatches];
     this->VertexArrayModels  = new VertexArrayModel*[this->numPatches];
@@ -464 +499 @@
 
     if(File(absFileName).exists()) {
-      PRINTF(0)("BSP FILE: gefunden . \n");
+      PRINTF(4)("BSP FILE: gefunden . \n");
       this->Materials[i] = this->loadAVI(fileName);
       continue;
@@ -553 +588 @@
     }
 
-    PRINTF(0)("BSP FILE: Textur %s nicht  gefunden . \n", &this->textures[8+72*i]);
+    PRINTF(0)("BSP FILE: Texture %s not found.",&this->textures[8+ 72*i] );
     //  Default Material
     this->Materials[i].mat = new Material();
@@ -1012 +1047 @@
   Face->meshvert = patchOffset -sz;  //3*(patchOffset-sz)*level1*level1;
   Face->n_meshverts = sz;
-  PRINTF(4)("BSP FILE: sz: %i. \n", sz);
-  PRINTF(4)("BSP FILE: Face->meshvert %i . \n", Face->meshvert);
+  PRINTF(0)("BSP FILE: sz: %i. \n", sz);
+  PRINTF(0)("BSP FILE: Face->meshvert %i . \n", Face->meshvert);
 
   //Face->n_meshverts = sz;

branches/single_player_map/src/lib/graphics/importer/bsp_file.h

@@ -151 +151 @@
 public:
   BspFile();
+  ~BspFile();
   int read(const char* name );
   void build_tree();
@@ -183 +184 @@
 
   int** patchRowIndexes;
-  VertexArrayModel** VertexArrayModels;
+  VertexArrayModel** VertexArrayModels; 
   int patchOffset;
 

branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc

@@ -77 +77 @@
 } */
 
-void BspManager::load(const char* fileName, float scale)
+BspManager::~BspManager()
+{
+  if(this->bspFile)
+    delete this->bspFile;
+}
+ 
+int BspManager::load(const char* fileName, float scale)
 {
   // open a BSP file
+  
+  
   this->bspFile = new BspFile();
   this->bspFile->scale =  scale;
-  this->bspFile->read(ResourceManager::getFullName(fileName).c_str());
+  if(this->bspFile->read(ResourceManager::getFullName(fileName).c_str()) == -1)
+    return -1;
   this->bspFile->build_tree();
   this->root  = this->bspFile->get_root();
@@ -88 +97 @@
 
   this->outputFraction = 1.0f;
+  
+  return 0;
 }
 /*

branches/single_player_map/src/lib/graphics/importer/bsp_manager.h

@@ -41 +41 @@
 class WorldEntity;
 
+
+// Obsolete
 struct BspCollisionEvent
 {
@@ -54 +56 @@
 
   BspManager(const char* fileName, float scale = 0.4f);
-  void load(const char* fileName, float scale);
+  
+  // Deconstructor
+  ~BspManager();
+  
+ 
 
   // Functions
+  int load(const char* fileName, float scale);
   const void draw();
   const void tick(float time);

branches/single_player_map/src/world_entities/bsp_entity.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
-
+ 
    Copyright (C) 2004 orx
-
+ 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-
+ 
    ### File Specific:
    main-programmer: Claudio Botta
@@ -15 +15 @@
 
 #include "bsp_entity.h"
+#include "util/loading/resource_manager.h"
 #include "util/loading/resource_manager.h"
 
@@ -43 +44 @@
 
 
+
 /**
  * initializes the BspEntity
@@ -50 +52 @@
 {
   this->setClassID(CL_BSP_ENTITY, "BspEntity");
-
-  this->bspManager = new BspManager(this);
-  this->toList(OM_ENVIRON);
-
+  this->bspManager = NULL;
   /**
    * @todo: Write CL_BSP_ENTITY INTO THE src/defs/class_id.h (your own definition)
@@ -64 +63 @@
   PRINTF(0)("+++++++++++ LOADING NAME %s\n", name.c_str());
 
-  this->bspManager->load(name.c_str(), 0.1f);
+  // Check wether file exists....
+  if ( File(ResourceManager::getFullName(name)).exists()  ){
+    // War das Laden erfolgreich?
+    this->bspManager = new BspManager(this);
+    if(this->bspManager->load(name.c_str(), 0.1f) == -1 ) {
+      this->bspManager = NULL;
+      // Dont do anything
+    } else {
+
+     
+      this->toList(OM_ENVIRON); // Success!!!
+    }
+  } else {
+    this->toList(OM_DEAD);
+  }
 }
 
@@ -76 +89 @@
 {
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
- // WorldEntity::loadParam(root);
+  // WorldEntity::loadParam(root);
 
   LoadParam(root, "Name", this, BspEntity, setName)
-      .describe("Sets the of the BSP file.");
+  .describe("Sets the of the BSP file.");
 
-/*  LoadParam(root, "Scale", this, BSpEntity, setScale)
-      .describe("Sets the scale factore of the bsp level.");
-*/
+  /*  LoadParam(root, "Scale", this, BSpEntity, setScale)
+        .describe("Sets the scale factore of the bsp level.");
+  */
 
   /**
@@ -115 +128 @@
  */
 void BspEntity::collidesWith (WorldEntity* entity, const Vector& location)
-{
-
-}
+{}