Changeset 2420

Timestamp:

Dec 12, 2008, 12:05:03 PM (16 years ago)

Author:

scheusso

Message:

merged lodfinal (planet) branch to presentation branch

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/core/Template.cc (modified) (1 prop)
• src/core/Template.h (modified) (1 prop)
• src/core/XMLFile.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/orxonox/CameraManager.cc (modified) (1 prop)
• src/orxonox/CameraManager.h (modified) (1 prop)
• src/orxonox/objects/Level.cc (modified) (1 prop)
• src/orxonox/objects/Level.h (modified) (1 prop)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
• src/orxonox/objects/quest/Quest.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Planet.cc (copied) (copied from code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.cc) (3 diffs)
• src/orxonox/objects/worldentities/Planet.h (copied) (copied from code/branches/lodfinal/src/orxonox/objects/worldentities/Planet.h)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/directories.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)

code/branches/presentation/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -13 +13 @@
   ParticleEmitter.cc
   ParticleSpawner.cc
+  Planet.cc
 #  Backlight.cc
 )

code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc

@@ -77 +77 @@
         {
             Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
-            COUT(2) << distance << std::endl;
+//             COUT(2) << distance << std::endl;
             Real planetRadius = this->getScale();
         
@@ -119 +119 @@
     void Planet::changedMesh()
     {
-COUT(0) << "changedMesh callback -===================" << endl;
         if (this->mesh_.getEntity())
             this->getNode()->detachObject(this->mesh_.getEntity());
@@ -158 +157 @@
 
     void Planet::registerVariables(){
-        REGISTERSTRING(this->atmosphere_, direction::toclient);
-        REGISTERSTRING(this->meshSrc_, direction::toclient, new NetworkCallback<Planet>(this, &Planet::changedMesh));
-        REGISTERDATA(this->bCastShadows_, direction::toclient, new NetworkCallback<Planet>(this, &Planet::changedShadows));
-        REGISTERDATA(this->atmosphereSize, direction::toclient);
-        REGISTERDATA(this->imageSize, direction::toclient);
+        registerVariable(this->atmosphere_, variableDirection::toclient);
+        registerVariable(this->meshSrc_, variableDirection::toclient, new NetworkCallback<Planet>(this, &Planet::changedMesh));
+        registerVariable(this->bCastShadows_, variableDirection::toclient, new NetworkCallback<Planet>(this, &Planet::changedShadows));
+        registerVariable(this->atmosphereSize, variableDirection::toclient);
+        registerVariable(this->imageSize, variableDirection::toclient);
     }