rpms/chess/devel chess-ogre16.patch,1.1,1.2

Alexey Torkhov atorkhov at fedoraproject.org
Mon Sep 29 17:20:15 UTC 2008 

Author: atorkhov

Update of /cvs/pkgs/rpms/chess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9059

Modified Files:
	chess-ogre16.patch 
Log Message:
Fixing ogre1.6 patch.

chess-ogre16.patch:

Index: chess-ogre16.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chess/devel/chess-ogre16.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chess-ogre16.patch	19 Sep 2008 07:37:06 -0000	1.1
+++ chess-ogre16.patch	29 Sep 2008 17:19:44 -0000	1.2
@@ -1,6 +1,7 @@
-diff -urp chess.orig/include/stdafx.h chess/include/stdafx.h
---- chess.orig/include/stdafx.h	2008-09-14 14:18:19.000000000 +0400
-+++ chess/include/stdafx.h	2008-09-14 14:18:34.000000000 +0400
+diff --git a/include/stdafx.h b/include/stdafx.h
+index 2f079ac..b951581 100644
+--- a/include/stdafx.h
++++ b/include/stdafx.h
 @@ -18,8 +18,6 @@
  #ifndef STDAFX_H
  #define STDAFX_H
@@ -19,10 +20,11 @@
  #include <Ogre.h>
  
  using namespace Ogre;
-diff -urp chess.orig/src/CaptureState.cpp chess/src/CaptureState.cpp
---- chess.orig/src/CaptureState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/CaptureState.cpp	2008-09-14 14:56:33.000000000 +0400
-@@ -48,7 +48,7 @@ void CaptureState::CreateMovementTrack(c
+diff --git a/src/CaptureState.cpp b/src/CaptureState.cpp
+index 1b23194..eb0afe5 100644
+--- a/src/CaptureState.cpp
++++ b/src/CaptureState.cpp
+@@ -48,7 +48,7 @@ void CaptureState::CreateMovementTrack(const int Type)
  
      // make sure the scene node's rotation is taken into account
      Ogre::Matrix3 nodeRot;      
@@ -31,31 +33,35 @@
      mOffset = mOffset * nodeRot;
  
      // tweak the position according to the offsets
-diff -urp chess.orig/src/ChessApplication.cpp chess/src/ChessApplication.cpp
---- chess.orig/src/ChessApplication.cpp	2008-09-14 14:18:19.000000000 +0400
-+++ chess/src/ChessApplication.cpp	2008-09-14 15:09:29.000000000 +0400
-@@ -118,7 +118,7 @@ void ChessApplication::createScene()
+diff --git a/src/ChessApplication.cpp b/src/ChessApplication.cpp
+index 64f44e7..58da946 100644
+--- a/src/ChessApplication.cpp
++++ b/src/ChessApplication.cpp
+@@ -118,7 +118,8 @@ void ChessApplication::createScene()
    plane.d = 0;
    MeshManager::getSingleton().createPlane("board", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, plane, 160,160,1,1,true,1,1,1,Vector3::UNIT_Z);
  
 -  RenderTexture* rttTex = mRoot->getRenderSystem()->createRenderTexture( "RttTex", 1024, 1024, TEX_TYPE_2D, PF_R8G8B8 );  
-+  RenderTexture* rttTex = (RenderTexture*) TextureManager::getSingleton().createManual("RttTex", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET).get();
++  Ogre::TexturePtr rttTexPtr = TextureManager::getSingleton().createManual("RttTex", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET);
++  RenderTexture* rttTex = rttTexPtr->getBuffer()->getRenderTarget();
    Viewport *v = rttTex->addViewport(mReflectCamera);
    v->setClearEveryFrame(true);
    v->setBackgroundColour(ColourValue::Black);
-@@ -159,7 +159,7 @@ void ChessApplication::createScene()
+@@ -159,7 +160,8 @@ void ChessApplication::createScene()
    mPlaneNode->attachObject(mPlane);
    mPlaneNode->translate(0, -15, 0);  
  
 -  RenderTexture* rttTexa = mRoot->getRenderSystem()->createRenderTexture("RttTexa", 1024, 1024, TEX_TYPE_2D, PF_R8G8B8 );
-+  RenderTexture* rttTexa = (RenderTexture*) TextureManager::getSingleton().createManual("RttTexa", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET).get();
++  Ogre::TexturePtr rttTexaPtr = TextureManager::getSingleton().createManual("RttTexa", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 1024, 1024, MIP_DEFAULT, PF_R8G8B8, TU_RENDERTARGET);
++  RenderTexture* rttTexa = rttTexaPtr->getBuffer()->getRenderTarget();
    {
        Viewport *va = rttTexa->addViewport( mReflectCameraGround );
        va->setClearEveryFrame( true );
-diff -urp chess.orig/src/HandState.cpp chess/src/HandState.cpp
---- chess.orig/src/HandState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/HandState.cpp	2008-09-14 15:17:09.000000000 +0400
-@@ -69,16 +69,16 @@ void HandState::AttachPiece(const String
+diff --git a/src/HandState.cpp b/src/HandState.cpp
+index 0922c6b..9b8c831 100644
+--- a/src/HandState.cpp
++++ b/src/HandState.cpp
+@@ -69,16 +69,16 @@ void HandState::AttachPiece(const String bonename, Piece* piece, SceneNode*& pie
    Bone* bone = mHandEntity->getSkeleton()->getBone(bonename);     
  
    // work out the offset orientation
@@ -75,7 +81,7 @@
    mHandNode->getOrientation().ToRotationMatrix(nodeRot);
  
    Vector3 offsetPosition = (nodePos - (handPos + (nodeRot * bonePos))); 
-@@ -102,7 +102,7 @@ void HandState::BaseCreateMovementTrack(
+@@ -102,7 +102,7 @@ void HandState::BaseCreateMovementTrack(void)
  {
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -84,10 +90,11 @@
  
    mTargetPosition = (mStartingPosition * nodeRot);  
  
-diff -urp chess.orig/src/MovePieceState.cpp chess/src/MovePieceState.cpp
---- chess.orig/src/MovePieceState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/MovePieceState.cpp	2008-09-14 15:18:31.000000000 +0400
-@@ -61,7 +61,7 @@ void MovePieceState::CreateMovementTrack
+diff --git a/src/MovePieceState.cpp b/src/MovePieceState.cpp
+index dac48f8..e5bc3fc 100644
+--- a/src/MovePieceState.cpp
++++ b/src/MovePieceState.cpp
+@@ -61,7 +61,7 @@ void MovePieceState::CreateMovementTrack()
  
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -96,17 +103,18 @@
    mOffset = mOffset * nodeRot;
  
    // tweak the position according to the offsets
-@@ -148,4 +148,4 @@ HandState::StateType MovePieceState::Upd
+@@ -148,4 +148,4 @@ HandState::StateType MovePieceState::Update(Real dt)
    }
    else    
      return mStateType;  
 -}
-\ В конце файла нет новой строки
+\ No newline at end of file
 +}
-diff -urp chess.orig/src/PickupState.cpp chess/src/PickupState.cpp
---- chess.orig/src/PickupState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/PickupState.cpp	2008-09-14 15:19:24.000000000 +0400
-@@ -70,7 +70,7 @@ void PickupState::CreateMovementTrack()
+diff --git a/src/PickupState.cpp b/src/PickupState.cpp
+index cb0da54..8d1931e 100644
+--- a/src/PickupState.cpp
++++ b/src/PickupState.cpp
+@@ -70,7 +70,7 @@ void PickupState::CreateMovementTrack()
  
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -115,17 +123,18 @@
    mOffset = mOffset * nodeRot;
  
    // tweak the position according to the offsets
-@@ -140,4 +140,4 @@ HandState::StateType PickupState::Update
+@@ -140,4 +140,4 @@ HandState::StateType PickupState::Update(Real dt)
    }
    else    
      return mStateType;
 -}
-\ В конце файла нет новой строки
+\ No newline at end of file
 +}
-diff -urp chess.orig/src/RemoveState.cpp chess/src/RemoveState.cpp
---- chess.orig/src/RemoveState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/RemoveState.cpp	2008-09-14 15:26:24.000000000 +0400
-@@ -49,7 +49,7 @@ void RemoveState::CreateMovementTrack()
+diff --git a/src/RemoveState.cpp b/src/RemoveState.cpp
+index 5558b3f..930361c 100644
+--- a/src/RemoveState.cpp
++++ b/src/RemoveState.cpp
+@@ -49,7 +49,7 @@ void RemoveState::CreateMovementTrack()
  
    // make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;      
@@ -134,17 +143,18 @@
    
    // tweak the position according to the offsets
    mTargetPosition += mOffset;  
-@@ -115,4 +115,4 @@ HandState::StateType RemoveState::Update
+@@ -115,4 +115,4 @@ HandState::StateType RemoveState::Update(Real dt)
    }
    else    
      return HandState::Remove;
 -}
-\ В конце файла нет новой строки
+\ No newline at end of file
 +}
-diff -urp chess.orig/src/StaticState.cpp chess/src/StaticState.cpp
---- chess.orig/src/StaticState.cpp	2008-09-14 14:18:15.000000000 +0400
-+++ chess/src/StaticState.cpp	2008-09-14 15:28:13.000000000 +0400
-@@ -33,7 +33,7 @@ void StaticState::Initialise(void)
+diff --git a/src/StaticState.cpp b/src/StaticState.cpp
+index 951bf1e..de8deae 100644
+--- a/src/StaticState.cpp
++++ b/src/StaticState.cpp
+@@ -33,7 +33,7 @@ void StaticState::Initialise(void)
    // put the hand in it's starting position
    // - make sure the scene node's rotation is taken into account
    Ogre::Matrix3 nodeRot;

More information about the fedora-extras-commits mailing list