Changeset 108

Timestamp:

Oct 25, 2007, 11:52:07 PM (18 years ago)

Author:

anonymous

Message:

nicolasc: fixed the problem in all braches
orxonox can be quit by 'q' or '<esc>'

Location:

code/branches

Files:

• mainloop/src/orxonox.cc (modified) (2 diffs)
• network/src/orxonox.cc (modified) (2 diffs)
• xml/src/orxonox.cc (modified) (2 diffs)

code/branches/mainloop/src/orxonox.cc

@@ -32 +32 @@
 SceneNode *lightNode;
 
-class FrameListener : public ExampleFrameListener
+class OrxFrameListener : public ExampleFrameListener
 {
   public:
-    FrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
+    OrxFrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
   : ExampleFrameListener(win, cam, false, false)
     {
@@ -116 +116 @@
     {
         // create frame listener
-      mFrameListener = new ExampleFrameListener(mWindow, mCamera, mSceneMgr);
+      mFrameListener = new OrxFrameListener(mWindow, mCamera, mSceneMgr);
       mRoot->addFrameListener(mFrameListener);
     }

code/branches/network/src/orxonox.cc

@@ -32 +32 @@
 SceneNode *lightNode;
 
-class FrameListener : public ExampleFrameListener
+class OrxFrameListener : public ExampleFrameListener
 {
   public:
-    FrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
+    OrxFrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
   : ExampleFrameListener(win, cam, false, false)
     {
@@ -116 +116 @@
     {
         // create frame listener
-      mFrameListener = new ExampleFrameListener(mWindow, mCamera, mSceneMgr);
+      mFrameListener = new OrxFrameListener(mWindow, mCamera, mSceneMgr);
       mRoot->addFrameListener(mFrameListener);
     }

code/branches/xml/src/orxonox.cc

@@ -32 +32 @@
 SceneNode *lightNode;
 
-class FrameListener : public ExampleFrameListener
+class OrxFrameListener : public ExampleFrameListener
 {
   public:
-    FrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
+    OrxFrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
   : ExampleFrameListener(win, cam, false, false)
     {
@@ -116 +116 @@
     {
         // create frame listener
-      mFrameListener = new ExampleFrameListener(mWindow, mCamera, mSceneMgr);
+      mFrameListener = new OrxFrameListener(mWindow, mCamera, mSceneMgr);
       mRoot->addFrameListener(mFrameListener);
     }