[Orxonox-commit 4020] r8694 - in code/branches/presentation/src: libraries/network/synchronisable modules/notifications/dispatchers modules/objects modules/objects/triggers modules/pickup orxonox/collisionshapes orxonox/graphics orxonox/weaponsystem orxonox/worldentities
scheusso at orxonox.net
scheusso at orxonox.net
Thu Jun 2 14:05:28 CEST 2011
Author: scheusso
Date: 2011-06-02 14:05:27 +0200 (Thu, 02 Jun 2011)
New Revision: 8694
Modified:
code/branches/presentation/src/libraries/network/synchronisable/Synchronisable.h
code/branches/presentation/src/modules/notifications/dispatchers/SimpleNotification.cc
code/branches/presentation/src/modules/objects/SpaceBoundaries.cc
code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc
code/branches/presentation/src/modules/objects/triggers/Trigger.cc
code/branches/presentation/src/modules/objects/triggers/TriggerBase.cc
code/branches/presentation/src/modules/pickup/PickupRepresentation.cc
code/branches/presentation/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
code/branches/presentation/src/orxonox/graphics/Camera.cc
code/branches/presentation/src/orxonox/weaponsystem/WeaponSlot.cc
code/branches/presentation/src/orxonox/worldentities/CameraPosition.cc
code/branches/presentation/src/orxonox/worldentities/SpawnPoint.cc
Log:
fixed a network problem with SpaceBoundaries
please don't use new on synchronisables without restricting to server or setting syncMode to None
Modified: code/branches/presentation/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/presentation/src/libraries/network/synchronisable/Synchronisable.h 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/libraries/network/synchronisable/Synchronisable.h 2011-06-02 12:05:27 UTC (rev 8694)
@@ -49,6 +49,7 @@
namespace ObjectDirection{
enum Value{
+ None=0x0,
ToClient=0x1,
ToServer=0x2,
Bidirectional=0x3
Modified: code/branches/presentation/src/modules/notifications/dispatchers/SimpleNotification.cc
===================================================================
--- code/branches/presentation/src/modules/notifications/dispatchers/SimpleNotification.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/modules/notifications/dispatchers/SimpleNotification.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -50,7 +50,7 @@
this->setSender("simpleNotification");
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
/**
Modified: code/branches/presentation/src/modules/objects/SpaceBoundaries.cc
===================================================================
--- code/branches/presentation/src/modules/objects/SpaceBoundaries.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/modules/objects/SpaceBoundaries.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -105,6 +105,7 @@
{
Billboard* billboard = new Billboard(this);
billboard->setPosition(position);
+ billboard->setSyncMode(ObjectDirection::None);
this->setBillboardOptions(billboard);
BillboardAdministration ba = {true, billboard};
this->billboards_.push_back(ba);
Modified: code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc
===================================================================
--- code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -62,7 +62,7 @@
this->bMultiTrigger_ = true;
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
/**
Modified: code/branches/presentation/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/presentation/src/modules/objects/triggers/Trigger.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/modules/objects/triggers/Trigger.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -75,7 +75,7 @@
this->attachOgreObject(this->debugBillboard_.getBillboardSet());
}
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
/**
Modified: code/branches/presentation/src/modules/objects/triggers/TriggerBase.cc
===================================================================
--- code/branches/presentation/src/modules/objects/triggers/TriggerBase.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/modules/objects/triggers/TriggerBase.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -70,7 +70,7 @@
this->bMultiTrigger_ = false;
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
/**
Modified: code/branches/presentation/src/modules/pickup/PickupRepresentation.cc
===================================================================
--- code/branches/presentation/src/modules/pickup/PickupRepresentation.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/modules/pickup/PickupRepresentation.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -56,7 +56,7 @@
RegisterObject(PickupRepresentation);
this->initialize();
- this->setSyncMode(0x0); // The default PickupRperesentation created by each PickupManager is not synchronised, since it only exists locally.
+ this->setSyncMode(ObjectDirection::None); // The default PickupRperesentation created by each PickupManager is not synchronised, since it only exists locally.
}
/**
Modified: code/branches/presentation/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
===================================================================
--- code/branches/presentation/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -42,7 +42,7 @@
this->worldEntityOwner_ = creator;
// suppress synchronisation
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
WorldEntityCollisionShape::~WorldEntityCollisionShape()
Modified: code/branches/presentation/src/orxonox/graphics/Camera.cc
===================================================================
--- code/branches/presentation/src/orxonox/graphics/Camera.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/orxonox/graphics/Camera.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -70,7 +70,7 @@
this->bDrag_ = false;
this->lastDtLagged_ = false;
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
this->setConfigValues();
Modified: code/branches/presentation/src/orxonox/weaponsystem/WeaponSlot.cc
===================================================================
--- code/branches/presentation/src/orxonox/weaponsystem/WeaponSlot.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/orxonox/weaponsystem/WeaponSlot.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -45,7 +45,7 @@
this->weaponSystem_ = 0;
this->weapon_ = 0;
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
WeaponSlot::~WeaponSlot()
Modified: code/branches/presentation/src/orxonox/worldentities/CameraPosition.cc
===================================================================
--- code/branches/presentation/src/orxonox/worldentities/CameraPosition.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/orxonox/worldentities/CameraPosition.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -45,7 +45,7 @@
this->bAbsolute_ = false;
this->bRenderCamera_ = false;
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
CameraPosition::~CameraPosition()
Modified: code/branches/presentation/src/orxonox/worldentities/SpawnPoint.cc
===================================================================
--- code/branches/presentation/src/orxonox/worldentities/SpawnPoint.cc 2011-05-31 15:55:50 UTC (rev 8693)
+++ code/branches/presentation/src/orxonox/worldentities/SpawnPoint.cc 2011-06-02 12:05:27 UTC (rev 8694)
@@ -49,7 +49,7 @@
else
COUT(1) << "Error: SpawnPoint has no Gametype" << std::endl;
- this->setSyncMode(0x0);
+ this->setSyncMode(ObjectDirection::None);
}
void SpawnPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
More information about the Orxonox-commit
mailing list