Changeset 1961 for code

Timestamp:

Oct 20, 2008, 12:04:03 AM (16 years ago)

Author:

rgrieder

Message:

updated msvc files and adjusted merged files.

Location:

code/branches/objecthierarchy

Files:

• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/LuaBind.cc (modified) (1 diff)
• src/orxonox/objects/DistanceTrigger.cc (modified) (2 diffs)
• src/orxonox/objects/Script.cc (modified) (1 diff)
• src/orxonox/objects/Trigger.cc (modified) (5 diffs)
• src/orxonox/objects/Trigger.h (modified) (2 diffs)
• visual_studio/vc8/core.vcproj (modified) (4 diffs)
• visual_studio/vc8/orxonox.vcproj (modified) (4 diffs)

code/branches/objecthierarchy/src/core/CMakeLists.txt

@@ -6 +6 @@
   GameState.cc
   Language.cc
-  Luabind.cc
+  LuaBind.cc
   ObjectListBase.cc
   OrxonoxClass.cc

code/branches/objecthierarchy/src/core/LuaBind.cc

@@ -215 +215 @@
       bool bInPrintFunction = true;
       size_t start = 0;
-      size_tend = 0;
+      size_t end = 0;
 
       do

code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.cc

@@ -71 +71 @@
   void DistanceTrigger::addTargets(std::string targets)
   {
-    Identifier* targetId = ID(targets);
+    Identifier* targetId = ClassByString(targets);
     targetMask_.include(targetId);
     // trigger shouldn't react on itself or other triggers
@@ -80 +80 @@
   void DistanceTrigger::removeTargets(std::string targets)
   {
-    Identifier* targetId = ID(targets);
+    Identifier* targetId = ClassByString(targets);
     targetMask_.exclude(targetId);
   }

code/branches/objecthierarchy/src/orxonox/objects/Script.cc

@@ -30 +30 @@
 #include "Script.h"
 
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "core/LuaBind.h"
-#include "core/Debug.h"
 
 namespace orxonox

code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc

@@ -31 +31 @@
 
 #include <OgreBillboard.h>
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
@@ -39 +39 @@
 {
 
-  ConsoleCommand(Trigger, setVisibility, AccessLevel::Debug, false).setDefaultValues(0);
+  SetConsoleCommand(Trigger, setVisibility, false).accessLevel(AccessLevel::User).defaultValues(0);
 
   CreateFactory(Trigger);
@@ -74 +74 @@
   {
     if(bVisible)
-      this->setScale(2,2,2);
+      this->setScale(2);
     else
-      this->setScale(0,0,0);
+      this->setScale(0);
   }
 
@@ -84 +84 @@
       return NULL;
 
-    std::set<Trigger*>::iterator it;
+    std::set<Trigger*>::const_iterator it;
     it = children_.begin();
 
@@ -226 +226 @@
     //XMLPortParamLoadOnlyTemplate(Trigger, "mode", setMode, xmlelement, mode, std::string);
 
-    XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode, false, true);
+    // what are those last two parameters?
+    //XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode, false, true);
+    XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode);
 
     this->init();

code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

@@ -35 +35 @@
 #include "OrxonoxPrereqs.h"
 
-#include "WorldEntity.h"
+#include "worldentities/PositionableEntity.h"
 
 #include "../tools/BillboardSet.h"
@@ -48 +48 @@
   };
 
-  class _OrxonoxExport Trigger : public WorldEntity
+  class _OrxonoxExport Trigger : public PositionableEntity
   {
     public:

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

@@ -173 +173 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\LuaBind.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\OrxonoxClass.cc"
                                 >
@@ -178 +182 @@
                         <File
                                 RelativePath="..\..\src\core\RootGameState.cc"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\Script.cc"
                                 >
                         </File>
@@ -405 +405 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\LuaBind.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\OrxonoxClass.h"
                                 >
@@ -410 +414 @@
                         <File
                                 RelativePath="..\..\src\core\RootGameState.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\Script.h"
                                 >
                         </File>

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

@@ -200 +200 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\DistanceTrigger.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Radar.cc"
                                         >
@@ -212 +216 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\Script.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Tickable.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\objects\Trigger.cc"
                                         >
                                 </File>
@@ -536 +548 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\DistanceTrigger.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Radar.h"
                                         >
@@ -548 +564 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\Script.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Tickable.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\objects\Trigger.h"
                                         >
                                 </File>