Changeset 10511 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2007, 7:39:47 PM (18 years ago)

Author:

snellen

Message:

corrected typo in worldentity → setVisibiliy to setVisibility

Location:

trunk/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• effects/blink.cc (modified) (1 diff)
• effects/trail.cc (modified) (1 diff)
• npcs/generic_npc.cc (modified) (1 diff)
• npcs/npc.cc (modified) (1 diff)
• projectiles/acid_splash.cc (modified) (3 diffs)
• projectiles/hbolt.cc (modified) (3 diffs)
• projectiles/lbolt.cc (modified) (3 diffs)
• projectiles/spike_ball.cc (modified) (3 diffs)
• weather_effects/lightning_effect.cc (modified) (4 diffs)
• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/creatures/fps_player.cc

@@ -341 +341 @@
 if( this->bJump)
     {
-      printf("dummyvariable:( %f, %f, %f) \n", this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ() );
+      printf("panicGuy:runTo( %f, %f, %f ) \n", this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ() );
       this->bJump = false;
      }

trunk/src/world_entities/effects/blink.cc

@@ -63 +63 @@
 
   this->bBoard = new Billboard;
-  this->bBoard->setVisibiliy(true);
+  this->bBoard->setVisibility(true);
   this->bBoard->setTexture("textures/light/blink.png");
 

trunk/src/world_entities/effects/trail.cc

@@ -94 +94 @@
 
   this->setAbsCoor(0, 0, 0);
-  this->setVisibiliy(true);
+  this->setVisibility(true);
 
   this->nodeList[0] = (this->getAbsCoor());

trunk/src/world_entities/npcs/generic_npc.cc

@@ -48 +48 @@
                         ->addMethod("playAnimation", Executor2<GenericNPC, lua_State*,int,int>(&GenericNPC::playAnimation))
                         // Display
-                        ->addMethod("hide", Executor0<WorldEntity, lua_State*>(&WorldEntity::hide))
-                        ->addMethod("unhide", Executor0<WorldEntity, lua_State*>(&WorldEntity::unhide))
+                        ->addMethod("setVisibility", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::setVisibility))
                         // Coordinates
                         ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))

trunk/src/world_entities/npcs/npc.cc

@@ -65 +65 @@
                         ->addMethod("fire", Executor0<NPC, lua_State*>(&NPC::fire))
                         ->addMethod("pause", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::pauseTrack))
-                        ->addMethod("hide", Executor0<WorldEntity, lua_State*>(&WorldEntity::hide))
-                        ->addMethod("unhide", Executor0<WorldEntity, lua_State*>(&WorldEntity::unhide))
+                        ->addMethod("setVisibility", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::setVisibility))
                        );
 

trunk/src/world_entities/projectiles/acid_splash.cc

@@ -54 +54 @@
   this->grid = new Wobblegrid( 5);
   this->grid->setParent( this);
-  this->grid->setVisibiliy(false);
+  this->grid->setVisibility(false);
 
 
@@ -99 +99 @@
   this->toList(OM_ENVIRON);
  // this->unhide();
-  this->grid->setVisibiliy(true);
+  this->grid->setVisibility(true);
 
   this->setPhysDamage(10);
@@ -112 +112 @@
 
  // this->hide();
-  this->grid->setVisibiliy(false);
+  this->grid->setVisibility(false);
   this->lifeCycle = 0.0;
   this->toList(OM_NULL);

trunk/src/world_entities/projectiles/hbolt.cc

@@ -59 +59 @@
   this->halo->setSize(.65, .65);
   this->halo->setTexture("hbolt_halo2.png");
-  this->halo->setVisibiliy(false);
+  this->halo->setVisibility(false);
 
 }
@@ -86 +86 @@
 void HBolt::activate()
 {
-  this->halo->setVisibiliy(true);
+  this->halo->setVisibility(true);
   this->origList = this->getOMListNumber();
   this->toList(OM_ENVIRON);
@@ -109 +109 @@
 void HBolt::deactivate()
 {
-  this->halo->setVisibiliy(false);
+  this->halo->setVisibility(false);
   assert (HBolt::explosionParticles != NULL);
   HBolt::explosionParticles->removeEmitter(this->emitter);

trunk/src/world_entities/projectiles/lbolt.cc

@@ -62 +62 @@
   this->halo->setSize(.35, .35);
   this->halo->setTexture("hbolt_halo.png");
-  this->halo->setVisibiliy(false);
+  this->halo->setVisibility(false);
 
 
@@ -90 +90 @@
 void LBolt::activate()
 {
-  this->halo->setVisibiliy(true);
+  this->halo->setVisibility(true);
   this->origList = this->getOMListNumber();
   this->toList(OM_ENVIRON);
@@ -115 +115 @@
   assert (LBolt::explosionParticles != NULL);
   LBolt::explosionParticles->removeEmitter(this->emitter);
-  this->halo->setVisibiliy(false);
+  this->halo->setVisibility(false);
   this->lifeCycle = 0.0;
 

trunk/src/world_entities/projectiles/spike_ball.cc

@@ -60 +60 @@
   this->halo->setSize(2, 2);
   this->halo->setTexture("hbolt_halo.png");
-  this->halo->setVisibiliy(false);
+  this->halo->setVisibility(false);
 
   this->setFragments(26);
@@ -95 +95 @@
 void SpikeBall::activate()
 {
-  this->halo->setVisibiliy(true);
+  this->halo->setVisibility(true);
   if (unlikely(SpikeBall::explosionParticles == NULL))
   {
@@ -142 +142 @@
 void SpikeBall::deactivate()
 {
-  this->halo->setVisibiliy(false);
+  this->halo->setVisibility(false);
   assert (SpikeBall::explosionParticles != NULL);
   //SpikeBall::explosionParticles->removeEmitter(this->emitter);

trunk/src/world_entities/weather_effects/lightning_effect.cc

@@ -107 +107 @@
         this->thunderBolt[i] = new Billboard(NULL);
         this->thunderBolt[i]->setSize(this->width, this->height);
-        this->thunderBolt[i]->setVisibiliy(false);
+        this->thunderBolt[i]->setVisibility(false);
     }
 
@@ -176 +176 @@
     int i;
     for (i = 0; i < 4; i++)
-        this->thunderBolt[i]->setVisibiliy(false);
+        this->thunderBolt[i]->setVisibility(false);
 
 }
@@ -197 +197 @@
 
         // Start a flash & lightning cycle
-        this->thunderBolt[0]->setVisibiliy(true);
+        this->thunderBolt[0]->setVisibility(true);
 
         // Lighten up environment
@@ -209 +209 @@
 
     if( this->thunderBolt[0]->isVisible() && this->time > this->flashRisingTime*1/3 ) {
-        this->thunderBolt[0]->setVisibiliy(false);
-        this->thunderBolt[1]->setVisibiliy(true);
+        this->thunderBolt[0]->setVisibility(false);
+        this->thunderBolt[1]->setVisibility(true);
     } else if( this->thunderBolt[1]->isVisible() && this->time > this->flashRisingTime*2/3 ) {
-        this->thunderBolt[1]->setVisibiliy(false);
-        this->thunderBolt[2]->setVisibiliy(true);
+        this->thunderBolt[1]->setVisibility(false);
+        this->thunderBolt[2]->setVisibility(true);
 
     } else if( this->thunderBolt[2]->isVisible() && this->time > this->flashRisingTime) {
-        this->thunderBolt[2]->setVisibiliy(false);
-        this->thunderBolt[3]->setVisibiliy(true);
+        this->thunderBolt[2]->setVisibility(false);
+        this->thunderBolt[3]->setVisibility(true);
     }
 
     if( this->thunderBolt[3]->isVisible() && this->time > this->flashHoldTime) {
-        this->thunderBolt[3]->setVisibiliy(false);
+        this->thunderBolt[3]->setVisibility(false);
 
         this->time = 0.0f;

trunk/src/world_entities/world_entity.cc

@@ -717 +717 @@
 void WorldEntity::draw(const Model* model) const
 {
+  if(bVisible)
+  {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -733 +735 @@
 
   glPopMatrix();
+  }
 }
 

trunk/src/world_entities/world_entity.h

@@ -64 +64 @@
 
   /** @param visibility if the Entity should be visible (been draw) */
-  void setVisibiliy (bool visibility) { this->bVisible = visibility; };
+  void setVisibility (bool visibility) { this->bVisible = visibility; };
   /** @returns true if the entity is visible, false otherwise */
   inline bool isVisible() const { return this->bVisible; };