Changeset 1647 for code/branches/gui

Timestamp:

Jul 27, 2008, 12:34:31 PM (16 years ago)

Author:

rgrieder

Message:

• removed Script_clean.h

Location:

code/branches/gui

Files:

• src/core/Script.h (modified) (2 diffs)
• src/core/Script_clean.h (deleted)
• src/core/tolua/tolua.pkg (modified) (1 diff)
• src/orxonox/gui/GUIManager.h (modified) (2 diffs)
• visual_studio/vc8/core.vcproj (modified) (2 diffs)

code/branches/gui/src/core/Script.h

@@ -28 +28 @@
 
 /**
- @file  script.h
+ @file
  @brief Representation of an interface to lua
  @author Benjamin Knecht <beni_at_orxonox.net>
@@ -47 +47 @@
 namespace orxonox // tolua_export
 { // tolua_export
-
-  class _CoreExport Script // tolua_export
-  { // tolua_export
+  class _CoreExport Script
+  /*
+  class Script { // tolua_export
+  */
+  {
     struct LoadS {
       const char *s;

code/branches/gui/src/core/tolua/tolua.pkg

@@ -1 @@
-$cfile "../../src/core/Script_clean.h"
+$cfile "../../src/core/Script.h"
 $cfile "../../src/core/CommandExecutor.h"

code/branches/gui/src/orxonox/gui/GUIManager.h

@@ -73 +73 @@
 
         bool initialise();
-        void tick(float dt);
+        void tick(float dt)
+        {
+            assert(guiSystem_);
+            guiSystem_->injectTimePulse(dt);
+        }
         void showGUI(const std::string& name, Ogre::SceneManager* sceneManager);// bool showBackground); // tolua_export
         void _hideGUI(); // tolua_export
@@ -131 +135 @@
         static GUIManager*        singletonRef_s;
     }; // tolua_export
-
-    inline void GUIManager::tick(float dt)
-    {
-        assert(guiSystem_);
-        guiSystem_->injectTimePulse(dt);
-    }
 } // tolua_export
 

code/branches/gui/visual_studio/vc8/core.vcproj

@@ -205 +205 @@
                                                         Description="Generating tolua bind files..."
                                                         CommandLine=""$(OutDir)\tolua_app_d.exe" -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
"
+                                                        AdditionalDependencies="$(RootDir)\src\core\Script.h; $(RootDir)\src\core\CommandExecutor.h"
                                                         Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h"
                                                 />
@@ -419 +420 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\Script_clean.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\SignalHandler.h"
                                 >