[chess] Patch lost carriage returns at some point.
Bruno Wolff III
bruno at fedoraproject.org
Sat Jan 8 05:49:01 UTC 2011
commit fe27ed768a8120019b7b2b8af56d95adc77f481a
Author: Bruno Wolff III <bruno at wolff.to>
Date: Fri Jan 7 23:47:25 2011 -0600
Patch lost carriage returns at some point.
chess-ogre17.patch | 178 ++++++++++++++++++++++++++--------------------------
1 files changed, 89 insertions(+), 89 deletions(-)
---
diff --git a/chess-ogre17.patch b/chess-ogre17.patch
index 6d3e518..6ed01ca 100644
--- a/chess-ogre17.patch
+++ b/chess-ogre17.patch
@@ -1,104 +1,104 @@
diff -up chess-1.0/include/Application.h.ogre17 chess-1.0/include/Application.h
--- chess-1.0/include/Application.h.ogre17 2010-12-21 16:11:52.200242001 -0500
+++ chess-1.0/include/Application.h 2010-12-21 16:11:52.238242001 -0500
-@@ -33,7 +33,7 @@ public:
-
- SceneManager* getSceneManager();
- RenderWindow* getRenderWindow();
-- CEGUI::OgreCEGUIRenderer* getGUIRenderer();
-+ CEGUI::OgreRenderer* getGUIRenderer();
- CEGUI::System* getGUISystem();
-
- protected:
-@@ -49,7 +49,7 @@ protected:
- RenderWindow *mWindow;
- SceneManager *mSceneManager;
- CollisionManager *mCollisionManager;
-- CEGUI::OgreCEGUIRenderer *mGUIRenderer;
-+ CEGUI::OgreRenderer *mGUIRenderer;
- CEGUI::System *mGUISystem;
- };
-
+@@ -33,7 +33,7 @@ public:
+
+ SceneManager* getSceneManager();
+ RenderWindow* getRenderWindow();
+- CEGUI::OgreCEGUIRenderer* getGUIRenderer();
++ CEGUI::OgreRenderer* getGUIRenderer();
+ CEGUI::System* getGUISystem();
+
+ protected:
+@@ -49,7 +49,7 @@ protected:
+ RenderWindow *mWindow;
+ SceneManager *mSceneManager;
+ CollisionManager *mCollisionManager;
+- CEGUI::OgreCEGUIRenderer *mGUIRenderer;
++ CEGUI::OgreRenderer *mGUIRenderer;
+ CEGUI::System *mGUISystem;
+ };
+
diff -up chess-1.0/include/stdafx.h.ogre17 chess-1.0/include/stdafx.h
--- chess-1.0/include/stdafx.h.ogre17 2010-12-21 16:11:52.230242001 -0500
+++ chess-1.0/include/stdafx.h 2010-12-21 16:11:52.239242001 -0500
-@@ -21,8 +21,8 @@
- #include <CEGUI/CEGUISystem.h>
- #include <CEGUI/CEGUILogger.h>
- #include <CEGUI/CEGUISchemeManager.h>
--#include "OgreCEGUIRenderer.h"
--#include "OgreCEGUIResourceProvider.h"
-+#include <RendererModules/Ogre/CEGUIOgreRenderer.h>
-+#include <RendererModules/Ogre/CEGUIOgreResourceProvider.h>
-
- #include <boost/thread/thread.hpp>
- #include <boost/bind.hpp>
+@@ -21,8 +21,8 @@
+ #include <CEGUI/CEGUISystem.h>
+ #include <CEGUI/CEGUILogger.h>
+ #include <CEGUI/CEGUISchemeManager.h>
+-#include "OgreCEGUIRenderer.h"
+-#include "OgreCEGUIResourceProvider.h"
++#include <RendererModules/Ogre/CEGUIOgreRenderer.h>
++#include <RendererModules/Ogre/CEGUIOgreResourceProvider.h>
+
+ #include <boost/thread/thread.hpp>
+ #include <boost/bind.hpp>
diff -up chess-1.0/Makefile.ogre17 chess-1.0/Makefile
--- chess-1.0/Makefile.ogre17 2010-12-21 16:11:52.228242001 -0500
+++ chess-1.0/Makefile 2010-12-21 16:11:52.239242001 -0500
-@@ -2,7 +2,7 @@ PREFIX = /home/opt
- DATADIR = $(PREFIX)/share/$(TARGET)
- OPTFLAGS= -g -Wall -O2
- CFLAGS = $(OPTFLAGS) -Iinclude $(shell pkg-config --cflags OGRE) \
-- $(shell pkg-config --cflags OIS) -I/usr/include/coldet
-+ $(shell pkg-config --cflags CEGUI-OGRE) $(shell pkg-config --cflags OIS) -I/usr/include/coldet
- CXXFLAGS= $(CFLAGS)
- LDFLAGS = $(shell pkg-config --libs OGRE) -lcoldet -lboost_thread-mt \
- $(shell pkg-config --libs CEGUI-OGRE) $(shell pkg-config --libs OIS)
+@@ -2,7 +2,7 @@ PREFIX = /home/opt
+ DATADIR = $(PREFIX)/share/$(TARGET)
+ OPTFLAGS= -g -Wall -O2
+ CFLAGS = $(OPTFLAGS) -Iinclude $(shell pkg-config --cflags OGRE) \
+- $(shell pkg-config --cflags OIS) -I/usr/include/coldet
++ $(shell pkg-config --cflags CEGUI-OGRE) $(shell pkg-config --cflags OIS) -I/usr/include/coldet
+ CXXFLAGS= $(CFLAGS)
+ LDFLAGS = $(shell pkg-config --libs OGRE) -lcoldet -lboost_thread-mt \
+ $(shell pkg-config --libs CEGUI-OGRE) $(shell pkg-config --libs OIS)
diff -up chess-1.0/src/Application.cpp.ogre17 chess-1.0/src/Application.cpp
--- chess-1.0/src/Application.cpp.ogre17 2010-12-21 16:12:41.554241999 -0500
+++ chess-1.0/src/Application.cpp 2010-12-21 16:33:43.468242000 -0500
-@@ -28,8 +28,6 @@ Application::Application() : mRoot(0), m
- Application::~Application()
- {
- delete mCollisionManager;
-- delete mGUISystem;
-- delete mGUIRenderer;
- mRoot->destroySceneManager(mSceneManager);
- delete mRoot;
- }
-@@ -55,7 +53,7 @@ RenderWindow* Application::getRenderWind
- return mWindow;
- }
-
--CEGUI::OgreCEGUIRenderer* Application::getGUIRenderer()
-+CEGUI::OgreRenderer* Application::getGUIRenderer()
- {
- return mGUIRenderer;
- }
-@@ -91,12 +89,13 @@ bool Application::initialize()
- ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
-
- // CEGUI setup
-- mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, mSceneManager);
-- mGUISystem = new CEGUI::System(mGUIRenderer);
-+ Ogre::RenderTarget *mRenderTarget = mWindow;
-+ mGUIRenderer = &CEGUI::OgreRenderer::bootstrapSystem(*mRenderTarget);
-+ mGUISystem = CEGUI::System::getSingletonPtr();
- mGUISystem->setMouseMoveScaling(1.25); // adjust the speed
-
- // Mouse
-- CEGUI::SchemeManager::getSingleton().loadScheme((CEGUI::utf8*)"WindowsLook.scheme");
-+ CEGUI::SchemeManager::getSingleton().create((CEGUI::utf8*)"WindowsLook.scheme");
- CEGUI::MouseCursor::getSingleton().setImage("WindowsLook", "MouseArrow");
-
- // create a new collision manager
+@@ -28,8 +28,6 @@ Application::Application() : mRoot(0), m
+ Application::~Application()
+ {
+ delete mCollisionManager;
+- delete mGUISystem;
+- delete mGUIRenderer;
+ mRoot->destroySceneManager(mSceneManager);
+ delete mRoot;
+ }
+@@ -55,7 +53,7 @@ RenderWindow* Application::getRenderWind
+ return mWindow;
+ }
+
+-CEGUI::OgreCEGUIRenderer* Application::getGUIRenderer()
++CEGUI::OgreRenderer* Application::getGUIRenderer()
+ {
+ return mGUIRenderer;
+ }
+@@ -91,12 +89,13 @@ bool Application::initialize()
+ ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+
+ // CEGUI setup
+- mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, mSceneManager);
+- mGUISystem = new CEGUI::System(mGUIRenderer);
++ Ogre::RenderTarget *mRenderTarget = mWindow;
++ mGUIRenderer = &CEGUI::OgreRenderer::bootstrapSystem(*mRenderTarget);
++ mGUISystem = CEGUI::System::getSingletonPtr();
+ mGUISystem->setMouseMoveScaling(1.25); // adjust the speed
+
+ // Mouse
+- CEGUI::SchemeManager::getSingleton().loadScheme((CEGUI::utf8*)"WindowsLook.scheme");
++ CEGUI::SchemeManager::getSingleton().create((CEGUI::utf8*)"WindowsLook.scheme");
+ CEGUI::MouseCursor::getSingleton().setImage("WindowsLook", "MouseArrow");
+
+ // create a new collision manager
diff -up chess-1.0/src/CollisionEntity.cpp.ogre17 chess-1.0/src/CollisionEntity.cpp
--- chess-1.0/src/CollisionEntity.cpp.ogre17 2010-12-21 16:57:28.713241999 -0500
+++ chess-1.0/src/CollisionEntity.cpp 2010-12-21 16:58:07.220242000 -0500
-@@ -98,7 +98,7 @@ void CollisionEntity::Initialise(void)
- void CollisionEntity::SetWorldTransform()
- {
- Matrix4 world;
-- mEntity->getParentSceneNode()->getWorldTransforms(&world);
-+ world = mEntity->getParentSceneNode()->_getFullTransform();
-
- float fMatrix[16];
-
-@@ -120,4 +120,4 @@ void CollisionEntity::SetWorldTransform(
- fMatrix[15] = world[3][3];
-
- mCollisionModel->setTransform(fMatrix);
--}
-\ No newline at end of file
-+}
+@@ -98,7 +98,7 @@ void CollisionEntity::Initialise(void)
+ void CollisionEntity::SetWorldTransform()
+ {
+ Matrix4 world;
+- mEntity->getParentSceneNode()->getWorldTransforms(&world);
++ world = mEntity->getParentSceneNode()->_getFullTransform();
+
+ float fMatrix[16];
+
+@@ -120,4 +120,4 @@ void CollisionEntity::SetWorldTransform(
+ fMatrix[15] = world[3][3];
+
+ mCollisionModel->setTransform(fMatrix);
+-}
+\ No newline at end of file
++}
More information about the scm-commits
mailing list