ogre 1.13

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 # specify which version and components you need
-find_package(OGRE 1.11 REQUIRED COMPONENTS Bites RTShaderSystem)
+find_package(OGRE 13.0.1 REQUIRED COMPONENTS Bites RTShaderSystem)
 
 
 # copy resource.cfg next to our binaries where OGRE looks for it

DotSceneLoader.cpp

@@ -241,6 +241,8 @@ void DotSceneLoader::processLight(TiXmlElement *XMLNode, SceneNode *pParent)
 
     // Create the light
     Light *pLight = mSceneMgr->createLight(name);
+
+
     if(pParent)
         pParent->attachObject(pLight);
 
@@ -262,12 +264,12 @@ void DotSceneLoader::processLight(TiXmlElement *XMLNode, SceneNode *pParent)
     // Process position (?)
     pElement = XMLNode->FirstChildElement("position");
     if(pElement)
-        pLight->setPosition(parseVector3(pElement));
+        pParent->setPosition(parseVector3(pElement));
 
     // Process normal (?)
     pElement = XMLNode->FirstChildElement("normal");
     if(pElement)
-        pLight->setDirection(parseVector3(pElement));
+        pParent->setDirection(parseVector3(pElement));
 
     // Process colourDiffuse (?)
     pElement = XMLNode->FirstChildElement("colourDiffuse");

GSMap.cpp

@@ -67,10 +67,10 @@ bool GSMap::frameStarted(const Ogre::FrameEvent& evt)
 bool GSMap::frameRenderingQueued(const Ogre::FrameEvent& evt)
 {
     Ogre::String statusText = "FPS: " + Ogre::StringConverter::toString(ITS::getSingleton().getWindow()->getStatistics().avgFPS);
-	Ogre::Vector3 cam = TPCamera::getSingleton().getCamera()->getPosition();
+    Ogre::Vector3 cam = TPCamera::getCameraSN()->getPosition();
 	cam.x = (int)cam.x;cam.y = (int)cam.y;cam.z = (int)cam.z;
 	statusText += "\nCameraPos: " + Ogre::StringConverter::toString(cam);
-	cam = TPCamera::getSingleton().getCamera()->getDirection();
+    cam = TPCamera::getCameraSN()->getOrientation().zAxis() * -1;
 	statusText += "\nCameraDir: " + Ogre::StringConverter::toString(cam.x, 2) + " " + Ogre::StringConverter::toString(cam.y, 2) + " " + Ogre::StringConverter::toString(cam.z, 2);
 	int unitsSpeed = mVehicle->getAvgSpeed();
 	int kmhSpeed = mVehicle->getAvgSpeed(VehicleBase::Kmh);

ITS.cpp

@@ -183,7 +183,7 @@ void ITS::setup(void)
     // get a pointer to the already created root
     // Initialise the resource groups:
     Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
-    scnMgr_ = root_->createSceneManager(Ogre::ST_EXTERIOR_FAR, "BulletTerrain");
+    scnMgr_ = root_->createSceneManager("BulletTerrain");
     //scnMgr_->setSkyBox(true, "Cratelake");
     scnMgr_->setSkyBox(true, "Examples/SpaceSkyBox", 5000);
     mWindow = getRenderWindow();
@@ -299,7 +299,7 @@ void ITS::windowResized(Ogre::RenderWindow *rw)
 {
     unsigned int width, height, depth;
     int left, top;
-    rw->getMetrics(width, height, depth, left, top);
+    rw->getMetrics(width, height, left, top);
 }
 
 void ITS::windowClosed(Ogre::RenderWindow *rw)

Map.cpp

@@ -57,7 +57,9 @@ void Map::load()
     ITS::getSceneManagerS()->setAmbientLight(mLightAmbient);
 
     mLight = ITS::getSceneManagerS()->createLight();
-	mLight->setDirection(mLightDirection);
+    mLightSN = ITS::getSceneManagerS()->getRootSceneNode()->createChildSceneNode("mCameraSN");
+    mLightSN->attachObject(mLight);
+    mLightSN->setDirection(mLightDirection);
 	mLight->setDiffuseColour(mLightDiffuse);
 
 	mLight->setSpecularColour(mLightSpecular);

Map.h

@@ -50,6 +50,7 @@ class Map : public Ogre::FrameListener
 
 	Landscape* mLandscape;
 	Ogre::SceneNode* mMapSceneNode;
+    Ogre::SceneNode* mLightSN;
 
 	Ogre::Light* mLight;
 	Ogre::ColourValue mLightAmbient;
@@ -70,4 +71,4 @@ class Map : public Ogre::FrameListener
 
 }
 
-#endif
+#endif

TPCamera.cpp

@@ -18,17 +18,18 @@ TPCamera::TPCamera()
     mSignDirection(-1)
 {
     mCamera = mIts.getSceneManager()->createCamera("PlayerCam");
-
+    mCameraSN = mIts.getSceneManager()->getRootSceneNode()->createChildSceneNode("mCameraSN");
+    mCameraSN->attachObject(mCamera);
     //mCamera->setPosition(Ogre::Vector3(0, 200, 200));
-    mCamera->setPosition(Ogre::Vector3(300, 100, 450));
-    mCamera->lookAt(Ogre::Vector3(0,0,0));
+    mCameraSN->setPosition(Ogre::Vector3(300, 100, 450));
+    mCameraSN->lookAt(Ogre::Vector3(0,0,0), Ogre::Node::TS_WORLD );
     mCamera->setNearClipDistance(1);
-	mCamera->setCastShadows(false);
+    mCamera->setCastShadows(false);
 	//mCamera->setAutoAspectRatio(true);
-	mCamera->setAspectRatio(
+    mCamera->setAspectRatio(
         Ogre::Real(mIts.getWindow()->getWidth()) / Ogre::Real(mIts.getWindow()->getHeight()));
 
-    mCamera->setOrientation(Ogre::Quaternion(Ogre::Radian(mPitch),Ogre::Vector3::UNIT_Y)*Ogre::Quaternion(Ogre::Radian(mYaw),Ogre::Vector3::UNIT_X));
+    mCameraSN->setOrientation(Ogre::Quaternion(Ogre::Radian(mPitch),Ogre::Vector3::UNIT_Y)*Ogre::Quaternion(Ogre::Radian(mYaw),Ogre::Vector3::UNIT_X));
 }
 
 TPCamera::~TPCamera()
@@ -64,8 +65,8 @@ void TPCamera::update()
             Ogre::Vector3 testPosCam = mTarget->_getDerivedPosition();
 			Ogre::Vector3 dir = mTarget->_getDerivedOrientation() * Ogre::Quaternion(Ogre::Radian(mYaw), Ogre::Vector3::UNIT_Y) *Ogre::Quaternion(Ogre::Radian(mPitch), Ogre::Vector3::UNIT_X) * Ogre::Vector3(0,0,1);
 			dir.normalise();
-            mCamera->setPosition(mTarget->_getDerivedPosition() + Ogre::Vector3(0, 3.0f, 0) + mSignDirection*dir*mTargetDistance);
-			mCamera->lookAt(mTarget->_getDerivedPosition() + Ogre::Vector3(0, 3.0f, 0));
+            mCameraSN->setPosition(mTarget->_getDerivedPosition() + Ogre::Vector3(0, 3.0f, 0) + mSignDirection*dir*mTargetDistance);
+            mCameraSN->lookAt(mTarget->_getDerivedPosition() + Ogre::Vector3(0, 3.0f, 0), Ogre::Node::TS_WORLD );
 
 		}
 		else
@@ -85,17 +86,17 @@ bool TPCamera::frameRenderingQueued(const Ogre::FrameEvent& evt)
 	{
 		Ogre::Vector3 delta = Ogre::Vector3::ZERO;
 
-		if (mGoingRight) delta += mCamera->getRight();
-		if (mGoingLeft) delta -= mCamera->getRight();
-		if (mGoingForward) delta += mCamera->getDirection();
-		if (mGoingBack) delta -= mCamera->getDirection();
+        if (mGoingRight) delta += mCameraSN->getOrientation().xAxis();
+        if (mGoingLeft) delta -= mCameraSN->getOrientation().xAxis();
+        if (mGoingForward) delta += mCameraSN->getOrientation().zAxis() * -1;
+        if (mGoingBack) delta -= mCameraSN->getOrientation().zAxis() * -1;
 
 		delta.normalise();
 
 //        if (ITS::getSingleton().getKeyboard()->isModifierDown(OIS::Keyboard::Modifier::Shift))
 //			delta *= 4;
 
-		mCamera->move(delta * mVelocity * evt.timeSinceLastFrame);
+        mCameraSN->translate(delta * mVelocity * evt.timeSinceLastFrame);
 	}
 
 	return true;
@@ -109,15 +110,20 @@ Ogre::Camera* TPCamera::getCamera()
 
 Ogre::Camera* TPCamera::getCameraS()
 {
-	return TPCamera::getSingleton().mCamera;
+    return TPCamera::getSingleton().mCamera;
+}
+
+Ogre::SceneNode *TPCamera::getCameraSN()
+{
+     return TPCamera::getSingleton().mCameraSN;
 }
 
 
 
 void TPCamera::rotate(Ogre::Real yaw, Ogre::Real pitch)
 {
-	mCamera->yaw(Ogre::Radian(-yaw*mSencivity));
-	mCamera->pitch(Ogre::Radian(-pitch*mSencivity));
+    mCameraSN->yaw(Ogre::Radian(-yaw*mSencivity));
+    mCameraSN->pitch(Ogre::Radian(-pitch*mSencivity));
 
 	if (mTarget)
 	{
@@ -174,7 +180,7 @@ void TPCamera::changeSignDirection(int sign)
 
 bool TPCamera::setTargetFollowing()
 {
-    mCamera->setPosition(Ogre::Vector3(300, 100, 550));
+    mCameraSN->setPosition(Ogre::Vector3(300, 100, 550));
     mFollowVehicle = !mFollowVehicle;
     return mFollowVehicle;
 }

TPCamera.h

@@ -21,6 +21,7 @@ class TPCamera : public Ogre::Singleton<TPCamera>, public Ogre::FrameListener
 
 	// static version to reduce code length
 	static Ogre::Camera* getCameraS();
+    static Ogre::SceneNode* getCameraSN();
 
 	void rotate(Ogre::Real yaw, Ogre::Real pitch);
 
@@ -54,6 +55,7 @@ class TPCamera : public Ogre::Singleton<TPCamera>, public Ogre::FrameListener
 	bool mGoingForward;
 	bool mGoingBack;
 
+    Ogre::SceneNode* mCameraSN;
 	Ogre::SceneNode* mTarget;
 	Ogre::Real mTargetDistance;
 	Ogre::Real mYaw;

Vehicle.cpp

@@ -49,10 +49,10 @@ bool Vehicle::frameRenderingQueued(const Ogre::FrameEvent& evt)
 
 	if (mControlledWeapon)
 	{
-		const Ogre::Quaternion& camRot = TPCamera::getSingleton().getCamera()->getOrientation();
+        const Ogre::Quaternion& camRot = TPCamera::getCameraSN()->getOrientation();
 		Ogre::Degree yaw = camRot.getYaw() - mControlledWeapon->getSceneNode()->getParentSceneNode()->_getDerivedOrientation().getYaw();
 			// Âû÷èñëÿåì óãîë íàêëîíà êàìåðû
-		Ogre::Vector3 direction = TPCamera::getSingleton().getCamera()->getDirection();
+        Ogre::Vector3 direction = TPCamera::getCameraSN()->getOrientation().zAxis() * -1;
 		Ogre::Real len = direction.length();
 		Ogre::Degree pitch(Ogre::Radian(Ogre::Math::ASin(direction.y / len)));