[Planeshift-cvs] CVS: planeshift/src/common/effects pseffectanchorsocket.cpp,1.10,1.11 pseffectanchorsocket.h,1.6,1.7 pseffectmanager.cpp,1.19,1.20 pseffectobj.cpp,1.36,1.37 pseffectobjsound.h,1.10,1.11 pseffectobjtext.cpp,1.21,1.22 pseffectobjtext.h,1.12,1.13 pseffectobjtrail.cpp,1.10,1.11

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/effects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18913/src/common/effects

Modified Files:
	pseffectanchorsocket.cpp pseffectanchorsocket.h 
	pseffectmanager.cpp pseffectobj.cpp pseffectobjsound.h 
	pseffectobjtext.cpp pseffectobjtext.h pseffectobjtrail.cpp 
Log Message:
Getting rid of tabs...


Index: pseffectanchorsocket.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectanchorsocket.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pseffectanchorsocket.cpp	22 Jul 2005 03:22:48 -0000	1.10
--- pseffectanchorsocket.cpp	1 Dec 2005 22:09:32 -0000	1.11
***************
*** 157,161 ****
      socket->SetSecondaryTransform(meshID, csReversibleTransform(mat, objOffset));
  
! 	return true;
  }
  
--- 157,161 ----
      socket->SetSecondaryTransform(meshID, csReversibleTransform(mat, objOffset));
  
!     return true;
  }
  

Index: pseffectanchorsocket.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectanchorsocket.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pseffectanchorsocket.h	17 Jun 2005 14:09:49 -0000	1.6
--- pseffectanchorsocket.h	1 Dec 2005 22:09:32 -0000	1.7
***************
*** 42,47 ****
      // we want to override these functions, because the default behaviour is for the effect to manage it
      void SetRotBase(const csMatrix3 & newRotBase) {}
! 	void SetPosition(const csVector3 & basePos, iSector * sector, const csMatrix3 & transf) {}
! 	void SetPosition(const csVector3 & basePos, iSectorList * sectors, const csMatrix3 & transf) {}
  
      /** Gets the name of the socket where this anchor is attached.
--- 42,47 ----
      // we want to override these functions, because the default behaviour is for the effect to manage it
      void SetRotBase(const csMatrix3 & newRotBase) {}
!     void SetPosition(const csVector3 & basePos, iSector * sector, const csMatrix3 & transf) {}
!     void SetPosition(const csVector3 & basePos, iSectorList * sectors, const csMatrix3 & transf) {}
  
      /** Gets the name of the socket where this anchor is attached.

Index: pseffectmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectmanager.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pseffectmanager.cpp	22 Nov 2005 04:34:57 -0000	1.19
--- pseffectmanager.cpp	1 Dec 2005 22:09:32 -0000	1.20
***************
*** 311,315 ****
  {
  #ifndef DONT_DO_EFFECTS
! 	unsigned int delId = (unsigned int)-1;
  
      if (elapsed == 0)
--- 311,315 ----
  {
  #ifndef DONT_DO_EFFECTS
!     unsigned int delId = (unsigned int)-1;
  
      if (elapsed == 0)
***************
*** 329,338 ****
          {
              delete effect;
! 			delId = id;
          }
      }
  
! 	if (delId != (unsigned int)-1)
! 		actualEffects.DeleteAll(delId);
  #endif
  }
--- 329,338 ----
          {
              delete effect;
!             delId = id;
          }
      }
  
!     if (delId != (unsigned int)-1)
!         actualEffects.DeleteAll(delId);
  #endif
  }

Index: pseffectobj.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobj.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** pseffectobj.cpp	26 Oct 2005 16:05:35 -0000	1.36
--- pseffectobj.cpp	1 Dec 2005 22:09:32 -0000	1.37
***************
*** 605,615 ****
          anchorMesh = anchor->GetMesh();
  
! 		/*
          if (isAlive)
              anchorMesh->GetChildren()->Add(mesh);
          anchorMesh->GetMovable()->UpdateMove();
! 		mesh->GetMovable()->SetPosition(csVector3(0,0,0));
          mesh->GetMovable()->UpdateMove();
! 		*/
          return true;
      }
--- 605,615 ----
          anchorMesh = anchor->GetMesh();
  
!         /*
          if (isAlive)
              anchorMesh->GetChildren()->Add(mesh);
          anchorMesh->GetMovable()->UpdateMove();
!         mesh->GetMovable()->SetPosition(csVector3(0,0,0));
          mesh->GetMovable()->UpdateMove();
!         */
          return true;
      }

Index: pseffectobjsound.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjsound.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pseffectobjsound.h	23 Jul 2005 09:46:46 -0000	1.10
--- pseffectobjsound.h	1 Dec 2005 22:09:32 -0000	1.11
***************
*** 57,63 ****
      bool loop;
      
! 	csRef<iSoundManager>	soundmanager;
!     csRef<iSoundHandle>		sndHandle;
!     csRef<iSoundSource>		sndSource;
  };
  
--- 57,63 ----
      bool loop;
      
!     csRef<iSoundManager>    soundmanager;
!     csRef<iSoundHandle>        sndHandle;
!     csRef<iSoundSource>        sndSource;
  };
  

Index: pseffectobjtext.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjtext.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** pseffectobjtext.cpp	3 Nov 2005 22:12:06 -0000	1.21
--- pseffectobjtext.cpp	1 Dec 2005 22:09:32 -0000	1.22
***************
*** 91,124 ****
      // Loop through all rows
      for(int i = 0; i < rows; i++)
! 	{
          row =  va_arg( arg, EffectTextRow*);
  
! 		// Text and Formatting
! 		newElem.colour = row->colour;
! 		newElem.hasOutline = row->hasOutline;
! 		newElem.hasShadow = row->hasShadow;
! 		newElem.shadowColour = row->shadowColour;
! 		newElem.outlineColour = row->outlineColour;
! 		newElem.text = row->text;
  
! 		// Positioning
          font->GetDimensions(newElem.text, newElem.width, newElem.height);
! 		newElem.x = x;
          newElem.y = y;
  
! 		textElems.Push(newElem);
          y += newElem.height;
! 	}
      va_end(arg);
  
      //now we have our elements..
! 	if ( RenderText(textElems) )
! 	{
      
! 		CalcTextureCoords();
! 		sprite->SetMaterialWrapper(mat);
! 		return true;
! 	}
! 	return false;
  }
  
--- 91,124 ----
      // Loop through all rows
      for(int i = 0; i < rows; i++)
!     {
          row =  va_arg( arg, EffectTextRow*);
  
!         // Text and Formatting
!         newElem.colour = row->colour;
!         newElem.hasOutline = row->hasOutline;
!         newElem.hasShadow = row->hasShadow;
!         newElem.shadowColour = row->shadowColour;
!         newElem.outlineColour = row->outlineColour;
!         newElem.text = row->text;
  
!         // Positioning
          font->GetDimensions(newElem.text, newElem.width, newElem.height);
!         newElem.x = x;
          newElem.y = y;
  
!         textElems.Push(newElem);
          y += newElem.height;
!     }
      va_end(arg);
  
      //now we have our elements..
!     if ( RenderText(textElems) )
!     {
      
!         CalcTextureCoords();
!         sprite->SetMaterialWrapper(mat);
!         return true;
!     }
!     return false;
  }
  
***************
*** 619,623 ****
          engine->RemoveObject(tex);
  
! 	//calculate dimensions
      int y = 0;
      int maxWidth = 0;
--- 619,623 ----
          engine->RemoveObject(tex);
  
!     //calculate dimensions
      int y = 0;
      int maxWidth = 0;
***************
*** 641,645 ****
  
      g2d->DrawBox(0, 0, texWidth, texHeight, g2d->FindRGB (51, 51, 254));
! 	return true;
  }*/
  
--- 641,645 ----
  
      g2d->DrawBox(0, 0, texWidth, texHeight, g2d->FindRGB (51, 51, 254));
!     return true;
  }*/
  
***************
*** 734,738 ****
          const psEffectObjText::EffectTextElement * elem = &textElems[a];
  
! 		ApplyRow( elem );
  
      }
--- 734,738 ----
          const psEffectObjText::EffectTextElement * elem = &textElems[a];
  
!         ApplyRow( elem );
  
      }

Index: pseffectobjtext.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjtext.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pseffectobjtext.h	3 Nov 2005 20:05:10 -0000	1.12
--- pseffectobjtext.h	1 Dec 2005 22:09:32 -0000	1.13
***************
*** 47,51 ****
       *   \return        True on success, false otherwise.
       */
! 	bool SetAttributedText(const char * newText) { return true; }
  
      /** Creates a texture with the given preformated text.
--- 47,51 ----
       *   \return        True on success, false otherwise.
       */
!     bool SetAttributedText(const char * newText) { return true; }
  
      /** Creates a texture with the given preformated text.

Index: pseffectobjtrail.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjtrail.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pseffectobjtrail.cpp	28 Jul 2005 11:39:33 -0000	1.10
--- pseffectobjtrail.cpp	1 Dec 2005 22:09:32 -0000	1.11
***************
*** 192,196 ****
  
          mesh->GetMovable()->SetSector(anchorMesh->GetMovable()->GetSectors()->Get(0));
! 		mesh->GetMovable()->SetPosition(anchorMesh->GetMovable()->GetFullPosition());
          mesh->GetMovable()->UpdateMove();
  
--- 192,196 ----
  
          mesh->GetMovable()->SetSector(anchorMesh->GetMovable()->GetSectors()->Get(0));
!         mesh->GetMovable()->SetPosition(anchorMesh->GetMovable()->GetFullPosition());
          mesh->GetMovable()->UpdateMove();