Changeset 10519 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 30, 2007, 9:51:21 PM (18 years ago)

Author:

patrick

Message:

emitter fix

Location:

trunk/src/world_entities

Files:

• bsp_entity.cc (modified) (4 diffs)
• bsp_entity.h (modified) (2 diffs)
• environments/rotor.cc (modified) (2 diffs)
• npcs/mover.cc (modified) (3 diffs)
• particles/particle_system.cc (modified) (1 diff)

trunk/src/world_entities/bsp_entity.cc

@@ -57 +57 @@
 
   this->bspManager = NULL;
+  this->sortTransparency = 1;
+  this->sortTransparencyMore = 0;
+
 
   this->name_handle = registerVarId( new SynchronizeableString( &this->name, &this->name_write, "name", PERMISSION_MASTER_SERVER ) );
@@ -74 +77 @@
 
     this->bspManager = new BspManager(this);
+    this->bspManager->sortTransparency = this->sortTransparency;
+    this->bspManager->sortTransparencyMore = this->sortTransparencyMore;
 
     if(this->bspManager->load(name.c_str(), 0.1f) == -1 ) {
@@ -87 +92 @@
 }
 
+void BspEntity::setTransparency(int sort, int sortMore)
+{
+  this->sortTransparency = sort;
+  this->sortTransparencyMore = sortMore;
+  
+  if (this->bspManager != NULL)
+  {
+    this->bspManager->sortTransparency = sort;
+    this->bspManager->sortTransparencyMore = sortMore;
+  }
+}
 
 /**
@@ -101 +117 @@
   .describe("Sets the of the BSP file.");
 
+  LoadParam(root, "Transparency", this, BspEntity, setTransparency)
+  .describe("1. argument: true -> sort transparent textures; 2. argument: true -> better but slower sorting")
+  .defaultValues(1, 0);
+  
   /*  LoadParam(root, "Scale", this, BSpEntity, setScale)
         .describe("Sets the scale factore of the bsp level.");

trunk/src/world_entities/bsp_entity.h

@@ -26 +26 @@
 
   void setName(const std::string& name);
+  void setTransparency(int sort, int sortMore = 0);
 
   void init();
@@ -44 +45 @@
    std::string name_write;             //!< temp variable to store name
    int name_handle;                    //!< handle for name
-
+   int sortTransparency;              //!< sort transparent textures
+   int sortTransparencyMore;          //!< sort transparent textures better
 };
 

trunk/src/world_entities/environments/rotor.cc

@@ -30 +30 @@
 {
   this->registerObject(this, Rotor::_objectList);
-  this->toList(OM_GROUP_00);
-  
+  this->toList(OM_ENVIRON);
+
   //PRINTF(0)("loading Rotor");
 
@@ -63 +63 @@
 {
      this->shiftDir(Quaternion(rotation.x*dt, Vector(1,0,0)) * Quaternion(rotation.y*dt, Vector(0,1,0)) * Quaternion(rotation.z*dt, Vector(0,0,1)));
-     
+
 }
 

trunk/src/world_entities/npcs/mover.cc

@@ -20 +20 @@
 
 #include "mover.h"
+#include "state.h"
+#include "camera.h"
 
 
@@ -31 +33 @@
 {
     this->registerObject(this, Mover::_objectList);
-    this->toList(OM_COMMON);
+    this->toList(OM_ENVIRON);
 
     this->targetCoordinates = Vector(0, 0, 0);
@@ -224 +226 @@
         if (distance < this->actionRadius)
         {
-            this->soundSource_starting.setSourceNode(entity);   // bad hack!
-            this->soundSource_moving.setSourceNode(entity);     // TODO: make the sound louder without
-            this->soundSource_ending.setSourceNode(entity);     // attaching him to the player
+            this->soundSource_starting.setSourceNode((PNode*)State::getCamera());   // bad hack!
+            this->soundSource_moving.setSourceNode((PNode*)State::getCamera());     // TODO: make the sound louder without
+            this->soundSource_ending.setSourceNode((PNode*)State::getCamera());     // attaching him to the player
             return true;
         }

trunk/src/world_entities/particles/particle_system.cc

@@ -264 +264 @@
   emitter->system = this;
   this->emitters.push_back(emitter);
+
+  // init the emitertter with the coordinates of the system
+  emitter->setAbsCoor(this->getAbsCoor());
+
 }