Changeset 1143

Timestamp:

Apr 22, 2008, 10:33:58 PM (17 years ago)

Author:

rgrieder

Message:

• all just little changes to make it work under windows

Location:

code/branches/console

Files:

• src/orxonox/Main.cc (modified) (3 diffs)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/orxonox/console/InGameConsole.cc (modified) (2 diffs)
• src/orxonox/console/InGameConsole.h (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/console/src/orxonox/Main.cc

@@ -74 +74 @@
 int main(int argc, char **argv)
 {
-  try {
+  //try {
     SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
     Orxonox* orx = Orxonox::getSingleton();
@@ -86 +86 @@
     orx->start();
     orx->destroySingleton();
-  }
+  /*}
   catch (std::exception &ex)
   {
@@ -92 +92 @@
     std::cerr << ex.what() << "\n";
     return 1;
-  }
+  }*/
 
   return 0;

code/branches/console/src/orxonox/Orxonox.cc

@@ -471 +471 @@
         it++;
       }
+      orxonoxConsole_->tick((float)evt.timeSinceLastFrame * this->timefactor_);
 
       // don't forget to call _fireFrameStarted in ogre to make sure

code/branches/console/src/orxonox/console/InGameConsole.cc

@@ -27 +27 @@
  */
 
+#include "OrxonoxStableHeaders.h"
+
 #include "InGameConsole.h"
+
+#include <string>
+#include <OgreOverlay.h>
+#include <OgreOverlayElement.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlayContainer.h>
+#include <OgreStringConverter.h>
+
+#include "core/Debug.h"
+#include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
+#include "GraphicsEngine.h"
+
 #define LINES 20
 
@@ -39 +54 @@
 
     InGameConsole::InGameConsole(InputBuffer* ib){
+        //RegisterObject(InGameConsole);
         ib_ = ib;
+        active = false;
+        cursor = 0.0;
         init();
     }

code/branches/console/src/orxonox/console/InGameConsole.h

@@ -31 +31 @@
 
 
-#include "OrxonoxStableHeaders.h"
 #include "OrxonoxPrereqs.h"
-#include "core/Debug.h"
-#include "core/InputBuffer.h"
-#include "core/Tickable.h"
-#include "core/ConsoleCommand.h"
-#include <string>
-#include <GraphicsEngine.h>
 #include <OgrePrerequisites.h>
-#include <OgreOverlay.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
 #include <OgreBorderPanelOverlayElement.h>
 #include <OgreTextAreaOverlayElement.h>
-#include <OgreOverlayElement.h>
-#include <OgreStringConverter.h>
+
+#include "core/Tickable.h"
+#include "core/InputBuffer.h"
 
 
 namespace orxonox
 {
-    class _OrxonoxExport InGameConsole : public InputBufferListener, public Tickable{
+    class _OrxonoxExport InGameConsole : public InputBufferListener
+    {
         public:
             InGameConsole(InputBuffer* ib);

code/branches/console/visual_studio/vc8/orxonox.vcproj

@@ -384 +384 @@
                                 </File>
                         </Filter>
+                        <Filter
+                                Name="console"
+                                >
+                                <File
+                                        RelativePath="..\..\src\orxonox\console\InGameConsole.cc"
+                                        >
+                                </File>
+                        </Filter>
                 </Filter>
                 <Filter
@@ -511 +519 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\tools\Timer.h"
+                                        >
+                                </File>
+                        </Filter>
+                        <Filter
+                                Name="console"
+                                >
+                                <File
+                                        RelativePath="..\..\src\orxonox\console\InGameConsole.h"
                                         >
                                 </File>