[Planeshift-cvs] CVS: planeshift/src/common/effects pseffectobjquad.cpp,1.22,1.23 pseffectobjspire.cpp,1.24,1.25 pseffectobjstar.cpp,1.15,1.16 pseffectobjtrail.cpp,1.12,1.13

[Luca P. <lpa...@us...>]

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

Modified Files:
	pseffectobjquad.cpp pseffectobjspire.cpp pseffectobjstar.cpp 
	pseffectobjtrail.cpp 
Log Message:
fixed for latest CS changes

Index: pseffectobjquad.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjquad.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** pseffectobjquad.cpp	15 Mar 2006 05:27:13 -0000	1.22
--- pseffectobjquad.cpp	7 May 2006 15:37:31 -0000	1.23
***************
*** 121,125 ****
  
      if (mixmode != CS_FX_ALPHA)
!         genState->SetMixMode(mixmode);
  
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);
--- 121,126 ----
  
      if (mixmode != CS_FX_ALPHA)
!       mesh->GetMeshObject()->SetMixMode(mixmode);  // to check
!       //genState->SetMixMode(mixmode); was not working with latest CS
  
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);

Index: pseffectobjspire.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjspire.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** pseffectobjspire.cpp	15 Mar 2006 05:27:13 -0000	1.24
--- pseffectobjspire.cpp	7 May 2006 15:37:31 -0000	1.25
***************
*** 139,146 ****
      genState = SCF_QUERY_INTERFACE(mesh->GetMeshObject(), iGeneralMeshState);
      genState->SetLighting(false);
!     genState->SetColor(csColor(1,1,1));
  
      if (mixmode != CS_FX_ALPHA)
!         genState->SetMixMode(mixmode);
    
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);
--- 139,149 ----
      genState = SCF_QUERY_INTERFACE(mesh->GetMeshObject(), iGeneralMeshState);
      genState->SetLighting(false);
! 
!     mesh->GetMeshObject()->SetColor(csColor(1,1,1)); // to check
!     //genState->SetColor(csColor(1,1,1)); was not working with latest CS
  
      if (mixmode != CS_FX_ALPHA)
!       mesh->GetMeshObject()->SetMixMode(mixmode);  // to check
!       //genState->SetMixMode(mixmode); was not working with latest CS
    
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);

Index: pseffectobjstar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjstar.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pseffectobjstar.cpp	15 Mar 2006 05:27:13 -0000	1.15
--- pseffectobjstar.cpp	7 May 2006 15:37:31 -0000	1.16
***************
*** 128,135 ****
      genState = SCF_QUERY_INTERFACE(mesh->GetMeshObject(), iGeneralMeshState);
      genState->SetLighting(false);
!     genState->SetColor(csColor(1,1,1));
  
      if (mixmode != CS_FX_ALPHA)
!         genState->SetMixMode(mixmode);
  
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);
--- 128,138 ----
      genState = SCF_QUERY_INTERFACE(mesh->GetMeshObject(), iGeneralMeshState);
      genState->SetLighting(false);
! 
!     mesh->GetMeshObject()->SetColor(csColor(1,1,1)); // to check
!     //genState->SetColor(csColor(1,1,1)); was not working with latest CS
  
      if (mixmode != CS_FX_ALPHA)
!       mesh->GetMeshObject()->SetMixMode(mixmode);  // to check
!       //genState->SetMixMode(mixmode); was not working with latest CS
  
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);

Index: pseffectobjtrail.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjtrail.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pseffectobjtrail.cpp	15 Mar 2006 05:27:13 -0000	1.12
--- pseffectobjtrail.cpp	7 May 2006 15:37:31 -0000	1.13
***************
*** 149,156 ****
      genState = SCF_QUERY_INTERFACE(mesh->GetMeshObject(), iGeneralMeshState);
      genState->SetLighting(false);
!     genState->SetColor(csColor(1,1,1));
  
      if (mixmode != CS_FX_ALPHA)
!         genState->SetMixMode(mixmode);
  
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);
--- 149,159 ----
      genState = SCF_QUERY_INTERFACE(mesh->GetMeshObject(), iGeneralMeshState);
      genState->SetLighting(false);
! 
!     mesh->GetMeshObject()->SetColor(csColor(1,1,1)); // to check
!     //genState->SetColor(csColor(1,1,1)); was not working with latest CS
  
      if (mixmode != CS_FX_ALPHA)
!       mesh->GetMeshObject()->SetMixMode(mixmode);  // to check
!       //genState->SetMixMode(mixmode); was not working with latest CS
  
      genState->SetAnimationControl((iGenMeshAnimationControl *)this);