Changeset 10280

Timestamp:

Feb 19, 2015, 12:39:06 PM (9 years ago)

Author:

maxima

Message:

Trunk(-r10279) merged to tutorial branch. Works now on ITET-Tardis.

Location:

code/branches/tutorial5

Files:

• . (modified) (1 prop)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/core/Loader.cc (modified) (1 diff)
• src/libraries/tools/BulletDebugDrawer.cc (modified) (1 diff)
• src/libraries/tools/BulletDebugDrawer.h (modified) (1 diff)

code/branches/tutorial5/src/libraries/core/GUIManager.cc

@@ -846 +846 @@
         this->guiRenderer_->setDisplaySize(CEGUI::Size((float)newWidth, (float)newHeight));
 #endif
-        this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, newWidth), CEGUI::UDim(1, newHeight)));
+        this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
     }
 

code/branches/tutorial5/src/libraries/core/Loader.cc

@@ -470 +470 @@
                     //A newline directly after square brackets is ignored. To make sure that the string is printed
                     //exactly as it is, including newlines at the beginning, insert a space after the brackets.
-                    output << "print([" + equalSigns + "[ " + temp + ']' + equalSigns +"])";
+                    bool needsExtraSpace = false;
+                    if (temp.size() > 0 && (temp[0] == '\n' || temp[0] == '\r')) // begins with \n or \r (a line break)
+                        needsExtraSpace = true;
+                    output << "print([" + equalSigns + (needsExtraSpace ? "[ " : "[") + temp + ']' + equalSigns +"])";
                     start = end + 5;
                 }

code/branches/tutorial5/src/libraries/tools/BulletDebugDrawer.cc

@@ -12 +12 @@
 #include <OgreManualObject.h>
 #include <OgreSceneManager.h>
+#include <OgreTimer.h>
 
 #include "util/Output.h"

code/branches/tutorial5/src/libraries/tools/BulletDebugDrawer.h

@@ -12 +12 @@
 
 #include <btBulletCollisionCommon.h>
+#include <OgreFrameListener.h>
 
 namespace orxonox